reactive-router 0.7.8 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4807bfc54a06c05e47632fce9506d66b40a39a4
-  data.tar.gz: d0556c0657b4c6445fc5de28c927a2a058081531
+  metadata.gz: c7464c623e1e6a0ec3a9ed9ad5606dfdfb3b2574
+  data.tar.gz: 4a70b6f2c314855b5d94f8834dc2b45445ca86d1
 SHA512:
-  metadata.gz: dae94468405923b8cf973ad4ec006deb82030122170694f8449cb949b4656c624aa2b71b7100df09fc0d647a498c0b64750315d38c0cf026eb15d4b1a952af68
-  data.tar.gz: ad3033f9f71ee5fd01c1425fb1c3c9bd706e87c2b6a717fbd94159a5e24d1b3ce510c3401c578a5022953030f6378f829311004cf04f14dad44fc74fc7bf90c4
+  metadata.gz: 6f26f5372874c3c24bf7f70d5931ca79e66fc830fa728f715b3f12463f3735ef30c43a9f0386eac45816fd547246f5cef8b2ad025020151599b8160f5c2e4f9b
+  data.tar.gz: 0d9032cd9212fa186ac35da1ca2dbe3e328af3195039a26ff67a808df80f633949beced36826c649b4bcaf7ab8602dd98cd2c1462f814417a5502ffff0ee4290

data/lib/reactive-router/router.rb

@@ -44,8 +44,8 @@ module React
             React::RenderingContext.render("a", opts, &block).on(:click) { transition_to(to, params, query) }
           end
 
-          def url_param_evaluators
-            @url_param_evaluators ||= []
+          def url_param_methods
+            @url_param_methods ||= []
           end
 
           attr_accessor :evaluated_url_params
@@ -53,33 +53,28 @@ module React
 
           def router_param(name, opts = {}, &block)
 
-            method_name = opts[:as] || name
+            # create a method visible both the instance and the class
+            # that gets passed the named router parameter (typically a db :id) and returns a
+            # meaningful value (typically a database record)
 
-            url_param_evaluators << [name, block]
+            method_name = opts[:as] || name
 
             class << self
               define_method method_name do
-                evaluated_url_params[name]
+                if @router_component
+                  block.call @router_component.url_params[name]
+                else
+                  raise "Call to #{self.name}.#{method_name} when #{self.name} is not mounted"
+                end
               end
             end
 
             define_method method_name do
-              self.class.send(method_name)
+              self.class.send method_name
             end
 
           end
 
-          def evaluate_new_params(params)
-            url_param_evaluators.each do |name, block|
-              begin
-                evaluated_url_params[name] = block.call(params[name]) if params.has_key?(name) and current_url_params[name] != params[name]
-                current_url_params[name] = params[name]
-              rescue Exception => e
-                log("failed to process router param #{name} (#{params[name]}): #{e}", :error)
-              end
-            end
-          end
-
         end
 
         static_call_back "willTransitionTo" do |transition, params, query, callback|
@@ -128,14 +123,13 @@ module React
         optional_param :query
         optional_param :params
 
-        def url_params(params)
-          params[:params] || (params[:router_state] && params[:router_state][:params]) || {}
+        def url_params(params = params)
+          (params && (params[:params] || (params[:router_state] && params[:router_state][:params]))) || {}
         end
 
-
         def render
           if self.class.routing?
-            self.class.evaluate_new_params url_params(params)
+            self.class.instance_variable_set(:@router_component, self)  # this was done after mount, but I think it works here
             show
           elsif on_opal_server?
             self.class.routing!
@@ -183,7 +177,7 @@ module React
             }
           elsif respond_to? :show
             puts "after mount inside of ruby router #{self.object_id}, my class router is #{self.class.object_id}"
-            self.class.instance_variable_set(:@router_component, self)
+            #self.class.instance_variable_set(:@router_component, self)  # this was done here but was moved to the first render
           end
         end
 

data/lib/reactive-router/version.rb

@@ -1,3 +1,3 @@
 module ReactiveRouter
-  VERSION = "0.7.8"
+  VERSION = "0.7.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reactive-router
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.9
 platform: ruby
 authors:
 - Adam George
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler