reactive-ruby 0.7.32 → 0.7.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 212dc6ace47eb491a9464258c6df6e26e4c35579
-  data.tar.gz: faa7ee755e54749e9acce87bc8c08ff1c890bc88
+  metadata.gz: 8a8e6fbd1897288817fe7b3abea0548784acb143
+  data.tar.gz: 9d89b9b4f0c398e450bb55117e1f6c2ef6ef64c4
 SHA512:
-  metadata.gz: 4b721773a255f59e5a852788fd75a4fd2ab7340b9c8f8e5d0846ca009adf0d37150fb83010ad80810e203352467744f81cc10008c3daeff0b97898f1cacf8971
-  data.tar.gz: 4b53af87056f9a2dbe19eddcd1217b7ab95daa705edb90011501702e956a97200dd28fff5e4396b30735c0344e408ee3b0cf8b7693294f6c01159307afbe5b15
+  metadata.gz: 4bf33cec30e4227dd94ff1fb453f625b40aa24fbb13201c30fa743e6529f2f768f4057174157402a9220ea2c165fefde5a1603ccdbb4ff8fec8edfffcf4e40b8
+  data.tar.gz: a3f22d4c8721d647f98f7e3eff04805fa6a6a5f80963edca8cbec9febb1c6ebf7c041b172668636b7314ee756e735674e56f247288acd7e2b74c540f4662e71e

data/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

data/README.md

@@ -10,6 +10,8 @@
 It lets you write reactive UI components, with Ruby's elegance using the tried
 and true React.js engine. :heart:
 
+[**Visit Our Documentation Site For The Full Story**](https://reactive-ruby.github.io)
+
 ### What's this Reactive Ruby?
 
 Reactive Ruby started as a fork of the original react.rb gem, and has since been

data/lib/react/component.rb

@@ -14,22 +14,6 @@ module React
     def self.included(base)
       base.include(API)
       base.include(React::Callbacks)
-      base.instance_eval do
-
-        class PropsWrapper
-
-          def initialize(props_hash)
-            @props_hash = props_hash
-            @processed_params = {}
-          end
-
-          def [](prop)
-            return unless @props_hash
-            @props_hash[prop]
-          end
-
-        end
-      end
       base.class_eval do
         class_attribute :initial_state
         define_callback :before_mount
@@ -102,11 +86,7 @@ module React
             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
@@ -149,7 +129,7 @@ module React
 
     def component_will_mount
       IsomorphicHelpers.load_context(true) if IsomorphicHelpers.on_opal_client?
-      @props_wrapper = self.class.const_get("PropsWrapper").new(Hash.new(`#{@native}.props`))
+      @props_wrapper = self.class.props_wrapper.new(Hash.new(`#{@native}.props`))
       set_state! initial_state if initial_state
       React::State.initialize_states(self, initial_state)
       React::State.set_state_context_to(self) { self.run_callback(:before_mount) }
@@ -202,7 +182,7 @@ module React
 
     def component_will_update(next_props, next_state)
       React::State.set_state_context_to(self) { self.run_callback(:before_update, Hash.new(next_props), Hash.new(next_state)) }
-      @props_wrapper = self.class.const_get("PropsWrapper").new(Hash.new(next_props))
+      @props_wrapper = self.class.props_wrapper.new(Hash.new(next_props))
     rescue Exception => e
       self.class.process_exception(e, self)
     end
@@ -264,11 +244,7 @@ module React
         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)

data/lib/react/component/class_methods.rb

@@ -28,7 +28,7 @@ module React
       end
 
       def validator
-        @validator ||= React::Validator.new(self)
+        @validator ||= Validator.new(self)
       end
 
       def prop_types
@@ -55,44 +55,12 @@ module React
         validator.build(&block)
       end
 
-      def define_param_method(name, param_type)
-        wrapper = const_get("PropsWrapper")
-        if param_type == React::Observable
-          #(@two_way_params ||= []) << name
-          wrapper.define_method("#{name}") do
-            @props_hash[name].instance_variable_get("@value") if @props_hash[name]
-          end
-          wrapper.define_method("#{name}!") do |*args|
-            return unless @props_hash[name]
-            if args.count > 0
-              current_value = @props_hash[name].instance_variable_get("@value")
-              @props_hash[name].call args[0]
-              current_value
-            else
-              current_value = @props_hash[name].instance_variable_get("@value")
-              @props_hash[name].call current_value unless @dont_update_state rescue nil # rescue in case we in middle of render
-              @props_hash[name]
-            end
-          end
-          define_method("#{name}") { deprecated_params_method("#{name}") }
-          define_method("#{name}!") { |*args| deprecated_params_method("#{name}!", *args) }
-        elsif param_type == Proc
-          wrapper.define_method("#{name}") do |*args, &block|
-            @props_hash[name].call(*args, &block) if @props_hash[name]
-          end
-          define_method("#{name}") { deprecated_params_method("#{name}", *args, &block) }
-        else
-          wrapper.define_method("#{name}") do
-            @processed_params[name] ||= if param_type.respond_to? :_react_param_conversion
-                                          param_type._react_param_conversion @props_hash[name]
-                                        elsif param_type.is_a?(Array) && param_type[0].respond_to?(:_react_param_conversion)
-                                          @props_hash[name].collect { |param| param_type[0]._react_param_conversion param }
-                                        else
-                                          @props_hash[name]
-                                        end
-          end
-          define_method("#{name}") { deprecated_params_method("#{name}") }
-        end
+      def props_wrapper
+        @props_wrapper ||= Class.new(PropsWrapper)
+      end
+
+      def define_param(name, param_type)
+        props_wrapper.define_param(name, param_type, self)
       end
 
       def param(*args)

data/lib/react/component/props_wrapper.rb

@@ -0,0 +1,65 @@
+module React
+  module Component
+    class PropsWrapper < BasicObject
+      attr_reader :props
+
+      def self.define_param(name, param_type, owner)
+        owner.define_method("#{name}") do
+          deprecated_params_method("#{name}", *args, &block)
+        end
+        if param_type == React::Observable
+          owner.define_method("#{name}!") do |*args|
+            deprecated_params_method("#{name}!", *args)
+          end
+          define_method("#{name}") do
+            value_for(name)
+          end
+          define_method("#{name}!") do |*args|
+            current_value = value_for(name)
+            if args.count > 0
+              props[name].call args[0]
+              current_value
+            else
+              # rescue in case we in middle of render... What happens during a
+              # render that causes exception?
+              # Where does `dont_update_state` come from?
+              props[name].call current_value unless @dont_update_state rescue nil
+              props[name]
+            end
+          end
+        elsif param_type == Proc
+          define_method("#{name}") do |*args, &block|
+            props[name].call(*args, &block) if props[name]
+          end
+        else
+          define_method("#{name}") do
+            if param_type.respond_to? :_react_param_conversion
+              param_type._react_param_conversion props[name]
+            elsif param_type.is_a?(Array) &&
+              param_type[0].respond_to?(:_react_param_conversion)
+              props[name].collect do |param|
+                param_type[0]._react_param_conversion param
+              end
+            else
+              props[name]
+            end
+          end
+        end
+      end
+
+      def initialize(props)
+        @props= props|| {}
+      end
+
+      def [](prop)
+        props[prop]
+      end
+
+      private
+
+      def value_for(name)
+        self[name].instance_variable_get("@value") if self[name]
+      end
+    end
+  end
+end

data/lib/react/native_library.rb

@@ -34,11 +34,7 @@ module React
       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
 

data/lib/react/rendering_context.rb

@@ -4,6 +4,14 @@ module React
       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

data/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 @@ module React
         @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

data/lib/react/validator.rb

@@ -20,13 +20,11 @@ module React
     def requires(name, options = {})
       options[:required] = true
       define_rule(name, options)
-      @component_class.define_param_method(name, options[:type])
     end
 
     def optional(name, options = {})
       options[:required] = false
       define_rule(name, options)
-      @component_class.define_param_method(name, options[:type]) unless name == :params
     end
 
     def allow_undefined_props=(allow)
@@ -72,6 +70,7 @@ module React
 
     def define_rule(name, options = {})
       rules[name] = coerce_native_hash_values(options)
+      @component_class.define_param(name, options[:type]) unless name == :params
     end
 
     def errors

data/lib/reactive-ruby.rb

@@ -2,6 +2,7 @@ if RUBY_ENGINE == 'opal'
   require 'sources/react.js'
   require 'react/top_level'
   require 'react/component'
+  require 'react/component/props_wrapper'
   require 'react/component/base'
   require 'react/element'
   require 'react/event'

data/lib/reactive-ruby/version.rb

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

data/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")

data/spec/react/component_spec.rb

@@ -123,6 +123,17 @@ describe React::Component do
       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

data/spec/react/param_declaration_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 if opal?
-
 describe 'the param macro' do
-
   it "can create and access a required param" do
     stub_const 'Foo', Class.new(React::Component::Base)
     Foo.class_eval do
@@ -180,8 +178,6 @@ describe 'the param macro' do
       expect(React.render_to_static_markup(React.create_element(Foo, foo: observer))).to eq('<span>ha!</span>')
       expect(current_state).to eq("ha!")
     end
-
   end
-
 end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reactive-ruby
 version: !ruby/object:Gem::Version
-  version: 0.7.32
+  version: 0.7.33
 platform: ruby
 authors:
 - David Chang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -136,8 +136,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Write reactive UI component with Ruby's elegancy and compiled to run
-  in Javascript.
+description: Write React UI components in pure Ruby.
 email: zeta11235813@gmail.com
 executables: []
 extensions: []
@@ -264,6 +263,7 @@ files:
 - lib/react/component/api.rb
 - lib/react/component/base.rb
 - lib/react/component/class_methods.rb
+- lib/react/component/props_wrapper.rb
 - lib/react/element.rb
 - lib/react/event.rb
 - lib/react/ext/hash.rb
@@ -313,7 +313,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/react/spec_helpers.rb
 - spec/vendor/es5-shim.min.js
-homepage: https://github.com/zetachang/react.rb
+homepage: https://reactive-ruby.github.io
 licenses:
 - MIT
 metadata: {}