hyper-react 1.0.0.lap27 → 1.0.0.lap28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 370cae4fc7839992e12c643e371aaee4db92c9bd1362d717a3573b1034445467
-  data.tar.gz: b60a9208f2df241fa515d01b0fae10a231c07b7a03614160bc7eaea6785cfe40
+  metadata.gz: d9576218218234fed776182c5bd4814d2214d0bccb8102713c9dfcb5c02896f7
+  data.tar.gz: 2459b76e64f90a64ebae1d995b823b9518eec3a3a11344f49f370506cebe9796
 SHA512:
-  metadata.gz: a8b4ddcfa119efc40385d306013afebf962f0d4fe8a52b29ba8a390cf8f0a6e1bc98951cc1fdf2dbed1c4b050793a16ab6ca137f97d4eca92507f010e822b45d
-  data.tar.gz: f98141b845788eab333e4881694a02d3435e471d2ef2654312ad873b757a1d4f44e19e91bdb51b8fcdb64cc0f7753279669f5b5435606f83103423a303f23a53
+  metadata.gz: aef37ff1d4521bde8476c00f98b312c17f72db9a36694dd7a3427d17dcc8572205cd2524c53a1e312e8250c18f8341d384dab85e0bb43fff86197a0980de1a02
+  data.tar.gz: d39a312fe4ba268ca680411ff37c6ee981501c4cccc382d432387e2fd31d486e2e2aa8e01b1743b43c7af846e5631c68c602e8364c1a58b4f13a697de947284b

data/hyper-react.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |spec|
   # }
 
   spec.files         = `git ls-files`.split("\n").reject { |f| f.match(%r{^(gemfiles|spec)/}) }
-  spec.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   spec.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   spec.require_paths = ['lib']
 
@@ -26,6 +25,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opal', '>= 0.11.0', '< 0.12.0'
   spec.add_dependency 'opal-activesupport', '~> 0.3.1'
   spec.add_dependency 'hyperloop-config', React::VERSION
+  spec.add_dependency 'mini_racer', '~> 0.1.15'
+  spec.add_dependency 'react-rails', '>= 2.4.0', '< 2.5.0'
 
   spec.add_development_dependency 'chromedriver-helper'
   spec.add_development_dependency 'hyper-spec', React::VERSION
@@ -36,13 +37,13 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'opal-jquery'
   spec.add_development_dependency 'opal-rails', '~> 0.9.4'
   spec.add_development_dependency 'opal-rspec'
+  spec.add_development_dependency 'puma'
+  spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rails', '>= 4.0.0'
   spec.add_development_dependency 'rails-controller-testing'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'react-rails', '>= 2.4.0', '< 2.5.0'
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'rubocop', '~> 0.51.0'
   spec.add_development_dependency 'sqlite3'
-  spec.add_development_dependency 'mini_racer', '~> 0.1.15'
   spec.add_development_dependency 'timecop', '~> 0.8.1'
 end

data/lib/hyper-react.rb

@@ -39,6 +39,7 @@ if RUBY_ENGINE == 'opal'
   require 'react/rendering_context'
   require 'react/state'
   require 'react/object'
+  require 'react/to_key'
   require 'react/ext/opal-jquery/element'
   require 'reactive-ruby/isomorphic_helpers'
   require 'rails-helpers/top_level_rails_component'

data/lib/react/api.rb

@@ -56,9 +56,17 @@ module React
             this.__opalInstance = #{type.new(`this`)};
             this.__opalInstanceInitializedState = true;
             this.__opalInstanceSyncSetState = false;
+            this.__name = #{type.name};
           }
           static get displayName() {
-            return #{type.name};
+            if (typeof this.__name != "undefined") {
+              return this.__name;
+            } else {
+              return #{type.name};
+            }
+          }
+          static set displayName(name) {
+            this.__name = name;
           }
           static get defaultProps() {
             return #{type.respond_to?(:default_props) ? type.default_props.to_n : `{}`};
@@ -106,11 +114,11 @@ module React
             }
           }
           componentWillUnmount() {
-            this.__opalInstance.is_mounted = false;
             if (#{type.method_defined? :component_will_unmount}) {
               this.__opalInstanceSyncSetState = false;
               this.__opalInstance.$component_will_unmount();
             }
+            this.__opalInstance.is_mounted = false;
           }
           componentDidCatch(error, info) {
             if (#{type.method_defined? :component_did_catch}) {

data/lib/react/component/api.rb

@@ -11,6 +11,7 @@ module React
 
       def force_update!
         `#{self}.native.forceUpdate()`
+        self
       end
 
       def set_props(prop, &block)
@@ -32,15 +33,15 @@ module React
       def set_or_replace_state_or_prop(state_or_prop, method, &block)
         raise "No native ReactComponent associated" unless @native
         `var state_prop_n = #{state_or_prop.shallow_to_n}`
-        # the state object is initalized when the ruby component is instanciated
+        # the state object is initalized when the ruby component is instantiated
         # this is detected by self.native.__opalInstanceInitializedState
-        # which is set in the netive component constructor in react/api.rb
+        # which is set in the native component constructor in react/api.rb
         # the setState update callback is not called when initalizing initial state
         if block
           %x{
             if (#{@native}.__opalInstanceInitializedState === true) {
               #{@native}[method](state_prop_n, function(){
-                #{block.call}
+                block.$call();
               });
             } else {
               for (var sp in state_prop_n) {

data/lib/react/element.rb

@@ -130,8 +130,17 @@ module React
     def merge_built_in_event_prop!(prop_name)
       @properties.merge!(
         prop_name => %x{
-          function(event){
-            return #{yield(React::Event.new(`event`))}
+          function(){
+            var react_event = arguments[0];
+            var all_args;
+            var other_args;
+            if (arguments.length > 1) {
+              all_args = Array.prototype.slice.call(arguments);
+              other_args = all_args.slice(1, arguments.length);
+              return #{yield(React::Event.new(`react_event`), *(`other_args`))};
+            } else {
+              return #{yield(React::Event.new(`react_event`))};
+            }
           }
         }
       )

data/lib/react/ext/opal-jquery/element.rb

@@ -23,4 +23,15 @@ Element.instance_eval do
 
     React.render(React.create_element(`#{self.to_n}._reactrb_component_class`), self)
   end
+
+  # mount_components is useful for dynamically generated page segments for example
+  # see react-rails documentation for more details
+
+  %x{
+    $.fn.mount_components = function() {
+      this.each(function(e) { ReactRailsUJS.mountComponents(e[0]) })
+      return this;
+    }
+  }
+  Element.expose :mount_components
 end if Object.const_defined?('Element')

data/lib/react/object.rb

@@ -12,20 +12,4 @@ class Object
       React::Component::Tags.html_tag_class_for(const_name) || raise(e)
     end
   end
-
-  def to_key
-    object_id
-  end
-end
-
-class Number
-  def to_key
-    self
-  end
-end
-
-class Boolean
-  def to_key
-    self
-  end
 end

data/lib/react/to_key.rb

@@ -0,0 +1,26 @@
+# to_key method returns a suitable unique id that can be used as
+# a react `key`.  Other classes may override to_key as needed
+# for example hyper_mesh returns the object id of the internal
+# backing record.
+#
+# to_key is automatically called on objects passed as keys for
+# example Foo(key: my_object) results in Foo(key: my_object.to_key)
+class Object
+  def to_key
+    object_id
+  end
+end
+
+# for Number to_key can just be the number itself
+class Number
+  def to_key
+    self
+  end
+end
+
+# for Boolean to_key can be true or false
+class Boolean
+  def to_key
+    self
+  end
+end

data/lib/reactive-ruby/rails/component_mount.rb

@@ -12,9 +12,9 @@ module ReactiveRuby
           options = context_initializer_options(options, name)
         end
         props = serialized_props(props, name, controller)
-        super(top_level_name, props, options, &block).gsub("\n","")
-          .gsub(/(<script>.*<\/script>)<\/div>$/,'</div>\1').html_safe +
-          footers
+        result = super(top_level_name, props, options, &block).gsub("\n","")
+        result = result.gsub(/(<script.*<\/script>)<\/div>$/,'</div>\1').html_safe
+        result + footers
       end
 
       private

data/lib/reactive-ruby/serializers.rb

@@ -1,12 +1,20 @@
-[Bignum, FalseClass, Fixnum, Float, Integer, NilClass, String, Symbol, Time, TrueClass].each do |klass|
-  klass.send(:define_method, :react_serializer) do 
+[FalseClass, Float, Integer, NilClass, String, Symbol, Time, TrueClass].each do |klass|
+  klass.send(:define_method, :react_serializer) do
     as_json
   end
 end
 
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.4.0')
+  [Bignum, Fixnum].each do |klass|
+    klass.send(:define_method, :react_serializer) do
+      as_json
+    end
+  end
+end
+
 BigDecimal.send(:define_method, :react_serializer) { as_json } rescue nil
 
-Array.send(:define_method, :react_serializer) do 
+Array.send(:define_method, :react_serializer) do
   self.collect { |e| e.react_serializer }.as_json
 end
 

data/lib/reactive-ruby/server_rendering/contextual_renderer.rb

@@ -14,6 +14,11 @@ module ReactiveRuby
         ComponentLoader.new(v8_context).load
       end
 
+      def before_render(*args)
+        # the base class clears the log history... we don't want that as it is taken
+        # care of in IsomorphicHelpers.load_context
+      end
+
       def render(component_name, props, prerender_options)
         if prerender_options.is_a?(Hash)
           if !v8_runtime? && prerender_options[:context_initializer]

data/lib/reactive-ruby/version.rb

@@ -1,3 +1,3 @@
 module React
-  VERSION = '1.0.0.lap27'
+  VERSION = '1.0.0.lap28'
 end

data/spec/react/component_spec.rb

@@ -116,7 +116,7 @@ describe 'React::Component', js: true do
           def self.get_error
             @@error
           end
-          
+
           def self.get_info
             @@info
           end
@@ -136,6 +136,48 @@ describe 'React::Component', js: true do
     end
   end
 
+  describe 'Misc Methods' do
+    it 'has a force_update! method' do
+      mount 'Foo' do
+        class Foo < Hyperloop::Component
+          class << self
+            attr_accessor :render_counter
+            attr_accessor :instance
+          end
+          before_mount do
+            Foo.render_counter = 0
+            Foo.instance = self
+          end
+          def render
+            Foo.render_counter += 1
+            DIV { "I have been rendered #{Foo.render_counter} times" }
+          end
+        end
+      end
+      expect_evaluate_ruby do
+        Foo.instance.force_update!
+        Foo.render_counter
+      end.to eq(2)
+    end
+
+    it 'has its force_update! method return itself' do
+      mount 'Foo' do
+        class Foo < Hyperloop::Component
+          class << self
+            attr_accessor :instance
+          end
+          before_mount do
+            Foo.instance = self
+          end
+          def render
+            DIV { "I have been rendered" }
+          end
+        end
+      end
+      expect_evaluate_ruby('Foo.instance == Foo.instance.force_update!').to be_truthy
+    end
+  end
+
   describe 'New style setter & getter' do
     before(:each) do
       on_client do
@@ -843,7 +885,6 @@ describe 'React::Component', js: true do
 
     it 'only overrides `p` in render context' do
       mount 'Foo' do
-        
         class Foo
           include React::Component
 

data/spec/react/dsl_spec.rb

@@ -103,7 +103,7 @@ describe 'the React DSL', js: true do
         end
       end
     end
-    expect(page.body[-80..-19]).to match(/(<div data-reactroot=""|<div)><span>hello<(br|br\/|br \/)><\/span><\/div>/)
+    expect(page.body[-285..-233]).to match(/(<div data-reactroot=""|<div)><span>hello<(br|br\/|br \/)><\/span><\/div>/)
   end
 
   it "has a .td short hand String method" do
@@ -197,7 +197,7 @@ describe 'the React DSL', js: true do
         'raised for sure!'
       end
     end.to eq('raised for sure!')
-      
+
   end
 
   it "will treat the component class name as a first class component name" do

data/spec/react/element_spec.rb

@@ -28,7 +28,7 @@ describe 'React::Element', js: true do
           end
         end
       end
-      expect(page.body[-80..-19]).to match(/<input (type="text" value=""|value="" type="text").*\/>/)
+      expect(page.body[-285..-233]).to match(/<input (type="text" value=""|value="" type="text").*\/>/)
     end
   end
 
@@ -62,7 +62,7 @@ describe 'React::Element', js: true do
     end
 
     it 'will subscribe to a native components event param' do
-      
+
       evaluate_ruby do
         "this makes sure everything is loaded"
       end
@@ -84,7 +84,7 @@ describe 'React::Element', js: true do
     end
 
     it 'will subscribe to a component event param with a non-default name' do
-      
+
       evaluate_ruby do
         class Foo < React::Component::Base
           param :my_event, type: Proc, default: nil, allow_nil: true

data/spec/react/opal_jquery_extensions_spec.rb

@@ -67,5 +67,28 @@ describe 'opal-jquery extensions', js: true do
       expect(page.driver.browser.manage.logs.get(:browser).map { |m| m.message.gsub(/\\n/, "\n") }.to_a.join("\n"))
           .not_to match(/Exception|Error/)
     end
+
+    it "can dynamically mount components" do
+      on_client do
+        class DynoMount < Hyperloop::Component
+          render(DIV) { 'I got rendered' }
+        end
+      end
+      mount 'MountPoint' do
+        class MountPoint < Hyperloop::Component
+          render(DIV) do
+            # simulate what react-rails render_component output
+            DIV(
+              'data-react-class' => 'React.TopLevelRailsComponent',
+              'data-react-props' => '{"render_params": {}, "component_name": "DynoMount", "controller": ""}'
+            )
+          end
+        end
+      end
+      evaluate_ruby do
+        Element['body'].mount_components
+      end
+      expect(page).to have_content('I got rendered')
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyper-react
 version: !ruby/object:Gem::Version
-  version: 1.0.0.lap27
+  version: 1.0.0.lap28
 platform: ruby
 authors:
 - David Chang
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2018-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hyper-store
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.lap27
+        version: 1.0.0.lap28
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.lap27
+        version: 1.0.0.lap28
 - !ruby/object:Gem::Dependency
   name: opal
   requirement: !ruby/object:Gem::Requirement
@@ -67,14 +67,48 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.lap27
+        version: 1.0.0.lap28
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.lap27
+        version: 1.0.0.lap28
+- !ruby/object:Gem::Dependency
+  name: mini_racer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.15
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.15
+- !ruby/object:Gem::Dependency
+  name: react-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: chromedriver-helper
   requirement: !ruby/object:Gem::Requirement
@@ -95,14 +129,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.lap27
+        version: 1.0.0.lap28
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.lap27
+        version: 1.0.0.lap28
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -202,21 +236,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails-controller-testing
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -230,7 +264,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: rails-controller-testing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -244,25 +292,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: react-rails
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -305,20 +347,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mini_racer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.15
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.15
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -401,6 +429,7 @@ files:
 - lib/react/test/rspec.rb
 - lib/react/test/session.rb
 - lib/react/test/utils.rb
+- lib/react/to_key.rb
 - lib/react/top_level.rb
 - lib/react/top_level_render.rb
 - lib/react/validator.rb
@@ -540,7 +569,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Opal Ruby wrapper of React.js library.