validates_serialized 0.0.7 → 0.0.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTRkMjAxMTM5MDY1MDg1ZjhhNzAwYTRiYjdlNmM1OTA5NmUxZjk1NA==
+    NmQ3OTUxMDE5ODExYjA2YWI3M2YwZTk2Yzk2NmYwYWVjNmIzOWM3Yg==
   data.tar.gz: !binary |-
-    M2Q2NWM0MmYxMGUwNGIzMjc0ZWFmYzY1MjM4MDViMGQ2ZGY3MWMyYQ==
+    YWIzOWE3ODJiMWYzNGI5ODhiMDAzNTU5YWM1OGZiMDA0NjliMmJmMA==
 SHA512:
   metadata.gz: !binary |-
-    NzdjZjA2NTEwYTc5MjhhOTAxNmEyMTk2MGIxZTFiODA1OTBmYTcyZDEzNGNj
-    NDg4MGJhM2QzYTRmODBjMzJkMjFkMzQ0ZDdhZDc0ZDliN2RiNTRlZWFiMTI4
-    Y2JhNDk5MmY0NjRmMjQ2NDNkZTdiMTI3ZDhmYmMwNzdhNmEzZmQ=
+    NjFhYmM3OWM2ZDMwOWFjMWMwN2Y3NDIyMDA0NzgxNmI4ZjI3NzMzYjI3NzMx
+    MzdlZDkzMDFiMmNjMDZjZTE2NjhjYTI4MWI5Y2M2YzNmYWI4MDM0NDc3ZWU4
+    MTk0MjAxMzJjY2IyMjQ5M2Y2OTNjZDAwODViNWRjNjY4Y2JmZWU=
   data.tar.gz: !binary |-
-    ODE1Y2E5Yjk5NDA0YjVmNWQyMWJiNTVmZTJlMTZkODcyNTk5OGJiOGExMzQ1
-    MDYwNTIzZDVlOGQ2MmQ2ZDRhOGI1MzMzZTQzNGM2MjQyYzc5ZWY4NjVhNDY4
-    ZDJjYzRmOGEwYjRkNDYzY2NiMDg1MWU5M2Q3MjJmZWRmOTIwMWY=
+    NzA3MTI5NmY5MDVhMjQ4ZGU5NDQwZTQ0MjhmODM0ZjRjYzA5ZjEwOWU3Nzk4
+    ZDc1OGY5YjI5NzA3OWU1MzA4NzBiNDIyYjA3ODYwN2U3YzgyZWI5NGZhYzZh
+    M2Y1YjZmZDE1YWQxZGEzN2JkNDdiODY3ZjNjNzJhMGZhZjdkN2I=

data/Gemfile.lock

@@ -1,26 +1,26 @@
 PATH
   remote: .
   specs:
-    validates_serialized (0.0.5)
+    validates_serialized (0.0.7)
       activemodel (>= 3.0, < 5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.1.8)
-      activesupport (= 4.1.8)
+    activemodel (4.2.0)
+      activesupport (= 4.2.0)
       builder (~> 3.1)
-    activesupport (4.1.8)
-      i18n (~> 0.6, >= 0.6.9)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     builder (3.2.2)
     diff-lcs (1.2.5)
-    i18n (0.6.11)
-    json (1.8.1)
-    minitest (5.5.0)
+    i18n (0.7.0)
+    json (1.8.2)
+    minitest (5.5.1)
     rake (10.4.2)
     rspec (2.99.0)
       rspec-core (~> 2.99.0)

data/lib/validates_serialized/validators/array_block_validator.rb

@@ -2,7 +2,6 @@ module ActiveModel
   module Validations
     class ArrayBlockValidator < BlockValidator #:nodoc:
       def initialize(options, &block)
-        @block = block
         @options = options
         super
       end
@@ -14,10 +13,21 @@ module ActiveModel
         add_errors_to_record(record, attribute, errors)
       end
 
+      def build_serialized_object(value)
+        #TODO: For the Rails 4 version, I can just clear_validators! on the ValidateableHash        
+        temp_class = Class.new(ValidateableArrayValue)
+        temp_class_name = "ValidateableArrayValue_#{SecureRandom.hex}"
+        if self.class.constants.include?(temp_class_name)
+          self.class.send(:remove_const, temp_class_name)
+        end
+        self.class.const_set(temp_class_name, temp_class)
+        temp_class.new(value)
+      end
+
       def get_serialized_object_errors(array)
         messages = []
         array.each do |value|
-          serialized_object = ValidateableArrayValue.new(value)
+          serialized_object = build_serialized_object(value)
           serialized_object.class_eval &@block
           serialized_object.valid?
           message = serialized_object.errors.messages[:value]
@@ -29,8 +39,7 @@ module ActiveModel
       def add_errors_to_record(record, attribute, error_array)
         error_array.each do |value|
           text = value.join(", ")
-          message = "#{attribute} has a value that #{text}"
-          record.errors.add(attribute, message)
+          record.errors.add(attribute, "#{attribute} has a value that #{text}")
         end
         if exception = options[:strict]
           exception = ActiveModel::StrictValidationFailed if exception == true
@@ -38,14 +47,6 @@ module ActiveModel
           raise exception, exception_message unless exception_message.blank?
         end
       end
-
-      # def get_message_from_error_hash(error_hash)
-      #   message = nil
-      #   error_hash.each_pair do |key, array|
-      #     message = array.join(", ")
-      #   end
-      #   message
-      # end
     end
 
     module ClassMethods

data/lib/validates_serialized/validators/hash_block_validator.rb

@@ -2,7 +2,6 @@ module ActiveModel
   module Validations
     class HashBlockValidator < BlockValidator #:nodoc:
       def initialize(options, &block)
-        @block = block
         @options = options
         super
       end
@@ -14,8 +13,19 @@ module ActiveModel
         add_errors_to_record(record, attribute, error_hash)
       end
 
+      def build_serialized_object(value)
+        #TODO: For the Rails 4 version, I can just clear_validators! on the ValidateableHash        
+        temp_class = Class.new(ValidateableHash)
+        temp_class_name = "TempValidateableHash_#{SecureRandom.hex}"
+        if self.class.constants.include?(temp_class_name)
+          self.class.send(:remove_const, temp_class_name)
+        end
+        self.class.const_set(temp_class_name, temp_class)
+        temp_class.new(value)
+      end
+
       def get_serialized_object_errors(value)
-        serialized_object = ValidateableHash.new(value)
+        serialized_object = build_serialized_object(value)
         serialized_object.class_eval &@block
         serialized_object.valid?
         serialized_object.errors.messages

data/lib/validates_serialized/validators/object_block_validator.rb

@@ -13,8 +13,19 @@ module ActiveModel
         add_errors_to_record(record, attribute, error_hash)
       end
 
+      def build_serialized_object(value)
+        #TODO: For the Rails 4 version, I can just clear_validators! on the ValidateableHash        
+        temp_class = Class.new(ValidateableObject)
+        temp_class_name = "ValidateableObject_#{SecureRandom.hex}"
+        if self.class.constants.include?(temp_class_name)
+          self.class.send(:remove_const, temp_class_name)
+        end
+        self.class.const_set(temp_class_name, temp_class)
+        temp_class.new(value)
+      end
+
       def get_serialized_object_errors(value)
-        serialized_object = ValidateableObject.new(value)
+        serialized_object = build_serialized_object(value)
         serialized_object.class_eval &@block
         serialized_object.valid?
         serialized_object.errors.messages

data/lib/validates_serialized/version.rb

@@ -1,3 +1,3 @@
 module ValidatesSerialized
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/acceptance_spec.rb

@@ -71,15 +71,15 @@ class Blog
     validates :value, length: { in: 4..20 }
   end
 
-  validates_hash_keys :comments, allow_blank: true do 
-    validates :admin, presence: true
-  end
-
   validates_each_in_array :metadata, if: :metadata do
     validates_hash_keys :value do 
       validates :timestamp, presence: true
     end
   end
+
+  validates_hash_keys :comments, allow_blank: true do 
+    validates :admin, presence: true
+  end
 end
 
 describe ValidatesSerialized do

data/spec/new_acceptance_spec.rb

@@ -0,0 +1,113 @@
+require 'spec_helper'
+
+class Consumer
+  include ActiveModel::Validations
+
+  def initialize(h={})
+    h.each {|k,v| send("#{k}=",v)}
+  end
+
+  def income_sources
+    @income_sources || []
+  end
+
+  def income_sources=(val)
+    @income_sources = val
+  end
+
+  def credit_card
+    @credit_card || {}
+  end
+
+  def credit_card=(val)
+    @credit_card = val
+  end
+
+  validates_hash_keys :credit_card do
+    validates :brand, presence: true, inclusion: { in: ['visa', 'mastercard'] }
+    validates :number, presence: true, length: { minimum: 10 }
+  end
+
+  validates :income_sources, presence: true
+  validates_each_in_array :income_sources do
+    validates_hash_keys :value do
+      validates :name, presence: true
+      validates :amount, presence: true, numericality: { greater_than: 0 }
+    end
+  end
+end
+
+describe Consumer do
+  it "does not add error for valid income_sources" do
+    model = described_class.new(income_sources: [{ amount: 40, name: "Widget Co." }])
+    model.valid?
+    model.errors[:income_sources].should be_empty
+  end
+
+  it "adds correct income_sources errors" do
+    model = described_class.new(income_sources: [{ amount: -40 }])
+    model.valid?
+    model.errors[:income_sources].should eq(["income_sources has a value that name can't be blank, amount must be greater than 0"])
+  end
+
+  it "does not add error for valid credit_card" do
+    model = described_class.new(credit_card: { brand: "visa", number: "4111333322221111" }, income_sources: [{name: nil}])
+    model.valid?
+    model.errors[:credit_card].should be_empty
+  end
+
+  it "adds correct credit_card errors" do
+    model = described_class.new(credit_card: { number: "112233" })
+    model.valid?
+    model.errors[:credit_card].should eq(["brand can't be blank, is not included in the list", "number is too short (minimum is 10 characters)"])
+  end
+
+  # it "is valid without comments" do
+  #   model = Blog.new(ratings: [1, 3, 1], author: Author.new(name: "Tom"))
+  #   model.should be_valid
+  # end
+
+  # it "is valid with valid tags" do
+  #   model = Blog.new(ratings: [1, 3], author: Author.new(name: "Tom"), comments: { admin: "This is great!" }, tags: ["sweet", "awesome"])
+  #   model.should be_valid
+  # end
+
+  # it "is valid with valid metadata" do
+  #   model = Blog.new(ratings: [1, 3], author: Author.new(name: "Tom"), comments: { admin: "This is great!" }, metadata: [{timestamp: Time.new(2014, 1, 2)}, {timestamp: Time.new(2014, 2, 2)}])
+  #   model.should be_valid
+  # end
+
+  # it "is invalid without Serialized author" do
+  #   model = Blog.new(ratings: [1, 3, 1], comments: { admin: "This is great!" })
+  #   model.should_not be_valid
+  # end
+
+  # it "is invalid without author name" do
+  #   model = Blog.new(ratings: [1, 3, 1], author: Author.new, comments: { admin: "This is great!" })
+  #   model.should_not be_valid
+  #   model.errors[:author].should eq(["name can't be blank"])
+  # end
+
+  # it "is invalid without comment admin key" do
+  #   model = Blog.new(ratings: [1, 3, 1], author: Author.new(name: "Tom"), comments: { other: "This is great!" })
+  #   model.should_not be_valid
+  #   model.errors[:comments].should eq(["admin can't be blank"])
+  # end
+
+  # it "raises error without ratings" do
+  #   model = Blog.new(ratings: nil, author: Author.new(name: "Tom"), comments: { admin: "This is great!" })
+  #   expect { model.valid? }.to raise_error
+  # end
+
+  # it "is invalid with invalid ratings value" do
+  #   model = Blog.new(ratings: [1, 8], author: Author.new(name: "Tom"), comments: { admin: "This is great!" })
+  #   model.should_not be_valid
+  #   model.errors[:ratings].should eq(["is not included in the list"])
+  # end
+
+  # it "is invalid with invalid tags" do
+  #   model = Blog.new(ratings: [1, 3], author: Author.new(name: "Tom"), comments: { admin: "This is great!" }, tags: ["sweet", "awesome", "i"])
+  #   model.should_not be_valid
+  #   model.errors[:tags].should eq(["tags has a value that is too short (minimum is 4 characters)"])
+  # end
+end

data/spec/validators/array_block_validator_spec.rb

@@ -23,27 +23,37 @@ describe ActiveModel::Validations::ArrayBlockValidator do
       end
     end
 
-    it "does not raise error for valid value" do
-      record = ValidatorBlockArrayTestOne.new(my_attr: [2, 4])
-      record.valid?
-      record.errors[:my_attr].should eq([])
-    end
+    describe "validating" do
+      it "does not raise error for valid value" do
+        record = ValidatorBlockArrayTestOne.new(my_attr: [2, 4])
+        record.valid?
+        record.errors[:my_attr].should eq([])
+      end
 
-    it "adds error for invalid value" do
-      record = ValidatorBlockArrayTestOne.new(my_attr: [nil, 4])
-      record.valid?
-      record.errors[:my_attr].should eq(["my_attr has a value that can't be blank"])
-    end
+      it "adds error for invalid value" do
+        record = ValidatorBlockArrayTestOne.new(my_attr: [nil, 4])
+        record.valid?
+        record.errors[:my_attr].should eq(["my_attr has a value that can't be blank"])
+      end
 
-    it "adds multiple errors for multiple invalid value" do
-      record = ValidatorBlockArrayTestOne.new(my_attr: [nil, 4, nil])
-      record.valid?
-      record.errors[:my_attr].should eq(["my_attr has a value that can't be blank", "my_attr has a value that can't be blank"])
+      it "adds multiple errors for multiple invalid value" do
+        record = ValidatorBlockArrayTestOne.new(my_attr: [nil, 4, nil])
+        record.valid?
+        record.errors[:my_attr].should eq(["my_attr has a value that can't be blank", "my_attr has a value that can't be blank"])
+      end
+
+      it "raises error for non-array" do
+        record = ValidatorBlockArrayTestOne.new(my_attr: 4)
+        expect { record.valid? }.to raise_error(TypeError, 'my_attr is not an Array')
+      end
     end
 
-    it "raises error for non-array" do
-      record = ValidatorBlockArrayTestOne.new(my_attr: 4)
-      expect { record.valid? }.to raise_error(TypeError, 'my_attr is not an Array')
+    describe "clearing ValidateableArrayValue validators" do
+      it "clears validators after validation" do
+        record = ValidatorBlockArrayTestOne.new(my_attr: [2, 4])
+        record.valid?
+        ValidateableArrayValue.validators.should be_empty        
+      end
     end
   end
 
@@ -68,25 +78,35 @@ describe ActiveModel::Validations::ArrayBlockValidator do
       end
     end
 
-    it "does not raise error for valid value" do
-      record = ValidatorBlockArrayTestStrict.new(my_attr: [2, 3])
-      record.valid?
-      record.errors[:my_attr].should eq([])
-    end
+    describe "validating" do
+      it "does not raise error for valid value" do
+        record = ValidatorBlockArrayTestStrict.new(my_attr: [2, 3])
+        record.valid?
+        record.errors[:my_attr].should eq([])
+      end
 
-    it "raises error for invalid value" do
-      record = ValidatorBlockArrayTestStrict.new(my_attr: [2, 5])
-      expect { record.valid? }.to raise_error(ActiveModel::StrictValidationFailed, 'my_attr has a value that is not included in the list')
-    end
+      it "raises error for invalid value" do
+        record = ValidatorBlockArrayTestStrict.new(my_attr: [2, 5])
+        expect { record.valid? }.to raise_error(ActiveModel::StrictValidationFailed, 'my_attr has a value that is not included in the list')
+      end
 
-    it "raises error for multiple invalid value" do
-      record = ValidatorBlockArrayTestStrict.new(my_attr: [nil, 9])
-      expect { record.valid? }.to raise_error(ActiveModel::StrictValidationFailed, "my_attr has a value that is not included in the list, my_attr has a value that is not included in the list")
+      it "raises error for multiple invalid value" do
+        record = ValidatorBlockArrayTestStrict.new(my_attr: [nil, 9])
+        expect { record.valid? }.to raise_error(ActiveModel::StrictValidationFailed, "my_attr has a value that is not included in the list, my_attr has a value that is not included in the list")
+      end
+
+      it "raises error for non-array" do
+        record = ValidatorBlockArrayTestStrict.new(my_attr: 4)
+        expect { record.valid? }.to raise_error(TypeError, 'my_attr is not an Array')
+      end
     end
 
-    it "raises error for non-array" do
-      record = ValidatorBlockArrayTestStrict.new(my_attr: 4)
-      expect { record.valid? }.to raise_error(TypeError, 'my_attr is not an Array')
+    describe "clearing ValidateableArrayValue validators" do
+      it "clears validators after validation" do
+        record = ValidatorBlockArrayTestStrict.new(my_attr: [2, 3])
+        record.valid?
+        ValidateableArrayValue.validators.should be_empty        
+      end
     end
   end
 end

data/spec/validators/hash_block_validator_spec.rb

@@ -48,6 +48,14 @@ describe ActiveModel::Validations::HashBlockValidator do
         expect { record.valid? }.to raise_error(TypeError, 'my_attr is not a Hash')
       end
     end
+
+    describe "clearing ValidateableHash validators" do
+      it "clears validators after validation" do
+        record = ValidatorBlockHashTestOne.new(my_attr: { first_key: 2, second_key: 4 })
+        record.valid?
+        ValidateableHash.validators.should be_empty        
+      end
+    end
   end
 
   context "#validates_hash_keys!" do
@@ -94,5 +102,13 @@ describe ActiveModel::Validations::HashBlockValidator do
         expect { record.valid? }.to raise_error(TypeError, 'my_attr is not a Hash')
       end
     end
+
+    describe "clearing ValidateableHash validators" do
+      it "clears validators after validation" do
+        record = ValidatorBlockHashTestStrict.new(my_attr: {first_key: 2, second_key: 3})
+        record.valid?
+        ValidateableHash.validators.should be_empty        
+      end
+    end
   end
 end

data/spec/validators/object_block_validator_spec.rb

@@ -65,6 +65,14 @@ describe ActiveModel::Validations::ObjectBlockValidator do
         record.errors[:my_attr].should eq(["name can't be blank", "age is not included in the list"])
       end
     end
+
+    describe "clearing ValidateableObject validators" do
+      it "clears validators after validation" do
+        record = ValidatorBlockObjectTestOne.new(my_attr: Foo.new(name: nil, age: 9))
+        record.valid?
+        ValidateableObject.validators.should be_empty        
+      end
+    end
   end
 
   context "#validates_serialized!" do
@@ -106,5 +114,13 @@ describe ActiveModel::Validations::ObjectBlockValidator do
         expect { record.valid? }.to raise_error(ActiveModel::StrictValidationFailed, "name can't be blank")
       end
     end
+
+    describe "clearing ValidateableObject validators" do
+      it "clears validators after validation" do
+        record = ValidatorBlockObjectTestStrict.new(my_attr: Foo.new(name: "Jim", age: 3))
+        record.valid?
+        ValidateableObject.validators.should be_empty        
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validates_serialized
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - brycesenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -114,6 +114,7 @@ files:
 - notes.md
 - spec/acceptance_spec.rb
 - spec/each_validator_spec.rb
+- spec/new_acceptance_spec.rb
 - spec/spec_helper.rb
 - spec/validateable_array_value_spec.rb
 - spec/validateable_hash_spec.rb
@@ -152,6 +153,7 @@ summary: An ActiveModel enhancement that allows for better validation of seriali
 test_files:
 - spec/acceptance_spec.rb
 - spec/each_validator_spec.rb
+- spec/new_acceptance_spec.rb
 - spec/spec_helper.rb
 - spec/validateable_array_value_spec.rb
 - spec/validateable_hash_spec.rb