reactive-ruby 0.7.30 → 0.7.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86c5b4441e399cef5e35abf8beddfb644d89e221
-  data.tar.gz: 012e4d570221a1541b5b0e912df55698d4c1e683
+  metadata.gz: 03ea6c95ebe59edebe184cba6f058d429f6e9f03
+  data.tar.gz: f68ee94ee71d55e877a19f253f012da2cba98fa1
 SHA512:
-  metadata.gz: 9b5e764f7d5b9355a626fff014ac7d122419546d19a756ba56832be83cb671968ae01a89d1884a25e164e489c76ce8f96f47b40494a7d3970e3349fbb63d15a5
-  data.tar.gz: c2f23addea6212a6a242b1de459b1b1391cd610a8d74278671ae5cc99b03532be046a445ac40749a540d4873e539ebd610e1bde4743d2cf7ac9d3518e5326493
+  metadata.gz: 51dffbcc520e2969b83f04c4820af42c100f7d3b6f340a5468e0dc847330a4f5fe4fdfa54722a0bb7a266de19bc827e6d3ed23cc66b27f1a2f6910ce32be66dd
+  data.tar.gz: 29ee24cee796f6ada843fbac91dd089a5d421d44be2318ba1dd5b1d600fa8c3b4e48ef4f8bd5a4d21cf3ee616c584cc77d87659f17a741083f7bc66705e14a50

data/README.md

@@ -102,8 +102,9 @@ require 'opal-jquery' # They must be in this order.
 ### Rendering Components
 
 Components may be rendered directly from a controller action by simply following
-a naming convention. To render a component from the `home#show` action, create
-component class `Components::Home::Show`:
+a naming convention. To render a component from the `home#show` action, create a
+component class named `Show`.  For details on how to override this behavior, and how the the module tree is searched for
+the class see the next section.
 
 ```ruby
 # app/views/components/home/show.rb
@@ -151,18 +152,23 @@ and you can set break points etc.
 
 You can control the top level component name and search path.
 
-You can specify the component name explicitly in the `render_component` method.
+By default the component class name is inferred from the controller method rendering the component.
+You can also specify the component name explicitly in the `render_component` method.
 `render_component "Blatz` will search the for a component class named `Blatz`
-regardless of the controller method.
+regardless of the name of the controller method.
 
-Searching for components normally works like this:  Given a controller named
-"Foo" then the component should be either in the `Components::Foo` module, the
-`Components` module (no controller - useful if you have just a couple of shared
-components) or just the outer scope (i.e. `Module`) which is useful for small
-apps.
+Searching for components works like this:  Given a controller named
+"Foo" then react.rb will search for a module named `Foo` containing the component.
+If this fails all modules will be searched (i.e. the name of the controller will be 
+ignored.)  In either case the search begins at the outer most scope until a match is made.
+
+Thus for example given a controller named `Foo`, components could be found in the `Foo` module,
+the `Components::Foo` module, in the outer most scope, or in any nested module. 
+The way the search works allows for small projects that do not need a lot
+of name spacing, and also allows components to be shared across several controllers.
 
 Saying `render_component "::Blatz"` will only search the outer scope, while
-`"::Foo::Blatz"` will look only in the module `Foo` for a class named `Blatz`.
+`"::Bar::Blatz"` will look only in the module `Bar` for a class named `Blatz`.
 
 
 ## Integration with Sinatra

data/lib/generators/reactive_ruby/test_app/templates/application.rb.erb

@@ -0,0 +1,15 @@
+<% if defined? application_definition %>
+
+  require File.expand_path('../boot', __FILE__)
+
+  require 'rails/all'
+
+  # Require the gems listed in Gemfile, including any gems
+  # you've limited to :test, :development, or :production.
+  Bundler.require(*Rails.groups(assets: %w(development test)))
+
+  require 'reactive-ruby'
+
+  <%= application_definition %>
+
+<% end %>

data/lib/generators/reactive_ruby/test_app/test_app_generator.rb

@@ -24,8 +24,8 @@ module ReactiveRuby
     end
 
     def configure_test_app
-      template 'boot.rb', "#{test_app_path}/config/boot.rb", force: true
-      template 'application.rb', "#{test_app_path}/config/application.rb", force: true
+      template 'boot.rb.erb', "#{test_app_path}/config/boot.rb", force: true
+      template 'application.rb.erb', "#{test_app_path}/config/application.rb", force: true
       template 'assets/javascripts/application.rb',
         "#{test_app_path}/app/assets/javascripts/application.rb", force: true
       template 'assets/javascripts/components.rb',

data/lib/rails-helpers/top_level_rails_component.rb

@@ -19,19 +19,19 @@ module React
       if component_name.start_with? "::"
         paths_searched << component_name.gsub(/^\:\:/,"")
         component = component_name.gsub(/^\:\:/,"").split("::").inject(Module) { |scope, next_const| scope.const_get(next_const, false) } rescue nil
-        return present component, render_params if component and component.method_defined? :render
+        return present component, render_params if component && component.method_defined?(:render)
       else
         self.class.search_path.each do |path|
           # try each path + controller + component_name
           paths_searched << "#{path.name + '::' unless path == Module}#{controller}::#{component_name}"
           component = "#{controller}::#{component_name}".split("::").inject(path) { |scope, next_const| scope.const_get(next_const, false) } rescue nil
-          return present component, render_params if component and component.method_defined? :render
+          return present component, render_params if component && component.method_defined?(:render)
         end
         self.class.search_path.each do |path|
           # then try each path + component_name
           paths_searched << "#{path.name + '::' unless path == Module}#{component_name}"
           component = "#{component_name}".split("::").inject(path) { |scope, next_const| scope.const_get(next_const, false) } rescue nil
-          return present component, render_params if component and component.method_defined? :render
+          return present component, render_params if component && component.method_defined?(:render)
         end
       end
       raise "Could not find component class '#{component_name}' for controller '#{controller}' in any component directory. Tried [#{paths_searched.join(", ")}]"

data/lib/react/component.rb

@@ -25,7 +25,7 @@ module React
 
         def render
           raise "no render defined"
-        end unless method_defined? :render
+        end unless method_defined?(:render)
 
         def children
           nodes = [`#{@native}.props.children`].flatten
@@ -78,7 +78,7 @@ module React
             rescue Exception
               name = nil
             end
-            unless name and name.method_defined? :render
+            unless name && name.method_defined?(:render)
               return super
             end
             if node_only
@@ -214,7 +214,7 @@ module React
         component = name_list.inject(scope) do |scope, class_name|
           scope.const_get(class_name)
         end rescue nil
-        return component if component and component.method_defined? :render
+        return component if component && component.method_defined?(:render)
       end
       nil
     end

data/lib/react/component/class_methods.rb

@@ -7,7 +7,7 @@ module React
 
       def process_exception(e, component, reraise = nil)
         message = ["Exception raised while rendering #{component}"]
-        if e.backtrace and e.backtrace.length > 1 and !@backtrace_off  # seems like e.backtrace is empty in safari???
+        if e.backtrace && e.backtrace.length > 1 && !@backtrace_off  # seems like e.backtrace is empty in safari???
           message << "    #{e.backtrace[0]}"
           message += e.backtrace[1..-1].collect { |line| line }
         else
@@ -72,7 +72,7 @@ module React
           define_method("#{name}") do
             @processed_params[name] ||= if param_type.respond_to? :_react_param_conversion
                                           param_type._react_param_conversion params[name]
-                                        elsif param_type.is_a? Array and param_type[0].respond_to? :_react_param_conversion
+                                        elsif param_type.is_a?(Array) && param_type[0].respond_to?(:_react_param_conversion)
                                           params[name].collect { |param| param_type[0]._react_param_conversion param }
                                         else
                                           params[name]
@@ -101,8 +101,8 @@ module React
       end
 
       def define_state(*states, &block)
-        default_initial_value = (block and block.arity == 0) ? yield : nil
-        states_hash = (states.last.is_a? Hash) ? states.pop : {}
+        default_initial_value = (block && block.arity == 0) ? yield : nil
+        states_hash = (states.last.is_a?(Hash)) ? states.pop : {}
         states.each { |name| states_hash[name] = default_initial_value }
         (self.initial_state ||= {}).merge! states_hash
         states_hash.each do |name, initial_value|
@@ -111,8 +111,8 @@ module React
       end
 
       def export_state(*states, &block)
-        default_initial_value = (block and block.arity == 0) ? yield : nil
-        states_hash = (states.last.is_a? Hash) ? states.pop : {}
+        default_initial_value = (block && block.arity == 0) ? yield : nil
+        states_hash = (states.last.is_a?(Hash)) ? states.pop : {}
         states.each { |name| states_hash[name] = default_initial_value }
         React::State.initialize_states(self, states_hash)
         states_hash.each do |name, initial_value|
@@ -126,22 +126,22 @@ module React
           React::State.get_state(from || self, name)
         end
         this.define_method("#{name}=") do |new_state|
-          yield name, React::State.get_state(from || self, name), new_state if block and block.arity > 0
+          yield name, React::State.get_state(from || self, name), new_state if block && block.arity > 0
           React::State.set_state(from || self, name, new_state)
         end
         this.define_method("#{name}!") do |*args|
           #return unless @native
           if args.count > 0
-            yield name, React::State.get_state(from || self, name), args[0] if block and block.arity > 0
+            yield name, React::State.get_state(from || self, name), args[0] if block && block.arity > 0
             current_value = React::State.get_state(from || self, name)
             React::State.set_state(from || self, name, args[0])
             current_value
           else
             current_state = React::State.get_state(from || self, name)
-            yield name, React::State.get_state(from || self, name), current_state if block and block.arity > 0
+            yield name, React::State.get_state(from || self, name), current_state if block && block.arity > 0
             React::State.set_state(from || self, name, current_state)
             React::Observable.new(current_state) do |update|
-              yield name, React::State.get_state(from || self, name), update if block and block.arity > 0
+              yield name, React::State.get_state(from || self, name), update if block && block.arity > 0
               React::State.set_state(from || self, name, update)
             end
           end
@@ -171,8 +171,8 @@ module React
       end
 
       def add_item_to_tree(current_tree, new_item)
-        if Native(current_tree).class != Native::Object or new_item.length == 1
-          new_item.inject do |memo, sub_name| {sub_name => memo} end
+        if Native(current_tree).class != Native::Object || new_item.length == 1
+          new_item.inject { |memo, sub_name| { sub_name => memo } }
         else
           Native(current_tree)[new_item.last] = add_item_to_tree(Native(current_tree)[new_item.last], new_item[0..-2])
           current_tree

data/lib/react/rendering_context.rb

@@ -14,20 +14,20 @@ module React
           result = block.call
           # Todo figure out how children rendering should happen, probably should have special method that pushes children into the buffer
           # i.e. render_child/render_children that takes Element/Array[Element] and does the push into the buffer
-          if !name and (  # !name means called from outer render so we check that it has rendered correctly
-              (@buffer.count > 1) or # should only render one element
-              (@buffer.count == 1 and @buffer.last != result) or # it should return that element
-              (@buffer.count == 0 and !(result.is_a? String or (result.respond_to? :acts_as_string? and result.acts_as_string?) or result.is_a? Element)) #for convience we will also convert the return value to a span if its a string
+          if !name && (  # !name means called from outer render so we check that it has rendered correctly
+              (@buffer.count > 1) || # should only render one element
+              (@buffer.count == 1 && @buffer.last != result) || # it should return that element
+              (@buffer.count == 0 && !(result.is_a?(String) || (result.respond_to?(:acts_as_string?) && result.acts_as_string?) || result.is_a?(Element))) #for convience we will also convert the return value to a span if its a string
             )
             raise "a components render method must generate and return exactly 1 element or a string"
           end
 
-          @buffer << result.to_s if result.is_a? String or (result.respond_to? :acts_as_string? and result.acts_as_string?) # For convience we push the last return value on if its a string
-          @buffer << result if result.is_a? Element and @buffer.count == 0
+          @buffer << result.to_s if result.is_a? String || (result.respond_to?(:acts_as_string?) && result.acts_as_string?) # For convience we push the last return value on if its a string
+          @buffer << result if result.is_a?(Element) && @buffer.count == 0
           if name
             buffer = @buffer.dup
             React.create_element(name, *args) { buffer }.tap do |element|
-              element.waiting_on_resources = saved_waiting_on_resources || !!buffer.detect { |e| e.waiting_on_resources if e.respond_to? :waiting_on_resources }
+              element.waiting_on_resources = saved_waiting_on_resources || !!buffer.detect { |e| e.waiting_on_resources if e.respond_to?(:waiting_on_resources) }
             end
           elsif @buffer.last.is_a? React::Element
             @buffer.last.tap { |element| element.waiting_on_resources ||= saved_waiting_on_resources }
@@ -71,8 +71,8 @@ module React
 
     def self.remove_nodes_from_args(args)
       args[0].each do |key, value|
-        value.as_node if value.is_a? Element rescue nil
-      end if args[0] and args[0].is_a? Hash
+        value.as_node if value.is_a?(Element) rescue nil
+      end if args[0] && args[0].is_a?(Hash)
     end
   end
 

data/lib/react/state.rb

@@ -9,7 +9,7 @@ module React
 
       def get_state(object, name, current_observer = @current_observer)
         # get current value of name for object, remember that the current object depends on this state, current observer can be overriden with last param
-        new_observers[current_observer][object] << name if current_observer and !new_observers[current_observer][object].include? name
+        new_observers[current_observer][object] << name if current_observer && !new_observers[current_observer][object].include?(name)
         states[object][name]
       end
 
@@ -42,11 +42,11 @@ module React
       end
 
       def will_be_observing?(object, name, current_observer)
-        current_observer and new_observers[current_observer][object].include?(name)
+        current_observer && new_observers[current_observer][object].include?(name)
       end
 
       def is_observing?(object, name, current_observer)
-        current_observer and observers_by_name[object][name].include?(current_observer)
+        current_observer && observers_by_name[object][name].include?(current_observer)
       end
 
       def update_states_to_observe(current_observer = @current_observer)  # should be called after the last after_render callback, currently called after components render method

data/lib/reactive-ruby/isomorphic_helpers.rb

@@ -12,7 +12,7 @@ module React
     else
       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 !unique_id || !@context || @context.unique_id != unique_id
           if on_opal_server?
             message = "************************ React Prerendering Context Initialized #{name} ***********************"
           else
@@ -147,7 +147,7 @@ module React
       end
 
       def when_on_server(&block)
-        @result = [block.call.to_json] unless IsomorphicHelpers.on_opal_client? or IsomorphicHelpers.on_opal_server?
+        @result = [block.call.to_json] unless IsomorphicHelpers.on_opal_client? || IsomorphicHelpers.on_opal_server?
       end
     end
 

data/lib/reactive-ruby/server_rendering/contextual_renderer.rb

@@ -8,7 +8,7 @@ module ReactiveRuby
 
       def render(component_name, props, prerender_options)
         if prerender_options.is_a? Hash
-          if v8_runtime? and prerender_options[:context_initializer]
+          if v8_runtime? && prerender_options[:context_initializer]
             raise React::ServerRendering::PrerenderError.new(component_name, props, "you must use 'therubyracer' with the prerender[:context] option") unless v8_runtime?
           else
             prerender_options[:context_initializer].call v8_context

data/lib/reactive-ruby/version.rb

@@ -1,3 +1,3 @@
 module React
-  VERSION = "0.7.30"
+  VERSION = "0.7.31"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reactive-ruby
 version: !ruby/object:Gem::Version
-  version: 0.7.30
+  version: 0.7.31
 platform: ruby
 authors:
 - David Chang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -249,10 +249,10 @@ files:
 - example/todos/vendor/base.css
 - example/todos/vendor/bg.png
 - example/todos/vendor/jquery.js
-- lib/generators/reactive_ruby/test_app/templates/application.rb
+- lib/generators/reactive_ruby/test_app/templates/application.rb.erb
 - lib/generators/reactive_ruby/test_app/templates/assets/javascripts/application.rb
 - lib/generators/reactive_ruby/test_app/templates/assets/javascripts/components.rb
-- lib/generators/reactive_ruby/test_app/templates/boot.rb
+- lib/generators/reactive_ruby/test_app/templates/boot.rb.erb
 - lib/generators/reactive_ruby/test_app/templates/script/rails
 - lib/generators/reactive_ruby/test_app/templates/views/components/hello_world.rb
 - lib/generators/reactive_ruby/test_app/templates/views/components/todo.rb

data/lib/generators/reactive_ruby/test_app/templates/application.rb

@@ -1,11 +0,0 @@
-require File.expand_path('../boot', __FILE__)
-
-require 'rails/all'
-
-# Require the gems listed in Gemfile, including any gems
-# you've limited to :test, :development, or :production.
-Bundler.require(*Rails.groups(assets: %w(development test)))
-
-require 'reactive-ruby'
-
-<%= application_definition %>