completed access to params directly via instance vars

Author: catmando

.travis.yml

@@ -21,7 +21,6 @@ env:
   - COMPONENT=hyper-i18n                  LANGUAGE=ruby LANGUAGE_VERSION=2.5.1
   - COMPONENT=hyper-model                 LANGUAGE=ruby LANGUAGE_VERSION=2.5.1
   - COMPONENT=hyper-operation             LANGUAGE=ruby LANGUAGE_VERSION=2.5.1
-  - COMPONENT=hyper-react                 LANGUAGE=ruby LANGUAGE_VERSION=2.5.1
   - COMPONENT=hyper-router                LANGUAGE=ruby LANGUAGE_VERSION=2.5.1
   - COMPONENT=hyper-spec                  LANGUAGE=ruby LANGUAGE_VERSION=2.5.1
   - COMPONENT=hyper-state                 LANGUAGE=ruby LANGUAGE_VERSION=2.5.1

ruby/examples/docs/home-page/app/hyperstack/components/native_example.rb

@@ -29,12 +29,12 @@ class SelectDate < HyperComponent
   render(DIV) do
     # DatePicker is a JS Component imported with Webpack
     # Notice the lambda to pass a Ruby method as a callback
-    DatePicker(selected: state.date,
+    DatePicker(selected: @date,
                todayButton: "Today",
-               onChange: ->(date) { mutate.date date }
+               onChange: ->(date) { mutate @date = date }
     )
     # see how we use `` and #{} to b ridger JS and Ruby
-    H3 { `moment(#{state.date}).format('LL')` }
+    H3 { `moment(#{@date}).format('LL')` }
     #  or if you prefer..
     # H3 { Native(`moment`).call(state.date).format('LL') }
   end

ruby/hyper-component/lib/hyperstack/internal/component/props_wrapper.rb

@@ -27,7 +27,9 @@ def param_definitions
 
           def define_param(name, param_type, aka = nil)
             aka ||= name
-            param_definitions[name] = ->(props) { @component.instance_variable_set :"@#{aka}", fetch_from_cache(name, param_type, props) } #[param_type, aka || name]
+            param_definitions[name] = lambda do |props|
+              @component.instance_variable_set :"@#{aka}", fetch_from_cache(name, param_type, props)
+            end
             if param_type == Proc
               define_method(aka.to_sym) do |*args, &block|
                 props[name].call(*args, &block) if props[name]
@@ -40,7 +42,9 @@ def define_param(name, param_type, aka = nil)
           end
 
           def define_all_others(name)
-            param_definitions[name] = -> (props) { puts "setting @#{name} props = #{props} self = #{self}"; @component.instance_variable_set :"@#{name}", yield(props) } #[:__hyperstack_component_all_others_flag, name, block]
+            param_definitions[name] = lambda do |props|
+              @component.instance_variable_set :"@#{name}", yield(props)
+            end
             define_method(name.to_sym) do
               @_all_others_cache ||= yield(props)
             end
@@ -53,7 +57,7 @@ def param_accessor_style
 
         def initialize(component, incoming = nil)
           @component = component
-          return if self.class.param_accessor_style == :legacy
+          return if param_accessor_style == :legacy
           self.class.param_definitions.each_value do |initializer|
             instance_exec(incoming || props, &initializer)
           end
@@ -73,12 +77,12 @@ def [](prop)
         def fetch_from_cache(name, param_type, props)
           last, cached_value = cache[name]
           return cached_value if last.equal?(props[name])
-          convert_param(name, param_type).tap do |value|
+          convert_param(name, param_type, props).tap do |value|
             cache[name] = [props[name], value]
           end
         end
 
-        def convert_param(name, param_type)
+        def convert_param(name, param_type, props)
           if param_type.respond_to? :_react_param_conversion
             param_type._react_param_conversion props[name], nil
           elsif param_type.is_a?(Array) &&

ruby/hyper-component/spec/client_features/auto_unmount_spec.rb

@@ -23,16 +23,16 @@ def timer_went_off!
             when :cancel_and_wait
               "waiting..."
             when :final_result
-              "works!" if !!Mounter.stayed_running == params.keep_running
+              "works!" if !!Mounter.stayed_running == @keep_running
             else
-              Mounted(keep_running: params.keep_running)
+              Mounted(keep_running: @keep_running)
             end
           end
         end
         class Mounted < HyperComponent
           param :keep_running
           after_mount do
-            if params.keep_running
+            if @keep_running
               Mounted.after(2) { puts "timer is going off!"; Mounter.timer_went_off! }
             else
               after(2) { puts "timer is going off!"; Mounter.timer_went_off! }
@@ -84,7 +84,7 @@ class Mounter < HyperComponent
       class Mounted < HyperComponent
         param :observable_object
         before_mount do
-          @observable_object = params.observable_object
+          @observable_object = @observable_object
         end
         render do
           "Mounted!"

ruby/hyper-component/spec/client_features/component_spec.rb

@@ -272,75 +272,19 @@ class Foo
         end
       end
 
-      it 'reads from parent passed properties through `params`' do
-        mount 'Foo', prop: 'foobar' do
-          Foo.class_eval do
-            param :prop
-            def render
-              Hyperstack::Component::ReactAPI.create_element('div') { params[:prop] }
-            end
-          end
-        end
-        expect(page.body[-40..-19]).to include("<div>foobar</div>")
-      end
-
       it 'accesses nested params as orignal Ruby object' do
         mount 'Foo', prop: [{foo: 10}] do
           Foo.class_eval do
             param :prop
             def render
-              Hyperstack::Component::ReactAPI.create_element('div') { params[:prop][0][:foo] }
+              Hyperstack::Component::ReactAPI.create_element('div') { @prop[0][:foo] }
             end
           end
         end
         expect(page.body[-35..-19]).to include("<div>10</div>")
       end
     end
 
-    describe 'Props Updating', v13_only: true do
-      before do
-        on_client do
-          class Foo
-            include Hyperstack::Component
-          end
-        end
-      end
-
-      it '`setProps` as method `set_props` is no longer supported' do
-        expect_evaluate_ruby do
-          Foo.class_eval do
-            param :foo
-            def render
-              Hyperstack::Component::ReactAPI.create_element('div') { params[:foo] }
-            end
-          end
-          instance = Hyperstack::Component::ReactTestUtils.render_component_into_document(Foo, foo: 10)
-          begin
-            instance.set_props(foo: 20)
-          rescue
-            'got risen'
-          end
-        end.to eq('got risen')
-      end
-
-      it 'original `replaceProps` as method `set_props!` is no longer supported' do
-        expect_evaluate_ruby do
-          Foo.class_eval do
-            param :foo
-            def render
-              Hyperstack::Component::ReactAPI.create_element('div') { params[:foo] ? 'exist' : 'null' }
-            end
-          end
-          instance = Hyperstack::Component::ReactTestUtils.render_component_into_document(Foo, foo: 10)
-          begin
-            instance.set_props!(bar: 20)
-          rescue
-            'got risen'
-          end
-        end.to eq('got risen')
-      end
-    end
-
     describe 'Prop validation' do
       before do
         on_client do
@@ -409,7 +353,7 @@ class Foo
             end
 
             def render
-              DIV { params[:foo] + '-' + params[:bar]}
+              DIV { @foo + '-' + @bar}
             end
           end
         end
@@ -477,82 +421,6 @@ def render; "hello".span; "goodby".span.delete; end
     end
   end
 
-  describe 'Event handling' do
-    before do
-      on_client do
-        class Foo
-          include Hyperstack::Component
-        end
-      end
-    end
-
-    it 'works in render method' do
-
-      expect_evaluate_ruby do
-        Foo.class_eval do
-
-          attr_reader :clicked
-
-          def render
-            Hyperstack::Component::ReactAPI.create_element('div').on(:click) do
-              @clicked = true
-            end
-          end
-        end
-        instance = Hyperstack::Component::ReactTestUtils.render_component_into_document(Foo)
-        Hyperstack::Component::ReactTestUtils.simulate_click(instance)
-        instance.clicked
-      end.to eq(true)
-    end
-
-    it 'invokes handler on `this.props` using emit' do
-      on_client do
-        Foo.class_eval do
-          param :on_foo_fubmit, type: Proc
-          after_mount :setup
-
-          def setup
-            self.emit(:foo_submit, 'bar')
-          end
-
-          def render
-            Hyperstack::Component::ReactAPI.create_element('div')
-          end
-        end
-      end
-      evaluate_ruby do
-        element = Hyperstack::Component::ReactAPI.create_element(Foo).on(:foo_submit) { 'bar' }
-        Hyperstack::Component::ReactTestUtils.render_into_document(element)
-      end
-      expect(page.driver.browser.manage.logs.get(:browser).map { |m| m.message.gsub(/\\n/, "\n") }.to_a.join("\n"))
-        .to_not match(/Exception raised/)
-    end
-
-    it 'invokes handler with multiple params using emit' do
-      on_client do
-        Foo.class_eval do
-          param :on_foo_invoked, type: Proc
-          after_mount :setup
-
-          def setup
-            self.emit(:foo_invoked, [1,2,3], 'bar')
-          end
-
-          def render
-            Hyperstack::Component::ReactAPI.create_element('div')
-          end
-        end
-      end
-
-      evaluate_ruby do
-        element = Hyperstack::Component::ReactAPI.create_element(Foo).on(:foo_invoked) { return [1,2,3], 'bar' }
-        Hyperstack::Component::ReactTestUtils.render_into_document(element)
-      end
-      expect(page.driver.browser.manage.logs.get(:browser).map { |m| m.message.gsub(/\\n/, "\n") }.to_a.join("\n"))
-        .to_not match(/Exception raised/)
-    end
-  end
-
   describe '#render' do
     it 'supports element building helpers' do
       on_client do
@@ -561,7 +429,7 @@ class Foo
           param :foo
           def render
             DIV do
-              SPAN { params[:foo] }
+              SPAN { @foo }
             end
           end
         end

ruby/hyper-component/spec/client_features/dsl_spec.rb

@@ -32,7 +32,7 @@ class Foo
       on_client do
         class Bar < HyperComponent
           param :p1
-          render { "hello #{params.p1}" }
+          render { "hello #{@p1}" }
         end
         class Foo < HyperComponent
           render Bar, p1: "fred"
@@ -287,8 +287,8 @@ class X2
         param :ele
         def render
           DIV do
-            params[:ele].render
-            params[:ele].render
+            @ele.render
+            @ele.render
           end
         end
       end

ruby/hyper-component/spec/client_features/element_spec.rb

@@ -37,9 +37,9 @@ def render
     it 'will subscribe to a component event param' do
       evaluate_ruby do
         class Foo < HyperComponent
-          param :on_event, type: Proc, default: nil, allow_nil: true
+          raises :event
           def render
-            params.on_event
+            event!
           end
         end
         Hyperstack::Component::ReactTestUtils.render_into_document(Hyperstack::Component::ReactAPI.create_element(Foo).on(:event) {'works!'})
@@ -50,10 +50,10 @@ def render
     it 'will subscribe to multiple component event params' do
       evaluate_ruby do
         class Foo < HyperComponent
-          param :on_event1, type: Proc, default: nil, allow_nil: true
-          param :on_event2, type: Proc, default: nil, allow_nil: true
+          raises :event1
+          raises :event2
           def render
-            params.on_event1+params.on_event2
+            event1! + event2!
           end
         end
         Hyperstack::Component::ReactTestUtils.render_into_document(Hyperstack::Component::ReactAPI.create_element(Foo).on(:event1, :event2) {'works!'})
@@ -87,9 +87,9 @@ class Foo < HyperComponent
 
       evaluate_ruby do
         class Foo < HyperComponent
-          param :my_event, type: Proc, default: nil, allow_nil: true
+          raises '<my_event>', alias: :my_event!
           def render
-            params.my_event
+            my_event!
           end
         end
         Hyperstack::Component::ReactTestUtils.render_into_document(Hyperstack::Component::ReactAPI.create_element(Foo).on("<my_event>") {'works!'})

ruby/hyper-component/spec/client_features/native_library_spec.rb

@@ -7,13 +7,13 @@ module NativeLibraryTestModule
         class Component < HyperComponent
           param :time_stamp
           backtrace :none
-          render { NativeComponent(name: "There - #{params.time_stamp}") }
+          render { NativeComponent(name: "There - #{@time_stamp}") }
         end
 
         class NestedComponent < HyperComponent
           param :time_stamp
           backtrace :none
-          render { NativeLibrary::NativeNestedLibrary::NativeComponent(name: "There - #{params.time_stamp}") }
+          render { NativeLibrary::NativeNestedLibrary::NativeComponent(name: "There - #{@time_stamp}") }
         end
       end
     end

ruby/hyper-component/spec/client_features/opal_jquery_extensions_spec.rb

@@ -7,7 +7,7 @@
         class Foo < HyperComponent
           param :name
           def render
-            "hello #{params.name}"
+            "hello #{@name}"
           end
         end
         test_div = Element.new(:div)
@@ -33,7 +33,7 @@ class Foo < HyperComponent
           end
 
           def render
-            "hello #{params.name} render-count: #{@render_count += 1}"
+            "hello #{@name} render-count: #{@render_count += 1}"
           end
 
           def self.rec_cnt
@@ -55,7 +55,7 @@ def self.rec_cnt
         class Foo < HyperComponent
           param :name
           def render
-            "hello #{params.name}"
+            "hello #{@name}"
           end
         end
         test_div = Element.new(:div)