Add set_state method

zetachang · zetachang · commit 833036c78dc0 · 2015-02-22T20:28:33.000+08:00
diff --git a/lib/react/component.rb b/lib/react/component.rb
@@ -38,6 +38,15 @@ def mounted?
       `#{@native}.isMounted()`
     end
 
+    def set_state(state, &block)
+      raise "No native ReactComponent associated" unless @native
+      %x{
+        #{@native}.setState(#{state.to_n}, function(){
+          #{block.call if block}
+        });
+      }
+    end
+
     def component_will_mount
       self.run_callback(:before_mount)
     end
@@ -131,43 +140,18 @@ def define_state(*states)
         states.each do |name|
           # getter
           define_method("#{name}") do
-            unless @native
-              self.class.init_state[name]
-            else
-              `#{@native}.state[#{name}]`
-            end
+            return unless @native
+            `#{@native}.state[#{name}]`
           end
           # setter
           define_method("#{name}=") do |new_state|
-            unless @native
-              self.class.init_state[name] = new_state
-            else
-              %x{
-                state = #{@native}.state || {};
-                state[#{name}] = #{new_state};
-                #{@native}.setState(state);
-              }
-            end
-
-            new_state
-          end
-          # setter with callback
-          define_method("set_#{name}") do |new_state, &block|
-            unless @native
-              self.class.init_state[name] = new_state
-            else
-              %x{
-                state = #{@native}.state || {};
-                state[#{name}] = #{new_state};
-                #{@native}.setState(state, function(){
-                  #{block.call if block}
-                });
-              }
-            end
+            return unless @native
+            hash = {}
+            hash[name] = new_state
+            self.set_state(hash)
 
             new_state
           end
-
         end
       end
     end
diff --git a/spec/component_spec.rb b/spec/component_spec.rb
@@ -90,7 +90,7 @@ def render
     it "should allow block for life cycle callback" do
       Foo.class_eval do
         define_state(:foo)
-        
+
         before_mount do
           self.foo = "bar"
         end
@@ -193,6 +193,17 @@ def render
       expect(element.getDOMNode.textContent).to eq("10")
     end
 
+    it "should support original `set_state` method" do
+      Foo.class_eval do
+        before_mount do
+          self.set_state(foo: "bar")
+        end
+      end
+
+      element = renderToDocument(Foo)
+      expect(element.state.foo).to be("bar")
+    end
+
     pending "should set initial state in Class#initialize method" do
       Foo.class_eval do
         define_state :foo, :bar
