reactive-ruby 0.7.19 → 0.7.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1291eb9025b7407c477b96834fdafb03417f74b4
-  data.tar.gz: 8a9c2c6290d2470b8160e42b8dd5d55edd1e38e7
+  metadata.gz: 9ca98468e40f18b1764978546a1a3436390ebc84
+  data.tar.gz: 70b9057c1a7924574a881d312c62551a8cb72adb
 SHA512:
-  metadata.gz: 60717270fb07ccda56cf87360442bb5991c68cecf206041f4f4b057e2d303b58e216a943a5dddae29ed7214555034eff372f7cb60159b92f5ed8a79751768b4e
-  data.tar.gz: 630c92fd6d7cdacad40602624292bec149edf94e50a5aa2bdbb5b4183a392bd48a84b3120308cdb755a50e719ffe30b2f807a2203ecf3bf292d31956f69a9d34
+  metadata.gz: b6800c763a8cc32f967fd89277eb9f365de027ec052feae35facd86f06a155e2173f90b5e636f97bb12bda4936ed27b1f25ad5da3dd749608a10d2166a5f4f20
+  data.tar.gz: ea5cc3ffdee3bbbfb778833338392e598de397638a7b48df10dedd3bfed61c7ddebe514dea54edbd0d16d9547c6e072720b655c3911e98207b2a52045a52da59

data/example/examples/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    reactive-ruby (0.7.18)
+    reactive-ruby (0.7.19)
       opal
       opal-activesupport
       opal-browser

data/example/examples/app/rerendering.rb

@@ -0,0 +1,72 @@
+class Rerendering
+
+  include React::Component
+
+  class Child
+
+    include React::Component
+
+    define_state state_changes: 0
+    require_param :param
+
+    before_mount do
+      @render_count = 0
+      @render_difference = -1
+      @render_saves = []
+    end
+
+    after_mount do
+      @start_time = Time.now.to_i
+      every(7) { puts "state  changes actual ticks = #{Time.now.to_i-@start_time}, calculated = #{(state_changes+1)*7}"; state_changes! state_changes+1}
+    end
+
+    def render
+      puts "child rendering"
+      @render_count = @render_count+1
+      puts "ticks = #{(state_changes)*7} / #{(param)*11} / #{(Rerendering.exported_state_changes)*12}"
+      if param + state_changes + Rerendering.exported_state_changes != @render_count + @render_difference
+        @render_difference = param + state_changes + Rerendering.exported_state_changes - @render_count
+        save = "Skipped a render @ #{Time.now.to_i-@start_time} secs when param = #{param} * 11, state_changes = #{state_changes} * 7, exported = #{Rerendering.exported_state_changes} * 12"
+        @render_saves << save
+        puts save
+      end
+      table do
+        tr { "ticks = #{(state_changes)*7} / #{(param)*11} / #{(Rerendering.exported_state_changes)*12}".td(col_span: 3) }
+        @render_saves.each do |save|
+          tr { save.td(col_span: 3) }
+        end
+        tr { "child param has changed".td;        param.td;                                                        "times.".td  }
+        tr { "internal state has changed".td;     state_changes.td;                                                "times.".td  }
+        tr { "external state has changed".td;     Rerendering.exported_state_changes.td;                           "times.".td  }
+        tr { "that's a total of".td;              (param + state_changes + Rerendering.exported_state_changes).td; "changes".td }
+        tr { "And I have rendered a total of".td; (@render_count).td;                            "times".td   }
+      end
+    end
+
+  end
+
+  define_state parent_state_changes: 0
+  define_state param_changes: 0
+  export_state exported_state_changes: 0
+
+  before_mount do
+    @render_count = 0
+  end
+
+  after_mount do
+    start_time = Time.now.to_i
+    every(5) {  parent_state_changes! parent_state_changes+1  }
+    every(11) { puts "param  changes actual ticks = #{Time.now.to_i-start_time}, calculated = #{(param_changes+1)*11}"; param_changes! param_changes+1 }
+    every(12) { puts "export changes actual ticks = #{Time.now.to_i-start_time}, calculated = #{(exported_state_changes+1)*11}"; exported_state_changes! exported_state_changes + 1 }
+  end
+
+  def render
+    puts "master_rendering"
+    @render_count = @render_count+1
+    div do
+      "master has changed state a total of #{parent_state_changes + param_changes} times, and has rendered #{@render_count} times".br
+      Child(param: param_changes)
+    end
+  end
+
+end

data/example/examples/app/show.rb

@@ -9,6 +9,7 @@ require 'reactive-router'
 require 'basics'
 require 'reuse'
 require 'items'
+require 'rerendering'
 
 
 class Show
@@ -20,6 +21,7 @@ class Show
   routes(path: "/") do
     route(path: "basics", name: "basics", handler: Basics)
     route(path: "reuse", name: "reuse", handler: Reuse)
+    route(path: "rerendering", name: "rerendering", handler: Rerendering)
     redirect(from: "/", to: "basics")
   end
 
@@ -29,6 +31,7 @@ class Show
       div do
         link(to: "basics") { "Basics" }; br
         link(to: "reuse") { "Reusable Components" }; br
+        link(to: "rerendering") { "Rerendering Test" }; br
       end
     route_handler
     end

data/lib/reactive-ruby/component.rb

@@ -63,23 +63,17 @@ module React
       base.extend(ClassMethods)
 
       if base.name
-#puts "getting parent of #{base.name}"
         parent = base.name.split("::").inject([Module]) { |nesting, next_const| nesting + [nesting.last.const_get(next_const)] }[-2]
-#puts "defining method missing for module #{parent}"
-
-        class << parent #.class_eval do
-
 
+        class << parent
 
           def method_missing(n, *args, &block)
-#puts "method missing for #{n} called"
             name = n
             if name =~ /_as_node$/
               node_only = true
               name = name.gsub(/_as_node$/, "")
             end
             unless name = const_get(name) and name.method_defined? :render
-#puts "can't find render method"
               return super
             end
             if node_only
@@ -114,7 +108,7 @@ module React
     end
 
     def update_react_js_state(object, name, value)
-      set_state({"#{object.class.to_s+'.' unless object == self}name" => value}) rescue nil
+      set_state({"***_state_updated_at-***" => Time.now.to_f, "#{object.class.to_s+'.' unless object == self}#{name}" => value}) rescue nil
     end
 
     def emit(event_name, *args)
@@ -148,10 +142,30 @@ module React
       self.class.process_exception(e, self)
     end
 
+    def props_changed?(next_props)
+      return true unless params.keys.sort == next_props.keys.sort
+      params.detect { |k, v| `#{next_props[k]} != #{params[k]}`}
+    end
+
     def should_component_update?(next_props, next_state)
-      React::State.set_state_context_to(self) { self.respond_to?(:needs_update?) ? self.needs_update?(Hash.new(next_props), Hash.new(next_state)) : true }
-    rescue Exception => e
-      self.class.process_exception(e, self)
+      React::State.set_state_context_to(self) do
+        next_props = Hash.new(next_props)
+        if self.respond_to?(:needs_update?)
+          !!self.needs_update?(next_props, Hash.new(next_state))
+        elsif false # switch to true to force updates per standard react
+          true
+        elsif props_changed? next_props
+          true
+        elsif `!next_state != !#{@native}.state`
+          true
+        elsif `!next_state && !#{@native}.state`
+          false
+        elsif `next_state["***_state_updated_at-***"] != #{@native}.state["***_state_updated_at-***"]`
+          true
+        else
+          false
+        end.to_n
+      end
     end
 
     def component_will_update(next_props, next_state)
@@ -247,12 +261,12 @@ module React
     module ClassMethods
 
       def backtrace(*args)
-        @backtrace_on = (args.count == 0 or (args[0] != :off and args[0]))
+        @backtrace_off = (args[0] == :off)
       end
 
       def process_exception(e, component, reraise = nil)
         message = ["Exception raised while rendering #{component}"]
-        if @backtrace_on
+        if !@backtrace_off
           message << "    #{e.backtrace[0]}"
           message += e.backtrace[1..-1].collect { |line| line }
         else

data/lib/reactive-ruby/state.rb

@@ -72,11 +72,22 @@ module React
       end
 
       def set_state_context_to(observer) # wrap all execution that may set or get states in a block so we know which observer is executing
+        if `typeof window.reactive_ruby_timing !== 'undefined'`
+          @nesting_level = (@nesting_level || 0) + 1
+          start_time = Time.now.to_f
+          observer_name = (observer.class.respond_to?(:name) ? observer.class.name : observer.to_s) rescue "object:#{observer.object_id}"
+          puts "#{'  ' * @nesting_level} Timing #{observer_name} Execution"
+        end
         saved_current_observer = @current_observer
         @current_observer = observer
         return_value = yield
+        if `typeof window.reactive_ruby_timing !== 'undefined'`
+          puts "#{'  ' * @nesting_level} Timing #{observer_name} Completed in #{'%.04f' % (Time.now.to_f-start_time)} seconds"
+        end
+        return_value
       ensure
         @current_observer = saved_current_observer
+        @nesting_level = [0, @nesting_level - 1].max if `typeof window.reactive_ruby_timing !== 'undefined'`
         return_value
       end
 

data/lib/reactive-ruby/version.rb

@@ -1,3 +1,3 @@
 module React
-  VERSION = "0.7.19"
+  VERSION = "0.7.20"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reactive-ruby
 version: !ruby/object:Gem::Version
-  version: 0.7.19
+  version: 0.7.20
 platform: ruby
 authors:
 - David Chang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -99,6 +99,7 @@ files:
 - example/examples/app/items.rb
 - example/examples/app/jquery.js
 - example/examples/app/react-router.js
+- example/examples/app/rerendering.rb
 - example/examples/app/reuse.rb
 - example/examples/app/show.rb
 - example/examples/config.ru