isomorfeus-redux 4.0.12 → 4.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6f522bb6c2d8d2b51d82b073e370866e07707b2ddb8687c431fb0c6818225b0
-  data.tar.gz: 3b90e208b9f3505b71ab85b5711c73304f82743b970329979e6211be654072c3
+  metadata.gz: bde7f84aef08838a72bd645cc7d301e027b7c0655d7a8b15574b702f8887ea16
+  data.tar.gz: c29f82dd8ddad188745ae302b2eeda6120ceec6b304badfacbad887abfb5a83d
 SHA512:
-  metadata.gz: 77a9fbdfcbe6ac471220a6a735f01d5f34fdfb2a4a985bd8bfe835d686954ae9c482fbda0478059a15ba6679014b54633b06fb667739801c68709b1e0b02031d
-  data.tar.gz: 44a41d2449be7bd81f6fc022c90dfba0b2e39c9c45e42a806e3b36ee85c3b1c4aef2aeb51b444b1d52283d4d2a51654ea8d99109a20153856ee2eaf6cb254f69
+  metadata.gz: 7268658a740a8ddf60d72d02b17982a627d7a5106a392239d95fe604a2a0ad5fc4ef4c30c35e2fe3670bb3adc667a670dd302a2ac2a88e691f2c997cdebe1735
+  data.tar.gz: 9975773c09019966c7eea4847145b24b53b60f946c213ee071521c1b83dd74c9fe11a647a33e4bc56dde89465f2e2a566ea11010fd2da539ab11a9a50c025bff

data/lib/isomorfeus-redux.rb

@@ -1,6 +1,7 @@
 if RUBY_ENGINE == 'opal'
   require 'native'
   require 'promise'
+  require 'isomorfeus/core_ext/hash/deep_merge'
   require 'redux/version'
   require 'redux'
   require 'redux/store'

data/lib/isomorfeus/core_ext/hash/deep_merge.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+# taken from: https://github.com/rails/rails/blob/master/activesupport/lib/active_support/core_ext/hash/deep_merge.rb
+
+class Hash
+  # Returns a new hash with +self+ and +other_hash+ merged recursively.
+  #
+  #   h1 = { a: true, b: { c: [1, 2, 3] } }
+  #   h2 = { a: false, b: { x: [3, 4, 5] } }
+  #
+  #   h1.deep_merge(h2) # => { a: false, b: { c: [1, 2, 3], x: [3, 4, 5] } }
+  #
+  # Like with Hash#merge in the standard library, a block can be provided
+  # to merge values:
+  #
+  #   h1 = { a: 100, b: 200, c: { c1: 100 } }
+  #   h2 = { b: 250, c: { c1: 200 } }
+  #   h1.deep_merge(h2) { |key, this_val, other_val| this_val + other_val }
+  #   # => { a: 100, b: 450, c: { c1: 300 } }
+  def deep_merge(other_hash, &block)
+    dup.deep_merge!(other_hash, &block)
+  end
+
+  # Same as +deep_merge+, but modifies +self+.
+  def deep_merge!(other_hash, &block)
+    merge!(other_hash) do |key, this_val, other_val|
+      if this_val.is_a?(Hash) && other_val.is_a?(Hash)
+        this_val.deep_merge(other_val, &block)
+      elsif block_given?
+        block.call(key, this_val, other_val)
+      else
+        other_val
+      end
+    end
+  end
+end

data/lib/redux/store.rb

@@ -68,6 +68,9 @@ module Redux
     end
 
     def initialize(reducer, preloaded_state = `null`, enhancer = `null`)
+      @deferred_actions = {}
+      @deferred_dispatcher = nil
+      @last_dispatch_time = Time.now
       %x{
         var compose = (typeof window === 'object' && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__) || Opal.global.Redux.compose;
         var devext_enhance;
@@ -122,6 +125,14 @@ module Redux
       Hash.new(`this.native.getState()`)
     end
 
+    def merge_and_defer_dispatch(action)
+      type = action.delete(:type)
+      @deferred_actions[type] = {} unless @deferred_actions.key?(type)
+      @deferred_actions[type].deep_merge!(action)
+      @last_dispatch_time = `new Date()`
+      create_deferred_dispatcher(`new Date()`) unless @deferred_dispatcher
+    end
+
     def replace_reducer(next_reducer)
       `this.native.replaceReducer(next_reducer)`
     end
@@ -130,5 +141,33 @@ module Redux
     def subscribe(&listener)
       `this.native.subscribe(function() { return listener$.call(); })`
     end
+
+    private
+
+    def create_deferred_dispatcher(first)
+      @deferred_dispatcher = true
+      %x{
+        setTimeout(function() {
+          if (#{wait_longer?(first)}) { #{create_deferred_dispatcher(first)} }
+          else { #{dispatch_deferred_dispatches} }
+        }, 25)
+      }
+    end
+
+    def dispatch_deferred_dispatches
+      @deferred_dispatcher = false
+      actions = @deferred_actions
+      @deferred_actions = {}
+      actions.each do |type, data|
+        dispatch({type: type}.merge(data))
+      end
+    end
+
+    def wait_longer?(first)
+      t = `new Date()`
+      return false if (`t - first`) > 50 # ms
+      return false if (`t - #@last_dispatch_time`) > 10 # ms
+      return true
+    end
   end
 end

data/lib/redux/version.rb

@@ -1,3 +1,3 @@
 module Redux
-  VERSION = '4.0.12'
+  VERSION = '4.0.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-redux
 version: !ruby/object:Gem::Version
-  version: 4.0.12
+  version: 4.0.13
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-28 00:00:00.000000000 Z
+date: 2019-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -33,6 +33,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/isomorfeus-redux.rb
+- lib/isomorfeus/core_ext/hash/deep_merge.rb
 - lib/isomorfeus/promise.rb
 - lib/isomorfeus/redux_config.rb
 - lib/redux.rb