morpher 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0eec4915e34accded2656d830113f0ae9af9ffb77d5aa09b76886886464eb02
-  data.tar.gz: cd0255f306246e12d521b749c1015b0c3f569df1be1ecd633aa5862524dfbcbc
+  metadata.gz: cc9380b32ac09b2e3765666a2c56baeb3aef272d22be1f7043f1977c9da1d815
+  data.tar.gz: 0736e2646b93e59dc8fb2bf992bdf7729431260a08f3b158dd1eaf1324a657f1
 SHA512:
-  metadata.gz: 79dcc3f54caaa111991c5e2423319ed7a3f80a46c36fdb56331b0d26169c5050bb288b9ce315c9a5dcc9fcc364f6fe65509ac55c46a6cda596aee35301c43d8a
-  data.tar.gz: 2c2b9d6c716ff971baebc94825d13e20ed986d35413e40fa817e67f33a38fe86fca894e20d30d16ff5f238f81bac306bb1572ead8d3e325e7905e1590ffb6fe3
+  metadata.gz: 496748be0cfeae869808cb58aead93df98b270020b93310bba695ce03bea0cbc14b7451a881ce3b3e9280acbbf2155caaba7bfba827896bd79dd1119d9fa7fc0
+  data.tar.gz: 0fc7f421fb376af18c2f1ea41eebf2b44350236e453a38878b1f015cb7cb15794d9e897de66c27c00143e1ce44b9271cc3f69be1ae79cb76f61f68a887e1c305

data/lib/morpher/record.rb

@@ -3,15 +3,18 @@
 module Morpher
   # Generator for struct a-like wrappers
   class Record < Module
-    include Concord.new(:attributes)
+    include Anima.new(:required, :optional)
 
+    # rubocop:disable Metrics/AbcSize
     # rubocop:disable Metrics/MethodLength
     def included(host)
-      attributes     = attributes()
-      keys_transform = keys_transform()
+      optional           = optional()
+      optional_transform = transform(optional)
+      required           = required()
+      required_transform = transform(required)
 
       host.class_eval do
-        include Adamantium::Flat, Anima.new(*attributes.keys)
+        include Adamantium::Flat, Anima.new(*(required.keys + optional.keys))
 
         const_set(
           :TRANSFORM,
@@ -19,18 +22,22 @@ module Morpher
             [
               Transform::Primitive.new(Hash),
               Transform::Hash::Symbolize.new,
-              Transform::Hash.new(required: keys_transform, optional: []),
+              Transform::Hash.new(
+                required: required_transform,
+                optional: optional_transform
+              ),
               Transform::Success.new(public_method(:new))
             ]
           )
         )
       end
     end
+  # rubocop:enable Metrics/AbcSize
   # rubocop:enable Metrics/MethodLength
 
   private
 
-    def keys_transform
+    def transform(attributes)
       attributes.map do |name, transform|
         Transform::Hash::Key.new(name, transform)
       end

data/lib/morpher/transform.rb

@@ -350,11 +350,16 @@ module Morpher
         transform_keys(required, input)
       end
 
+      def defaults
+        optional.map(&:value).product([nil]).to_h
+      end
+      memoize :defaults
+
       def transform_optional(input)
         transform_keys(
           optional.select { |key| input.key?(key.value) },
           input
-        )
+        ).fmap(&defaults.public_method(:merge))
       end
 
       # rubocop:disable Metrics/MethodLength

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: morpher
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Markus Schirp
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-07 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abstract_type