detox 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 819d53441b8e4cbfe446f921fd1c350410c1efbd
-  data.tar.gz: 486a61f7e2b0f2990473245b9bf4b0b030043116
+  metadata.gz: 365d9d489a7c82f900f04d1652bd38b45bdb5b53
+  data.tar.gz: b6cf2d7bb865be5bdf573ecc757b4656fdab517c
 SHA512:
-  metadata.gz: 36d92e758704e0d1694c35577947bda5d6956f13b52a11b09403e0358038d49567e86a86d5a6021fc6aae477c1f05ebe71667f314addf50bd787154b79e70659
-  data.tar.gz: 6ead87d992b548fc9964c432693ff5be0274f73d46f4768dfc3e6badbdae15e994585d938510fa1a4bbfce555cfe2d61ff91fa9c2461d82283ae139f48bd7a51
+  metadata.gz: d5f8e3f9cdd9a36c99c7b1007b11848373954b54c30f28c5a59d401b4aedb164619139b78a33cc5b37c1a5824b81cd69a98a5c628e190e9cd83918c93657a0a8
+  data.tar.gz: 0e49ea7065b4bb3aaacb0649954dc935c554eaf7fa53193f2f0ef001958a9b865e1ebf46bed3ced2555f89485f1f56e42b5b1b45afee99ff24a7a240d6eaacb3

data/lib/detox.rb

@@ -8,5 +8,7 @@ require "detox/validations/all"
 require "detox/validations/any"
 
 ActiveModel::Validations.__send__(:include, Detox::Validations)
-I18n.load_path << Dir[Pathname.new(File.dirname(__FILE__)).join("detox", "locales", "*.yml")]
+Dir[Pathname.new(File.dirname(__FILE__)).join("detox", "locales", "*.yml")].each do |f|
+  I18n.load_path << f
+end
 

data/lib/detox/array_validity.rb

@@ -19,5 +19,16 @@ module Detox
       values = values.reject(&:blank?) if options[:ignore_blank_value]
       values
     end
+
+    def validate_values(args)
+      record, attribute, value, message, opts = *args.values
+
+      values = convert_to_validatee(value, opts.slice(*Detox::ArrayValidity::RESERVED_OPTIONS))
+      return if values.blank?
+
+      unless values_valid?(values)
+        record.errors.add(attribute, message, opts)
+      end
+    end
   end
 end

data/lib/detox/validations/ordering.rb

@@ -7,18 +7,22 @@ module Detox::Validations
     include Detox::ArrayValidity
 
     def validate_each(record, attribute, value)
-      values = convert_to_validatee(value, options.slice(*Detox::ArrayValidity::RESERVED_OPTIONS))
-      return if values.blank?
+      args = { :record => record,
+               :attribute => attribute,
+               :value => value,
+               :message => options[:message] || :invalid_as_order,
+               :options => options }
 
-      unless values_valid?(values)
-        message = options[:message] || :invalid_as_order
-        record.errors.add(attribute, message)
-      end
+      validate_values(args)
     end
 
     private
     def values_valid?(values)
-      valid_numbers(values.length).map(&:to_s).sort == values.map(&:to_s).sort
+      same_values?(valid_numbers(values.length), values)
+    end
+
+    def same_values?(values, another)
+      normalize_values_for_compare(values) == normalize_values_for_compare(another)
     end
 
     def valid_numbers(length)
@@ -30,5 +34,9 @@ module Detox::Validations
       num = options[:start_with].to_i
       num.zero? ? 1 : num
     end
+
+    def normalize_values_for_compare(values)
+      values.map(&:to_s).sort
+    end
   end
 end

data/lib/detox/validations/possession.rb

@@ -8,13 +8,13 @@ module Detox::Validations
     ERROR_MESSAGE = ":target must be supplied".freeze
 
     def validate_each(record, attribute, value)
-      values = convert_to_validatee(value, options.slice(*Detox::ArrayValidity::RESERVED_OPTIONS))
-      return if values.blank?
+      args = { :record => record,
+               :attribute => attribute,
+               :value => value,
+               :message => options[:message] || :possession,
+               :options => options.merge(:target => [options[:target]].flatten.join(", ")) }
 
-      unless values_valid?(values)
-        message = options[:message] || :possession
-        record.errors.add(attribute, message, options.merge(:target => [options[:target]].flatten.join(", ")))
-      end
+      validate_values(args)
     end
 
     def check_validity!

data/lib/detox/validations/values_uniqueness.rb

@@ -7,13 +7,13 @@ module Detox::Validations
     include Detox::ArrayValidity
 
     def validate_each(record, attribute, value)
-      values = convert_to_validatee(value, options.slice(*Detox::ArrayValidity::RESERVED_OPTIONS))
-      return if values.blank?
+      args = { :record => record,
+               :attribute => attribute,
+               :value => value,
+               :message => options[:message] || :values_not_unique,
+               :options => options }
 
-      unless values_valid?(values)
-        message = options[:message] || :values_not_unique
-        record.errors.add(attribute, message)
-      end
+      validate_values(args)
     end
 
     private

data/lib/detox/version.rb

@@ -1,4 +1,4 @@
 # coding: utf-8
 module Detox
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: detox
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - pinzolo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel