isomorfeus-redux 4.0.4 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e09d746effc4c63063225aed58daf7d5d64b4c3e958b9d1838d7d2bf3f6a0c8
-  data.tar.gz: 1a18a2dadc9879c059d45f00cc66a1025b7fe9d834aa13a9dacac96c8a2d688e
+  metadata.gz: 49006acd13e7f948dbb946c3b268efce6e0aa6da59737c38bbfefe0268382f99
+  data.tar.gz: 537e3571716389f6a76eb003301f5d34fab219453ba87d49f133bd6b0b23128f
 SHA512:
-  metadata.gz: 6e07fe1a3f01bf4fc6adfe3ea766add3f87a5524106e2629af4f63e1c6e3804583c6cda96bf9fd7b2289bf7ffbe862fdf06a66cafbac6d91d6520252c5a3b1b7
-  data.tar.gz: a3a2b9da7c21199c32d92ff96cbe70b99aa6c08ab13983f3e2e6ab2ce4cd46e9693eb7d1e841eaaa42042ee78abdf0203eef105c1317ba0e8945d203c65dcfd0
+  metadata.gz: ae672f889977318b8e4b84f680a79899ddd0fe8d71d8b600451429f0ad3def04dd59ef030e78d3970dfa1ad6fbe77a7185b1381d280fb2d1afb6065a5b1235ba
+  data.tar.gz: 58790b372dc6d6ad25a4f28d065559859392c5c9da0930b9e645d37373a74edb219fe0fed5c15ee35b7ad99359e482550f4e46552b370c59a4a4ed9cf7d5bbe5

data/README.md

@@ -7,7 +7,7 @@ At the [Isomorfeus Framework Project](http://isomorfeus.com)
 
 ## Versioning
 isomorfeus-redux version follows the Redux version which features and API it implements.
-Isomorfeus-redux 4.0.x implements features and the API of Redux 4.0 and should be used with Redux4.0
+Isomorfeus-redux 4.0.x implements features and the API of Redux 4.0 and should be used with Redux 4.0
 
 ## Installation
 To install redux with the matching version:
@@ -27,14 +27,14 @@ require 'isomorfeus-redux'
 ### Dependencies
 
 For full functionality the following are required:
-- [Opal ES6 import export](https://github.com/opal/opal/pull/1832)
+- [Opal ES6 import export](https://github.com/opal/opal/pull/1976)
 - [Opal Webpack Loader](https://github.com/janbiedermann/opal-webpack-loader)
 - [Opal Autoloader](https://github.com/janbiedermann/opal-autoloader)
 
 For the Gemfile:
 ```ruby
-gem 'opal', github: 'janbiedermann/opal', branch: 'es6_import_export'
-gem 'opal-webpack-loader', '~> 0.3.7'
+gem 'opal', github: 'janbiedermann/opal', branch: 'es6_modules_1_1'
+gem 'opal-webpack-loader', '~> 0.9.1'
 gem 'opal-autoloader', '~> 0.0.3'
 ```
 
@@ -92,6 +92,7 @@ To get the native store from within Javascript context:
 ```javascript
 Opal.Isomorfeus.store.native
 ```
+
 ### Other Rubyfications
 - `dispatch` accepts a Ruby Hash
 - `get_state` returns a Ruby Hash
@@ -102,7 +103,7 @@ Isomorfeus.store.subscribe do
 end
 ```
 ### Setup
-This is done automatically within Isomorfeus. If isomorfeus-redux is used in isolation, these methods can be used:
+If isomorfeus-redux is used in isolation, these methods can be used:
 ```ruby
 Redux::Store.add_middleware(middleware) # middleware must be Javascript function
 Redux::Store.init! # initializes the global store

data/lib/isomorfeus/promise.rb

@@ -1,5 +1,4 @@
-# taken from https://github.com/ruby-hyperloop/isomorfeus-operation/blob/edge/lib/isomorfeus-operation/promise.rb
-# TODO: This is used only server side and may be used by others too and should be a separate gem maybe
+# taken from https://github.com/ruby-hyperloop/hyper-operation/blob/edge/lib/hyper-operation/promise.rb
 
 class Promise
   def self.value(value)

data/lib/isomorfeus/redux_config.rb

@@ -0,0 +1,19 @@
+module Isomorfeus
+  class << self
+    attr_reader :store_initialized
+    attr_reader :store
+
+    def init_store
+      return if store_initialized
+      @store_initialized = true
+      force_init_store!
+    end
+
+    def force_init_store!
+      # at least one reducer must have been added at this stage
+      # this happened in isomorfeus-react.rb, where the component reducers were added
+      @store = Redux::Store.init!
+      `Opal.Isomorfeus.store = #@store`
+    end
+  end
+end

data/lib/isomorfeus-redux.rb

@@ -4,7 +4,11 @@ if RUBY_ENGINE == 'opal'
   require 'redux/version'
   require 'redux'
   require 'redux/store'
-  # store initialization happens in Isomorfeus.init, see isomorfeus-react/lib/isomorfeus/config.rb
+  require 'redux/reducers'
+  require 'isomorfeus/redux_config'
+
+  Redux::Reducers::add_application_reducers_to_store
+  Isomorfeus.init_store
 else
   require 'opal'
   require 'isomorfeus/promise'

data/lib/redux/reducers.rb

@@ -0,0 +1,21 @@
+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'
+            new_state = {}.merge!(prev_state) # make a copy of state
+            new_state.merge!(action[:name] => action[:value])
+            new_state
+          else
+            prev_state
+          end
+        end
+
+        Redux::Store.add_reducers(application_state: app_reducer)
+      end
+    end
+  end
+end

data/lib/redux/store.rb

@@ -94,15 +94,13 @@ module Redux
     end
 
     def add_reducer(reducer)
-      self.class.reducers << reducer
-      next_reducer = Redux.combine_reducers(*self.class.reducers)
+      self.class.reducers.merge!(reducer)
+      next_reducer = Redux.combine_reducers(self.class.reducers)
       self.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

data/lib/redux/version.rb

@@ -1,3 +1,3 @@
 module Redux
-  VERSION = '4.0.4'
+  VERSION = '4.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-redux
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.0.5
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-30 00:00:00.000000000 Z
+date: 2019-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -34,7 +34,9 @@ files:
 - README.md
 - lib/isomorfeus-redux.rb
 - lib/isomorfeus/promise.rb
+- lib/isomorfeus/redux_config.rb
 - lib/redux.rb
+- lib/redux/reducers.rb
 - lib/redux/store.rb
 - lib/redux/version.rb
 homepage: http://isomorfeus.com