data_validator 0.0.8 → 0.1.0

data/lib/data_validator/version.rb

@@ -1,3 +1,3 @@
 module DataValidator
-  VERSION = "0.0.8"
+  VERSION = "0.1.0"
 end

data/lib/data_validator.rb

@@ -45,7 +45,8 @@ module DataValidator
   end
 end
 
-I18n.load_path += Dir[File.join(File.dirname(__FILE__), '..', 'locale', '*.{rb,yml}')]
+I18n.load_path += Dir[File.join(File.dirname(__FILE__), '..', 'locales', '*.{rb,yml}')]
+
 Dir[File.dirname(__FILE__) + "/validations/*.rb"].sort.each do |path|
   filename = File.basename(path)
   require "validations/#{filename}"

data/lib/validations/acceptance.rb

@@ -3,7 +3,7 @@
 module DataValidator
   class AcceptanceValidator < BaseValidator
     def initialize(name, value, options, errors)
-      raise ArgumentError, "options must define" unless options
+      raise ArgumentError, 'Options must define' unless options
       case options
       when Hash
         options_base = options

data/lib/validations/base.rb

@@ -7,7 +7,7 @@ module DataValidator
     attr_accessor :name, :value, :options, :errors
 
     def initialize(name, value, options, errors)
-      raise ArgumentError, "Options must define" if options.blank?
+      raise ArgumentError, 'Options must define' if options.blank?
 
       case options
       when Hash
@@ -25,14 +25,14 @@ module DataValidator
     end
 
     def validate
-      raise ArgumentError, "Validate method is necessary"
+      raise ArgumentError, 'Validate method is necessary'
     end
 
     def add_error(error_message_key, message_args = {})
-      error_subject_key = "datavalidator.attribute.#{name}"
+      error_subject_key = "datavalidator.errors.subjects.#{name}"
       error_subject = ''
       begin
-        error_subject = I18n.t! "datavalidator.attribute.#{name}"
+        error_subject = I18n.t! "datavalidator.errors.subjects.#{name}"
       rescue
         error_subject = name.to_s
       end

data/lib/validations/format.rb

@@ -4,7 +4,7 @@ module DataValidator
   class FormatValidator < BaseValidator
     def check_validity!
       unless options.include?(:with) ^ options.include?(:without)  # ^ == xor, or "exclusive or"
-        raise ArgumentError, "Either :with or :without must be supplied (but not both)"
+        raise ArgumentError, 'Either :with or :without must be supplied (but not both)'
       end
       check_options_validity(options, :with)
       check_options_validity(options, :without)

data/lib/validations/inclusion.rb

@@ -2,8 +2,8 @@
 
 module DataValidator
   class InclusionValidator < BaseValidator
-    ERROR_MESSAGE = "An object with the method #include? or a proc or lambda is required, " <<
-                      "and must be supplied as the :in option of the configuration hash"
+    ERROR_MESSAGE = 'An object with the method #include? or a proc or lambda is required, ' <<
+                      'and must be supplied as the :in option of the configuration hash'
 
     def check_validity!
       unless [:include?, :call].any?{ |method| options[:in].respond_to?(method) }

data/{locale → locales}/en.yml

@@ -22,4 +22,4 @@ en:
         less_than_or_equal_to: "must be less than or equal to %{count}"
         odd: "must be odd"
         even: "must be even"
-
+      subjects:

data/spec/locales/jp.yml

@@ -0,0 +1,8 @@
+jp:
+  datavalidator:
+    errors:
+      messages:
+        blank: "は必須項目です"
+      subjects:
+        name: "名前"
+

data/spec/spec_helper.rb

@@ -11,4 +11,5 @@ $TESTING=true
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'data_validator'
 
+I18n.load_path += Dir[File.join(File.dirname(__FILE__), 'locales', '*.{rb,yml}')]
 

data/spec/validations/base_spec.rb

@@ -39,6 +39,14 @@ describe DataValidator::BaseValidator do
         @obj.errors.should eql({name: ["name can't be blank", "name is invalid"]})
       end
     end
+    context 'non default locale error message' do
+      it do
+        I18n.locale = :jp
+        @obj.add_error(:blank)
+        @obj.errors.should eql({name: ["名前 は必須項目です"]})
+      end
+      after { I18n.locale = :en }
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_validator
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -69,8 +69,9 @@ files:
 - lib/validations/length.rb
 - lib/validations/numericality.rb
 - lib/validations/presence.rb
-- locale/en.yml
+- locales/en.yml
 - spec/data_validator_spec.rb
+- spec/locales/jp.yml
 - spec/spec_helper.rb
 - spec/validations/acceptance_spec.rb
 - spec/validations/base_spec.rb
@@ -106,6 +107,7 @@ specification_version: 3
 summary: DataValidator is validation anywhere
 test_files:
 - spec/data_validator_spec.rb
+- spec/locales/jp.yml
 - spec/spec_helper.rb
 - spec/validations/acceptance_spec.rb
 - spec/validations/base_spec.rb