active_comparison_validator 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 555696c870e739aab3bf4157be8d60fe0d6b058c
-  data.tar.gz: 9ab7a249371e28f1be8183463ce9895de0c14461
+  metadata.gz: a59f4a00d296945bf26f7e4ee8b191a4731c5884
+  data.tar.gz: 471bf88a1db0919b8d6eda3b0dc82c731763e345
 SHA512:
-  metadata.gz: a1df0185130513ee3f518ce8ac6c4e06ad2832ed2c2678668ff84d57bb2d87ad3d512fd914c9aa5afdcc026c965b979f4e1f483830f86ce9c288ce72c9db95d1
-  data.tar.gz: 611ad287aa04ce18339bb4ae89e3f8ee9a268e5b7d912bbfc1d8f1ab766acad1eacde027f2df4a78480694f9691b1381163add564154211b92d326b03033ab46
+  metadata.gz: 0076fb69858daf2157634bd2f26b1e64329b4a213246a2597099bfeaa3b1444ecb445bbbe8e85f41f3b527898a4eaea7a7106abf63a1be15379eb0a4cf1b55f8
+  data.tar.gz: 5cfb7d9ef64fbea5324150e5e141a151cba437ed48431797404b21b8f745fa9fc0b5559b61e4514609761524fbfee1d9ff59b74674ac481918183b0eaca37349

data/circle.yml

@@ -0,0 +1,16 @@
+machine:
+  timezone:
+    Asia/Tokyo
+
+  # Version of ruby to use
+  ruby:
+    version:
+      2.2.3
+
+dependencies:
+  pre:
+    - gem install bundler
+
+  override:
+    - bundle install:
+        timeout: 180

data/lib/active_comparison_validator.rb

@@ -1,66 +1,12 @@
 # -*- coding: utf-8 -*-
 require 'active_comparison_validator/version.rb'
+require 'i18n'
 require 'active_record'
 require 'active_support/concern'
 require 'active_support/core_ext/object/with_options'
 require 'active_support/core_ext/array/access'
-require 'i18n'
+require 'active_comparison_validator/class_methods.rb'
 
 module ActiveComparisonValidator
   extend ActiveSupport::Concern
-  module ClassMethods
-    # Verified: that A is greater than B.
-    # @param [String] field_a_<_field_b This string is field_name, operator_name and field_name
-    # @return Define a custom validator in the context of the model.
-    # @example open_at < close_at
-    #     class Shop < ActiveRecord::Base
-    #       include OriginValidator
-    #       comparison_validator 'open_at < close_at'
-    #     end
-    # @note
-    #   You can use their operator.
-    #     - '<'
-    #     - '<='
-    #     - '>'
-    #     - '>='
-    #     - '=='
-    #     - '!='
-    # @note
-    #   And localization.
-    #     - Dedault is used errors.messages
-    #       - greater_than
-    #       - less_than
-    #       - greater_than_or_equal_to
-    #       - less_than_or_equal_to
-    #       - confirmation
-    #       - other_than
-    def comparison_validator(a_operator_b)
-      a_attr, operator, b_attr = *a_operator_b.split(/\s/).map(&:to_sym)
-      method_name = "comparison_validator_for_#{a_attr}_and_#{b_attr}"
-      define_method(method_name) do
-        a_value = send(a_attr)
-        to_value = send(b_attr)
-        return unless a_value && to_value
-        locals = {
-          :<  => [:greater_than,             :less_than,                :count],
-          :<= => [:greater_than_or_equal_to, :less_than_or_equal_to,    :count],
-          :>  => [:less_than,                :greater_than,             :count],
-          :>= => [:less_than_or_equal_to,    :greater_than_or_equal_to, :count],
-          :== => [:confirmation,             :confirmation,             :attribute],
-          :!= => [:other_than,               :other_than,               :attribute]
-        }
-        return unless locals.key?(operator)
-        return if a_value.send(operator, to_value)
-        a_value_human = { locals[operator].last => self.class.human_attribute_name(a_attr) }
-        b_value_human = { locals[operator].last => self.class.human_attribute_name(b_attr) }
-
-        I18n.with_options scope: 'errors.messages' do |locale|
-          errors.add(b_attr, locale.t(locals[operator].first,  a_value_human))
-          errors.add(a_attr, locale.t(locals[operator].second, b_value_human))
-        end
-      end
-      config = %(validate :#{method_name})
-      class_eval(config)
-    end
-  end
 end

data/lib/active_comparison_validator/class_methods.rb

@@ -0,0 +1,57 @@
+module ActiveComparisonValidator
+  module ClassMethods
+    # Verified: that A is greater than B.
+    # @param [String] field_a_<_field_b This string is field_name, operator_name and field_name
+    # @return Define a custom validator in the context of the model.
+    # @example open_at < close_at
+    #     class Shop < ActiveRecord::Base
+    #       include OriginValidator
+    #       comparison_validator 'open_at < close_at'
+    #     end
+    # @note
+    #   You can use their operator.
+    #     - '<'
+    #     - '<='
+    #     - '>'
+    #     - '>='
+    #     - '=='
+    #     - '!='
+    # @note
+    #   And localization.
+    #     - Dedault is used errors.messages
+    #       - greater_than
+    #       - less_than
+    #       - greater_than_or_equal_to
+    #       - less_than_or_equal_to
+    #       - confirmation
+    #       - other_than
+    def comparison_validator(a_operator_b)
+      a_attr, operator, b_attr = *a_operator_b.split(/\s/).map(&:to_sym)
+      method_name = "comparison_validator_for_#{a_attr}_and_#{b_attr}"
+      define_method(method_name) do
+        a_value = send(a_attr)
+        to_value = send(b_attr)
+        return unless a_value && to_value
+        locals = {
+          :<  => [:greater_than,             :less_than,                :count],
+          :<= => [:greater_than_or_equal_to, :less_than_or_equal_to,    :count],
+          :>  => [:less_than,                :greater_than,             :count],
+          :>= => [:less_than_or_equal_to,    :greater_than_or_equal_to, :count],
+          :== => [:confirmation,             :confirmation,             :attribute],
+          :!= => [:other_than,               :other_than,               :attribute]
+        }
+        return unless locals.key?(operator)
+        return if a_value.send(operator, to_value)
+        a_value_human = { locals[operator].last => self.class.human_attribute_name(a_attr) }
+        b_value_human = { locals[operator].last => self.class.human_attribute_name(b_attr) }
+
+        I18n.with_options scope: 'errors.messages' do |locale|
+          errors.add(b_attr, locale.t(locals[operator].first,  a_value_human))
+          errors.add(a_attr, locale.t(locals[operator].second, b_value_human))
+        end
+      end
+      config = %(validate :#{method_name})
+      class_eval(config)
+    end
+  end
+end

data/lib/active_comparison_validator/version.rb

@@ -1,3 +1,3 @@
 module ActiveComparisonValidator
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_comparison_validator
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - onodera
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-24 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -128,7 +128,9 @@ files:
 - active_comparison_validator.gemspec
 - bin/console
 - bin/setup
+- circle.yml
 - lib/active_comparison_validator.rb
+- lib/active_comparison_validator/class_methods.rb
 - lib/active_comparison_validator/version.rb
 homepage: https://github.com/s1160054/active_comparison_validator
 licenses: