rest_my_case 1.9.2 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 088ea74126da74d24cd42b6ca1bd23838cf16f74
-  data.tar.gz: a5c583155c12293f7e23e23213bab13c74cf3544
+  metadata.gz: f7c0fba5355ebbec27dbca5c5d364b5541383361
+  data.tar.gz: 2f2a0d395b3371b7228c1c6973925fe5cab20163
 SHA512:
-  metadata.gz: d48c0464b9ea66217c168963ebbef24542273a55336486e0c0dcbfb0a7bf5ae8bbdf38cbdfb7d4dbf646f401a7d9ff62196e9885c13493a1e8af19c418c39057
-  data.tar.gz: 6c8546d1508b909c58e19287d7e8e8dc826f311a4e52387d7aeaf49b72d693e3d40816fba6da3c90d9253d4d3f5cdfed6fed21dc88c450cc613b6ffb5f73a69e
+  metadata.gz: 3414f0946225813a7632cdaf0dcfd2791e4a766adc34a93fddf8e2a9758a885ba0285e5fcd1bdd7c53c5f8ca47b3da7a57aad76cbc8eac74b48e0b3671299a78
+  data.tar.gz: 065550d6c4ec94909b57caa65f27470b5a43e5fb2393f8ba4f7672ab8572ec4004daa5caba3845f85495ac405771e1c85d4bf85b4370dc16e8588ecb48cc2a2f

data/lib/rest_my_case/validator.rb

@@ -6,8 +6,6 @@ module RestMyCase
 
       attr_writer :validators
 
-      attr_reader :clear_errors
-
       def trial_court
         @trial_court ||= Trial::Court.new \
           Judge::Base, DefenseAttorney::Base, Validator, Context::Base
@@ -21,10 +19,6 @@ module RestMyCase
         @target_name = target_name
       end
 
-      def clear_errors!
-        @clear_errors = true
-      end
-
       def validators
         @validators ||= Hash.new { |hash, key| hash[key] = [] }
       end
@@ -46,12 +40,8 @@ module RestMyCase
       protected ######################## PROTECTED #############################
 
       def store_validators_by_attribute(validator)
-        if validator.respond_to?(:attributes) && !validator.attributes.empty?
-          validator.attributes.each do |attribute|
-            validators[attribute.to_sym] << validator
-          end
-        else
-          validators[nil] << validator
+        validator.attributes.each do |attribute|
+          validators[attribute.to_sym] << validator
         end
       end
 
@@ -77,15 +67,15 @@ module RestMyCase
     end
 
     def target
+      return nil if target_name.nil?
+
       respond_to?(target_name) ? send(target_name) : context.send(target_name)
     end
 
     def perform
       targets = [*target]
 
-      skip! if targets.empty?
-
-      if target.nil?
+      if targets.empty?
         error('no target to validate!')
       else
         error('unprocessable_entity') unless all_validations_green? targets
@@ -111,8 +101,6 @@ module RestMyCase
     def extend_errors_and_run_validations(object_to_validate)
       extend_errors_if_necessary object_to_validate
 
-      object_to_validate.errors.clear if self.class.clear_errors
-
       self.class.validators.values.flatten.uniq.each do |validator|
         next if validator_condition_fails(validator, object_to_validate)
 

data/lib/rest_my_case/version.rb

@@ -1,5 +1,5 @@
 module RestMyCase
 
-  VERSION = '1.9.2'
+  VERSION = '1.9.3'
 
 end

data/spec/rest_my_case/validator_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+describe RestMyCase::Validator do
+
+  context "Given a validator with no target" do
+    before do
+      @context = RestMyCase::Validator.perform
+    end
+
+    it "@context.ok? should be false" do
+      expect(@context.ok?).to be false
+    end
+
+    it "@context.errors should reflect the fact that no target is defined" do
+      expect(@context.errors).to a_hash_including({"RestMyCase::Validator"=>["no target to validate!"]})
+    end
+  end
+
+  context "Given a validator with a custom validation" do
+    context "given a post with an invalid phone_number" do
+      before do
+        @post = RubyPost.new(phone_number: 'asd')
+        @context = CustomValidator.perform(post: @post)
+      end
+
+      it "@context.ok? should be false" do
+        expect(@context.ok?).to be false
+      end
+
+      it "@context.errors should include the unprocessable_entity error" do
+        expect(@context.errors).to a_hash_including({"CustomValidator"=>["unprocessable_entity"]})
+      end
+
+      it "@post.errors should mention the bad phone_number error" do
+        expect(@post.errors.added?(:phone_number, 'invalid country code')).to be true
+      end
+    end
+
+    context "given a post with a valid phone_number" do
+      before do
+        @post = RubyPost.new(phone_number: '123 123')
+        @context = CustomValidator.perform(post: @post)
+      end
+
+      it "@context.ok? should be true" do
+        expect(@context.ok?).to be true
+      end
+    end
+  end
+
+  context "Given a class that inherits from a class that has its own dependencies" do
+    before do
+      @post = RubyPost.new
+      @context = HierarchyValidation::Son.perform(post: @post)
+    end
+
+    it "HierarchyValidation::Son should be able to inherit Father's validations and alter them" do
+      expect(@context.ok?).to be false
+      expect(@post.errors.added?(:title, :blank)).to be true
+      expect(@post.errors.added?(:email, :blank)).to be true
+      expect(@post.errors.size).to be 2
+    end
+  end
+
+end
+

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

@@ -0,0 +1,17 @@
+class CustomValidator < RestMyCase::Validator
+
+  target :post
+
+  validate :phone_number_country_code
+
+  def phone_number_country_code(post)
+    if post.phone_number.split(' ')[0] != '123'
+      post.errors.add(:phone_number, 'invalid country code')
+
+      return false
+    end
+
+    true
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest_my_case
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.3
 platform: ruby
 authors:
 - goncalvesjoao
@@ -150,13 +150,14 @@ files:
 - spec/rest_my_case/http_status_spec.rb
 - spec/rest_my_case/status_spec.rb
 - spec/rest_my_case/trial_case/court_spec.rb
-- spec/rest_my_case/validator/hierarchy_spec.rb
+- spec/rest_my_case/validator_spec.rb
 - spec/spec_helper.rb
 - spec/support/defense_attorney.rb
 - spec/support/perform.rb
 - spec/support/rest_my_case_base.rb
 - spec/support/validator/models/ruby_post.rb
 - spec/support/validator/models/ruby_post_with_comments.rb
+- spec/support/validator/usecases/custom_validator.rb
 - spec/support/validator/usecases/hierarchy_validation.rb
 homepage: https://github.com/goncalvesjoao/rest_my_case
 licenses:
@@ -191,11 +192,12 @@ test_files:
 - spec/rest_my_case/http_status_spec.rb
 - spec/rest_my_case/status_spec.rb
 - spec/rest_my_case/trial_case/court_spec.rb
-- spec/rest_my_case/validator/hierarchy_spec.rb
+- spec/rest_my_case/validator_spec.rb
 - spec/spec_helper.rb
 - spec/support/defense_attorney.rb
 - spec/support/perform.rb
 - spec/support/rest_my_case_base.rb
 - spec/support/validator/models/ruby_post.rb
 - spec/support/validator/models/ruby_post_with_comments.rb
+- spec/support/validator/usecases/custom_validator.rb
 - spec/support/validator/usecases/hierarchy_validation.rb

data/spec/rest_my_case/validator/hierarchy_spec.rb

@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-describe 'Testing hierarchy capabilities' do
-
-  it "HierarchyValidation::Son should be able to inherit Father's validations and alter them" do
-    # post_for_father = RubyPost.new
-    # father_context  = HierarchyValidation::Father.perform(post: post_for_father)
-
-    # expect(father_context.ok?).to be false
-    # expect(post_for_father.errors.added?(:title, :blank)).to be true
-    # expect(post_for_father.errors.size).to be 1
-
-    post_for_son  = RubyPost.new
-    son_context   = HierarchyValidation::Son.perform(post: post_for_son)
-
-    expect(son_context.ok?).to be false
-    expect(post_for_son.errors.added?(:title, :blank)).to be true
-    expect(post_for_son.errors.added?(:email, :blank)).to be true
-    expect(post_for_son.errors.size).to be 2
-  end
-
-end
-