closes #93, cleans up some duplicate code problems

Author: catmando

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    reactive-ruby (0.7.31)
+    reactive-ruby (0.7.33)
       opal
       opal-activesupport (>= 0.2.0)
       opal-browser

lib/react/component.rb

@@ -16,7 +16,7 @@ def self.included(base)
       base.include(React::Callbacks)
       base.instance_eval do
 
-        class PropsWrapper
+        class PropsWrapper < BasicObject
 
           def initialize(props_hash)
             @props_hash = props_hash
@@ -102,11 +102,7 @@ def method_missing(n, *args, &block)
             unless name && name.method_defined?(:render)
               return super
             end
-            if node_only
-              React::RenderingContext.build { React::RenderingContext.render(name, *args, &block) }.to_n
-            else
-              React::RenderingContext.render(name, *args, &block)
-            end
+            React::RenderingContext.build_or_render(node_only, name, *args, &block)
           end
 
         end
@@ -264,11 +260,7 @@ def method_missing(n, *args, &block)
         name = "p"
       end
 
-      if node_only
-        React::RenderingContext.build { React::RenderingContext.render(name, *args, &block) }.to_n
-      else
-        React::RenderingContext.render(name, *args, &block)
-      end
+      React::RenderingContext.build_or_render(node_only, name, *args, &block)
     end
 
     def watch(value, &on_change)

lib/react/native_library.rb

@@ -34,11 +34,7 @@ def self.method_missing(n, *args, &block)
       unless name = const_get(name)
         return super
       end
-      if node_only
-        React::RenderingContext.build { React::RenderingContext.render(name, *args, &block) }.to_n
-      else
-        React::RenderingContext.render(name, *args, &block)
-      end
+      React::RenderingContext.build_or_render(node_only, name, *args, &block)
     rescue
     end
 

lib/react/rendering_context.rb

@@ -4,6 +4,14 @@ class << self
       attr_accessor :waiting_on_resources
     end
 
+    def self.build_or_render(node_only, name, *args, &block)
+      if node_only
+        React::RenderingContext.build { React::RenderingContext.render(name, *args, &block) }.to_n
+      else
+        React::RenderingContext.render(name, *args, &block)
+      end
+    end
+
     def self.render(name, *args, &block)
       remove_nodes_from_args(args)
       @buffer = [] unless @buffer

lib/react/state.rb

@@ -1,5 +1,6 @@
 module React
-  class StateWrapper
+
+  class StateWrapper < BasicObject
 
     def initialize(native, from)
       @state_hash = Hash.new(`#{native}.state`)
@@ -130,17 +131,13 @@ def states
         @states ||= Hash.new { |h, k| h[k] = {} }
       end
 
-      def new_observers
-        @new_observers ||= Hash.new { |h, k| h[k] = Hash.new { |h, k| h[k] = [] } }
-      end
-
-      def current_observers
-        @current_observers ||= Hash.new { |h, k| h[k] = Hash.new { |h, k| h[k] = [] } }
+      [:new_observers, :current_observers, :observers_by_name].each do |method_name|
+        define_method(method_name) do
+          instance_variable_get("@#{method_name}") or
+          instance_variable_set("@#{method_name}", Hash.new { |h, k| h[k] = Hash.new { |h, k| h[k] = [] } })
+        end
       end
 
-      def observers_by_name
-        @observers_by_name ||= Hash.new { |h, k| h[k] = Hash.new { |h, k| h[k] = [] } }
-      end
     end
   end
 end

lib/reactive-ruby/version.rb

@@ -1,3 +1,3 @@
 module React
-  VERSION = "0.7.32"
+  VERSION = "0.7.33"
 end

reactive-ruby.gemspec

@@ -9,11 +9,10 @@ Gem::Specification.new do |s|
 
   s.author       = 'David Chang'
   s.email        = 'zeta11235813@gmail.com'
-  s.homepage     = 'https://github.com/zetachang/react.rb'
+  s.homepage     = 'https://reactive-ruby.github.io'
   s.summary      = 'Opal Ruby wrapper of React.js library.'
   s.license      = 'MIT'
-  s.description  = "Write reactive UI component with Ruby's elegancy and compiled to run in Javascript."
-
+  s.description  = "Write React UI components in pure Ruby."
   s.files          = `git ls-files`.split("\n")
   s.executables    = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.test_files     = `git ls-files -- {test,spec,features}/*`.split("\n")

spec/react/component_spec.rb

@@ -123,6 +123,17 @@ def render
       expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<div>bar</div>')
     end
 
+    it 'allows kernal method names like "format" to be used as state variable names' do
+      Foo.class_eval do
+        before_mount do
+          state.format! 'yes'
+          state.foo! state.format
+        end
+      end
+
+      expect(React.render_to_static_markup(React.create_element(Foo))).to eq('<div>yes</div>')
+    end
+
     it 'returns an observer with the bang method and no arguments' do
       Foo.class_eval do
         before_mount do