array_validator 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b026957a9197f90b480fdcb3a9202b13e42f6e89
-  data.tar.gz: c8e2997b85250c3ccffdc08ccd90ce5c485212a2
+  metadata.gz: bc31c0c649677829798ded258de4247ab5025c01
+  data.tar.gz: 30cc7c88c932786dbb6dfbb5ec5b127febd7c598
 SHA512:
-  metadata.gz: bc40bfd0ca9c205f81d0244f80854cd37ab8e0ebac1b924ccc3f378623d6cf9c13a5d6fdf80f59c0b1131847a99ce1b83c16c85a96c13360b84b346937e63305
-  data.tar.gz: 209f8e6efb556d6ad27f517e2e42c9ce6e384f62425c45b3fc6496b3c05956859298a28221b06e1784c42066660a951a4bf84b83c1e99744feb075409467acb7
+  metadata.gz: d09e94377307fd625dc3e38f729eedb48f5254d7314420447a71d4d2406c577182b95fff1c12fa60585ec77e8963d2ff3454540590cbf0ed1cffcdd1516d2abc
+  data.tar.gz: 65fd955eddb83c6f409efb1da33cd2d4eadf91b61a0cab9cb75b450beabe11707ce67dd247647b293df24633a139da41da8eb59d878511bfde50441e7695dbe6

data/.travis.yml

@@ -1,5 +1,11 @@
 sudo: false
 language: ruby
-rvm:
-  - 2.3.1
 before_install: gem install bundler -v 1.14.3
+script:
+  - bundle exec rspec spec/
+  - bundle exec codeclimate-test-reporter
+matrix:
+  include:
+    - rvm: 2.2.2
+    - rvm: 2.3.0
+    - rvm: 2.4.0

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in array_validator.gemspec
 gemspec

data/README.md

@@ -1,18 +1,10 @@
 # ArrayValidator
 
-ActiveModel Validations for array attributes (e.g. Postgres JSONB).
-
-## Installation
-
-Add this line to your application's Gemfile:
+[![Build Status](https://travis-ci.org/infinum/array_validator.png)](https://travis-ci.org/infinum/array_validator)
+[![Code Climate](https://codeclimate.com/github/infinum/array_validator/badges/gpa.svg)](https://codeclimate.com/github/infinum/array_validator)
+[![Test Coverage](https://codeclimate.com/github/infinum/array_validator/badges/coverage.svg)](https://codeclimate.com/github/infinum/array_validator/coverage)
 
-```ruby
-gem 'array_validator'
-```
-
-And then execute:
-
-    $ bundle
+ActiveModel Validations for array attributes (e.g. Postgres JSONB).
 
 ## Usage
 
@@ -28,7 +20,7 @@ Don't allow duplicates:
 
 ```ruby
 class Plant < ActiveRecord::Base
-  validates :watering_times, array: { subset_of: ['trees', 'flowers'], duplicates: false }
+  validates :categories, array: { subset_of: ['trees', 'flowers'], duplicates: false }
 end
 ```
 
@@ -41,10 +33,27 @@ class Plant < ActiveRecord::Base
 end
 ```
 
-## TODO
+Validate the elements are ordered:
+
+```ruby
+class Plant < ActiveRecord::Base
+  validates :intake_times, array: { order: :asc }
+  validates :quantities, array: { order: :desc }
+end
+```
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'array_validator'
+```
+
+And then execute:
+
+    $ bundle
 
-- array elements are sorted
-- length of the array
 
 ## Development
 

data/array_validator.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'array_validator'
-  spec.version       = '0.1.0'
+  spec.version       = '0.2.0'
   spec.authors       = ['Damir Svrtan']
   spec.email         = ['damir.svrtan@gmail.com']
 
@@ -26,4 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'simplecov', '~> 0.12.0'
+  spec.add_development_dependency 'codeclimate-test-reporter', '~> 1.0.0'
 end

data/lib/array_validator.rb

@@ -1,9 +1,15 @@
 require 'active_model'
 require 'active_support/i18n'
+require 'array_validator/subset_validator'
+require 'array_validator/format_validator'
+require 'array_validator/duplicates_validator'
+require 'array_validator/order_validator'
+
 I18n.load_path += Dir[File.dirname(__FILE__) + "/locale/*.yml"]
 
 class ArrayValidator < ActiveModel::EachValidator
   I18N_SCOPE = 'activerecord.errors.messages.array'.freeze
+  VALIDATORS = [SubsetValidator, FormatValidator, DuplicatesValidator, OrderValidator].freeze
 
   def validate_each(record, attribute, values)
     unless values.is_a? Array
@@ -11,43 +17,8 @@ class ArrayValidator < ActiveModel::EachValidator
       return
     end
 
-    check_subset(record, attribute, values) if options[:subset_of].present?
-    check_format(record, attribute, values) if options[:format].present?
-    check_duplicates(record, attribute, values) if options[:duplicates] == false
-  end
-
-  private
-
-  def check_subset(record, attribute, values)
-    unlisted_values = values - options[:subset_of]
-    return if unlisted_values.empty?
-
-    record.errors[attribute] << subset_error_message(unlisted_values)
-  end
-
-  def subset_error_message(unlisted_values)
-    I18n.t('subset_of', scope: I18N_SCOPE, invalid_values: unlisted_values.join(', '))
-  end
-
-  def check_format(record, attribute, values)
-    invalid_values = values.select { |value| value !~ options[:format] }
-    return if invalid_values.empty?
-
-    record.errors[attribute] << format_error_message(invalid_values)
-  end
-
-  def format_error_message(invalid_values)
-    I18n.t('format', scope: I18N_SCOPE, invalid_values: invalid_values.join(', '))
-  end
-
-  def check_duplicates(record, attribute, values)
-    duplicates = values.select { |value| values.count(value) > 1 }.uniq
-    return if duplicates.none?
-
-    record.errors[attribute] << duplicates_error_message(duplicates)
-  end
-
-  def duplicates_error_message(duplicates)
-    I18n.t('duplicates', scope: I18N_SCOPE, invalid_values: duplicates.join(', '))
+    VALIDATORS.each do |validator|
+      validator.call(record, attribute, values, options)
+    end
   end
 end

data/lib/array_validator/duplicates_validator.rb

@@ -0,0 +1,13 @@
+class ArrayValidator < ActiveModel::EachValidator
+  module DuplicatesValidator
+    def self.call(record, attribute, values, options = {})
+      return if options[:duplicates] != false
+      duplicates = values.select { |value| values.count(value) > 1 }.uniq
+      return if duplicates.none?
+
+      record.errors[attribute].push(
+        I18n.t('duplicates', scope: I18N_SCOPE, invalid_values: duplicates.join(', '))
+      )
+    end
+  end
+end

data/lib/array_validator/format_validator.rb

@@ -0,0 +1,13 @@
+class ArrayValidator < ActiveModel::EachValidator
+  module FormatValidator
+    def self.call(record, attribute, values, options = {})
+      return if options[:format].nil?
+      invalid_values = values.select { |value| value !~ options[:format] }
+      return if invalid_values.empty?
+
+      record.errors[attribute].push(
+        I18n.t('format', scope: I18N_SCOPE, invalid_values: invalid_values.join(', '))
+      )
+    end
+  end
+end

data/lib/array_validator/order_validator.rb

@@ -0,0 +1,19 @@
+class ArrayValidator
+  module OrderValidator
+    def self.call(record, attribute, values, options)
+      return if options[:order].nil?
+      raise ArgumentError, 'Not a supported order option' unless [:asc, :desc].include?(options[:order])
+
+      ordered = if options[:order] == :asc
+                  values.sort == values
+                else
+                  values.sort.reverse == values
+                end
+      return if ordered
+
+      record.errors[attribute].push(
+        I18n.t('order', scope: I18N_SCOPE, direction: "#{options[:order]}ending")
+      )
+    end
+  end
+end

data/lib/array_validator/subset_validator.rb

@@ -1,18 +1,13 @@
-class ArrayValidator
+class ArrayValidator < ActiveModel::EachValidator
   module SubsetValidator
-    def self.call(record, attribute, values, options)
+    def self.call(record, attribute, values, options = {})
       return if options[:subset_of].nil?
-
       unlisted_values = values - options[:subset_of]
-      return if unlisted_values.empty?
-
-      error_message = if unlisted_values.size == 1
-                        "#{unlisted_values.first} is not in the list"
-                      else
-                        "#{unlisted_values.join(', ')} are not in the list"
-                      end
+      return if unlisted_values.none?
 
-      record.errors[attribute] << error_message
+      record.errors[attribute].push(
+        I18n.t('subset_of', scope: I18N_SCOPE, invalid_values: unlisted_values.join(', '))
+      )
     end
   end
 end

data/lib/locale/en.yml

@@ -6,3 +6,4 @@ en:
           subset_of: 'has invalid values: %{invalid_values}'
           format: 'not in a valid format: %{invalid_values}'
           duplicates: 'has duplicates: %{invalid_values}'
+          order: 'is not ordered in %{direction} order'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: array_validator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Damir Svrtan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -80,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: Array validations for Rails (e.g. Postgres jsonb columns)
 email:
 - damir.svrtan@gmail.com
@@ -99,6 +127,9 @@ files:
 - bin/console
 - bin/setup
 - lib/array_validator.rb
+- lib/array_validator/duplicates_validator.rb
+- lib/array_validator/format_validator.rb
+- lib/array_validator/order_validator.rb
 - lib/array_validator/subset_validator.rb
 - lib/locale/en.yml
 homepage: https://github.com/infinum/array_validator
@@ -121,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Array validations for Rails