roshi 0.6.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13d535156e05594cb49cbe7db58a74010dd4ab4b
-  data.tar.gz: 9bf4d72b692ff28a79a1f25cda7241b1ebe93802
+  metadata.gz: 96f2b09d4f9a2cfc7266be05fee56a50bbad6609
+  data.tar.gz: 673294fba72c81de66be3d7a6f13b7ed4f8e9a21
 SHA512:
-  metadata.gz: ea26911b4f4b66988b07461ad533edba7f9e4d53260ae29b3df001f0ab85e4b5dd886a2412eb06dd90500f4e767ae10c18fb589a7e8171f2da708889c6ac86af
-  data.tar.gz: 61a3701facdb89c1eb9f16838c08c5e4bc6bfcf43247a94c6e74cc42843e55b0cb2433be0ac8a40cbc600a5e4ea45dd2e899cdff91c27ddd7f007a52f07dc653
+  metadata.gz: dd07de35b85f1b1211b6831d4f70e69ad2f06a5ad3790252ba167871bc4a12468127558b73007a6df0820b3d005ea5465b66b4f348fea5df181727f70995c07b
+  data.tar.gz: b5ad9b612f018af303a5d806694078574226c395abad44fa7ff6c0d6fdba3ad4041daa74eb7a9f3c3bfc7df597f4d5f98599d14136be6bc19ece295ab0e7db95

data/.gitignore

@@ -7,4 +7,6 @@
 /pkg/
 /spec/reports/
 /tmp/
-/vendor/bundle
+/vendor/bundle
+/.rubocop.yml
+/.rubocop

data/README.md

@@ -31,6 +31,14 @@ class TestModel
   validates :date, date: true
   validates :hiragana, hiragana: true
   validates :version_number, version_number: true
+  validates :accept_word, available_word: {accept_words: %w(accept available)}
+  validates :reject_word, available_word: {reject_words: %w(reject unavailable)}
+  validates :large_value, numerical_comparison: { greater_than: :small_value }
+  validates :large_value, numerical_comparison: { greater_than_or_equal_to: :small_value }
+  validates :large_value, numerical_comparison: { equal_to: :small_value }
+  validates :small_value, numerical_comparison: { less_than_or_equal_to: :large_value }
+  validates :small_value, numerical_comparison: { less_than: :large_value }
+  validates :middle_value, numerical_comparison: { between: { min: :small_value, max: :large_value } }
 end
 ```
 

data/lib/roshi.rb

@@ -1,5 +1,8 @@
 require 'active_model'
 require 'roshi/version'
-%w(email zip_code phone_number date hiragana version_number).each do |validator_name|
+%w(
+  email zip_code phone_number date hiragana
+  version_number available_word numerical_comparison
+).each do |validator_name|
   require "roshi/active_model/validations/#{validator_name}_validator"
 end

data/lib/roshi/active_model/validations/available_word_validator.rb

@@ -0,0 +1,15 @@
+module ActiveModel
+  module Validations
+    class AvailableWordValidator < EachValidator
+      def validate_each(record, attribute, value)
+        accept_words = options[:accept_words] || []
+        reject_words = options[:reject_words] || []
+
+        if !(accept_words.empty? || accept_words.include?(value)) \
+           || reject_words.include?(value)
+          record.errors.add(attribute, options[:message] || :reject_word)
+        end
+      end
+    end
+  end
+end

data/lib/roshi/active_model/validations/numerical_comparison_validator.rb

@@ -0,0 +1,91 @@
+module ActiveModel
+  module Validations
+    class NumericalComparisonValidator < EachValidator
+      def validate_each(record, attribute, value)
+        # null check
+        unless value.present?
+          record.errors.add(attribute, :blank)
+          return false
+        end
+
+        # check if value is numerical value
+        unless value.is_a?(Numeric)
+          record.errors.add(attribute, :not_a_number)
+          return false
+        end
+
+        keys = options.keys
+
+        # validate operations(>, >=, ==, <=, <)
+        {
+          greater_than: :>,
+          greater_than_or_equal_to: :>=,
+          equal_to: :==,
+          less_than_or_equal_to: :<=,
+          less_than: :<
+        }.each do |k, v|
+          check_valid(record, attribute, value, k, v) if keys.include? k
+        end
+
+        # validate between
+        if keys.include? :between
+          between_hash = options[:between]
+          min_value_name = between_hash[:min]
+          max_value_name = between_hash[:max]
+          min_value = record.send(min_value_name)
+          max_value = record.send(max_value_name)
+
+          unless max_value.present? && min_value.present?
+            record.errors.add(max_value_name, :blank) unless max_value.present?
+            record.errors.add(min_value_name, :blank) unless min_value.present?
+            return false
+          end
+          unless max_value.is_a?(Numeric) && min_value.is_a?(Numeric)
+            unless max_value.is_a?(Numeric)
+              record.errors.add(attribute, :not_a_number)
+            end
+            unless max_value.is_a?(Numeric)
+              record.errors.add(attribute, :not_a_number)
+            end
+            return false
+          end
+
+          unless (min_value..max_value).cover? value
+            record.errors.add(
+              attribute,
+              :must_be_in_range,
+              min_field: record.class.human_attribute_name(min_value_name),
+              max_field: record.class.human_attribute_name(max_value_name)
+            )
+            return false
+          end
+        end
+      end
+
+      private
+
+      def check_valid(record, attribute, value, type, op)
+        compare_to = options[type]
+        compare_value = record.send(options[type])
+
+        unless compare_value.present?
+          record.errors.add(compare_to, :blank)
+          return false
+        end
+        unless compare_value.is_a?(Numeric)
+          record.errors.add(attribute, :not_a_number)
+          return false
+        end
+
+        unless value.send(op, compare_value)
+          record.errors.add(
+            attribute,
+            "must_be_#{type}".to_sym,
+            min_field: record.class.human_attribute_name(compare_to)
+          )
+          return false
+        end
+      end
+    end
+  end
+end

data/lib/roshi/version.rb

@@ -1,3 +1,3 @@
 module Roshi
-  VERSION = '0.6.2'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roshi
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.8.0
 platform: ruby
 authors:
 - kawahiro311
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -91,14 +91,17 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
 - lib/roshi.rb
+- lib/roshi/active_model/validations/available_word_validator.rb
 - lib/roshi/active_model/validations/date_validator.rb
 - lib/roshi/active_model/validations/email_validator.rb
 - lib/roshi/active_model/validations/hiragana_validator.rb
+- lib/roshi/active_model/validations/numerical_comparison_validator.rb
 - lib/roshi/active_model/validations/phone_number_validator.rb
 - lib/roshi/active_model/validations/version_number_validator.rb
 - lib/roshi/active_model/validations/zip_code_validator.rb