rest_my_case 1.10.6 → 1.10.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTE5NWY3NzA5ZDI4MThjZmM2MmY3ZGE2NDE3NDY0YTNiZGM2ZWM1Mg==
+    YmJmYmE1OGE0MGY2ZjA3MjMwOTE2ODQxYTIxYWZmM2E1M2IyZDkxOA==
   data.tar.gz: !binary |-
-    NjZmZTUwYTY5NzZhMWFmNDljYTMyYzkwNjVlNTQ3OTRlYzg5YjlhOQ==
+    Zjk0NGQwMGRiNjRhODFmMDQ3MmM5N2RiODRlMThmMDBiYjljOGI1NA==
 SHA512:
   metadata.gz: !binary |-
-    NmM0OWE1NGZmYzZjZjgyYjQ1NzVkYWYzYjYzN2QyNmI5YTc4OWI4NmMwOTQw
-    MWNhZTMzYTdhZWJiZDM1NzNlZTBmMDAzYmRhNmNhNzExZDJjYTZhMDBmYmE5
-    NjI5Nzk5NWI5ODYyZGNlNzBhZmVjMDJhZTkwYzQxYzE4YjBhZTc=
+    ZjNkYTcxMGJhMzcxZDZlNjMwNDE5ZGQxMjQxMWJmMjNiODhiZGRlMjFiMzNm
+    MTdiODRkOTNjOTdhMTgyMmZmY2VlZTRjNTQ3ZGQyMzc2ZDY1ZjY0N2VjMDM0
+    NzNmMWMzMjQ0MzQ5NTAwYmZjMDg2MmVlOGE3ZmRjZGFiNWZjMWE=
   data.tar.gz: !binary |-
-    NDc2ZmI4ZDAzOTA1NzJkNzBkMjhjNjBhNWVmZGJkMDNkZDRjZGMyMWYyZjdl
-    ODg5MGViZTU4ZTEwZmNhOGM0ZmNmZDQ3MTNhYWJkMmE4ODNjNzEzNDQ3Njc5
-    Y2YzNzM5ZjIzOWUyNjEwZTI3ZTQyNzc3ZTNiYzE1ZThlZjQ3MGI=
+    ZDViMmUzY2MyNzBiMTBkMjg5Y2Q5OTBhZGE0ZmExNmJjY2ZiYWY0ZDdhYzU4
+    OTFiM2I3OTk3ZDQ4MDI2MTE4ODU1OTEyMWEzMjEzMzU0OTk3ZjNkYjVhNDFj
+    NjAwOTZjYjk3NDRiMGM2M2YwMTE5NjE1ODViYmU3MjJlNDA5MmI=

data/lib/rest_my_case/validator.rb

@@ -11,12 +11,13 @@ module RestMyCase
           Judge::Base, DefenseAttorney::Base, Validator, Context::Base
       end
 
-      def target_name
-        @target_name || Helpers.super_method(self, :target_name)
+      def target_options
+        @target_options || Helpers.super_method(self, :target_options)
       end
 
-      def target(target_name)
-        @target_name = target_name
+      def target(target_name, target_options = {})
+        @target_options = target_options || {}
+        @target_options[:name] = target_name
       end
 
       def validators
@@ -62,26 +63,45 @@ module RestMyCase
 
     extend AccusationAttorneys::HelperMethods
 
-    def target_name
-      self.class.target_name
+    def target_options
+      self.class.target_options || {}
+    end
+
+    def parent_target
+      @parent_target ||=
+        target_options[:in] ? get_target(target_options[:in]) : nil
     end
 
     def target
-      return nil if target_name.nil?
+      return nil if target_options[:name].nil?
 
-      respond_to?(target_name) ? send(target_name) : context.send(target_name)
+      if parent_target
+        extend_errors_if_necessary(parent_target)
+
+        parent_target.send(target_options[:name])
+      else
+        get_target(target_options[:name])
+      end
     end
 
     def perform
       targets = [*target]
 
-      return if Helpers.blank?(targets)
+      return if Helpers.blank?(targets) || all_validations_green?(targets)
 
-      error('unprocessable_entity') unless all_validations_green? targets
+      if parent_target
+        parent_target.errors.add(target_options[:name], :invalid)
+      end
+
+      error('unprocessable_entity')
     end
 
     protected ######################## PROTECTED ###############################
 
+    def get_target(method)
+      respond_to?(method) ? send(method) : context.send(method)
+    end
+
     def all_validations_green?(targets)
       targets.map do |object_to_validate|
         extend_errors_if_necessary(object_to_validate)

data/lib/rest_my_case/version.rb

@@ -1,5 +1,5 @@
 module RestMyCase
 
-  VERSION = '1.10.6'
+  VERSION = '1.10.7'
 
 end

data/spec/rest_my_case/validator_spec.rb

@@ -102,11 +102,11 @@ describe RestMyCase::Validator do
         expect(@context.ok?).to be true
       end
 
-      it "@post1 should not cotain errors" do
+      it "@post1 should not contain errors" do
         expect(@post1.errors.count).to be 0
       end
 
-      it "@post2 should not cotain errors" do
+      it "@post2 should not contain errors" do
         expect(@post2.errors.count).to be 0
       end
     end
@@ -122,11 +122,11 @@ describe RestMyCase::Validator do
         expect(@context.ok?).to be false
       end
 
-      it "@post1 should not cotain errors" do
+      it "@post1 should not contain errors" do
         expect(@post1.errors.count).to be 0
       end
 
-      it "@post2 should not cotain errors" do
+      it "@post2 should not contain errors" do
         expect(@post2.errors.count).to be 1
         expect(@post2.errors.added?(:body, :blank)).to be true
       end
@@ -143,12 +143,12 @@ describe RestMyCase::Validator do
         expect(@context.ok?).to be false
       end
 
-      it "@post1 should not cotain errors" do
+      it "@post1 should not contain errors" do
         expect(@post1.errors.count).to be 1
         expect(@post1.errors.added?(:title, :blank)).to be true
       end
 
-      it "@post2 should not cotain errors" do
+      it "@post2 should not contain errors" do
         expect(@post2.errors.count).to be 1
         expect(@post2.errors.keys).to eq [:body]
       end
@@ -165,11 +165,11 @@ describe RestMyCase::Validator do
         expect(@context.ok?).to be false
       end
 
-      it "@post1 should not cotain errors" do
+      it "@post1 should not contain errors" do
         expect(@post1.errors.count).to be 0
       end
 
-      it "@post2 should not cotain errors" do
+      it "@post2 should not contain errors" do
         expect(@post2.errors.count).to be 1
         expect(@post2.errors.include?(:body)).to be true
       end
@@ -186,11 +186,11 @@ describe RestMyCase::Validator do
         expect(@context.ok?).to be true
       end
 
-      it "@post1 should not cotain errors" do
+      it "@post1 should not contain errors" do
         expect(@post1.errors.count).to be 0
       end
 
-      it "@post2 should not cotain errors" do
+      it "@post2 should not contain errors" do
         expect(@post2.errors.count).to be 0
       end
     end
@@ -206,15 +206,74 @@ describe RestMyCase::Validator do
         expect(@context.ok?).to be true
       end
 
-      it "@post1 should not cotain errors" do
+      it "@post1 should not contain errors" do
         expect(@post1.errors.count).to be 0
       end
 
-      it "@post2 should not cotain errors" do
+      it "@post2 should not contain errors" do
         expect(@post2.errors.count).to be 0
       end
     end
 
   end
+
+  context "When passing an object with nested objects" do
+
+    context "and both of the nested object are valid" do
+      before do
+        @post_with_comments = RubyPostWithComments.new([
+          { title: 'first comment' },
+          { title: 'second comment' }
+        ])
+
+        @context = NestedValidation.perform(post: @post_with_comments)
+      end
+
+      it "@context.ok? should be true" do
+        expect(@context.ok?).to be true
+      end
+
+      it "@post_with_comments should not contain errors" do
+        expect(@post_with_comments.errors.count).to be 0
+      end
+
+      it "@post_with_comments.comments should not contain errors" do
+        @post_with_comments.comments.each do |comment|
+          expect(comment.errors.count).to be 0
+        end
+      end
+    end
+
+    context "and one of them is invalid" do
+      before do
+        @post_with_comments = RubyPostWithComments.new([
+          { title: 'first comment' },
+          {}
+        ])
+
+        @context = NestedValidation.perform(post: @post_with_comments)
+      end
+
+      it "@context.ok? should be false" do
+        expect(@context.ok?).to be false
+      end
+
+      it "@post_with_comments should contain one error" do
+        expect(@post_with_comments.errors.count).to be 1
+        expect(@post_with_comments.errors.added?(:comments, :invalid)).to be true
+      end
+
+      it "@post_with_comments.comments[0] should not contain errors" do
+        expect(@post_with_comments.comments[0].errors.count).to be 0
+      end
+
+      it "@post_with_comments.comments[1] should contain one error" do
+        expect(@post_with_comments.comments[1].errors.count).to be 1
+        expect(@post_with_comments.comments[1].errors.added?(:title, :blank)).to be true
+      end
+    end
+
+  end
+
 end
 

data/spec/support/validator/models/ruby_post_with_comments.rb

@@ -2,7 +2,7 @@ class RubyPostWithComments
 
   class RubyComment
 
-    attr_accessor :title, :email, :post_id
+    attr_accessor :title
 
     def initialize(attributes = {})
       (attributes || {}).each { |name, value| send("#{name}=", value) }
@@ -10,19 +10,10 @@ class RubyPostWithComments
 
   end
 
-
   attr_reader :comments
 
-  def initialize(comments = {})
+  def initialize(comments = [])
     @comments = comments.map { |comment| RubyComment.new(comment) }
-    @comments = [] if @comments.nil?
-  end
-
-  def first_two_comments
-    [
-      comments[0],
-      comments[1]
-    ]
   end
 
 end

data/spec/support/validator/usecases/hierarchy_validation.rb

@@ -20,4 +20,4 @@ module HierarchyValidation
 
   end
 
-end
+end

data/spec/support/validator/usecases/nested_validation.rb

@@ -0,0 +1,7 @@
+class NestedValidation < RestMyCase::Validator
+
+  target :comments, in: :post
+
+  validates_presence_of :title
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest_my_case
 version: !ruby/object:Gem::Version
-  version: 1.10.6
+  version: 1.10.7
 platform: ruby
 authors:
 - goncalvesjoao
@@ -164,6 +164,7 @@ files:
 - spec/support/validator/usecases/custom_validator.rb
 - spec/support/validator/usecases/hierarchy_validation.rb
 - spec/support/validator/usecases/length_validator.rb
+- spec/support/validator/usecases/nested_validation.rb
 - spec/support/validator/usecases/numericality_validator.rb
 homepage: https://github.com/goncalvesjoao/rest_my_case
 licenses:
@@ -212,4 +213,5 @@ test_files:
 - spec/support/validator/usecases/custom_validator.rb
 - spec/support/validator/usecases/hierarchy_validation.rb
 - spec/support/validator/usecases/length_validator.rb
+- spec/support/validator/usecases/nested_validation.rb
 - spec/support/validator/usecases/numericality_validator.rb