lotus-validations 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0249c7c704d709f9579693a8f8b8faac3c1ca338
-  data.tar.gz: e2913b58194002b58ec6da05154982e46d30efd5
+  metadata.gz: 5c28b2bd092a3123b3449bd57ce7aa6bf641aef7
+  data.tar.gz: 6def7642d5acb0049d3f9656ccb22617a7a0a97c
 SHA512:
-  metadata.gz: e82fe5c215943d1fdfd11068c1b5639dcec94062a1e1cce5dafee5ee643e09dde7b05b826f1c32d7d9c10e33a0b618587cdae1a393c21f0361388f8162798afa
-  data.tar.gz: b92988e71b73a27e7319acf7957e001042035ce9091c3f2a1e55d83f7f9d4afb45f6c41c9742d1ba663e4eca107977c714685e53577143b7baf5e51bc11ad4b7
+  metadata.gz: 721ec4289267c55b2ac39e132568568023c3a51ba3ecf1faca3627d7a1a60a351985aa0dfb778808fbfa19f3dec305fd1830e179a1f5f8d1ae4252676130a81b
+  data.tar.gz: 695f77817307e158789652f4a584bad04af0cf05e5f65d48068389a6db9e1153b613f827e45c25a5a3051c355eee28cc32889488988435798625a3b1f6d1a780

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Lotus::Validations
 Validations mixin for Ruby objects
 
+## v0.2.3 - 2015-01-12
+### Added
+- [Luca Guidi] Compatibility with Lotus::Entity
+
+### Fixed
+- [Luca Guidi] Ensure `.validates` usage to not raise `ArgumentError` when `:type` option is passed
+- [Luca Guidi] Ensure to assign attributes when only `.validates` is used
+
 ## v0.2.2 - 2015-01-08
 ### Added
 - [Steve Hodgkiss] Introduced `Validations.validates`. It defines validations, for already existing attributes.

data/README.md

@@ -471,6 +471,29 @@ signup.errors
   # }>
 ```
 
+### Lotus::Entity
+
+Integration with [`Lotus::Entity`](https://github.com/lotus/model) is activated automatically.
+
+```ruby
+require 'lotus/model'
+require 'lotus/validations'
+
+class Product
+  include Lotus::Entity
+  include Lotus::Validations
+
+  attribute :name,  type: String,  presence: true
+  attribute :price, type: Integer, presence: true
+end
+
+product = Product.new(name: 'Book', price: '100')
+product.valid? # => true
+
+product.name  # => "Book"
+product.price # => 100
+```
+
 ## Contributing
 
 1. Fork it ( https://github.com/lotus/lotus-validations/fork )
@@ -481,4 +504,4 @@ signup.errors
 
 ## Copyright
 
-Copyright 2014 Luca Guidi – Released under MIT License
+Copyright 2014-2015 Luca Guidi – Released under MIT License

data/lib/lotus/validations/attribute_definer.rb

@@ -8,6 +8,14 @@ module Lotus
     # @since 0.2.2
     # @api private
     module AttributeDefiner
+      # @since 0.2.3
+      # @api private
+      LOTUS_ENTITY_CLASS_NAME = 'Lotus::Entity'.freeze
+
+      # @since 0.2.3
+      # @api private
+      LOTUS_ENTITY_ID         = 'id'.freeze
+
       # Override Ruby's hook for modules.
       #
       # @param base [Class] the target class
@@ -18,6 +26,19 @@ module Lotus
       # @see http://www.ruby-doc.org/core/Module.html#method-i-included
       def self.included(base)
         base.extend ClassMethods
+        base.extend EntityAttributeDefiner if lotus_entity?(base)
+      end
+
+      # Decide if enable the support for `Lotus::Entity`.
+      #
+      # @param base [Class]
+      #
+      # @since 0.2.3
+      # @api private
+      def self.lotus_entity?(base)
+        base.included_modules.any? do |m|
+          m.to_s == LOTUS_ENTITY_CLASS_NAME
+        end
       end
 
       # @since 0.2.2
@@ -237,8 +258,14 @@ module Lotus
           validates(name, options)
         end
 
+        # Set of user defined attributes
+        #
+        # @return [Array<String>]
+        #
+        # @since 0.2.2
+        # @api private
         def defined_attributes
-          @defined_attributes ||= Set.new
+          @defined_attributes ||= Set.new(super)
         end
 
         private
@@ -246,7 +273,8 @@ module Lotus
         # @since 0.2.2
         # @api private
         def define_attribute(name, options)
-          type = options.delete(:type)
+          type = options.fetch(:type) { nil }
+
           define_accessor(name, type)
           defined_attributes.add(name.to_s)
 
@@ -294,6 +322,73 @@ module Lotus
         end
       end
 
+      # Support for `Lotus::Entity`
+      #
+      # @since 0.2.3
+      # @api private
+      #
+      # @example
+      #   require 'lotus/model'
+      #   require 'lotus/validations'
+      #
+      #   class Product
+      #     include Lotus::Entity
+      #     include Lotus::Validations
+      #
+      #     attribute :name,  type: String,  presence: true
+      #     attribute :price, type: Integer, presence: true
+      #   end
+      #
+      #   product = Product.new(name: 'Computer', price: '100')
+      #
+      #   product.name   # => "Computer"
+      #   product.price  # => 100
+      #   product.valid? # => true
+      module EntityAttributeDefiner
+        # Override for Module#extend
+        #
+        # @since 0.2.3
+        # @api private
+        #
+        # @see http://ruby-doc.org/Module.html#method-i-extended
+        def self.extended(base)
+          base.class_eval do
+            include EntityAttributeDefiner::InstanceMethods
+          end
+        end
+
+        # @since 0.2.3
+        # @api private
+        #
+        # @see Lotus::Validations::AttributeDefiner#attribute
+        def attribute(name, options = {})
+          super
+          attributes name
+        end
+
+        # @since 0.2.3
+        # @api private
+        #
+        # @see Lotus::Validations::ClassMethods#validates
+        def validates(name, options = {})
+          super
+          define_attribute(name, options)
+        end
+
+        # @since 0.2.3
+        # @api private
+        module InstanceMethods
+          private
+          # @since 0.2.3
+          # @api private
+          #
+          # @see Lotus::Validations::AttributeDefiner#assign_attribute?
+          def assign_attribute?(attr)
+            super || attr.to_s == LOTUS_ENTITY_ID
+          end
+        end
+      end
+
       # Create a new instance with the given attributes
       #
       # @param attributes [#to_h] an Hash like object which contains the
@@ -335,7 +430,7 @@ module Lotus
       #   signup = Signup.new(params)
       #
       #   signup.name # => "Luca"
-      def initialize(attributes)
+      def initialize(attributes = {})
         @attributes ||= Utils::Attributes.new
 
         attributes.to_h.each do |key, value|

data/lib/lotus/validations/validation_set.rb

@@ -16,7 +16,8 @@ module Lotus
         :inclusion,
         :exclusion,
         :confirmation,
-        :size
+        :size,
+        :type
       ].freeze
 
       # @since 0.2.2
@@ -45,6 +46,12 @@ module Lotus
         @validations.each_key(&blk)
       end
 
+      # @since 0.2.3
+      # @api private
+      def names
+        @validations.keys
+      end
+
       private
       # Checks at the loading time if the user defined validations are recognized
       #

data/lib/lotus/validations/version.rb

@@ -1,6 +1,6 @@
 module Lotus
   module Validations
     # @since 0.1.0
-    VERSION = '0.2.2'.freeze
+    VERSION = '0.2.3'.freeze
   end
 end

data/lib/lotus/validations.rb

@@ -126,6 +126,16 @@ module Lotus
         @validations ||= ValidationSet.new
       end
 
+      # Set of user defined attributes
+      #
+      # @return [Array<String>]
+      #
+      # @since 0.2.3
+      # @api private
+      def defined_attributes
+        validations.names.map(&:to_s)
+      end
+
       private
 
       # Transfers attributes to a base class

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lotus-validations
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Luca Guidi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lotus-utils