massager 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53f2c10f9317523283972f8951006e762166f9c9
-  data.tar.gz: ce31aa5c501efde93d6b7fa5ad2787690e502689
+  metadata.gz: cbe0172b4b689156c4e488c3860b272c096b3c7c
+  data.tar.gz: 4ee1813aa3fdf68ea08f431eb1a66910d8c61347
 SHA512:
-  metadata.gz: 738f93609dbd29d766e922f239d2da48aab11404b449e7a0041263f8f3af7dd493c83acb3120e7a208c134ad9627d3244d9f793dbf89316cc44b6ea7cad9aa6d
-  data.tar.gz: b5e655c41a1a8623a006c4f09190508a22e648c2ce79f7b29f26a2af6fa21206562d26db128042faa8ea5f1e785492a42eb33dedfc7da0ddfcf90d42e6d28ba1
+  metadata.gz: d8704155886d7bf79ca08f2f3a73032a9a49b25fba6a7e65c65e37b12d270999acd0eddc49c6eac43f8a10ea2dda30cac26a129045f1d4d7edfb0d227e99ac07
+  data.tar.gz: d2b8547a4d30459cf7346f0055e87ad529e07d616f44042e6dd72a01681da788934e46e03ff7f93f741b68de0495015254180e734a888da83bf3aae0fdaeb671

data/README.md

@@ -31,6 +31,20 @@ In this scenario, the "bar" key's value will become the result `foo` method
 testable = ExampleClass.build({"bar" => "value"})
 testable.foo #=> "value"
 ```
+## Strict schema
+You can have required keys defined with `strict: true`
+```ruby
+class ExampleClass
+  include Massager
+  attribute :foo, "bar", strict: true
+end
+```
+It will raise an error if "bar" is not passed:
+```ruby
+testable = ExampleClass.build({"bar" => "value"})
+testable.foo #=> "value"
+testable = ExampleClass.build({"baz" => "value"}) #=> raises ArgumentError
+```
 
 ## Type checking
 You can also pass type checks using dry-types library:

data/lib/massager/version.rb

@@ -1,3 +1,3 @@
 module Massager
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/massager.rb

@@ -2,6 +2,7 @@ require "massager/version"
 require "dry-types"
 require "dry-monads"
 require "dry-container"
+require "set"
 
 require "massager/attributes/attribute"
 require "massager/attributes/enum_attribute"
@@ -9,41 +10,63 @@ require "massager/attributes/enum_attribute"
 module Massager
   module ClassMethods
     def attribute(name, *target_keys, **opts, &block)
-      set_container
       register_attribute(
         Attribute.new(name: name, target_keys: target_keys, opts: opts, block: block)
       )
+      add_to_schema(opts, target_keys)
       define_setter(name)
       define_getter(name)
     end
 
     def enum_attribute(name, *target_keys, **opts, &block)
-      set_container
       register_attribute(
         EnumAttribute.new(name: name, target_keys: target_keys, opts: opts, block: block)
       )
+      add_to_schema(opts, target_keys)
       define_setter(name)
       define_getter(name)
     end
 
     def build(attrs)
+      check_schema(attrs)
       instance = new
-      container.each_key do |k|
-        attribute = container.resolve(k)
-        instance.public_send("#{k}=", attrs) if attribute.match_schema?(attrs)
+      each_key do |k|
+        attribute = resolve(k)
+        instance.public_send("#{attribute.name}=", attrs) if attribute.match_schema?(attrs)
       end
       instance
     end
 
     private
 
+    def check_schema(attrs)
+      attr_keys = attrs.keys.to_set
+      if key?(:schema)
+        schema = resolve(:schema)
+        raise ArgumentError, "Missing keys: #{(schema - attr_keys).to_a}" unless schema.superset?(attr_keys) 
+      end
+    end
+
+    def add_keys_to_schema(opts, target_keys)
+      Dry::Monads::Maybe(opts[:strict]).fmap {
+        unless key?(:schema)
+          register(:schema, Set.new)
+        end
+        target_keys.each do |k|
+          resolve(:schema) << k
+        end
+      }
+    end
+
     def register_attribute(attribute)
-      container.register(attribute.name) {attribute}
+      namespace(:attributes) do
+        register(attribute.name, attribute)
+      end
     end
 
     def define_setter(name)
       define_method "#{name}=", Proc.new {|values|
-        attribute = self.class.container.resolve(name)
+        attribute = self.class.resolve("attributes.#{name}")
         instance_variable_set(:"@#{name}", attribute.call(values))
       }
     end
@@ -53,15 +76,10 @@ module Massager
         instance_variable_get(:"@#{name}")
       }
     end
-
-    def set_container
-      self.define_singleton_method(:container) do
-        @container ||= Dry::Container.new
-      end
-    end
   end
 
   def self.included(base)
     base.extend(ClassMethods)
+    base.extend(Dry::Container::Mixin)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: massager
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Janis Miezitis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-16 00:00:00.000000000 Z
+date: 2016-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-types