hashcraft 1.0.0.pre.alpha.3 → 1.0.0.pre.alpha.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5eeb66db8e62e9998006101e746cf23be8e66da88a98b3292b3f769b89fb5bd9
-  data.tar.gz: dba52c0e835c9c09fb82e5fa963d45c57a8988dcde962eb8bb5e6e3feb0e3a9f
+  metadata.gz: de90f4a4235178d5dd03c534a7b371583825795ea40b0218f678e5be516dbaba
+  data.tar.gz: 0227f29c0dc69de054f58abd31f854fe4f2a9fed7ad4ba60c439d8ca76d09cbe
 SHA512:
-  metadata.gz: 4d493d7190833e14ed7c14f3deaeec7a86ad1d779cdd93d22141d80195986a0c18382fa1011e4cce2fd872ca2ea1c00aca4797aafdc70193b9405ccfd0c0af82
-  data.tar.gz: aae0ba2e2b5dd0b7bd55514276d823337dcfe7e0f5a17fe149cfbc521117b3706a31c9056516c2fd0c1d7f495f2d48859ac4b77f9ee66d94a01155ad4d417768
+  metadata.gz: 1d1376245cf1dbf76948e6241965287776c169cf3d2c5e2879e396be0697f3bac9eb25539c3b8198997f4a5f2b2a74a9dfa9943229cf7f2183eeb196bb4cfeaa
+  data.tar.gz: 4da6b340943dd7241ed820853892808664aea71ed7ea45047764aaf1cc63e6b703129d9ab446fcac49b2b8417ff6378d2142fb5329a6c855211bfdffab1f1c75

data/lib/hashcraft/base.rb

@@ -19,12 +19,13 @@ module Hashcraft
                    :option?,
                    :option_set,
                    :find_option,
-                   :key_transformer_object,
-                   :value_transformer_object
+                   :key_transformer_to_use,
+                   :value_transformer_to_use
 
     def initialize(opts = {}, &block)
-      @data = make_default_data
+      @data = {}
 
+      load_default_data
       load_opts(opts)
 
       return unless block_given?
@@ -48,14 +49,8 @@ module Hashcraft
 
     attr_reader :data
 
-    def make_default_data
-      option_set.values.each_with_object({}) do |o, memo|
-        o.default!(
-          memo,
-          key_transformer_object,
-          value_transformer_object
-        )
-      end
+    def load_default_data
+      option_set.each { |option| default!(option) }
     end
 
     def load_opts(opts)
@@ -68,13 +63,9 @@ module Hashcraft
 
     def method_missing(method_name, *arguments, &block)
       if option?(method_name)
-        find_option(method_name).value!(
-          data,
-          arguments.first,
-          key_transformer_object,
-          value_transformer_object,
-          &block
-        )
+        option = find_option(method_name)
+
+        value!(option, arguments.first, &block)
       else
         super
       end
@@ -95,5 +86,30 @@ module Hashcraft
 
       self
     end
+
+    def default!(option)
+      return self unless option.eager?
+
+      key   = hash_key(option)
+      value = value_transformer_to_use.transform(option.default.dup, option)
+
+      data[key] = value
+
+      self
+    end
+
+    def value!(option, value, &block)
+      key   = hash_key(option)
+      value = option.craft_value(value, &block)
+      value = value_transformer_to_use.transform(value, option)
+
+      option.value!(data, key, value)
+
+      self
+    end
+
+    def hash_key(option)
+      key_transformer_to_use.transform(option.hash_key, option)
+    end
   end
 end

data/lib/hashcraft/dsl.rb

@@ -15,12 +15,33 @@ module Hashcraft
   # OptionSet instance along with materializing one for its
   # inheritance chain (child has precedence.)
   module Dsl
+    attr_reader :local_key_transformer,
+                :local_value_transformer
+
     def key_transformer(name)
-      tap { @key_transformer_object = TransformerRegistry.resolve(name) }
+      tap { @local_key_transformer = TransformerRegistry.resolve(name) }
     end
 
     def value_transformer(name)
-      tap { @value_transformer_object = TransformerRegistry.resolve(name) }
+      tap { @local_value_transformer = TransformerRegistry.resolve(name) }
+    end
+
+    def key_transformer_to_use
+      return @key_transformer_to_use if @key_transformer_to_use
+
+      @closest_key_transformer =
+        ancestors.select { |a| a < Base }
+                 .find(&:local_key_transformer)
+                 &.local_key_transformer || Transformers::PassThru.instance
+    end
+
+    def value_transformer_to_use
+      return @value_transformer_to_use if @value_transformer_to_use
+
+      @closest_value_transformer =
+        ancestors.select { |a| a < Base }
+                 .find(&:local_value_transformer)
+                 &.local_value_transformer || Transformers::PassThru.instance
     end
 
     def option?(name)
@@ -54,13 +75,5 @@ module Hashcraft
     def local_option_set
       @local_option_set ||= Generic::Dictionary.new(key: :name)
     end
-
-    def key_transformer_object
-      @key_transformer_object || Transformers::PassThru.instance
-    end
-
-    def value_transformer_object
-      @value_transformer_object || Transformers::PassThru.instance
-    end
   end
 end

data/lib/hashcraft/generic/dictionary.rb

@@ -28,6 +28,12 @@ module Hashcraft
         freeze
       end
 
+      def each(&block)
+        return enum_for(:each) unless block_given?
+
+        values.each(&block)
+      end
+
       def exist?(key)
         !find(key).nil?
       end

data/lib/hashcraft/generic/registry.rb

@@ -46,11 +46,7 @@ module Hashcraft
       def resolve(value)
         return value unless lookup?(value)
 
-        mutator = map[value.to_s]
-
-        raise ArgumentError, "registration: #{value} not found" unless mutator
-
-        mutator
+        map[value.to_s] || raise(ArgumentError, "registration: #{value} not found")
       end
 
       private

data/lib/hashcraft/option.rb

@@ -12,6 +12,10 @@ require_relative 'mutator_registry'
 module Hashcraft
   # Defines a method and corresponding attribute for a craftable class.
   class Option
+    extend Forwardable
+
+    def_delegators :mutator, :value!
+
     attr_reader :craft,
                 :default,
                 :eager,
@@ -19,6 +23,8 @@ module Hashcraft
                 :mutator,
                 :name
 
+    alias eager? eager
+
     def initialize(name, opts = {})
       raise ArgumentError, 'name is required' if name.to_s.empty?
 
@@ -37,44 +43,16 @@ module Hashcraft
       internal_meta[key.to_s.to_sym]
     end
 
-    def default!(data, key_transformer, value_transformer)
-      return self unless eager
-
-      final_key = hash_key(key_transformer)
-      value     = value_transformer.transform(default.dup, self)
-
-      data[final_key] = value
-
-      self
+    def hash_key
+      key.empty? ? name : key
     end
 
-    def value!(
-      data,
-      value,
-      key_transformer,
-      value_transformer,
-      &block
-    )
-      value = craft_value(value, &block)
-      value = value_transformer.transform(value, self)
-
-      final_key = hash_key(key_transformer)
-
-      mutator.value!(data, final_key, value)
-
-      self
+    def craft_value(value, &block)
+      craft ? craft.new(value, &block) : value
     end
 
     private
 
     attr_reader :internal_meta
-
-    def hash_key(key_transformer)
-      key_transformer.transform(key.empty? ? name : key, self)
-    end
-
-    def craft_value(value, &block)
-      craft ? craft.new(value, &block) : value
-    end
   end
 end

data/lib/hashcraft/version.rb

@@ -8,5 +8,5 @@
 #
 
 module Hashcraft
-  VERSION = '1.0.0-alpha.3'
+  VERSION = '1.0.0-alpha.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hashcraft
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.alpha.3
+  version: 1.0.0.pre.alpha.4
 platform: ruby
 authors:
 - Matthew Ruggio