reactive-router 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a37cfefc5d18c03f42d0302fd1e56360ab0acdf
-  data.tar.gz: c367a01366dca24fed30dfa4bbf332d7b6e83163
+  metadata.gz: afcd6107bb9240daef9cfd61b79857b40dc92bd1
+  data.tar.gz: 63feb3be11e99dffb41553252d290efbc9d37741
 SHA512:
-  metadata.gz: 84257330b586a80d5d958207e31f2797bf95e4ee8538c4ffd4fd1bc80f8c47b93302ef1b1eb9c10da86e6500ad5a34d90c7e2b9c60eb107cf6f523359528f157
-  data.tar.gz: 5d130e422da66bcbc0ed5f3bd7c89f69c312349de727086fe26ab41fdae9019c27203794cf4ccd997cc16b18ab65bb76556e3f084de4e55de8bc7c0e6c7d6b69
+  metadata.gz: e0f20cfccd6e0ac4276b8422d5ef49f4ed07d064f5de209ad825b60e59c3d9dfc1f88518268aa068d9f467384a6ee8b28283192c9d98890e28c6c91832df3567
+  data.tar.gz: 4d5322c6bb0a294f0e5e9af3ec06cf44d780158711873739d9775ea7e1c2c23840f74eb77280e79e9d6ff25fecd876f9b285c122709f0e9d10100e9b17f7035e

data/lib/reactive-router/component.rb

@@ -2,29 +2,31 @@ module React
   module Component
 
     module ClassMethods
-      
+
       def url_param_evaluators
-        @url_param_evaluators ||= {}
+        @url_param_evaluators ||= []
       end
-      
+
       attr_accessor :evaluated_url_params
-      
-      def router_param(name, &block)
-        
-        url_param_evaluators[name] = block
-        
+
+      def router_param(name, opts = {}, &block)
+
+        method_name = opts[:as] || name
+
+        url_param_evaluators << [name, block]
+
         class << self
-          define_method name do
+          define_method method_name do
             evaluated_url_params[name]
           end
         end
-        
-        define_method name do
-          self.class.send(name)
+
+        define_method method_name do
+          self.class.send(method_name)
         end
-        
+
       end
-      
+
     end
 
     def route_handler(*args)
@@ -35,6 +37,6 @@ module React
       opts[:params] = opts[:params].to_n if opts[:params]
       Router::RR::Link(opts, &block)
     end
-    
+
   end
 end

data/lib/reactive-router/router.rb

@@ -19,18 +19,19 @@ module React
         native_mixin `ReactRouter.Navigation`
         native_mixin `ReactRouter.State`
 
-        def get_path
-          path = `self.native.getPath()`
+        def self.get_path
+          path = `#{@router_component}.native.getPath()`
           path = nil if `typeof path === 'undefined'`
           path
         end
 
-        def replace_with(route_or_path, params = nil, query = nil)
-          `self.native.replaceWith.apply(self.native, #{[route_or_path, params].compact})`
+        def self.replace_with(route_or_path, params = nil, query = nil)
+          `#{@router_component}.native.replaceWith.apply(self.native, #{[route_or_path, params, query].compact})`
         end
 
-        def transition_to(route_or_path, params = nil, query = nil)
-          `self.native.transitionTo.apply(self.native, #{[route_or_path, params].compact})`
+        def self.transition_to(route_or_path, params = @router_component.params[:router_state][:params], query = @router_component.params[:router_state][:query])
+          params = [route_or_path, params.to_n, query.to_n].compact
+          `#{@router_component}.native.transitionTo.apply(self.native, #{params})`
         end
 
         static_call_back "willTransitionTo" do |transition, params, query, callback|
@@ -39,9 +40,11 @@ module React
           transition = `transition.path`
           puts "willTransitionTo(#{transition}, #{params}, #{query})"
           begin
-            params.each do |param, value|
-              if evaluator = url_param_evaluators[param]
-                evaluated_url_params[param] = evaluator.call(value)
+            url_param_evaluators.each do |name, block|
+              begin
+                evaluated_url_params[name] = block.call(params[name]) if params.has_key? name
+              rescue Exception => e
+                log("failed to process router param #{name} (#{params[name]}): #{e}", :error)
               end
             end
             if self.respond_to? :will_transition_to
@@ -121,7 +124,7 @@ module React
         end
 
         after_mount do
-          unless self.class.routing!
+          if !self.class.routing!
             dom_node = if `typeof React.findDOMNode === 'undefined'`
               `#{self}.native.getDOMNode`            # v0.12.0
             else
@@ -134,6 +137,8 @@ module React
                 React.render(React.createElement(root, self.native.props), #{dom_node});
               });
             }
+          elsif respond_to? :show
+            self.class.instance_variable_set(:@router_component, self)
           end
         end
 
@@ -158,6 +163,8 @@ module React
           opts = opts.dup
           opts[:handler] = React::API.create_native_react_class(opts[:handler])
           (generate_node ? RR::Route_as_node(opts, &block) : RR::Route(opts, &block))
+        rescue Exception => e
+          React::IsomorphicHelpers.log("Could not define route #{opts}: #{e}", :error)
         end
 
         def self.default_route(ops = {}, &block)

data/lib/reactive-router/version.rb

@@ -1,3 +1,3 @@
 module ReactiveRouter
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 end

metadata

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