view_component_reducible 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a699ce3503948db085a77d5d187e725157966bf53a132e9d9124a772db648f1c
-  data.tar.gz: ba68826392cd3ea83ca6ceea8f8f753d893f013467d61eff20f3085fd40c9e0c
+  metadata.gz: 5505b895dc07055d3d09ad5e466316aadab92321fd2b8a71c3889cc1284059f2
+  data.tar.gz: 66757165853350bb660d16605c935ec5072eb01aedf4dfaf62419ab4d1af5439
 SHA512:
-  metadata.gz: 9eca692a8a5b7185869237597cb79d199d4e1e036501f2c9c2574e40ea643e99535202f31fb44198a51e293e2fd5078adefd2e65756bd95fc8732917a688b892
-  data.tar.gz: bfe0b991478a5a8788f2b2f9c69f7705d5ad9bf1de828d76d50c5b652a8d57bb23c18dfe883289bf231c54b77885e311c35485e9d4a7fc37f200b87d113033a8
+  metadata.gz: a5a98ecba5e6ac762086bce05b77409360708c91489d6bbd23bba626e9cc0f6ed1f06ee138b90bcb44c68c06e4b35f4474365ea4b5baae3600283e261e1b09aa
+  data.tar.gz: b56697564e122c374d7291cd1955678af2fb79ca307351b74f4c39043e7912bebab33d4f2ae17d26644a46a42a6f9781267be0db27601b5bbad14affe7fa9a3d

data/lib/view_component_reducible/msg.rb

@@ -20,17 +20,59 @@ module ViewComponentReducible
       type = params.fetch('vcr_msg_type')
       payload_json = params['vcr_msg_payload']
       payload = payload_json && payload_json != '' ? JSON.parse(payload_json) : {}
-      new(type:, payload:)
+      build(type:, payload:)
     end
 
-    private
+    # Build a Msg with a normalized payload object.
+    # @param type [String, Symbol]
+    # @param payload [Object, nil]
+    # @return [ViewComponentReducible::Msg]
+    def self.build(type:, payload: nil)
+      return new(type:, payload:) if payload.is_a?(Data)
 
-    def normalized_type
+      normalized = normalize_type(type)
+      new(type:, payload: self::Payload.from_hash(normalized, payload))
+    end
+
+    # @param type [String, Symbol]
+    # @return [Symbol]
+    def self.normalize_type(type)
       type.to_s
           .gsub(/([a-z\d])([A-Z])/, '\1_\2')
           .tr('-', '_')
           .downcase
           .to_sym
     end
+
+    private
+
+    def normalized_type
+      self.class.normalize_type(type)
+    end
+  end
+
+  class Msg
+    module Payload
+      Empty = Data.define
+      Value = Data.define(:value)
+
+      def self.from_hash(_type, payload)
+        payload_hash = payload.is_a?(Hash) ? payload.transform_keys(&:to_s) : nil
+
+        return Empty.new if payload.nil? || (payload.respond_to?(:empty?) && payload.empty?)
+        return Value.new(value: payload) unless payload_hash
+
+        build_generic(payload_hash)
+      end
+
+      def self.build_generic(payload_hash)
+        return Empty.new if payload_hash.empty?
+
+        keys = payload_hash.keys.map(&:to_sym)
+        klass = Data.define(*keys)
+        values = keys.to_h { |key| [key, payload_hash[key.to_s]] }
+        klass.new(**values)
+      end
+    end
   end
 end

data/lib/view_component_reducible/runtime.rb

@@ -48,34 +48,53 @@ module ViewComponentReducible
       schema = component_klass.vcr_state_schema
       state = schema.build_data(env['data'])
 
-      new_state = component.reduce(state, msg)
-      env['data'] = normalize_state(new_state, schema)
-      effects = build_effects(component, schema, env['data'], msg)
+      reducer_result = component.reduce(state, msg)
+      reduced_state, reducer_effects = case reducer_result
+                                       in state_only unless reducer_result.is_a?(Array)
+                                         [state_only, []]
+                                       in [state_only]
+                                         [state_only, []]
+                                       in [state_only, *effects]
+                                         [state_only, effects]
+                                       end
+      env['data'] = normalize_state(reduced_state, schema)
+      effects = normalize_effects(reducer_effects) + normalize_effects(build_effects(component, schema, env['data'],
+                                                                                     msg))
 
       run_effects(component_klass, env, effects, controller)
     end
 
     def run_effects(component_klass, env, effects, controller)
-      return env if effects.nil? || effects.empty?
+      effects_queue = normalize_effects(effects).dup
+      return env if effects_queue.empty?
 
-      effects_queue = effects.dup
       steps = 0
 
       while (eff = effects_queue.shift)
         steps += 1
         raise 'Too many effect steps' if steps > MAX_EFFECT_STEPS
 
-        follow_msg = eff.call(controller: controller, envelope: env)
+        follow_msg = resolve_effect_msg(eff, controller, env)
         next unless follow_msg
+        raise ArgumentError, 'Effect must return a Msg' unless follow_msg.is_a?(Msg)
 
         component = component_klass.new(vcr_envelope: env)
         schema = component_klass.vcr_state_schema
         state = schema.build_data(env['data'])
 
-        new_state = component.reduce(state, follow_msg)
-        env['data'] = normalize_state(new_state, schema)
-        new_effects = build_effects(component, schema, env['data'], follow_msg)
-        effects_queue.concat(Array(new_effects))
+        reducer_result = component.reduce(state, follow_msg)
+        reduced_state, reducer_effects = case reducer_result
+                                         in state_only unless reducer_result.is_a?(Array)
+                                           [state_only, []]
+                                         in [state_only]
+                                           [state_only, []]
+                                         in [state_only, *effects]
+                                           [state_only, effects]
+                                         end
+        env['data'] = normalize_state(reduced_state, schema)
+        new_effects = normalize_effects(reducer_effects) + normalize_effects(build_effects(component, schema,
+                                                                                           env['data'], follow_msg))
+        effects_queue.concat(new_effects)
       end
 
       env
@@ -110,6 +129,17 @@ module ViewComponentReducible
       Array(component.effects(state, msg))
     end
 
+    def normalize_effects(effects)
+      Array(effects).compact
+    end
+
+    def resolve_effect_msg(effect, controller, env)
+      return effect if effect.is_a?(Msg)
+      return effect.call(controller: controller, envelope: env) if effect.respond_to?(:call)
+
+      raise ArgumentError, 'Effect must respond to #call or be a Msg'
+    end
+
     def deep_dup(obj)
       Marshal.load(Marshal.dump(obj))
     end

data/lib/view_component_reducible/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ViewComponentReducible
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: view_component_reducible
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - manabeai