rom-model 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dae3cb7ed3616ec2fb6dab8815cdcfcbcc5d4ee
-  data.tar.gz: dd5df2f70e0b945ec0a42e4ce02bbac700ca13ef
+  metadata.gz: 6603e93e6f5f8d81a8ea8e11b90eab50a1838341
+  data.tar.gz: dbf3b3ca0ef55c9414f7bd495e08858c5ba67f9d
 SHA512:
-  metadata.gz: d9e16eedc459dfda4e4ff7d641179a23266781cbd646fedc10234386dfda320487dd30f2a81bf6134cca7b17ffa93c35a92e694872f91e1a91f2f4b6e924703f
-  data.tar.gz: 416b99d8c8bdcc6be0377706976e3d42b725f3b3f3136ffcc9f555fef2a34989fbe20a3a340cce8e980c43fc1e3e54b65ecf4a555f6ced6ba37bdfd1d1efcc6b
+  metadata.gz: 57127a346d805caec84570a3ce603d4a049b22412a74be6ef8fa12b5707a5ea4282ac1b9efa3d73c5142160772eade72cd6f322abf716e75c200e08ab1048da0
+  data.tar.gz: e4ff1ee087a43c703b1f6c39b35b898df2ef99c3d27f1624b0f2806b0456c8d83c9f6e818eb7a8e4983e1ba7fbddfdcec12843f0cdd5083ef95e2f52dfe9856b

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+# 0.1.1 2015-08-19
+
+## Added
+
+- Embedded validator has access to `root` node of the input attributes (solnic)
+- Embedded validator has access to `parent` node of the input attributes (solnic)
+- Presence validation for embedded validation can be skipped with `presence: false` option (solnic)
+
+## Fixed
+
+- `set_model_name` is correctly set for embedded validators (solnic)
+
+[Compare v0.1.0...v0.1.1](https://github.com/rom-rb/rom-model/compare/v0.1.0...v0.1.1)
+
 # 0.1.0 2015-08-14
 
 Extracted code from rom-rails 0.5.0

data/lib/rom/model/validator.rb

@@ -60,11 +60,23 @@ module ROM
       # @api private
       attr_reader :attr_names
 
+      # @attr_reader [Object] root The root node in attributes hash of an embedded validator
+      #
+      # @api public
+      attr_reader :root
+
+      # @attr_reader [Object] root The parent node in attributes hash of an embedded validator
+      #
+      # @api public
+      attr_reader :parent
+
       delegate :model_name, to: :attributes
 
       # @api private
-      def initialize(attributes)
+      def initialize(attributes, root = attributes, parent = nil)
         @attributes = attributes
+        @root = root
+        @parent = parent
         @attr_names = self.class.validators.map(&:attributes).flatten.uniq
       end
 
@@ -169,21 +181,26 @@ module ROM
         #   validator.errors[:tasks] # errors for tasks
         #
         # @api public
-        def embedded(name, &block)
-          validator_class = Class.new { include ROM::Model::Validator }
-          validator_class.class_eval(&block)
+        def embedded(name, options = {}, &block)
+          presence = options.fetch(:presence, true)
+
+          validator_class = Class.new {
+            include ROM::Model::Validator
+          }
+
           validator_class.set_model_name(name.to_s.classify)
+          validator_class.class_eval(&block)
 
           embedded_validators[name] = validator_class
 
-          validates name, presence: true
+          validates name, presence: true if presence
 
           validate do
             value = attributes[name]
 
             if value.present?
               Array([value]).flatten.each do |object|
-                validator = validator_class.new(object)
+                validator = validator_class.new(object, root, attributes)
                 validator.validate
 
                 if validator.errors.any?

data/lib/rom/model/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module Model
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.1.1'.freeze
   end
 end

data/spec/unit/validator/embedded_spec.rb

@@ -113,4 +113,94 @@ describe 'Embedded validators' do
 
     expect(user_validator.embedded_validators[:tasks]).to be_present
   end
+
+  it 'adds access to the root node in attribute hash' do
+    user_validator = Class.new do
+      include ROM::Model::Validator
+
+      set_model_name 'User'
+
+      validates :name, presence: true
+
+      embedded :tasks do
+        set_model_name 'Task'
+
+        validate do
+          if attributes[:title] != "#{root[:name]} Task"
+            errors.add(:base, 'does not look correct')
+          end
+        end
+      end
+    end
+
+    attributes = { name: 'Jade', tasks: [{ title: 'Jane Task' }] }
+
+    validator = user_validator.new(attributes)
+
+    validator.validate
+
+    expect(validator.errors[:tasks][0][:base]).to include('does not look correct')
+  end
+
+  it 'adds access to the parent node in attribute hash' do
+    user_validator = Class.new do
+      include ROM::Model::Validator
+
+      set_model_name 'User'
+
+      validates :name, presence: true
+
+      embedded :tasks do
+        set_model_name 'Task'
+
+        validate do
+          if attributes[:title] != "#{parent[:name]} Task"
+            errors.add(:base, 'does not look correct')
+          end
+        end
+      end
+    end
+
+    attributes = { name: 'Jade', tasks: [{ title: 'Jane Task' }] }
+
+    validator = user_validator.new(attributes)
+
+    validator.validate
+
+    expect(validator.errors[:tasks][0][:base]).to include('does not look correct')
+  end
+
+  it 'allows skipping presence check' do
+    user_validator = Class.new do
+      include ROM::Model::Validator
+
+      set_model_name 'User'
+
+      validates :name, presence: true
+
+      embedded :tasks, presence: false do
+        set_model_name 'Task'
+      end
+    end
+
+    attributes = { name: 'Jade' }
+
+    validator = user_validator.new(attributes)
+
+    expect(validator).to be_valid
+  end
+
+  it 'sets model name' do
+    user_validator = Class.new do
+      include ROM::Model::Validator
+
+      set_model_name 'User'
+
+      embedded :tasks, presence: false do
+        set_model_name 'Task'
+      end
+    end
+
+    expect(user_validator.embedded_validators[:tasks].model_name.name).to eql('Task')
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-model
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rom-support