Merge pull request #99 from vipulnsward/1-refactorings

Minor refactorings

Author: zpao

lib/react/rails/view_helper.rb

@@ -8,7 +8,7 @@ module ViewHelper
       #
       def react_component(name, args = {}, options = {}, &block)
         options = {:tag => options} if options.is_a?(Symbol)
-        block = Proc.new{concat React::Renderer.render(name, args)} if options[:prerender] == true
+        block = Proc.new{concat React::Renderer.render(name, args)} if options[:prerender]
 
         html_options = options.reverse_merge(:data => {})
         html_options[:data].tap do |data|
@@ -18,7 +18,7 @@ def react_component(name, args = {}, options = {}, &block)
         html_tag = html_options[:tag] || :div
 
         # remove internally used properties so they aren't rendered to DOM
-        [:tag, :prerender].each{|prop| html_options.delete(prop)}
+        html_options.except!(:tag, :prerender)
 
         content_tag(html_tag, '', html_options, &block)
       end

lib/react/renderer.rb

@@ -18,7 +18,8 @@ def self.setup!(react_js, components_js, args={})
       @@components_js = components_js
       @@pool.shutdown{} if @@pool
       reset_combined_js!
-      @@pool = ConnectionPool.new(:size => args[:size]||10, :timeout => args[:timeout]||20) { self.new }
+      default_pool_options = {:size =>10, :timeout => 20}
+      @@pool = ConnectionPool.new(default_pool_options.merge(args)) { self.new }
     end
 
     def self.render(component, args={})
@@ -27,6 +28,33 @@ def self.render(component, args={})
       end
     end
 
+    def self.react_props(args={})
+      if args.is_a? String
+        args
+      else
+        args.to_json
+      end
+    end
+
+    def context
+      @context ||= ExecJS.compile(self.class.combined_js)
+    end
+
+    def render(component, args={})
+      react_props = React::Renderer.react_props(args)
+      jscode = <<-JS
+        function() {
+          return React.renderToString(React.createElement(#{component}, #{react_props}));
+        }()
+      JS
+      context.eval(jscode).html_safe
+    rescue ExecJS::ProgramError => e
+      raise PrerenderError.new(component, react_props, e)
+    end
+
+
+    private
+
     def self.setup_combined_js
       <<-CODE
         var global = global || this;
@@ -54,28 +82,5 @@ def self.combined_js
       @@combined_js
     end
 
-    def self.react_props(args={})
-      if args.is_a? String
-        args
-      else
-        args.to_json
-      end
-    end
-
-    def context
-      @context ||= ExecJS.compile(self.class.combined_js)
-    end
-
-    def render(component, args={})
-      react_props = React::Renderer.react_props(args)
-      jscode = <<-JS
-        function() {
-          return React.renderToString(React.createElement(#{component}, #{react_props}));
-        }()
-      JS
-      context.eval(jscode).html_safe
-    rescue ExecJS::ProgramError => e
-      raise PrerenderError.new(component, react_props, e)
-    end
   end
 end