rbdux 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e2b52fe3fdf03fb4b57e8875edf152dfa7dba39
-  data.tar.gz: 2a4cdd6c7dd86694bac2dee6af8fddeb793bdbed
+  metadata.gz: 696d9041db4b07c10faa88172f0caf377671d414
+  data.tar.gz: 0119532c811ec2326d07bc5e4a81a067901bb7dd
 SHA512:
-  metadata.gz: 7bbe51b93c102910fac95498117eff8774c924448bcb3b7e7308b8cf5f204f605321eb4bccc6c0cf2d1835d0674872cd1e6c1b20f64e6e16a7f38919d53f9b7a
-  data.tar.gz: 0b81e094159550b1bad1fe2508471abf88c9fb7a350c8ba2230f6c52320cca4e351f8b1bc61a836f918a2f5338dab073ba3fe612e00abacc80fb3f2d52559b0d
+  metadata.gz: cd12a4029311954a642eb2319afd055afee8ccadfe2ed9f9c7a679e1a7936f0329eb00cf106fd7be02a58ab4c5f4172c4aadbb93e09af393ff8c612b98c44f9b
+  data.tar.gz: 13ff0be159045cff7f3370ae228f310ca342b47f07358c2610e859f2d4af573de3817a4e2aeae6ae725642b228f2b38e0fb88315b3f0ed5bf0d89c1bd73b5f50

data/lib/rbdux/errors.rb

@@ -0,0 +1,5 @@
+module Rbdux
+  module Errors
+    MissingStoreContainerError = Class.new(StandardError)
+  end
+end

data/lib/rbdux/middleware/thunk.rb

@@ -0,0 +1,13 @@
+module Rbdux
+  module Middleware
+    class Thunk
+      def before(store, action)
+        func = action.class.dispatch_func
+
+        return nil unless func
+
+        func.call(store, action)
+      end
+    end
+  end
+end

data/lib/rbdux/store.rb

@@ -1,4 +1,5 @@
 require 'securerandom'
+require_relative 'errors'
 
 module Rbdux
   class Store
@@ -13,10 +14,6 @@ module Rbdux
         @instance = nil
       end
 
-      def with_state(state)
-        @instance = Store.new(state)
-      end
-
       def method_missing(method, *args, &block)
         return unless instance.respond_to?(method)
 
@@ -24,50 +21,54 @@ module Rbdux
       end
     end
 
-    attr_reader :state
+    def with_store(store)
+      raise ArgumentError, 'You must provide a store.' unless store
 
-    def reduce(action, state_key = nil, &block)
-      add_reducer(action, state_key, true, block)
+      @store_container = store
 
       self
     end
 
-    def reduce_and_merge(action, state_key = nil, &block)
-      add_reducer(action, state_key, false, block)
+    def add_middleware(middleware)
+      @before_middleware << middleware if middleware.respond_to? :before
+      @after_middleware << middleware if middleware.respond_to? :after
 
       self
     end
 
-    def when_merging(&block)
-      validate_functional_inputs(block)
-
-      @merge_func = block
+    def get(state_key = nil)
+      validate_store_container
 
-      self
+      if state_key
+        @store_container.get(state_key)
+      else
+        @store_container.get_all
+      end
     end
 
-    def before(&block)
-      @before_middleware << block if block
+    def reduce(action, state_key = nil, &block)
+      validate_functional_inputs(block)
 
-      self
-    end
+      key = action.name
 
-    def after(&block)
-      @after_middleware << block if block
+      reducers[key] = [] unless reducers.key?(key)
+      reducers[key] << Reducer.new(state_key, block)
 
       self
     end
 
     def dispatch(action)
-      previous_state = state
+      validate_store_container
+
+      previous_state = @store_container.get_all
 
-      dispatched_action = apply_before_middleware(action)
+      dispatched_action = apply_before_middleware!(action)
 
       reducers.fetch(action.class.name, []).each do |reducer|
         apply_reducer!(reducer, dispatched_action)
       end
 
-      apply_after_middleware(previous_state, dispatched_action)
+      apply_after_middleware!(previous_state, dispatched_action)
 
       observers.values.each(&:call)
     end
@@ -88,79 +89,52 @@ module Rbdux
 
     private
 
-    Reducer = Struct.new(:state_key, :auto_merge, :func)
+    Reducer = Struct.new(:state_key, :func)
 
     attr_reader :observers, :reducers
 
-    def initialize(state = {})
-      @state = state
+    def initialize
       @observers = {}
       @reducers = {}
       @before_middleware = []
       @after_middleware = []
-      @merge_func = nil
     end
 
-    def add_reducer(action, state_key, auto_merge, func)
-      validate_functional_inputs(func)
-
-      key = action.name
-
-      reducers[key] = [] unless reducers.key?(key)
-      reducers[key] << Reducer.new(state_key, auto_merge, func)
-    end
-
-    def apply_before_middleware(action)
+    def apply_before_middleware!(action)
       dispatched_action = action
 
       @before_middleware.each do |m|
-        new_action = m.call(self, dispatched_action)
+        new_action = m.before(self, dispatched_action)
         dispatched_action = new_action unless new_action.nil?
       end
 
       dispatched_action
     end
 
-    def apply_after_middleware(previous_state, action)
+    def apply_after_middleware!(previous_state, action)
       @after_middleware.each do |m|
-        m.call(previous_state, state, action)
+        m.after(previous_state, get, action)
       end
     end
 
     def apply_reducer!(reducer, action)
-      reducer_params = [slice_state(reducer.state_key), action]
-      reducer_params << state unless reducer.auto_merge
-      new_state = reducer.func.call(*reducer_params)
+      new_state = reducer.func.call(get(reducer.state_key), action)
 
       return if new_state.nil?
 
-      @state =  if reducer.auto_merge
-                  merge_state(new_state, reducer.state_key)
-                else
-                  new_state
-                end
-    end
-
-    def slice_state(state_key)
-      return state unless state_key
-
-      state[state_key]
-    end
-
-    def merge_state(new_state, state_key)
-      if @merge_func.nil?
-        default_merge(state, new_state, state_key)
+      if reducer.state_key
+        @store_container.set(reducer.state_key, new_state)
       else
-        @merge_func.call(state, new_state, state_key)
+        @store_container.replace(new_state)
       end
     end
 
-    def default_merge(old_state, new_state, state_key)
-      old_state.dup.merge(state_key ? { state_key => new_state } : new_state)
-    end
-
     def validate_functional_inputs(block)
       raise ArgumentError, 'You must define a block.' unless block
     end
+
+    def validate_store_container
+      raise Rbdux::Errors::MissingStoreContainerError unless @store_container
+    end
   end
 end

data/lib/rbdux/stores/immutable_memory_store.rb

@@ -0,0 +1,35 @@
+require 'hamster'
+
+module Rbdux
+  module Stores
+    class ImmutableMemoryStore
+      def self.with_state(state)
+        ImmutableMemoryStore.new(state)
+      end
+
+      def get(key)
+        state[key]
+      end
+
+      def get_all
+        state.to_h
+      end
+
+      def set(key, value)
+        @state = state.put(key, value)
+      end
+
+      def replace(state)
+        @state = Hamster::Hash.new(state)
+      end
+
+      private
+
+      attr_reader :state
+
+      def initialize(state)
+        @state = Hamster::Hash.new(state)
+      end
+    end
+  end
+end

data/lib/rbdux/stores/memory_store.rb

@@ -0,0 +1,33 @@
+module Rbdux
+  module Stores
+    class MemoryStore
+      def self.with_state(state)
+        MemoryStore.new(state)
+      end
+
+      def get(key)
+        state[key]
+      end
+
+      def get_all
+        state
+      end
+
+      def set(key, value)
+        state[key] = value
+      end
+
+      def replace(state)
+        @state = state
+      end
+
+      private
+
+      attr_reader :state
+
+      def initialize(state)
+        @state = state
+      end
+    end
+  end
+end

data/lib/rbdux.rb

@@ -1,3 +1,5 @@
 require 'rbdux/action'
 require 'rbdux/store'
-require 'rbdux/middleware/dispatch_interceptor'
+require 'rbdux/errors'
+require 'rbdux/stores/memory_store'
+require 'rbdux/middleware/thunk'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbdux
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Joshua Tompkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: josh@joshtompkins.com
@@ -18,8 +18,11 @@ extra_rdoc_files: []
 files:
 - lib/rbdux.rb
 - lib/rbdux/action.rb
-- lib/rbdux/middleware/dispatch_interceptor.rb
+- lib/rbdux/errors.rb
+- lib/rbdux/middleware/thunk.rb
 - lib/rbdux/store.rb
+- lib/rbdux/stores/immutable_memory_store.rb
+- lib/rbdux/stores/memory_store.rb
 homepage: https://github.com/jtompkins/rbdux
 licenses:
 - MIT

data/lib/rbdux/middleware/dispatch_interceptor.rb

@@ -1,13 +0,0 @@
-module Rbdux
-  module Middleware
-    module_function
-
-    def dispatch_interceptor(store, action)
-      func = action.class.dispatch_func
-
-      return nil unless func
-
-      func.call(store, action)
-    end
-  end
-end