koine-attributes 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6da140fccc56d959e8a81f0635b28a2b58e66aec
-  data.tar.gz: 117e2dd751d2b26f7555eaf4fcfb455f5129634f
+  metadata.gz: 2a9535455293c05a1e29ea4562853bc4d9616722
+  data.tar.gz: 442426418ec93bdf7988551b30a97261a7639ed8
 SHA512:
-  metadata.gz: c4064ef3599fbf212fefd43db605a59dc717219750f2d1c39bd806b7770cc7d9a11fe2e066517e4c1dd980a24b6da9aeff5406ad0fdae8b84167967d020ba72e
-  data.tar.gz: f887ffe331009e118d15a719d703178d893eba01334284bdfede204760a1b9c0d2407f866f5031d3dcf7317779f1e91d6e44f47557b5b1e574e8748cc2061f5e
+  metadata.gz: 69ffc8f35383086566c9c59a0551b889769f5f502877b14f2442a65b41aaafbcaf2191a105de1f5b8f72d4395a6a367be4aaf715d22f1e5d2ba2a1bcd2ece97f
+  data.tar.gz: d818f1fb1c4cdfa4e2e3ebf2d989ba73f7a7a7955be6d931b80359bea084308be03ebf79ab3cdac6bd7a6b28beacc77df84c488c8be0d7300e0739f0e6fd8af3

data/.travis.yml

@@ -1,7 +1,6 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.1
   - 2.2
   - 2.3.1
   - 2.3.5

data/README.md

@@ -68,6 +68,12 @@ Options:
  end
 ```
 
+## Adapter's methods
+
+- with_default_value(default, &block)
+- with_nil_value(value = nil, &block)
+
+
  Also, a constructor can be created by the API
 
  ```ruby

data/lib/koine/attributes/adapter/any.rb

@@ -2,7 +2,9 @@ module Koine
   module Attributes
     module Adapter
       class Any < Base
-        def coerce(value)
+        private
+
+        def coerce_not_nil(value)
           secure do
             value
           end

data/lib/koine/attributes/adapter/array_of.rb

@@ -7,7 +7,9 @@ module Koine
           with_default_value([])
         end
 
-        def coerce(collectionOfValues)
+        private
+
+        def coerce_not_nil(collectionOfValues)
           secure do
             collectionOfValues.map { |value| @adapter.coerce(value) }
           end

data/lib/koine/attributes/adapter/base.rb

@@ -2,8 +2,10 @@ module Koine
   module Attributes
     module Adapter
       class Base
-        def coerce(*_values)
-          raise NotImplementedError
+        def coerce(value)
+          return coerce_nil if value.nil?
+
+          coerce_not_nil(value)
         end
 
         def default_value
@@ -12,13 +14,32 @@ module Koine
             @default_value
         end
 
+        def with_nil_value(value = nil, &block)
+          @nil_value_set = true
+          @nil_value = value
+          @nil_value = block if block
+          self
+        end
+
         def with_default_value(value = nil, &block)
           @default_value = value
           @default_value = block if block
           self
         end
 
-        protected
+        private
+
+        def coerce_nil
+          if @nil_value_set
+            return @nil_value.respond_to?(:call) ? @nil_value.call : @nil_value
+          end
+
+          raise ArgumentError, 'Cannot be nil'
+        end
+
+        def coerce_not_nil(_value)
+          raise NotImplementedError
+        end
 
         # duplicates if possible and freezes object
         def secure

data/lib/koine/attributes/adapter/boolean.rb

@@ -13,12 +13,6 @@ module Koine
           @false_values = false_values
         end
 
-        def coerce(value)
-          return true if true_values.include?(value)
-          return false if false_values.include?(value)
-          raise ArgumentError, "Invalid argument '#{value}'"
-        end
-
         def append_true_value(value)
           true_values << value
           self
@@ -29,10 +23,16 @@ module Koine
           self
         end
 
-        protected
+        private
 
         attr_reader :true_values
         attr_reader :false_values
+
+        def coerce_not_nil(value)
+          return true if true_values.include?(value)
+          return false if false_values.include?(value)
+          raise ArgumentError, "Invalid argument '#{value}'"
+        end
       end
     end
   end

data/lib/koine/attributes/adapter/date.rb

@@ -2,7 +2,9 @@ module Koine
   module Attributes
     module Adapter
       class Date < Base
-        def coerce(date)
+        private
+
+        def coerce_not_nil(date)
           secure do
             next date if date.is_a?(::Date)
             next date.to_date if date.is_a?(::Time)

data/lib/koine/attributes/adapter/float.rb

@@ -2,7 +2,9 @@ module Koine
   module Attributes
     module Adapter
       class Float < Base
-        def coerce(value)
+        private
+
+        def coerce_not_nil(value)
           Float(value)
         end
       end

data/lib/koine/attributes/adapter/hash_of.rb

@@ -8,7 +8,9 @@ module Koine
           with_default_value({})
         end
 
-        def coerce(hash)
+        private
+
+        def coerce_not_nil(hash)
           secure do
             {}.tap do |new_hash|
               hash.each do |key, value|

data/lib/koine/attributes/adapter/integer.rb

@@ -2,7 +2,9 @@ module Koine
   module Attributes
     module Adapter
       class Integer < Base
-        def coerce(value)
+        private
+
+        def coerce_not_nil(value)
           Integer(value)
         end
       end

data/lib/koine/attributes/adapter/string.rb

@@ -3,6 +3,7 @@ module Koine
     module Adapter
       class String < Base
         def empty_to_nil
+          with_nil_value(nil)
           @empty_to_nil = true
           self
         end
@@ -12,7 +13,9 @@ module Koine
           self
         end
 
-        def coerce(value)
+        private
+
+        def coerce_not_nil(value)
           secure do
             value = String(value)
             value = value.strip if @trim_empty_spaces

data/lib/koine/attributes/adapter/symbol.rb

@@ -2,7 +2,9 @@ module Koine
   module Attributes
     module Adapter
       class Symbol < Base
-        def coerce(value)
+        private
+
+        def coerce_not_nil(value)
           value.to_sym
         end
       end

data/lib/koine/attributes/adapter/time.rb

@@ -4,7 +4,9 @@ module Koine
   module Attributes
     module Adapter
       class Time < Base
-        def coerce(value)
+        private
+
+        def coerce_not_nil(value)
           secure do
             next value if value.is_a?(::Time)
             ::Time.parse(value)

data/lib/koine/attributes/version.rb

@@ -1,5 +1,5 @@
 module Koine
   module Attributes
-    VERSION = '0.2.3'.freeze
+    VERSION = '0.3.0'.freeze
   end
 end

data/lib/koine/attributes.rb

@@ -75,10 +75,9 @@ require 'koine/attributes/adapter/base'
 #       attribute :birthday, :date
 #     end
 #
-#     def initializ(attributes = {})
+#     def initialize(attributes = {})
 #       @foo = attributes.delete(:foo)
-#
-#       initialize_attributes(attributes) # protected
+#       self.attributes.set_values(attributes)
 #     end
 #   end
 #
@@ -124,6 +123,8 @@ module Koine
     end
 
     module ClassMethods
+      private
+
       def attributes(options = {}, &block)
         @builder = true
         @_attributes_factory ||= AttributesFactory.new(options)
@@ -134,6 +135,8 @@ module Koine
             @_attributes ||= self.class.instance_variable_get(:@_attributes_factory).create(self)
           end
 
+          private :attributes
+
           define_method(:initialize) { |*args| attributes.initialize_values(*args) }
         end
 
@@ -154,7 +157,7 @@ module Koine
           def_delegators :attributes, name, "#{name}=", "with_#{name}"
 
           define_method :== do |other|
-            attributes == other.attributes
+            attributes == other.send(:attributes)
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: koine-attributes
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Marcelo Jacobus
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-23 00:00:00.000000000 Z
+date: 2017-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler