validates_serialized 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTU3NzRmZTFiOGNlYmMzNGFlZDMwOTBkOWU1NTk2MjMyMmVkNDI5ZA==
+    OTc4ZmQ5ZGFhNDlmOGEwZGI0NzI1NzA1NWQ0OTZmY2UyMTdlN2MxNA==
   data.tar.gz: !binary |-
-    NDIzOGFmMjllYmY0MThkODVlYzkxMWQwNzljOTNhMzhjNzg2ZGJkZQ==
+    Y2VlNTQ5NjViNzExZmZlZGFkNDMwNzAyZjExNjkyYTM1OTVmYWFjMw==
 SHA512:
   metadata.gz: !binary |-
-    ZjhiOGNhY2U5ZGU2Y2Y4N2ExOWNmOWFlOGZkZjAxZjAwZWY0NGVlMmU4ZjE3
-    YTY4ODI5ZDFkOTBjMDQ5MzEyYWUzNzMwY2JmOTkxNWVkYzk3NzgxMmFhNzhm
-    NTVlZjMxMzU1M2Y0NTMwNzY3OGUwYTllYjI3Zjk2MWM5ZWEyOWI=
+    ODM1ODIzYmIzYjIyZTVhOWU0NjJjMjkxODI0MGUxMjdmZWM2MWYzOWIyYzBl
+    NmZhOThlN2VjZWRiNjJlMDBjYWIzYzAyMDI0MzE2ZDgwZWUwMDRkMTkxMTQw
+    MmQzYzZmMDlmZWQ0NjIyMTBlNDhhNWQyYWUwNjkzMjZiMzM2NmI=
   data.tar.gz: !binary |-
-    MjY0NGI2YTk5MWY3YzlkZWVhNDZjYzQyM2E0NmU0OGMwY2QzNzE0NjNjNTkz
-    NDJhOGJmOGQzYzhiY2FmZTE1NWQ0ZDZmMzFkYTBmMmNjYTY5N2JkMTZmMTg4
-    ODczYWZkZTE4MDZkYzkyNTE4NGE0NmZlMzY4M2M2YjIxNzFkMTM=
+    ZmY2ZGJkMzc0MGFkOTJlYjFiMmUwNTZmNzkxMGJlM2ZjMjZhYzY0NWU0MTAw
+    Y2JjMmIyYWM0MDUyNDkzNjdmMzI2YTYwYTM2ZWIyNmNlNGNkNzkxZTBjZTY1
+    ZWYzZTY5NTY5ZjFkY2E5YmUwMGM0OTU2ODFhMmI4ZjYzZDk2Mzc=

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    validates_serialized (0.0.0)
-      activemodel (>= 4.0.0)
+    validates_serialized (0.0.2)
+      activemodel (>= 3.0, < 5.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -122,7 +122,7 @@ comment.valid? #=> false
 comment.errors[:ratings] #=> ["ratings must be greater than 0"]
 ```
 
-## Validating a serialized array
+## Validating a serialized array (syntax #1)
 ```ruby
 class Comment < ActiveRecord::Base
   include ActiveModel
@@ -142,6 +142,28 @@ comment.valid? #=> false
 comment.errors[:tags] #=> ["tags is too short (minimum is 4 characters)"]
 ```
 
+## Validating a serialized array (syntax #2)
+```ruby
+class Comment < ActiveRecord::Base
+  include ActiveModel
+  ...
+
+  serialize :tags, Array
+  validates_each_in_array :tags do
+    validates :value, length: { minimum: 4 } #the attribute 'value' with access each value
+  end
+end
+
+# With valid hash
+comment = Comment.new(tags: ["ruby" "rails"])
+comment.valid? #=> true
+
+# With invalid hash
+comment = Comment.new(tags: ["ruby" "rails", "ror"])
+comment.valid? #=> false
+comment.errors[:tags] #=> ["tags is too short (minimum is 4 characters)"]
+```
+
 ## Contributing
 
 1. Fork it

data/lib/validates_serialized/validateable_array_value.rb

@@ -0,0 +1,13 @@
+require 'active_model'
+
+class ValidateableArrayValue
+  include ::ActiveModel::Validations
+
+  def initialize(value)
+    @value = value
+  end
+
+  def value
+    @value
+  end
+end

data/lib/validates_serialized/validators/array_block_validator.rb

@@ -0,0 +1,65 @@
+module ActiveModel
+  module Validations
+    class ArrayBlockValidator < BlockValidator #:nodoc:
+      def initialize(options, &block)
+        @block = block
+        @options = options
+        super
+      end
+
+      private
+      def validate_each(record, attribute, array)
+        raise TypeError, "#{attribute} is not an Array" unless array.is_a?(Array)
+        errors = get_serialized_object_errors(array)
+        add_errors_to_record(record, attribute, errors)
+      end
+
+      def get_serialized_object_errors(array)
+        messages = []
+        array.each do |value|
+          serialized_object = ValidateableArrayValue.new(value)
+          serialized_object.class_eval &@block
+          serialized_object.valid?
+          message = serialized_object.errors.messages[:value]
+          messages << message unless message.blank?
+        end
+        messages
+      end
+
+      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)
+        end
+        if exception = options[:strict]
+          exception = ActiveModel::StrictValidationFailed if exception == true
+          exception_message = record.errors[attribute].join(", ")
+          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
+      # Helper to accept arguments in the style of the +validates+ class method
+      def validates_each_in_array(*attr_names, &block)
+        raise ArgumentError, "You need to supply at least one attribute" if attr_names.empty?
+        validates_with ArrayBlockValidator, _merge_attributes(attr_names), &block
+      end
+
+      def validates_each_in_array!(*attr_names, &block)
+        options = attr_names.extract_options!
+        options[:strict] = true
+        validates_each_in_array(*(attr_names << options), &block)
+      end
+    end
+  end
+end

data/lib/validates_serialized/version.rb

@@ -1,3 +1,3 @@
 module ValidatesSerialized
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/validates_serialized.rb

@@ -1,10 +1,11 @@
 require 'validates_serialized/version'
-require 'validates_serialized/validateable_array'
+require 'validates_serialized/validateable_array_value'
 require 'validates_serialized/validateable_hash'
 require 'validates_serialized/validateable_object'
 require 'validates_serialized/each_validator'
 require 'validates_serialized/validators/serialized_validator'
 require 'validates_serialized/validators/array_validator'
+require 'validates_serialized/validators/array_block_validator'
 require 'validates_serialized/validators/hash_validator'
 require 'validates_serialized/validators/hash_block_validator'
 require 'validates_serialized/validators/object_block_validator'

data/spec/validateable_array_value_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe ValidateableArrayValue do
+  let!(:array) { [1, 2, 3] }
+  let!(:value) { array.first }
+
+  subject { described_class.new(value) }
+
+  it "responds to valid?" do
+    subject.should be_valid
+  end
+
+  it "responds to .errors" do
+    subject.errors.should be_empty
+  end
+
+  it "returns itself on :value method" do
+    subject.value.should eq(1)
+  end
+end

data/spec/validators/array_block_validator_spec.rb

@@ -0,0 +1,92 @@
+require 'spec_helper'
+require 'ostruct'
+
+describe ActiveModel::Validations::ArrayBlockValidator do
+  context "#validates_each_in_array" do
+    class ValidatorBlockArrayTestOne
+      include ActiveModel::Validations
+
+      def initialize(h={})
+        h.each {|k,v| send("#{k}=",v)}
+      end
+
+      def my_attr
+        @my_attr ||= []
+      end
+
+      def my_attr=(val)
+        @my_attr = val
+      end
+
+      validates_each_in_array :my_attr do
+        validates :value, presence: true
+      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
+
+    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"])
+    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
+
+  context "#validates_each_in_array!" do
+    class ValidatorBlockArrayTestStrict
+      include ActiveModel::Validations
+
+      def initialize(h={})
+        h.each {|k,v| send("#{k}=",v)}
+      end
+
+      def my_attr
+        @my_attr ||= {}
+      end
+
+      def my_attr=(val)
+        @my_attr = val
+      end
+
+      validates_each_in_array! :my_attr do
+        validates :value, inclusion: { in: [1, 2, 3, 4] }
+      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
+
+    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")
+    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
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validates_serialized
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - brycesenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-05 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -101,9 +101,10 @@ files:
 - README.md
 - lib/validates_serialized.rb
 - lib/validates_serialized/each_validator.rb
-- lib/validates_serialized/validateable_array.rb
+- lib/validates_serialized/validateable_array_value.rb
 - lib/validates_serialized/validateable_hash.rb
 - lib/validates_serialized/validateable_object.rb
+- lib/validates_serialized/validators/array_block_validator.rb
 - lib/validates_serialized/validators/array_validator.rb
 - lib/validates_serialized/validators/hash_block_validator.rb
 - lib/validates_serialized/validators/hash_validator.rb
@@ -114,9 +115,10 @@ files:
 - spec/acceptance_spec.rb
 - spec/each_validator_spec.rb
 - spec/spec_helper.rb
-- spec/validateable_array_spec.rb
+- spec/validateable_array_value_spec.rb
 - spec/validateable_hash_spec.rb
 - spec/validateable_object_spec.rb
+- spec/validators/array_block_validator_spec.rb
 - spec/validators/array_validator_spec.rb
 - spec/validators/hash_block_validator_spec.rb
 - spec/validators/hash_validator_spec.rb
@@ -151,9 +153,10 @@ test_files:
 - spec/acceptance_spec.rb
 - spec/each_validator_spec.rb
 - spec/spec_helper.rb
-- spec/validateable_array_spec.rb
+- spec/validateable_array_value_spec.rb
 - spec/validateable_hash_spec.rb
 - spec/validateable_object_spec.rb
+- spec/validators/array_block_validator_spec.rb
 - spec/validators/array_validator_spec.rb
 - spec/validators/hash_block_validator_spec.rb
 - spec/validators/hash_validator_spec.rb

data/lib/validates_serialized/validateable_array.rb

@@ -1,9 +0,0 @@
-require 'active_model'
-
-class ValidateableArray < Array
-  include ::ActiveModel::Validations
-
-  def initialize(array)
-    @array = array
-  end
-end

data/spec/validateable_array_spec.rb

@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-describe ValidateableArray do
-  let!(:array) { Array.new }
-
-  subject { described_class.new(array) }
-
-  it "responds to valid?" do
-    subject.should be_valid
-  end
-
-  it "responds to .errors" do
-    subject.errors.should be_empty
-  end
-end