isomorfeus-redux 4.1.14 → 4.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 025b8912245201aa017694533af72e872c0fab88ddfb92b5e635063b54c755b4
-  data.tar.gz: 27c35a6d959b591a4466761d60a86bc5bb39b8ad1fbeeba8fcb2b8ba69a91459
+  metadata.gz: 90b649600d874c4ee1a1aa211440783505cd9f49c32fcc86d3f19d58ad3f91ff
+  data.tar.gz: 2691fabf451cf7a70d199f22733f7a146823414ce42805b44cc3109e23103b05
 SHA512:
-  metadata.gz: f57f256c46df5c13c3ed94cbf4cb5649186130eeb9b9fa9fa021adfadc730e9a737a90a0dab41857be3f78db7060b30c874c7c8f64385d1d04e179d158aec18e
-  data.tar.gz: 4cb517c3356c24f4b76186a14d189e4f169dfeb6f804fc70c40324e206abeaf920eecf96b7591ace34d5d4abfa52e2b6701ea897ae934e45a8750cafa6ea65b6
+  metadata.gz: ff5d875c014668e3422480edfa3064547ecbc5f6401d77d6062f1895449cddd5da39f5d4293ec8f30c071f22b928f2d85b6fe3ebe8a64ffe812b4257de6c1085
+  data.tar.gz: 7e79f8f3e07b35b626f3b5f370dc8c6440a31dcd220989b34d5ebdec92a709d33f4b0bfb82098d051a20b268e758233b03c8375936a819a850910ce7ad10cae4

data/lib/redux/reducers.rb

@@ -1,77 +1,54 @@
-module Redux
-  module Reducers
-    def self.add_application_reducers_to_store
-      unless @_application_reducers_added
-        @_application_reducers_added = true
-        app_reducer = Redux.create_reducer do |prev_state, action|
-          case action[:type]
-          when 'APPLICATION_STATE'
-            if action.key?(:set_state)
-              action[:set_state]
-            else
-              new_state = {}.merge!(prev_state) # make a copy of state
-              if action.key?(:collected)
-                action[:collected].each do |act|
-                  new_state.merge!(act[:name] => act[:value])
-                end
-              else
-                new_state.merge!(action[:name] => action[:value])
-              end
-              new_state
-            end
-          else
-            prev_state
-          end
-        end
-
-        instance_reducer = Redux.create_reducer do |prev_state, action|
-          case action[:type]
-          when 'INSTANCE_STATE'
-            if action.key?(:set_state)
-              action[:set_state]
-            else
-              new_state = {}.merge!(prev_state) # make a copy of state
-              if action.key?(:collected)
-                action[:collected].each do |act|
-                  new_state[act[:object_id]] = {} unless new_state.key?(act[:object_id])
-                  new_state[act[:object_id]].merge!(act[:name] => act[:value])
-                end
-              else
-                new_state[action[:object_id]] = {} unless new_state.key?(action[:object_id])
-                new_state[action[:object_id]].merge!(action[:name] => action[:value])
-              end
-              new_state
-            end
-          else
-            prev_state
-          end
-        end
-
-        class_reducer = Redux.create_reducer do |prev_state, action|
-          case action[:type]
-          when 'CLASS_STATE'
-            if action.key?(:set_state)
-              action[:set_state]
-            else
-              new_state = {}.merge!(prev_state) # make a copy of state
-              if action.key?(:collected)
-                action[:collected].each do |act|
-                  new_state[act[:class]] = {} unless new_state.key?(act[:class])
-                  new_state[act[:class]].merge!(act[:name] => act[:value])
-                end
-              else
-                new_state[action[:class]] = {} unless new_state.key?(action[:class])
-                new_state[action[:class]].merge!(action[:name] => action[:value])
-              end
-              new_state
-            end
-          else
-            prev_state
-          end
-        end
-        Redux::Store.preloaded_state_merge!(application_state: {}, instance_state: {}, class_state: {})
-        Redux::Store.add_reducers(application_state: app_reducer, instance_state: instance_reducer, class_state: class_reducer)
-      end
-    end
-  end
-end
+module Redux
+  module Reducers
+    def self.add_application_reducers_to_store
+      unless @_application_reducers_added
+        @_application_reducers_added = true
+        app_reducer = Redux.create_reducer do |prev_state, action|
+          case action[:type]
+          when 'APPLICATION_STATE'
+            if action.key?(:set_state)
+              action[:set_state]
+            else
+              new_state = {}.merge!(prev_state) # make a copy of state
+              if action.key?(:collected)
+                action[:collected].each do |act|
+                  new_state.merge!(act[:name] => act[:value])
+                end
+              else
+                new_state.merge!(action[:name] => action[:value])
+              end
+              new_state
+            end
+          else
+            prev_state.nil? ? {} : prev_state
+          end
+        end
+
+        class_reducer = Redux.create_reducer do |prev_state, action|
+          case action[:type]
+          when 'CLASS_STATE'
+            if action.key?(:set_state)
+              action[:set_state]
+            else
+              new_state = {}.merge!(prev_state) # make a copy of state
+              if action.key?(:collected)
+                action[:collected].each do |act|
+                  new_state[act[:class]] = {} unless new_state.key?(act[:class])
+                  new_state[act[:class]].merge!(act[:name] => act[:value])
+                end
+              else
+                new_state[action[:class]] = {} unless new_state.key?(action[:class])
+                new_state[action[:class]].merge!(action[:name] => action[:value])
+              end
+              new_state
+            end
+          else
+            prev_state.nil? ? {} : prev_state
+          end
+        end
+        Redux::Store.preloaded_state_merge!(application_state: {}, class_state: {})
+        Redux::Store.add_reducers(application_state: app_reducer, class_state: class_reducer)
+      end
+    end
+  end
+end

data/lib/redux/store.rb

@@ -1,192 +1,199 @@
-module Redux
-  class Store
-    include Native::Wrapper
-
-    class << self
-      def add_middleware(middleware)
-        if Isomorfeus.store
-          `console.warning("Adding middleware after Store initialization may have side effects! Saving state and initializing new store with restored state!")`
-          middlewares << middleware
-          preloaded_state = Isomorfeus.store.get_state
-          init!
-        else
-          middlewares << middleware
-        end
-      end
-
-      def add_reducer(reducer)
-        if Isomorfeus.store
-          # if the store has been initalized already, add the reducer to the instance
-          Isomorfeus.store.add_reducer(reducer)
-        else
-          # otherwise just add it to the reducers, so that they will be used when initializing the store
-          preloaded_state[reducer.keys.first] = {} unless preloaded_state.key?(reducer.keys.first)
-          reducers.merge!(reducer)
-        end
-      end
-
-      def add_reducers(new_reducers)
-        if Isomorfeus.store
-          # if the store has been initalized already, add the reducer to the instance
-          Isomorfeus.store.add_reducers(new_reducers)
-        else
-          # otherwise just add it to the reducers, so that they will be used when initializing the store
-          new_reducers.each do |key, value|
-            add_reducer(key => value)
-          end
-        end
-      end
-
-      # called from Isomorfeus.init
-      def init!
-        next_reducer = Redux.combine_reducers(@reducers)
-        if middlewares.any?
-          enhancer = Redux.apply_middleware(middlewares)
-          Redux::Store.new(next_reducer, preloaded_state, enhancer)
-        else
-          Redux::Store.new(next_reducer, preloaded_state)
-        end
-      end
-
-      def middlewares
-        @middlewares ||= []
-      end
-
-      def preloaded_state_merge!(ruby_hash)
-        preloaded_state.merge!(ruby_hash)
-      end
-
-      def preloaded_state
-        @preloaded_state ||= {}
-      end
-
-      def preloaded_state=(ruby_hash)
-        @preloaded_state = ruby_hash
-      end
-
-      def reducers
-        @reducers ||= {}
-      end
-    end
-
-    def initialize(reducer, preloaded_state = nil, enhancer = nil)
-      @deferred_actions = {}
-      @deferred_dispatcher = nil
-      @last_dispatch_time = Time.now
-      %x{
-        var ogre = Opal.global.Redux;
-        var compose = (typeof window === 'object' && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__) || ogre.compose;
-        if (enhancer == nil) { enhancer = null; }
-        if (typeof window === 'object' && window.__REDUX_DEVTOOLS_EXTENSION__) {
-          var devext_enhance = window.__REDUX_DEVTOOLS_EXTENSION__();
-          if (enhancer) { enhancer = compose([enhancer, devext_enhance]); }
-          else { enhancer = devext_enhance; }
-        }
-        if (preloaded_state == nil) {
-          preloaded_state = null;
-        } else if (typeof preloaded_state.$class === "function" && preloaded_state.$class() == "Hash") {
-          if (preloaded_state.$size() == 0) {
-            preloaded_state = null;
-          } else {
-            preloaded_state = preloaded_state.$to_n();
-          }
-        }
-        if (enhancer && preloaded_state) {
-          this.native = ogre.createStore(reducer, preloaded_state, enhancer);
-        } else if (preloaded_state) {
-          this.native = ogre.createStore(reducer, preloaded_state);
-        } else if (enhancer) {
-          this.native = ogre.createStore(reducer, enhancer);
-        } else {
-          this.native = ogre.createStore(reducer);
-        }
-      }
-    end
-
-    def add_reducer(reducer)
-      self.class.reducers.merge!(reducer)
-      next_reducer = Redux.combine_reducers(self.class.reducers)
-      replace_reducer(next_reducer)
-    end
-
-    def add_reducers(new_reducers)
-      self.class.reducers.merge!(new_reducers)
-      next_reducer = Redux.combine_reducers(self.class.reducers)
-      replace_reducer(next_reducer)
-    end
-
-    def dispatch(action)
-      %x{
-        if (typeof action.$class === "function" && action.$class() == "Hash") {
-          action = action.$to_n();
-        }
-        this.native.dispatch(action);
-      }
-    end
-
-    def get_state
-      %x{
-        let res = this.native.getState();
-        if (typeof(res) === 'object' && !Array.isArray(res) && res !== null) {
-          return Opal.Hash.$new(res);
-        }
-        return res;
-      }
-    end
-
-    def collect_and_defer_dispatch(action)
-      if !Isomorfeus.on_ssr?
-        type = action.delete(:type)
-        @deferred_actions[type] = [] unless @deferred_actions.key?(type)
-        @deferred_actions[type].push(action)
-        @last_dispatch_time = `Date.now()`
-        # `console.log(#@last_dispatch_time)`
-        deferred_dispatcher(`Date.now()`) unless @deferred_dispatcher
-      else
-        dispatch(action)
-      end
-      nil
-    end
-
-    def replace_reducer(next_reducer)
-      `this.native.replaceReducer(next_reducer)`
-    end
-
-    # returns function needed to unsubscribe the listener
-    def subscribe(&listener)
-      `this.native.subscribe(function() { return listener.$call(); })`
-    end
-
-    private
-
-    def deferred_dispatcher(first)
-      @deferred_dispatcher = true
-      %x{
-        setTimeout(function() {
-          if (#{wait_longer?(first)}) { #{deferred_dispatcher(first)} }
-          else { #{dispatch_deferred_dispatches} }
-        }, 10)
-      }
-    end
-
-    def dispatch_deferred_dispatches
-      # `console.log(Date.now())`
-      @deferred_dispatcher = false
-      actions = @deferred_actions
-      @deferred_actions = {}
-      actions.each do |type, data|
-        dispatch(type: type, collected: data)
-      end
-    end
-
-    def wait_longer?(first)
-      t = `Date.now()`
-      time_since_first = `t - first`
-      # `console.log('delta', time_since_first)`
-      return true if `typeof Opal.Preact !== 'undefined' && typeof Opal.Preact.render_buffer !== 'undefined' && Opal.Preact.render_buffer.length > 0 && time_since_first < 1000`
-      return false if time_since_first > 100 # ms
-      return false if (`t - #@last_dispatch_time`) > 9 # ms
-      return true
-    end
-  end
-end
+module Redux
+  class Store
+    include Native::Wrapper
+
+    class << self
+      def add_middleware(middleware)
+        if Isomorfeus.store
+          `console.warning("Adding middleware after Store initialization may have side effects! Saving state and initializing new store with restored state!")`
+          middlewares << middleware
+          preloaded_state = Isomorfeus.store.get_state
+          init!
+        else
+          middlewares << middleware
+        end
+      end
+
+      def add_reducer(reducer)
+        if Isomorfeus.store
+          # if the store has been initalized already, add the reducer to the instance
+          Isomorfeus.store.add_reducer(reducer)
+        else
+          # otherwise just add it to the reducers, so that they will be used when initializing the store
+          preloaded_state[reducer.keys.first] = {} unless preloaded_state.key?(reducer.keys.first)
+          reducers.merge!(reducer)
+        end
+      end
+
+      def add_reducers(new_reducers)
+        if Isomorfeus.store
+          # if the store has been initalized already, add the reducer to the instance
+          Isomorfeus.store.add_reducers(new_reducers)
+        else
+          # otherwise just add it to the reducers, so that they will be used when initializing the store
+          new_reducers.each do |key, value|
+            add_reducer(key => value)
+          end
+        end
+      end
+
+      # called from Isomorfeus.init
+      def init!
+        next_reducer = Redux.combine_reducers(@reducers)
+        if middlewares.any?
+          enhancer = Redux.apply_middleware(middlewares)
+          Redux::Store.new(next_reducer, preloaded_state, enhancer)
+        else
+          Redux::Store.new(next_reducer, preloaded_state)
+        end
+      end
+
+      def middlewares
+        @middlewares ||= []
+      end
+
+      def preloaded_state_merge!(ruby_hash)
+        preloaded_state.merge!(ruby_hash)
+      end
+
+      def preloaded_state
+        @preloaded_state ||= {}
+      end
+
+      def preloaded_state=(ruby_hash)
+        @preloaded_state = ruby_hash
+      end
+
+      def reducers
+        @reducers ||= {}
+      end
+    end
+
+    def initialize(reducer, preloaded_state = nil, enhancer = nil)
+      @deferred_actions = {}
+      @deferred_dispatcher = nil
+      @last_dispatch_time = Time.now
+      %x{
+        var ogre = Opal.global.Redux;
+        var compose = (typeof window === 'object' && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__) || ogre.compose;
+        if (enhancer == nil) { enhancer = null; }
+        if (typeof window === 'object' && window.__REDUX_DEVTOOLS_EXTENSION__) {
+          var devext_enhance = window.__REDUX_DEVTOOLS_EXTENSION__();
+          if (enhancer) { enhancer = compose([enhancer, devext_enhance]); }
+          else { enhancer = devext_enhance; }
+        }
+        if (preloaded_state == nil) {
+          preloaded_state = null;
+        } else if (typeof preloaded_state.$class === "function" && preloaded_state.$class() == "Hash") {
+          if (preloaded_state.$size() == 0) {
+            preloaded_state = null;
+          } else {
+            preloaded_state = preloaded_state.$to_n();
+          }
+        }
+        if (enhancer && preloaded_state) {
+          this.native = ogre.createStore(reducer, preloaded_state, enhancer);
+        } else if (preloaded_state) {
+          this.native = ogre.createStore(reducer, preloaded_state);
+        } else if (enhancer) {
+          this.native = ogre.createStore(reducer, enhancer);
+        } else {
+          this.native = ogre.createStore(reducer);
+        }
+      }
+    end
+
+    def add_reducer(reducer)
+      self.class.reducers.merge!(reducer)
+      next_reducer = Redux.combine_reducers(self.class.reducers)
+      replace_reducer(next_reducer)
+    end
+
+    def add_reducers(new_reducers)
+      self.class.reducers.merge!(new_reducers)
+      next_reducer = Redux.combine_reducers(self.class.reducers)
+      replace_reducer(next_reducer)
+    end
+
+    def dispatch(action)
+      %x{
+        if (typeof action.$class === "function" && action.$class() == "Hash") {
+          action = action.$to_n();
+        }
+        this.native.dispatch(action);
+      }
+    end
+
+    def get_state
+      %x{
+        let res = this.native.getState();
+        if (typeof(res) === 'object' && !Array.isArray(res) && res !== null) {
+          return Opal.Hash.$new(res);
+        }
+        return res;
+      }
+    end
+
+    def recently_dispatched?
+      res = @dispatched
+      @dispatched = false
+      res
+    end
+
+    def collect_and_defer_dispatch(action)
+      if !Isomorfeus.on_ssr?
+        type = action.delete(:type)
+        @deferred_actions[type] = [] unless @deferred_actions.key?(type)
+        @deferred_actions[type].push(action)
+        @last_dispatch_time = `Date.now()`
+        # `console.log(#@last_dispatch_time)`
+        deferred_dispatcher(`Date.now()`) unless @deferred_dispatcher
+      else
+        @dispatched = true
+        dispatch(action)
+      end
+      nil
+    end
+
+    def replace_reducer(next_reducer)
+      `this.native.replaceReducer(next_reducer)`
+    end
+
+    # returns function needed to unsubscribe the listener
+    def subscribe(&listener)
+      `this.native.subscribe(function() { return listener.$call(); })`
+    end
+
+    private
+
+    def deferred_dispatcher(first)
+      @deferred_dispatcher = true
+      %x{
+        setTimeout(function() {
+          if (#{wait_longer?(first)}) { #{deferred_dispatcher(first)} }
+          else { #{dispatch_deferred_dispatches} }
+        }, 10)
+      }
+    end
+
+    def dispatch_deferred_dispatches
+      # `console.log(Date.now())`
+      @deferred_dispatcher = false
+      actions = @deferred_actions
+      @deferred_actions = {}
+      actions.each do |type, data|
+        dispatch(type: type, collected: data)
+      end
+    end
+
+    def wait_longer?(first)
+      t = `Date.now()`
+      time_since_first = `t - first`
+      # `console.log('delta', time_since_first)`
+      return true if `typeof Opal.Preact !== 'undefined' && typeof Opal.Preact.render_buffer !== 'undefined' && Opal.Preact.render_buffer.length > 0 && time_since_first < 1000`
+      return false if time_since_first > 100 # ms
+      return false if (`t - #@last_dispatch_time`) > 9 # ms
+      return true
+    end
+  end
+end

data/lib/redux/version.rb

@@ -1,3 +1,3 @@
-module Redux
-  VERSION = '4.1.14'
-end
+module Redux
+  VERSION = '4.1.18'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-redux
 version: !ruby/object:Gem::Version
-  version: 4.1.14
+  version: 4.1.18
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-12 00:00:00.000000000 Z
+date: 2022-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.9
+        version: 0.14.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.9
+        version: 0.14.12
 - !ruby/object:Gem::Dependency
   name: isomorfeus-speednode
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.9
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.9
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement