reactive-router 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afcd6107bb9240daef9cfd61b79857b40dc92bd1
-  data.tar.gz: 63feb3be11e99dffb41553252d290efbc9d37741
+  metadata.gz: c3dcdd11e337d8988b6bdd8a53a0574edb3112a6
+  data.tar.gz: 66d093331294658c98740d6993805646781e0149
 SHA512:
-  metadata.gz: e0f20cfccd6e0ac4276b8422d5ef49f4ed07d064f5de209ad825b60e59c3d9dfc1f88518268aa068d9f467384a6ee8b28283192c9d98890e28c6c91832df3567
-  data.tar.gz: 4d5322c6bb0a294f0e5e9af3ec06cf44d780158711873739d9775ea7e1c2c23840f74eb77280e79e9d6ff25fecd876f9b285c122709f0e9d10100e9b17f7035e
+  metadata.gz: abcef3451bacffb2a4e6eb352e3e96aadf956f5ad6c182b818fa4ab2c7adcf72a61678103bb6488f7793cc17a2ba72d3e4caf71e992ad60777ac45558bc77e4a
+  data.tar.gz: a415c2a9088e7f8054938831a27f06cc8685881fd0116d80f088dde560f3a5ba4e71c68c984ecb83619e4363c872c7526e438a3be560253038b8a85df390b5d6

data/lib/reactive-router/component.rb

@@ -3,29 +3,7 @@ module React
 
     module ClassMethods
 
-      def url_param_evaluators
-        @url_param_evaluators ||= []
-      end
 
-      attr_accessor :evaluated_url_params
-
-      def router_param(name, opts = {}, &block)
-
-        method_name = opts[:as] || name
-
-        url_param_evaluators << [name, block]
-
-        class << self
-          define_method method_name do
-            evaluated_url_params[name]
-          end
-        end
-
-        define_method method_name do
-          self.class.send(method_name)
-        end
-
-      end
 
     end
 

data/lib/reactive-router/router.rb

@@ -19,34 +19,68 @@ module React
         native_mixin `ReactRouter.Navigation`
         native_mixin `ReactRouter.State`
 
-        def self.get_path
-          path = `#{@router_component}.native.getPath()`
-          path = nil if `typeof path === 'undefined'`
-          path
-        end
+        class << self
 
-        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 get_path
+            path = `#{@router_component}.native.getPath()`
+            path = nil if `typeof path === 'undefined'`
+            path
+          end
 
-        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
+          def replace_with(route_or_path, params = nil, query = nil)
+            `#{@router_component}.native.replaceWith.apply(self.native, #{[route_or_path, params, query].compact})`
+          end
 
-        static_call_back "willTransitionTo" do |transition, params, query, callback|
-          params = Hash.new(params)
-          query = Hash.new(query)
-          transition = `transition.path`
-          puts "willTransitionTo(#{transition}, #{params}, #{query})"
-          begin
+          def transition_to(route_or_path, params = {}, query = {})
+            params = @router_component.params[:router_state][:params].merge params
+            query = @router_component.params[:router_state][:query].merge query
+            `#{@router_component}.native.transitionTo.apply(self.native, #{[route_or_path, params.to_n, query.to_n]})`
+          end
+
+          def url_param_evaluators
+            @url_param_evaluators ||= []
+          end
+
+          attr_accessor :evaluated_url_params
+          attr_accessor :current_url_params
+
+          def router_param(name, opts = {}, &block)
+
+            method_name = opts[:as] || name
+
+            url_param_evaluators << [name, block]
+
+            class << self
+              define_method method_name do
+                evaluated_url_params[name]
+              end
+            end
+
+            define_method method_name do
+              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
+                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|
+          params = Hash.new(params)
+          query = Hash.new(query)
+          transition = `transition.path`
+          puts "willTransitionTo(#{transition}, #{params}, #{query}) for router #{self.object_id}, router_component = #{@router_component.object_id}"
+          begin
             if self.respond_to? :will_transition_to
               result = will_transition_to transition, params, query if self.respond_to? :will_transition_to
               if result.is_a? Promise
@@ -65,6 +99,7 @@ module React
         before_first_mount do |context|
 
           @evaluated_url_params = {}
+          @current_url_params = {}
           if !self.instance_methods.include?(:show)  # if there is no show method this is NOT a top level router so we assume routing will begin elsewhere
             @routing = true
           elsif `typeof ReactRouter === 'undefined'`
@@ -93,6 +128,7 @@ module React
 
         def render
           if self.class.routing?
+            self.class.evaluate_new_params url_params(params)
             show
           elsif on_opal_server?
             self.class.routing!
@@ -125,6 +161,7 @@ module React
 
         after_mount do
           if !self.class.routing!
+            puts "after mount outside of ruby router #{self.object_id}, my class router is #{self.class.object_id}"
             dom_node = if `typeof React.findDOMNode === 'undefined'`
               `#{self}.native.getDOMNode`            # v0.12.0
             else
@@ -138,6 +175,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)
           end
         end

data/lib/reactive-router/version.rb

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

metadata

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