massager 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c76b7d2aefdb4e9d17182759b7c7abcf25793f8b
-  data.tar.gz: eb96295d2ede881cf36fd89540fc16f805269c4b
+  metadata.gz: 78a1fd152f231a1aeffae99644dbc95b6cf8583d
+  data.tar.gz: 371c921b1552297cae85ccc5220f117e0a2f9885
 SHA512:
-  metadata.gz: aafea83a72a4438db9be150cb8c4c230d1c12b33901214a2cec88f864afaa6c5b77adcd3fde16d75e78303042ca1663eb3ac8d08ace0f84d3775a435841ba3ac
-  data.tar.gz: 9fb64863a5619f31690f6d440e7602f4e1049254b95a2fcbeffb787c7d1fb42d780a8dc50e2f81be3865569481fd8f38348754195788cf86e85abbc78416a47b
+  metadata.gz: e89af400a3047eff8b7b9aa209ed07082cbf1956d8bc12b1d9ef4ed7d39919adc4afcbb4588d4c6c1d41bf37a359322703f68dc99e82e1e03806971ca24cc67f
+  data.tar.gz: e7a1062b52df8b43fdeda66b4c212963e9b1a98bc1f19a461a3663da1f498efb368bf4730bb41ba3f86e4fddf52e8f5e467022808a09829e0d823f17084e0945

data/README.md

@@ -58,8 +58,7 @@ It will raise an error if the type is not correct:
 ```ruby
 testable = ExampleClass.call({"bar" => "value"})
 testable.foo #=> "value"
-testable = ExampleClass.call({"bar" => 123})
-testable.foo #=> raises Dry::Types::ConstraintError
+testable = ExampleClass.call({"bar" => 123})  #=> raises Dry::Types::ConstraintError
 ```
 If you want to define your own types, check the Dry Types library. Type needs to respond to `call` method, so 
 you can define your own

data/lib/massager/version.rb

@@ -1,3 +1,3 @@
 module Massager
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/massager.rb

@@ -28,19 +28,23 @@ module Massager
     def call(attrs)
       check_schema(attrs)
       instance = new
-      _container.each_key.select {|a| a.include?("attributes.")}.each do |k|
-        attribute = resolve(k)
+      _container.keys.select {|a| a.include?("attributes.")}.each do |k|
+        attribute = _container.resolve(k)
         instance.public_send("#{attribute.name}=", attrs) if attribute.match_schema?(attrs)
       end
       instance
     end
 
+    def _container
+      @container ||= Dry::Container.new
+    end
+
     private
 
     def check_schema(attrs)
       attr_keys = attrs.keys.to_set
       if _container.key?("schema")
-        schema = resolve("schema")
+        schema = _container.resolve("schema")
         attr_keys = attr_keys.find_all {|a| schema.include?(a)}
         raise ArgumentError, "Missing keys: #{(schema - attr_keys).to_a}" unless schema.subset?(attr_keys.to_set)
       end
@@ -48,24 +52,24 @@ module Massager
 
     def add_keys_to_schema(opts, target_keys)
       Dry::Monads::Maybe(opts[:strict]).fmap {
-        unless key?(:schema)
-          register(:schema, Set.new)
+        unless _container.key?(:schema)
+          _container.register(:schema, Set.new)
         end
         target_keys.each do |k|
-          resolve(:schema) << k
+          _container.resolve(:schema) << k
         end
       }
     end
 
     def register_attribute(attribute)
-      namespace(:attributes) do
+      _container.namespace(:attributes) do
         register(attribute.name, attribute)
       end
     end
 
     def define_setter(name)
       define_method "#{name}=", Proc.new {|values|
-        attribute = self.class.resolve("attributes.#{name}")
+        attribute = self.class._container.resolve("attributes.#{name}")
         instance_variable_set(:"@#{name}", attribute.call(values))
       }
     end
@@ -75,10 +79,18 @@ module Massager
         instance_variable_get(:"@#{name}")
       }
     end
+
+    def inherited(subclass)
+      subclass_container = Dry::Container.new
+      _container.each_key do |k|
+        subclass_container.register(k, _container.resolve(k).clone)
+      end
+      subclass.instance_variable_set(:"@container", subclass_container)
+    end
   end
 
+
   def self.included(base)
     base.extend(ClassMethods)
-    base.extend(Dry::Container::Mixin)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: massager
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Janis Miezitis