lotus-validations 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4749d31a52499ff7d0c98b64b6320385710088e3
-  data.tar.gz: 6c59dcc59fedca2f7b96292694c33dc1f9266a86
+  metadata.gz: 0698ed51ac049cae199e98abad4addfbb485845f
+  data.tar.gz: 3c76854dfa9d49e51d794e0d42c13912316e2271
 SHA512:
-  metadata.gz: 238e5d8ef149a598764242f04ff4edc97643bae2f34da0de797aecba58ed55907ff06f21e71588ac38404a39f61d3eb07b62fb2ed322b70ee1c55c5443c728cc
-  data.tar.gz: 49fb9594fb7512596587733f6cb946ecc2c1d67a9a815b26b5659755c9e2413eb15535c1a0036d9af8f5f02213c583f881536dd992c3cadc18872a6cad9135d2
+  metadata.gz: 2be7bcf9a481123a449ae177dc8e3bf1becb08678e460b7ac4cb08c21dd784401a5e34be547ea9c537d11fa12bef586dac9407705d5713f26c0443998cbf7b87
+  data.tar.gz: 3080435f881d64ae783f145c06f9005e5a3cd4a1825aaf49fbb3bd49de0c44224a29eefd2407b802e00a5e3186ed5c2b022d2bc3a3395c6cc10f412329f0ab30

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Lotus::Validations
 Validations mixin for Ruby objects
 
+## v0.3.1 - 2015-05-15
+### Fixed
+- [Luca Guidi] Fixed Hash serialization for nested validations. It always return nested `::Hash` structure.
+- [Alfonso Uceda Pompa & Dmitry Tymchuk] Fixed Hash serialization when `Lotus::Entity` is included in the same class.
+
 ## v0.3.0 - 2015-03-23
 
 ## v0.2.4 - 2015-01-30

data/README.md

@@ -197,7 +197,7 @@ signup.valid? # => false
 An attribute is valid if it's value and the value of a corresponding attribute
 is valid.
 
-By convention, if you have a `password` attribute, the validation looks for `password_validation`.
+By convention, if you have a `password` attribute, the validation looks for `password_confirmation`.
 
 ```ruby
 require 'lotus/validations'
@@ -386,7 +386,7 @@ validator.valid? # => false
 ```
 
 Bulk operations on errors are guaranteed by `#each`.
-This method yields a **flatten collection of errors**.
+This method yields a **flattened collection of errors**.
 
 ```ruby
 validator.errors.each do |error|
@@ -483,9 +483,9 @@ end
 
 ### Errors
 
-When you invoke `#valid?`, validations errors are available at `#errors`.
+When you invoke `#valid?`, validation errors are available at `#errors`.
 It's a set of errors grouped by attribute. Each error contains the name of the
-invalid attribute, the failed validation, the expected value and the current one.
+invalid attribute, the failed validation, the expected value, and the current one.
 
 ```ruby
 require 'lotus/validations'
@@ -518,7 +518,7 @@ signup.errors
 
 ### Lotus::Entity
 
-Integration with [`Lotus::Entity`](https://github.com/lotus/model) is activated automatically.
+Integration with [`Lotus::Entity`](https://github.com/lotus/model) is straight forward.
 
 ```ruby
 require 'lotus/model'

data/lib/lotus/validations.rb

@@ -244,7 +244,10 @@ module Lotus
     #
     # @since 0.1.0
     def to_h
-      Utils::Hash.new(read_attributes).deep_dup
+      # TODO remove this symbolization when we'll support Ruby 2.2+ only
+      Utils::Hash.new(
+        @attributes
+      ).deep_dup.symbolize!.to_h
     end
 
     private

data/lib/lotus/validations/attribute_definer.rb

@@ -1,5 +1,6 @@
 require 'set'
 require 'lotus/utils/attributes'
+require 'lotus/validations/nested_attributes'
 
 module Lotus
   module Validations
@@ -254,6 +255,16 @@ module Lotus
         #   signup = Signup.new(password: 'short')
         #   signup.valid? # => false
         def attribute(name, options = {}, &block)
+          _attribute(name, options, &block)
+        end
+
+        # Define an attribute
+        #
+        # @see Lotus::Validations::AttributeDefiner#attribute
+        #
+        # @since 0.3.1
+        # @api private
+        def _attribute(name, options = {}, &block)
           if block_given?
             define_nested_attribute(name, options, &block)
             validates(name, {})
@@ -357,12 +368,8 @@ module Lotus
         #
         # @since 0.2.4
         # @api private
-        def build_validation_class(&block)
-          kls = Class.new do
-            include Lotus::Validations
-          end
-          kls.class_eval(&block)
-          kls
+        def build_validation_class(&blk)
+          NestedAttributes.fabricate(&blk)
         end
       end
 
@@ -401,13 +408,33 @@ module Lotus
           end
         end
 
+        # @return [Array<String>]
+        #
+        # @since 0.3.1
+        # @api private
+        def defined_attributes
+          super
+          @defined_attributes.merge(attributes.map(&:to_s))
+        end
+
+        # Override attribute accessors function.
+        #
+        # @since 0.3.1
+        #
+        # @api private
+        # @see Lotus::Model::Entity#define_attr_accessor
+        def define_attr_accessor(attr)
+          _attribute(attr)
+          super
+        end
+
         # @since 0.2.3
         # @api private
         #
         # @see Lotus::Validations::AttributeDefiner#attribute
         def attribute(name, options = {})
-          super
           attributes name
+          super
         end
 
         # @since 0.2.3
@@ -430,6 +457,12 @@ module Lotus
           def assign_attribute?(attr)
             super || attr.to_s == LOTUS_ENTITY_ID
           end
+
+          def initialize(attributes = {})
+            super
+            @attributes.set(LOTUS_ENTITY_ID, id)
+            self.class.attribute(LOTUS_ENTITY_ID)
+          end
         end
       end
 

data/lib/lotus/validations/nested_attributes.rb

@@ -0,0 +1,22 @@
+module Lotus
+  module Validations
+    # @since 0.3.1
+    # @api private
+    class NestedAttributes
+      # @since 0.3.1
+      # @api private
+      def self.fabricate(&blk)
+        dup.tap do |klass|
+          klass.class_eval { include Lotus::Validations }
+          klass.class_eval(&blk)
+        end
+      end
+
+      # @since 0.3.1
+      # @api private
+      def lotus_nested_attributes?
+        true
+      end
+    end
+  end
+end

data/lib/lotus/validations/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lotus-validations
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Luca Guidi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2015-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lotus-utils
@@ -86,6 +86,7 @@ files:
 - lib/lotus/validations/coercions.rb
 - lib/lotus/validations/error.rb
 - lib/lotus/validations/errors.rb
+- lib/lotus/validations/nested_attributes.rb
 - lib/lotus/validations/validation_set.rb
 - lib/lotus/validations/validator.rb
 - lib/lotus/validations/version.rb