massager 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ea5940423c363a2f3d765f9504e4477fa7dc899
-  data.tar.gz: 31eab0624ed8ceeb8db534553337b128cc57ba2a
+  metadata.gz: bb5f8e586ab12d52bd6754f918c955a8bcfc7b35
+  data.tar.gz: de71786ff585c916936b4c6d6f3a9309ca054518
 SHA512:
-  metadata.gz: dcd086a0ddcb18e9e7c5befa11c85376641e2d6e181f0f6c775c9005a2438989e2b1d59ce3a0deb241e413382cf2114da64372edc479cd9fca88928db8655bff
-  data.tar.gz: 16546d2ed9e8b1f56aa77bebc010bc29c940ff924b269607ecc14adabd5217e5915e1bd963717919cab5ae1cbc600cb84fd4594bcde0d5d40c2ee0735aef1902
+  metadata.gz: ca80f2aa124b47bd794ab56fd94aba597b1534349561e7588ad3cd1c88f191d1dd66ebba9d5c4334ce1fd1397b1eece186f45edc36d9c911faf4cfc11b2ef1d8
+  data.tar.gz: 5d16cc90a4e2301f5b297c27458958134624eceda586bcc420a58943bf11e71d28073cee298bc22df3c33c724e1534b32b4348f1022754a42da5a41af5c642b9

data/lib/massager.rb

@@ -4,10 +4,27 @@ require "dry-monads"
 require "dry-container"
 require "set"
 
+require "massager/errors/constraint_error"
 require "massager/attributes/attribute_with_single_key"
 require "massager/attributes/attribute_with_multiple_keys"
+require "massager/hashify"
 
 module Massager
+  module InstanceMethods
+    def [](name)
+      public_send(name)
+    end
+
+    def to_hash
+      self.class._container.keys.select {|a| a.include?("attributes.")}.each_with_object({}) do |key, result|
+        attribute_name = key.gsub("attributes.", "").to_sym
+        result[attribute_name] = Hashify[self[attribute_name]]
+      end
+    end
+
+    alias_method :to_h, :to_hash
+  end
+
   module ClassMethods
     def attribute(name, *target_keys, **opts, &block)
       case
@@ -92,5 +109,6 @@ module Massager
 
   def self.included(base)
     base.extend(ClassMethods)
+    base.include(InstanceMethods)
   end
 end

data/lib/massager/attributes/attribute_with_multiple_keys.rb

@@ -8,7 +8,13 @@ module Massager
     def call(values)
       values = values.values_at(*keys)
       values = block.call(*values)
-      Dry::Monads::Maybe(opts[:type]).fmap {|type| values = type.call(*values)}
+      Dry::Monads::Maybe(opts[:type]).fmap {|type|
+        begin
+          value = type.call(values)
+        rescue Dry::Types::ConstraintError
+          raise Massager::ConstraintError, "Attribute #{name} did not pass the constraint for value of #{values.inspect}"
+        end
+      }
       values
     end
 

data/lib/massager/attributes/attribute_with_single_key.rb

@@ -7,7 +7,13 @@ module Massager
     def call(values)
       value = values.fetch(key)
       Dry::Monads::Maybe(block).fmap {|block| value = block.call(value)}
-      Dry::Monads::Maybe(opts[:type]).fmap {|type| value = type.call(value)}
+      Dry::Monads::Maybe(opts[:type]).fmap {|type|
+        begin
+          value = type.call(value)
+        rescue Dry::Types::ConstraintError
+          raise Massager::ConstraintError, "Attribute #{name} did not pass the constraint for value of #{value}"
+        end
+      }
       value
     end
 

data/lib/massager/errors/constraint_error.rb

@@ -0,0 +1,4 @@
+module Massager
+  class ConstraintError < RuntimeError
+  end
+end

data/lib/massager/hashify.rb

@@ -0,0 +1,13 @@
+module Massager
+  module Hashify
+    def self.[](value)
+      if value.respond_to?(:to_hash)
+        value.to_hash
+      elsif value.respond_to?(:map)
+        value.map { |item| self[item] }
+      else
+        value
+      end
+    end
+  end
+end

data/lib/massager/version.rb

@@ -1,3 +1,3 @@
 module Massager
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: massager
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Janis Miezitis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-types
@@ -101,6 +101,8 @@ files:
 - lib/massager.rb
 - lib/massager/attributes/attribute_with_multiple_keys.rb
 - lib/massager/attributes/attribute_with_single_key.rb
+- lib/massager/errors/constraint_error.rb
+- lib/massager/hashify.rb
 - lib/massager/version.rb
 - massager.gemspec
 homepage: http://github.com/janjiss/massager