russian_phone 0.2.4 → 0.3.0

data/README.md

@@ -58,7 +58,7 @@ Or install it yourself as:
 
     class User
         include Mongoid::Document
-        field :phone, type: RussianPhone.field(default_country: 7, allowed_cities: [495]), validate: true
+        field :phone, type: RussianPhone.field(default_country: 7, allowed_cities: [495]), validate: true, required: true
     end
 
     # u = User.new(phone: '495 1111111')

data/lib/russian_phone/field.rb

@@ -10,7 +10,13 @@ module RussianPhone
 
     ::Mongoid::Fields.option :validate do |model, field, value|
       if value
-        model.validates_with(RussianPhone::Validator, fields: [field.name])
+        model.validates_with(RussianPhone::FormatValidator, fields: [field.name])
+      end
+    end
+
+    ::Mongoid::Fields.option :required do |model, field, value|
+      if value
+        model.validates_with(RussianPhone::PresenceValidator, fields: [field.name])
       end
     end
 

data/lib/russian_phone/format_validator.rb

@@ -0,0 +1,13 @@
+# coding: utf-8
+
+module RussianPhone
+  class FormatValidator < ActiveModel::Validator
+    def validate(record)
+      options[:fields].each do |field|
+        unless record.send(field).phone.blank?
+          record.errors[field] << 'Неверный телефонный номер' unless record.send(field).valid? && record.send(field).city_allowed?
+        end
+      end
+    end
+  end
+end

data/lib/russian_phone/presence_validator.rb

@@ -0,0 +1,13 @@
+# coding: utf-8
+
+module RussianPhone
+  class PresenceValidator < ActiveModel::Validator
+    def validate(record)
+      options[:fields].each do |field|
+        if record.send(field).phone.blank?
+          record.errors[field] << 'Необходимо заполнить'
+        end
+      end
+    end
+  end
+end

data/lib/russian_phone/version.rb

@@ -1,3 +1,3 @@
 module RussianPhone
-  VERSION = "0.2.4"
+  VERSION = "0.3.0"
 end

data/lib/russian_phone.rb

@@ -3,10 +3,11 @@
 require "russian_phone/version"
 
 module RussianPhone
-  autoload :Field,        'russian_phone/field'
-  autoload :Number,       'russian_phone/number'
-  autoload :Codes,        'russian_phone/codes'
-  autoload :Validator,    'russian_phone/validator'
+  autoload :Field,             'russian_phone/field'
+  autoload :Number,            'russian_phone/number'
+  autoload :Codes,             'russian_phone/codes'
+  autoload :PresenceValidator, 'russian_phone/presence_validator'
+  autoload :FormatValidator,   'russian_phone/format_validator'
 
   def self.field(options = {})
     RussianPhone::Field.new(options)

data/spec/phone_spec.rb

@@ -505,6 +505,30 @@ describe RussianPhone do
       u.valid?.should be_true
       u.save.should be_true
     end
+
+    it 'should pass validation when required but not validated' do
+      u = UserWithRequired.new(phone: '906 121 11 11')
+
+      u.valid?.should be_true
+      u.save.should be_true
+    end
+
+    it 'should pass validation when required but not validated' do
+      u = UserWithRequired.new(phone: '11 11')
+
+      u.valid?.should be_true
+      u.save.should be_true
+    end
+
+    it 'should fail validation when required and not present' do
+      u = UserWithRequired.new()
+      u.valid?.should be_false
+      u.save.should be_false
+
+      u = UserWithRequired.new(phone: '')
+      u.valid?.should be_false
+      u.save.should be_false
+    end
   end
 
 end

data/spec/support/user_with_required.rb

@@ -0,0 +1,7 @@
+# coding: utf-8
+
+class UserWithRequired
+  include Mongoid::Document
+
+  field :phone, type: RussianPhone.field(default_country: 7, allowed_cities: [495]), validate: false, required: true
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: russian_phone
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-03 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -107,14 +107,16 @@ files:
 - lib/russian_phone.rb
 - lib/russian_phone/codes.rb
 - lib/russian_phone/field.rb
+- lib/russian_phone/format_validator.rb
 - lib/russian_phone/number.rb
-- lib/russian_phone/validator.rb
+- lib/russian_phone/presence_validator.rb
 - lib/russian_phone/version.rb
 - russian_phone.gemspec
 - spec/phone_spec.rb
 - spec/spec_helper.rb
 - spec/support/user.rb
 - spec/support/user_with_any_code.rb
+- spec/support/user_with_required.rb
 - spec/support/user_with_validation.rb
 - spec/support/user_without_validation.rb
 - validate.sh
@@ -147,5 +149,6 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/user.rb
 - spec/support/user_with_any_code.rb
+- spec/support/user_with_required.rb
 - spec/support/user_with_validation.rb
 - spec/support/user_without_validation.rb

data/lib/russian_phone/validator.rb

@@ -1,11 +0,0 @@
-# coding: utf-8
-
-module RussianPhone
-  class Validator < ActiveModel::Validator
-    def validate(record)
-      options[:fields].each do |field|
-        record.errors[field] << 'Неверный телефонный номер' unless record.send(field).valid? && record.send(field).city_allowed?
-      end
-    end
-  end
-end