isomorfeus-redux 4.1.12 → 4.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a907bd5fc4e279e7b5e325c8529db0d71f3a1cbf6a4e41a12a1a333301e24ac
-  data.tar.gz: 518c374f37aaf8bbe8e0fe23818ecc75bf841b23e4711ef7b5a6ed6e0a9e36e7
+  metadata.gz: 1a46845466bba750b171d19966366ae639b0af9cd91682b5ae80a2778de5ff88
+  data.tar.gz: 41bd56cf5bc3ef23de58c71c05eec403346eb079b4bd8830d40b61811eb1c873
 SHA512:
-  metadata.gz: ccc5d077bd9cf3175d63868ac6a20ac594f2bbc215c9b8979ff8d858608a479e5eddb029a4e08ba29f2556636be0eb18fe7373f11299fee22c02b3f23afdf25f
-  data.tar.gz: 45e2223e4b648fc3f118c7ce7f92b2e30191bf0090e0e784e152f1dc3519d421329786cf653c6209a17b414a4977d421ad05f76dc6d86eb0d08fac36dbb00cbc
+  metadata.gz: 2db38277c88d8492654800bf92b8cba1125d6d2e3cd42ac693fe0fa88ff994c6de3b6d1e3e04c2dc3916294d180d358b8ffc88571e373521886434f963445ea6
+  data.tar.gz: 28024774eb4559343c6cf2b2fc3545a2815f16445e2a082fb35fbc2837f63bee73f442fbd8e3e0355cfee1108d12c6b706aa03475c86ca150cfde2e4ec3187e2

data/lib/redux/reducers.rb

@@ -20,7 +20,7 @@ module Redux
               new_state
             end
           else
-            prev_state
+            prev_state.nil? ? {} : prev_state
           end
         end
 
@@ -43,7 +43,7 @@ module Redux
               new_state
             end
           else
-            prev_state
+            prev_state.nil? ? {} : prev_state
           end
         end
 
@@ -66,7 +66,7 @@ module Redux
               new_state
             end
           else
-            prev_state
+            prev_state.nil? ? {} : prev_state
           end
         end
         Redux::Store.preloaded_state_merge!(application_state: {}, instance_state: {}, class_state: {})

data/lib/redux/store.rb

@@ -1,183 +1,199 @@
-module Redux
-  class Store
-    include Native::Wrapper
-
-    def self.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 self.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 self.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 self.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 self.middlewares
-      @middlewares ||= []
-    end
-
-    def self.preloaded_state_merge!(ruby_hash)
-      preloaded_state.merge!(ruby_hash)
-    end
-
-    def self.preloaded_state
-      @preloaded_state ||= {}
-    end
-
-    def self.preloaded_state=(ruby_hash)
-      @preloaded_state = ruby_hash
-    end
-
-    def self.reducers
-      @reducers ||= {}
-    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;
-        if (typeof window === 'object' && window.__REDUX_DEVTOOLS_EXTENSION__) { devext_enhance = window.__REDUX_DEVTOOLS_EXTENSION__(); }
-        var real_preloaded_state;
-        if (typeof preloaded_state.$class === "function" && preloaded_state.$class() == "Hash") {
-          if (preloaded_state.$size() == 0) {
-            real_preloaded_state = null;
-          } else {
-            real_preloaded_state = preloaded_state.$to_n();
-          }
-        } else if (preloaded_state == nil) {
-          real_preloaded_state = null;
-        } else {
-          real_preloaded_state = preloaded_state;
-        }
-        if (enhancer && real_preloaded_state) {
-          this.native = Opal.global.Redux.createStore(reducer, real_preloaded_state, compose(enhancer));
-        } else if (real_preloaded_state) {
-          this.native = Opal.global.Redux.createStore(reducer, real_preloaded_state, devext_enhance);
-        } else if (enhancer) {
-          this.native = Opal.global.Redux.createStore(reducer, compose(enhancer));
-        } else {
-          this.native = Opal.global.Redux.createStore(reducer, devext_enhance);
-        }
-      }
-    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") {
-          this.native.dispatch(action.$to_n());
-        } else {
-          this.native.dispatch(action);
-        }
-      }
-    end
-
-    def get_state
-      Hash.new(`this.native.getState()`)
-    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.12'
-end
+module Redux
+  VERSION = '4.1.16'
+end

data/lib/redux.rb

@@ -1,112 +1,118 @@
 module Redux
-  def self.create_store(reducer, preloaded_state = nil, enhancer = nil)
-    Redux::Store.new(reducer, preloaded_state, enhancer)
-  end
+  class << self
+    def create_store(reducer, preloaded_state = nil, enhancer = nil)
+      Redux::Store.new(reducer, preloaded_state, enhancer)
+    end
 
-  def self.combine_reducers(reducers)
-    %x{
-      var real_reducers;
-      if (typeof reducers.$class === "function") {
-        real_reducers = reducers.$to_n();
-      } else {
-        real_reducers = reducers;
+    def combine_reducers(reducers)
+      %x{
+        if (typeof reducers.$to_n === "function") {
+          reducers = reducers.$to_n();
+        }
+        return Opal.global.Redux.combineReducers(reducers);
       }
-      return Opal.global.Redux.combineReducers(real_reducers);
-    }
-  end
+    end
 
-  def self.apply_middleware(*middlewares)
-    if middlewares.size == 1
-      `Opal.global.Redux.applyMiddleware.apply(null, middlewares[0])`
-    else
-      `Opal.global.Redux.applyMiddleware.apply(null, middlewares)`
+    def apply_middleware(*middlewares)
+      if middlewares.size == 1
+        `Opal.global.Redux.applyMiddleware.apply(null, middlewares[0])`
+      else
+        `Opal.global.Redux.applyMiddleware.apply(null, middlewares)`
+      end
     end
-  end
 
-  def self.bind_action_creators(*args)
-    dispatch = args.pop
-    `Opal.global.Redux.bindActionCreators(args, dispatch)`
-  end
+    def bind_action_creators(*args)
+      dispatch = args.pop
+      `Opal.global.Redux.bindActionCreators(args, dispatch)`
+    end
 
-  def self.compose(*functions)
-    `Opal.global.Redux.compose(functions)`
-  end
+    def compose(*functions)
+      `Opal.global.Redux.compose(functions)`
+    end
 
-  def self.create_reducer(&block)
-    %x{
-      return (function(previous_state, action) {
-        if (!previous_state) { previous_state = {}; }
-        var previous_state_hash = Opal.Hash.$new(previous_state);
-        var new_state_hash = block.$call(previous_state_hash, Opal.Hash.$new(action));
-        if (previous_state_hash === new_state_hash) { return previous_state; }
-        if (typeof new_state_hash.$class === "function") { return new_state_hash.$to_n(); }
-        return previous_state;
-      });
-    }
-  end
+    def create_reducer(&block)
+      %x{
+        return function(previous_state, action) {
+          let state = null;
+          if (previous_state === null || typeof(previous_state) === 'undefined') { state = nil; }
+          else if (typeof(previous_state) === 'object' && !Array.isArray(previous_state)) {
+            state = Opal.Hash.$new(previous_state);
+          } else { state = previous_state; }
+          var new_state = block.$call(state, Opal.Hash.$new(action));
+          if (typeof(previous_state) === 'undefined' || previous_state === null) {
+            if (typeof(new_state.$to_n) === "function") { return new_state.$to_n(); }
+            return new_state;
+          }
+          if (state === new_state) { return previous_state; }
+          if (typeof(new_state.$to_n) === "function") { return new_state.$to_n(); }
+          return previous_state;
+        };
+      }
+    end
 
-  def self.delete_state_path(state, *path)
-    size = path.size - 1
-    set_state_path(state, *path[0..-2], nil)
-    (2...size).each do |i|
-      val = get_state_path(state, *path[0..-i])
-      break if val.keys.size > 1
-      set_state_path(state, *path[0..-i], nil)
+    def delete_state_path(state, *path)
+      size = path.size - 1
+      set_state_path(state, *path[0..-2], nil)
+      (2...size).each do |i|
+        val = get_state_path(state, *path[0..-i])
+        break if val.keys.size > 1
+        set_state_path(state, *path[0..-i], nil)
+      end
     end
-  end
 
-  def self.fetch_by_path(*path)
-    # get active redux component
-    %x{
-      var active_component = Opal.Preact.active_redux_component();
-      var current_state;
-      var final_data;
-      var path_last = path.length - 1;
-      if (path[path_last].constructor === Array) {
-        path[path_last] = JSON.stringify(path[path_last]);
-      }
-      if (active_component) {
-        // try to get data from component state or props or store
-        current_state = active_component.data_access()
-        if (current_state) {
+    def fetch_by_path(*path)
+      # get active redux component
+      %x{
+        var active_component = Opal.Preact.active_redux_component();
+        var current_state;
+        var final_data;
+        var path_last = path.length - 1;
+        if (path[path_last].constructor === Array) {
+          path[path_last] = JSON.stringify(path[path_last]);
+        }
+        if (active_component) {
+          // try to get data from component state or props or store
+          current_state = active_component.data_access()
+          if (current_state) {
+            final_data = path.reduce(function(prev, curr) { return prev && prev[curr]; }, current_state);
+            // if final data doesn't exist, 'null' is returned, so nil or false are ok as final_data
+            if (final_data !== null && typeof final_data !== "undefined") { return final_data; }
+          }
+        } else {
+          // try to get data from store
+          current_state = Opal.Isomorfeus.store.native.getState();
           final_data = path.reduce(function(prev, curr) { return prev && prev[curr]; }, current_state);
           // if final data doesn't exist, 'null' is returned, so nil or false are ok as final_data
           if (final_data !== null && typeof final_data !== "undefined") { return final_data; }
         }
-      } else {
-        // try to get data from store
-        current_state = Opal.Isomorfeus.store.native.getState();
-        final_data = path.reduce(function(prev, curr) { return prev && prev[curr]; }, current_state);
-        // if final data doesn't exist, 'null' is returned, so nil or false are ok as final_data
-        if (final_data !== null && typeof final_data !== "undefined") { return final_data; }
+        return null;
       }
-      return null;
-    }
-  end
+    end
 
-  def self.get_state_path(state, *path)
-    path.inject(state) do |state_el, path_el|
-      if state_el.key?(path_el)
-        state_el[path_el]
-      else
-        return nil
+    def get_state_path(state, *path)
+      path.inject(state) do |state_el, path_el|
+        if state_el.key?(path_el)
+          state_el[path_el]
+        else
+          return nil
+        end
       end
     end
-  end
 
-  def self.set_state_path(state, *path, value)
-    last_el = path.last
-    path.inject(state) do |state_el, path_el|
-      if path_el == last_el
-        state_el[path_el] = value
-        state_el[path_el]
-      elsif !state_el.key?(path_el)
-        state_el[path_el] = {}
-        state_el[path_el]
-      else
-        state_el[path_el]
+    def set_state_path(state, *path, value)
+      last_el = path.last
+      path.inject(state) do |state_el, path_el|
+        if path_el == last_el
+          state_el[path_el] = value
+          state_el[path_el]
+        elsif !state_el.key?(path_el)
+          state_el[path_el] = {}
+          state_el[path_el]
+        else
+          state_el[path_el]
+        end
       end
+      nil
     end
-    nil
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-redux
 version: !ruby/object:Gem::Version
-  version: 4.1.12
+  version: 4.1.16
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-08 00:00:00.000000000 Z
+date: 2022-02-15 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.8
+        version: 0.14.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.8
+        version: 0.14.10
 - !ruby/object:Gem::Dependency
   name: isomorfeus-speednode
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.8
+        version: 0.4.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.8
+        version: 0.4.9
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -309,7 +309,7 @@ licenses:
 - MIT
 metadata:
   github_repo: ssh://github.com/isomorfeus/gems
-  source_code_uri: https://github.com/isomorfeus/redux
+  source_code_uri: https://github.com/isomorfeus/isomorfeus-redux
 post_install_message:
 rdoc_options: []
 require_paths: