reactive-ruby 0.7.15 → 0.7.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e948fb3518db4028cc39e28dca45a3f13271aef
-  data.tar.gz: 6d4e11a9c0bbb3d14ab9eb19aa48118e9c0048ba
+  metadata.gz: 62be457a5e6af8f6d9256a011861d1e3d24b6af4
+  data.tar.gz: e157fb2ff874e37b04298478da4f82081c07b616
 SHA512:
-  metadata.gz: e4fa07962b7800a637c7222b5dc43957e04760e5fa6b7a366dd8cc2a451da92da8b6d2224673684c499d6f393f420351d18b768f8ca3f89758b3e8f77bc2909f
-  data.tar.gz: 7c70da041fd31ccdb8b7ee003a621c4581a706035b6213f426f2007aba6275cc0d28349df21cf07f184d346d059b265500819e327dbb6e6761acba5e47edfbf7
+  metadata.gz: dde88af3a00a5718e5059fb710506098dcf5ca34389bed3007773f51f30067a2e600ce2ee2d07246c262b661460ec6a55da734bedeaaf3069dde9c35bfabd7ab
+  data.tar.gz: ce17d4836b267ea0db712a7b684fa14d492c8fdad81472db749ae21a051c11d6c3743ea959e8a3c74bf075f2147d6a6298182003b70c32a1c99797b315017031

data/lib/rails-helpers/react_component.rb

@@ -6,11 +6,9 @@ begin
   class ActionController::Base
 
     def render_component(*args)
-      component_name = ((args[0].is_a? Hash) || args.empty?) ? params[:action].camelize : args.shift
-      controller = params[:controller].camelize
-      rails_react_variables = (args[0].is_a? Hash) ? args[0] : {}
-      @render_params = {component_name: component_name, controller: controller, render_params: rails_react_variables}
-      render inline: "<%= react_component 'React.TopLevelRailsComponent', @render_params, { prerender: !params[:no_prerender] } %>", layout: 'application'
+      @component_name = ((args[0].is_a? Hash) || args.empty?) ? params[:action].camelize : args.shift
+      @render_params = (args[0].is_a? Hash) ? args[0] : {}
+      render inline: "<%= react_component @component_name, @render_params, { prerender: !params[:no_prerender] } %>", layout: 'application'
     end
 
   end
@@ -30,11 +28,13 @@ begin
         alias_method :pre_opal_react_component, :react_component
 
         def react_component(name, props = {}, render_options={}, &block)
+          props = {render_params: props, component_name: name, controller: self.controller.class.name}
+          name = 'React.TopLevelRailsComponent'
           if render_options[:prerender]
             render_options[:prerender] = {render_options[:prerender] => true} unless render_options[:prerender].is_a? Hash
             existing_context_initializer = render_options[:prerender][:context_initializer]
             render_options[:prerender][:context_initializer] = lambda do |ctx| 
-              React::IsomorphicHelpers.load_context(ctx, self.controller)
+              React::IsomorphicHelpers.load_context(ctx, self.controller, props[:component_name])
               existing_context_initializer.call ctx if existing_context_initializer
             end
             

data/lib/reactive-ruby/isomorphic_helpers.rb

@@ -8,17 +8,17 @@ module React
     
     if RUBY_ENGINE != 'opal'
       
-      def self.load_context(ctx, controller)
-        puts "************************** React Server Context Initialized *********************************************"
-        @context = Context.new("#{controller.object_id}-#{Time.now.to_i}", ctx, controller) 
+      def self.load_context(ctx, controller, name = nil)
+        puts "************************** React Server Context Initialized #{name} *********************************************"
+        @context = Context.new("#{controller.object_id}-#{Time.now.to_i}", ctx, controller, name) 
       end
 
     else
       
-      def self.load_context(unique_id = nil)  # can be called on the client to force re-initialization for testing purposes
+      def self.load_context(unique_id = nil, name = nil)  # can be called on the client to force re-initialization for testing purposes
         if !unique_id or !@context or @context.unique_id != unique_id
           if on_opal_server?
-            message = "************************ React Prerendering Context Initialized ***********************"
+            message = "************************ React Prerendering Context Initialized #{name} ***********************"
           else
             message = "************************ React Browser Context Initialized ****************************"
           end
@@ -103,13 +103,13 @@ module React
         @prerender_footer_blocks ||= []
       end
       
-      def initialize(unique_id, ctx = nil, controller = nil)
+      def initialize(unique_id, ctx = nil, controller = nil, name = nil)
         @unique_id = unique_id
         if RUBY_ENGINE != 'opal' 
           @controller = controller
           @ctx = ctx 
           ctx["ServerSideIsomorphicMethods"] = self
-          send_to_opal(:load_context, @unique_id)
+          send_to_opal(:load_context, @unique_id, name)
         end
         self.class.before_first_mount_blocks.each { |block| block.call(self) } 
       end
@@ -125,7 +125,7 @@ module React
             @ctx.eval(Opal::Processor.load_asset_code(::Rails.application.assets, 'components')) rescue nil
             raise "No opal-react components found in the components.rb file" unless @ctx.eval('Opal.React')
           end
-          @ctx.eval("Opal.React.IsomorphicHelpers.$#{method}(#{args.join(', ')})")
+          @ctx.eval("Opal.React.IsomorphicHelpers.$#{method}(#{args.collect { |arg| "'#{arg}'"}.join(', ')})")
         end
       end
       

data/lib/reactive-ruby/version.rb

@@ -1,3 +1,3 @@
 module React
-  VERSION = "0.7.15"
+  VERSION = "0.7.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reactive-ruby
 version: !ruby/object:Gem::Version
-  version: 0.7.15
+  version: 0.7.16
 platform: ruby
 authors:
 - David Chang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal