restrict InertiRails.always to only acept blocks

Author: skryukov

docs/guide/partial-reloads.md

@@ -201,13 +201,7 @@ On the inverse, you can use the `InertiaRails.always` method to specify that a p
 class UsersController < ApplicationController
   def index
     render inertia: 'Users/Index', props: {
-      users: InertiaRails.always(User.all),
-
-      # Also works with block:
-      # users: InertiaRails.always { User.all },
-
-      # Also works with a lambda:
-      # users: InertiaRails.always(-> { User.all }),
+      users: InertiaRails.always { User.all },
     }
   end
 end

lib/inertia_rails/base_prop.rb

@@ -3,19 +3,12 @@
 module InertiaRails
   # Base class for all props.
   class BaseProp
-    def initialize(value = nil, &block)
-      raise ArgumentError, 'You must provide either a value or a block, not both' if value && block
-
-      @value = value
+    def initialize(&block)
       @block = block
     end
 
     def call(controller)
-      value.respond_to?(:call) ? controller.instance_exec(&value) : value
-    end
-
-    def value
-      @value.nil? ? @block : @value
+      controller.instance_exec(&@block)
     end
   end
 end

lib/inertia_rails/inertia_rails.rb

@@ -19,8 +19,8 @@ def lazy(value = nil, &block)
       LazyProp.new(value, &block)
     end
 
-    def always(value = nil, &block)
-      AlwaysProp.new(value, &block)
+    def always(&block)
+      AlwaysProp.new(&block)
     end
   end
 end

lib/inertia_rails/lazy_prop.rb

@@ -2,5 +2,19 @@
 
 module InertiaRails
   class LazyProp < BaseProp
+    def initialize(value = nil, &block)
+      raise ArgumentError, 'You must provide either a value or a block, not both' if value && block
+
+      @value = value
+      @block = block
+    end
+
+    def call(controller)
+      value.respond_to?(:call) ? controller.instance_exec(&value) : value
+    end
+
+    def value
+      @value.nil? ? @block : @value
+    end
   end
 end

spec/dummy/app/controllers/inertia_render_test_controller.rb

@@ -20,7 +20,7 @@ def except_props
         first: 'first nested param',
         second: 'second nested param'
       },
-      always: InertiaRails.always('always prop')
+      always: InertiaRails.always { 'always prop' }
     }
   end
 
@@ -54,7 +54,7 @@ def lazy_props
 
   def always_props
     render inertia: 'TestComponent', props: {
-      always: InertiaRails.always('always prop'),
+      always: InertiaRails.always { 'always prop' },
       regular: 'regular prop',
       lazy: InertiaRails.lazy do
         'lazy prop'

spec/inertia/lazy_prop_spec.rb

@@ -1,3 +1,35 @@
 RSpec.describe InertiaRails::LazyProp do
   it_behaves_like 'base prop'
+
+  describe '#call' do
+    subject(:call) { prop.call(controller) }
+    let(:prop) { described_class.new('value') }
+    let(:controller) { ApplicationController.new }
+
+    it { is_expected.to eq('value') }
+
+    context 'with false as value' do
+      let(:prop) { described_class.new(false) }
+
+      it { is_expected.to eq(false) }
+    end
+
+    context 'with nil as value' do
+      let(:prop) { described_class.new(nil) }
+
+      it { is_expected.to eq(nil) }
+    end
+
+    context 'with a callable value' do
+      let(:prop) { described_class.new(-> { 'callable' }) }
+
+      it { is_expected.to eq('callable') }
+
+      context 'with dependency on the context of a controller' do
+        let(:prop) { described_class.new(-> { controller_method }) }
+
+        it { is_expected.to eq('controller_method value') }
+      end
+    end
+  end
 end

spec/support/shared_examples.rb

@@ -1,45 +1,15 @@
 RSpec.shared_examples 'base prop' do
   describe '#call' do
     subject(:call) { prop.call(controller) }
-    let(:prop) { described_class.new('value') }
+    let(:prop) { described_class.new { 'block' } }
     let(:controller) { ApplicationController.new }
 
-    it { is_expected.to eq('value') }
+    it { is_expected.to eq('block') }
 
-    context 'with false as value' do
-      let(:prop) { described_class.new(false) }
+    context 'with dependency on the context of a controller' do
+      let(:prop) { described_class.new { controller_method } }
 
-      it { is_expected.to eq(false) }
-    end
-
-    context 'with nil as value' do
-      let(:prop) { described_class.new(nil) }
-
-      it { is_expected.to eq(nil) }
-    end
-
-    context 'with a callable value' do
-      let(:prop) { described_class.new(-> { 'callable' }) }
-
-      it { is_expected.to eq('callable') }
-
-      context 'with dependency on the context of a controller' do
-        let(:prop) { described_class.new(-> { controller_method }) }
-
-        it { is_expected.to eq('controller_method value') }
-      end
-    end
-
-    context 'with a block' do
-      let(:prop) { described_class.new { 'block' } }
-
-      it { is_expected.to eq('block') }
-
-      context 'with dependency on the context of a controller' do
-        let(:prop) { described_class.new { controller_method } }
-
-        it { is_expected.to eq('controller_method value') }
-      end
+      it { is_expected.to eq('controller_method value') }
     end
   end
 end