nested_attributes_validator 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9af2b38072f6fd3be516a9d2c4486f271b0ceba
-  data.tar.gz: 2b9f87c8963b55e7b5478f8283787299d3d17b5e
+  metadata.gz: 36dcdf83db4cf99946d9358c90098a23f9f20b1a
+  data.tar.gz: c80b9157145643f6b3917673db1fd89f98320d84
 SHA512:
-  metadata.gz: 7a8015ef770baaf7a74681d7d18ed01aff60a8f47ab4da9decc62de6ac41ef9cdb3da40f5b2f506970bb7520877a308c8af1c583bb5da41aaddc0d930e8fb2fb
-  data.tar.gz: 2c5119f357c048cace35b014a702fa812040fb2ac6e54931b0d233143be3d9b13570055d1791898f3c053dd6f8c6959a99744f70603317e3e64c8fb2d3b31844
+  metadata.gz: b4f0bc8d50fa61d0343c131c410070928f090b2d5957edc4b2cbb969ad4834cfd9ade168d5e009d9ce909c824cfad5490d939961ea24723a7876012871a099d6
+  data.tar.gz: 25fdc36ab808e44e431ae3dd54ab3a79835f13337b2c13b97872c7c7f03ee0689a6ec3c2250dd4a047dc4d01d7e7cc10f84b4bf15a80d77d4877567228e876c0

data/.travis.yml

@@ -3,3 +3,4 @@ language: ruby
 rvm:
   - 2.3.1
 before_install: gem install bundler -v 1.12.5
+script: CODECLIMATE_REPO_TOKEN=8e0b1905147fe1ecadd30ce0811b7d8d67a1347d112baf2b17bca95b8c9056f8 bundle exec rake

data/README.md

@@ -1,6 +1,11 @@
 #
 # NestedAttributesValidator
 
+[![Gem Version](https://badge.fury.io/rb/nested_attributes_validator.svg)](https://badge.fury.io/rb/nested_attributes_validator)
+[![Build Status](https://travis-ci.org/Kta-M/nested_attributes_validator.svg?branch=master)](https://travis-ci.org/Kta-M/nested_attributes_validator)
+[![Code Climate](https://codeclimate.com/github/Kta-M/nested_attributes_validator/badges/gpa.svg)](https://codeclimate.com/github/Kta-M/nested_attributes_validator)
+[![Test Coverage](https://codeclimate.com/github/Kta-M/nested_attributes_validator/badges/coverage.svg)](https://codeclimate.com/github/Kta-M/nested_attributes_validator/coverage)
+
 Nested Attributes Validation Collection for Rails
 
 ## Installation

data/lib/nested_attributes_validator.rb

@@ -1,5 +1,6 @@
 require 'active_model'
 require "nested_attributes_validator/version"
+require "nested_attributes_validator/nested_attributes_validator_util"
 
 %w(
   uniqueness order

data/lib/nested_attributes_validator/active_model/validations/nested_attributes_order_validator.rb

@@ -1,22 +1,20 @@
 class NestedAttributesOrderValidator < ActiveModel::EachValidator
+  include NestedAttributesValidatorUtil
 
-  def validate_each(record, attribute, values)
-    fields = ([options[:fields]] || [:self]).flatten.map(&:to_s)
+  def validate_each(record, _attribute, values)
+    trg_fields = target_fields
 
-    h = values.inject({}){|ret, v| ret[v] = fields.map{|f| v.send(f)}; ret}
-    if options[:ignore_nil]
-      h = h.reject{|k, v| v.all?(&:nil?)}
-    end
-    if fields.size == 1
-      h.keys.each {|k| h[k] = h[k].first}
+    trg_values = target_values(trg_fields, values)
+    if trg_fields.size == 1
+      trg_values.keys.each {|k| trg_values[k] = trg_values[k].first}
     end
 
-    h.each_cons(2) do |(v1, f1), (v2, f2)|
+    trg_values.each_cons(2) do |(v1, f1), (v2, f2)|
       condition = options[:condition] || lambda {|a, b| a < b}
       is_valid = condition.call(f1, f2)
 
       unless is_valid
-        fields.each do |field|
+        trg_fields.each do |field|
           # set error to the parent record
           attribute_name = :"#{attributes.first}.#{options[:display_field] || field}"
           record.errors[attribute_name] << I18n.t('errors.messages.nested_attributes_invalid_order')

data/lib/nested_attributes_validator/active_model/validations/nested_attributes_uniqueness_validator.rb

@@ -1,18 +1,20 @@
 class NestedAttributesUniquenessValidator < ActiveModel::EachValidator
+  include NestedAttributesValidatorUtil
 
-  def validate_each(record, attribute, values)
-    fields = ([options[:fields]] || [:self]).flatten.map(&:to_s)
+  def validate_each(record, _attribute, values)
+    trg_fields = target_fields
 
     # detect duplicated values
-    h = values.inject({}){|ret, v| ret[v] = fields.map{|f| v.send(f)}; ret}
-    if options[:ignore_nil]
-      h = h.reject{|k, v| v.all?(&:nil?)}
-    end
-    duplicated_values = h.group_by{|k ,v| v}.values.select{|a| a.size>1}.flatten(1).to_h.keys
+    duplicated_values = target_values(trg_fields, values)
+                          .group_by{|_k ,v| v}.values
+                          .select{|a| a.size>1}
+                          .flatten(1)
+                          .to_h
+                          .keys
 
     # set errors
     duplicated_values.each do |value|
-      fields.each do |field|
+      trg_fields.each do |field|
         # set error to the parent record
         attribute_name = :"#{attributes.first}.#{options[:display_field] || field}"
         record.errors[attribute_name] << I18n.t('errors.messages.nested_attributes_not_unique')

data/lib/nested_attributes_validator/nested_attributes_validator_util.rb

@@ -0,0 +1,18 @@
+module NestedAttributesValidatorUtil
+
+  def target_fields
+    ([options[:fields]] || [:self]).flatten.map(&:to_s)
+  end
+
+  def target_values(fields, values)
+    trg = values.inject({}) do |ret, v|
+      ret[v] = fields.map{|f| v.send(f)}
+      ret
+    end
+    if options[:ignore_nil]
+      trg = trg.reject{|_k, v| v.all?(&:nil?)}
+    end
+    trg
+  end
+
+end

data/lib/nested_attributes_validator/version.rb

@@ -1,3 +1,3 @@
 module NestedAttributesValidator
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/nested_attributes_validator.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry-rails"
+  spec.add_development_dependency "codeclimate-test-reporter"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nested_attributes_validator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Kta-M
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Nested Attributes Validation Collection for Rails
 email:
 - mohri1219@gmail.com
@@ -100,6 +114,7 @@ files:
 - lib/nested_attributes_validator.rb
 - lib/nested_attributes_validator/active_model/validations/nested_attributes_order_validator.rb
 - lib/nested_attributes_validator/active_model/validations/nested_attributes_uniqueness_validator.rb
+- lib/nested_attributes_validator/nested_attributes_validator_util.rb
 - lib/nested_attributes_validator/version.rb
 - nested_attributes_validator.gemspec
 homepage: https://github.com/Kta-M/nested_form_validator