rest_my_case 1.10.7 → 1.10.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmJmYmE1OGE0MGY2ZjA3MjMwOTE2ODQxYTIxYWZmM2E1M2IyZDkxOA==
+    MDcxNjdjZWE5MzY5NTJjMmQ2YTVmMzM3ODc5Y2Y5MjNkNjcyZjVkMQ==
   data.tar.gz: !binary |-
-    Zjk0NGQwMGRiNjRhODFmMDQ3MmM5N2RiODRlMThmMDBiYjljOGI1NA==
+    NjUyMjQ0OTM5NGI2Yjg0ZTkyZjBlOTUwNGE4YjQyNzY1N2U1MGJkYQ==
 SHA512:
   metadata.gz: !binary |-
-    ZjNkYTcxMGJhMzcxZDZlNjMwNDE5ZGQxMjQxMWJmMjNiODhiZGRlMjFiMzNm
-    MTdiODRkOTNjOTdhMTgyMmZmY2VlZTRjNTQ3ZGQyMzc2ZDY1ZjY0N2VjMDM0
-    NzNmMWMzMjQ0MzQ5NTAwYmZjMDg2MmVlOGE3ZmRjZGFiNWZjMWE=
+    MmE1MTA3NDkwYjQzMjQxYzk4MDZiMjY5Y2ZhNTI3ZjU1NGQxMmQwZmUwZDAx
+    ODBiMWYxNDUwNGE5M2JmOTc0MGVmZDk5OWZkYTcwNWZkYjQ1MGY5NDVjMDBh
+    ZDIzYjk4NDBlMWQ4MTg3NTI5OTg0ZjY4NzA3NDI4OTUzN2E2MTg=
   data.tar.gz: !binary |-
-    ZDViMmUzY2MyNzBiMTBkMjg5Y2Q5OTBhZGE0ZmExNmJjY2ZiYWY0ZDdhYzU4
-    OTFiM2I3OTk3ZDQ4MDI2MTE4ODU1OTEyMWEzMjEzMzU0OTk3ZjNkYjVhNDFj
-    NjAwOTZjYjk3NDRiMGM2M2YwMTE5NjE1ODViYmU3MjJlNDA5MmI=
+    OWQ3NWViNGU1MGRmMmZlODU5NGIyZjdhYmZlZjBlYWNhN2IyZDBlNjllZDAx
+    NjNjODM0MzY4YjIyZmVhZjkyMjhkZTc5NGFkZThlNDU1ZTEyODY4MjBlNjlh
+    MGI1NzhlZGFiMDFjYWVjYWEyNjFlMWMyNGYzMjkxNzQ2Y2ZmYWE=

data/lib/rest_my_case/validator.rb

@@ -75,13 +75,15 @@ module RestMyCase
     def target
       return nil if target_options[:name].nil?
 
+      target_content = get_target(target_options[:name])
+
       if parent_target
         extend_errors_if_necessary(parent_target)
 
-        parent_target.send(target_options[:name])
-      else
-        get_target(target_options[:name])
+        target_content ||= parent_target.send(target_options[:name])
       end
+
+      target_content
     end
 
     def perform

data/lib/rest_my_case/version.rb

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

data/spec/rest_my_case/validator_spec.rb

@@ -226,7 +226,7 @@ describe RestMyCase::Validator do
           { title: 'second comment' }
         ])
 
-        @context = NestedValidation.perform(post: @post_with_comments)
+        @context = NestedValidation::Base.perform(post: @post_with_comments)
       end
 
       it "@context.ok? should be true" do
@@ -251,7 +251,7 @@ describe RestMyCase::Validator do
           {}
         ])
 
-        @context = NestedValidation.perform(post: @post_with_comments)
+        @context = NestedValidation::Base.perform(post: @post_with_comments)
       end
 
       it "@context.ok? should be false" do
@@ -273,6 +273,61 @@ describe RestMyCase::Validator do
       end
     end
 
+    context "Validator has a method with the same name has the target" do
+      before do
+        @post_with_comments = RubyPostWithComments.new([
+          { title: 'first comment' },
+          {}
+        ])
+
+        @context = NestedValidation::ValidatorSameMethod.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 "@context._comments should not contain errors" do
+        @context._comments.each do |comment|
+          expect(comment.errors.count).to be 0
+        end
+      end
+    end
+
+    context "Context has a method with the same name has the target" do
+      before do
+        @post_with_comments = RubyPostWithComments.new([
+          { title: 'first comment' },
+          {}
+        ])
+
+        @context = NestedValidation::Base.perform(
+          post: @post_with_comments,
+          comments: [
+            RubyPostWithComments::RubyComment.new({ title: 'first comment' }),
+            RubyPostWithComments::RubyComment.new({ title: 'second comment' })
+          ])
+      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 "@context.comments should not contain errors" do
+        @context.comments.each do |comment|
+          expect(comment.errors.count).to be 0
+        end
+      end
+    end
+
   end
 
 end

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

@@ -1,7 +1,30 @@
-class NestedValidation < RestMyCase::Validator
+module NestedValidation
 
-  target :comments, in: :post
+  class Base < RestMyCase::Validator
 
-  validates_presence_of :title
+    target :comments, in: :post
+
+    validates_presence_of :title
+
+  end
+
+  class ValidatorSameMethod < RestMyCase::Validator
+
+    target :comments, in: :post
+
+    validates_presence_of :title
+
+    def setup
+      context._comments = comments
+    end
+
+    def comments
+      @comments ||= [
+        RubyPostWithComments::RubyComment.new({ title: 'first comment' }),
+        RubyPostWithComments::RubyComment.new({ title: 'second comment' })
+      ]
+    end
+
+  end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest_my_case
 version: !ruby/object:Gem::Version
-  version: 1.10.7
+  version: 1.10.8
 platform: ruby
 authors:
 - goncalvesjoao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry