russian_phone 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d89d8025ce3a7d212137465e97c88b61436b74721834fa8b1e05d77321398506
-  data.tar.gz: ddfa3266a52fea0bc16d284043185ebc41139a381b260bfcc09b9ad0cd25405e
+  metadata.gz: 1e7aeaf94f764188fd507b23450b75c326c3ffc6074a56f5500701fd23256ce2
+  data.tar.gz: 54cd7b0a6ee69ba2a7e434b33dee4ef70ea8a98411e953957d51407e1e2ab80e
 SHA512:
-  metadata.gz: f4f4e8cc5edf893e31d84a120e57b3b63edbea943c15974ec2b1f7c57e19ee4394bb8519c981bb76f54b52978bbdeb25111c98079712aa226e51c2aa51d5e4a1
-  data.tar.gz: 95bf4e385a8278395df6cfc95d46dc8b9c7d751f759f33dda5465578a4907b5f3043813e2bbf2c9a0661441cb196eb96e4947ddd92ba1a49eb5037f8dafe5a78
+  metadata.gz: 0ee2f16cd01ea105abd80f0100361688c303bc23eea2802d02b3d72c88c4d6bcdd4eea9c69aef1d55514721f0e0f3e3e0c38cf5e33271f9c9eeb50783f529711
+  data.tar.gz: 5ff4d42b9647eb79aacb5fc06fcd90f80434a1b9e7410ff6af154268166250f118d27fb95c3edeaee958a50d02bacebb52d5c3065c41cc59d5afec9f82dd0dde

data/.ruby-version

@@ -1 +1 @@
-2.2.2
+3.3.1

data/README.md

@@ -21,6 +21,15 @@ https://gitlab.com/rocket-science/russian_phone
 
 Разработка -  glebtv и [Rocket Scicence](https://github.com/rs-pro)
 
+## Mongoid 8
+
+Новый синтаксис полей, требуется заменить
+```
+field :phone, type: RussianPhone.field(default_country: 7), validate: true, required: true
+```
+
+
+
 ## Альтернативные решения
 
 https://github.com/floere/phony

data/lib/russian_phone/codes.rb

@@ -141,6 +141,8 @@ module RussianPhone
           ndcs_with_6_subscriber_digits
         elsif digits == 5
           ndcs_with_5_subscriber_digits
+        else
+          []
         end
       end
     end

data/lib/russian_phone/field.rb

@@ -44,5 +44,11 @@ module RussianPhone
         else object
       end
     end
+
+    # Mongoid 8 hack
+    def is_a?(o)
+      return true if o == Class
+      super
+    end
   end
-end
+end

data/lib/russian_phone/format_validator.rb

@@ -5,7 +5,9 @@ module RussianPhone
     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?
+          unless record.send(field).valid? && record.send(field).city_allowed?
+            record.errors.add(field, 'Неверный телефонный номер')
+          end
         end
       end
     end

data/lib/russian_phone/number.rb

@@ -218,7 +218,7 @@ module RussianPhone
             # Телефон слишком длинный для телефона без кода города
             return nil
           else
-            if Codes.codes_for(clean_string.length).include? opts[:default_city]
+            if !opts[:default_city].blank? && Codes.codes_for(clean_string.length).include?(opts[:default_city])
               return {country: opts[:default_country], city: opts[:default_city], subscriber: clean_string}
             else
               # Количество цифр в телефоне не соответствует количеству цифр местных номеров города
@@ -289,4 +289,4 @@ module RussianPhone
       end
     end
   end
-end
+end

data/lib/russian_phone/presence_validator.rb

@@ -5,7 +5,7 @@ module RussianPhone
     def validate(record)
       options[:fields].each do |field|
         if record.send(field).phone.blank?
-          record.errors[field] << 'Необходимо заполнить'
+          record.errors.add(field, 'Необходимо заполнить')
         end
       end
     end

data/lib/russian_phone/version.rb

@@ -1,4 +1,4 @@
 module RussianPhone
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end
 

data/russian_phone.gemspec

@@ -21,14 +21,15 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'mongoid', '>= 3.0.0'
   gem.add_development_dependency "rails", ">= 3.0"
-	gem.add_development_dependency "rspec", "~> 2.14"
-  gem.add_development_dependency 'sqlite3'
-  gem.add_development_dependency "rspec-rails", "~> 2.14"
+  gem.add_development_dependency "rspec"
+  gem.add_development_dependency 'sqlite3', '~> 1.4'
+  gem.add_development_dependency "rspec-rails"
   gem.add_development_dependency 'activerecord'
   gem.add_development_dependency 'bundler'
-  gem.add_development_dependency 'rake', '< 11.0'
+  gem.add_development_dependency 'rake'
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'database_cleaner'
+  gem.add_development_dependency 'database_cleaner-mongoid'
 end
 

data/spec/phone_spec.rb

@@ -17,14 +17,23 @@ describe RussianPhone do
     end
   end
 
+  describe '#full' do
+    it "formats number" do
+      RussianPhone::Number.new('906 111-11-11').full.should eq '+7 (906) 111-11-11'
+      RussianPhone::Number.new('9061111111').full.should eq '+7 (906) 111-11-11'
+      RussianPhone::Number.new('79061111111').full.should eq '+7 (906) 111-11-11'
+      RussianPhone::Number.new('89061111111').full.should eq '+7 (906) 111-11-11'
+    end
+  end
+
   describe 'when parsing' do
     it 'should parse 8-800-111-11-11 number' do
       phone = RussianPhone::Number.new('8-800-111-11-11', default_country: 7)
       phone.should_not be_nil
-      phone.valid?.should be_true
+      phone.valid?.should be true
 
-      phone.cell?.should be_false
-      phone.free?.should be_true
+      phone.cell?.should be false
+      phone.free?.should be true
 
       phone.city.should eq '800'
       phone.country.should eq '7'
@@ -35,10 +44,10 @@ describe RussianPhone do
     it 'should parse (906) 111-11-11 number' do
       phone = RussianPhone::Number.new('(906) 111-11-11', default_country: 7)
       phone.should_not be_nil
-      phone.valid?.should be_true
+      phone.valid?.should be true
 
-      phone.cell?.should be_true
-      phone.free?.should be_false
+      phone.cell?.should be true
+      phone.free?.should be false
 
       phone.city.should eq '906'
       phone.country.should eq '7'
@@ -49,10 +58,10 @@ describe RussianPhone do
     it 'should parse 111-11-11 number with default city' do
       phone = RussianPhone::Number.new('111-11-11', default_country: 7, default_city: 495)
       phone.should_not be_nil
-      phone.valid?.should be_true
+      phone.valid?.should be true
 
-      phone.cell?.should be_false
-      phone.free?.should be_false
+      phone.cell?.should be false
+      phone.free?.should be false
 
       phone.city.should eq '495'
       phone.country.should eq '7'
@@ -62,16 +71,16 @@ describe RussianPhone do
 
     it 'should not parse 111-11-11 number without default city' do
       phone = RussianPhone::Number.new('111-11-11', default_country: 7)
-      phone.valid?.should be_false
+      phone.valid?.should be false
     end
 
     it 'should parse 1111111 number with default city' do
       phone = RussianPhone::Number.new('1111111', default_country: 7, default_city: 495)
       phone.should_not be_nil
-      phone.valid?.should be_true
+      phone.valid?.should be true
 
-      phone.cell?.should be_false
-      phone.free?.should be_false
+      phone.cell?.should be false
+      phone.free?.should be false
 
       phone.city.should eq '495'
       phone.country.should eq '7'
@@ -82,10 +91,10 @@ describe RussianPhone do
     it 'should parse +7 (495) 111-11-11 number' do
       phone = RussianPhone::Number.new('+7 (495) 111-11-11')
       phone.should_not be_nil
-      phone.valid?.should be_true
+      phone.valid?.should be true
 
-      phone.cell?.should be_false
-      phone.free?.should be_false
+      phone.cell?.should be false
+      phone.free?.should be false
 
       phone.city.should eq '495'
       phone.country.should eq '7'
@@ -96,10 +105,10 @@ describe RussianPhone do
     it 'should parse +7 (495) 111-11-11 number' do
       phone = RussianPhone::Number.new('+7 (495) 111-11-11')
       phone.should_not be_nil
-      phone.valid?.should be_true
+      phone.valid?.should be true
 
-      phone.cell?.should be_false
-      phone.free?.should be_false
+      phone.cell?.should be false
+      phone.free?.should be false
 
       phone.city.should eq '495'
       phone.country.should eq '7'
@@ -110,10 +119,10 @@ describe RussianPhone do
     it 'should parse  8(4912)12-34-56 number' do
       phone = RussianPhone::Number.new('+7 (4912) 12-34-56', default_country: 7)
       phone.should_not be_nil
-      phone.valid?.should be_true
+      phone.valid?.should be true
 
-      phone.cell?.should be_false
-      phone.free?.should be_false
+      phone.cell?.should be false
+      phone.free?.should be false
 
       phone.city.should eq '4912'
       phone.country.should eq '7'
@@ -124,10 +133,10 @@ describe RussianPhone do
     it 'should parse 2-34-56 number whith default city' do
       phone = RussianPhone::Number.new('2-34-56', default_country: 7, default_city: 87252)
       phone.should_not be_nil
-      phone.valid?.should be_true
+      phone.valid?.should be true
 
-      phone.cell?.should be_false
-      phone.free?.should be_false
+      phone.cell?.should be false
+      phone.free?.should be false
 
       phone.city.should eq '87252'
       phone.country.should eq '7'
@@ -138,10 +147,10 @@ describe RussianPhone do
     it 'should parse 12-34-56 number whith default city' do
       phone = RussianPhone::Number.new('12-34-56', default_country: 7, default_city: 4912)
       phone.should_not be_nil
-      phone.valid?.should be_true
+      phone.valid?.should be true
 
-      phone.cell?.should be_false
-      phone.free?.should be_false
+      phone.cell?.should be false
+      phone.free?.should be false
 
       phone.city.should eq '4912'
       phone.country.should eq '7'
@@ -154,10 +163,10 @@ describe RussianPhone do
 
       phone = RussianPhone::Number.new('8(34356)5-67-89', default_country: 7)
       phone.should_not be_nil
-      phone.valid?.should be_true
+      phone.valid?.should be true
 
-      phone.cell?.should be_false
-      phone.free?.should be_false
+      phone.cell?.should be false
+      phone.free?.should be false
 
       phone.city.should eq '343'
       phone.country.should eq '7'
@@ -170,10 +179,10 @@ describe RussianPhone do
 
       phone = RussianPhone::Number.new('7 (906) 123-45-67', default_country: 7)
       phone.should_not be_nil
-      phone.valid?.should be_true
+      phone.valid?.should be true
 
-      phone.cell?.should be_true
-      phone.free?.should be_false
+      phone.cell?.should be true
+      phone.free?.should be false
       phone.extra.should eq ''
       phone.city.should eq '906'
       phone.country.should eq '7'
@@ -184,10 +193,10 @@ describe RussianPhone do
     it 'should handle phones with extra stuff [8 (906) 111-11-11 доб. 123]' do
       phone = RussianPhone::Number.new('8 (906) 111-11-11 доб. 123', default_country: 7)
       phone.should_not be_nil
-      phone.valid?.should be_true
+      phone.valid?.should be true
 
-      phone.cell?.should be_true
-      phone.free?.should be_false
+      phone.cell?.should be true
+      phone.free?.should be false
 
       phone.city.should eq '906'
       phone.country.should eq '7'
@@ -198,10 +207,10 @@ describe RussianPhone do
     it 'should handle phones with extra stuff [8 (906) 111-11-11 д. 123]' do
       phone = RussianPhone::Number.new('8 (906) 111-11-11 д. 123', default_country: 7)
       phone.should_not be_nil
-      phone.valid?.should be_true
+      phone.valid?.should be true
 
-      phone.cell?.should be_true
-      phone.free?.should be_false
+      phone.cell?.should be true
+      phone.free?.should be false
 
       phone.city.should eq '906'
       phone.country.should eq '7'
@@ -212,10 +221,10 @@ describe RussianPhone do
     it 'should handle phones with extra stuff [89061010101 д. 123]' do
       phone = RussianPhone::Number.new('89061010101 д. 123', default_country: 7)
       phone.should_not be_nil
-      phone.valid?.should be_true
+      phone.valid?.should be true
 
-      phone.cell?.should be_true
-      phone.free?.should be_false
+      phone.cell?.should be true
+      phone.free?.should be false
 
       phone.city.should eq '906'
       phone.country.should eq '7'
@@ -226,10 +235,10 @@ describe RussianPhone do
     it 'should handle phones with extra stuff [89061010101-д. 123]' do
       phone = RussianPhone::Number.new('89061010101-д. 123', default_country: 7)
       phone.should_not be_nil
-      phone.valid?.should be_true
+      phone.valid?.should be true
 
-      phone.cell?.should be_true
-      phone.free?.should be_false
+      phone.cell?.should be true
+      phone.free?.should be false
 
       phone.city.should eq '906'
       phone.country.should eq '7'
@@ -240,10 +249,10 @@ describe RussianPhone do
     it 'should handle phones with unknown codes [8 (533) 111-11-11]' do
       phone = RussianPhone::Number.new('8 (533) 111-11-11', default_country: 7)
       phone.should_not be_nil
-      phone.valid?.should be_true
+      phone.valid?.should be true
 
-      phone.cell?.should be_false
-      phone.free?.should be_false
+      phone.cell?.should be false
+      phone.free?.should be false
 
       phone.city.should eq '533'
       phone.country.should eq '7'
@@ -295,15 +304,15 @@ describe RussianPhone do
       it "should parse #{str}" do
         phone = RussianPhone::Number.new(str, default_country: 7)
         phone.should_not be_nil
-        phone.valid?.should be_true
+        phone.valid?.should be true
 
         if %w(927 926).include? result[1].to_s
-          phone.cell?.should be_true
+          phone.cell?.should be true
         else
-          phone.cell?.should be_false
+          phone.cell?.should be false
         end
 
-        phone.free?.should be_false
+        phone.free?.should be false
 
         phone.country.should eq result[0].to_s
         phone.city.should eq result[1].to_s
@@ -323,7 +332,7 @@ describe RussianPhone do
     bad_phones.each do |phone|
       it "should not parse #{phone}" do
         phone = RussianPhone::Number.new(phone, default_country: 7)
-        phone.valid?.should be_false
+        phone.valid?.should be false
       end
     end
   end
@@ -345,11 +354,11 @@ describe RussianPhone do
   describe 'when storing with activerecord' do
     it 'should parse, store and retrieve numbers correctly' do
       u = ArUser.new(name: 'test', phone: '906 111 11 11')
-      u.save.should be_true
+      u.save.should be true
       u = ArUser.first
       u.phone.should eq '+7 (906) 111-11-11'
-      u.phone.cell?.should be_true
-      u.phone.free?.should be_false
+      u.phone.cell?.should be true
+      u.phone.free?.should be false
 
       u.phone.clean.should eq '79061111111'
 
@@ -360,39 +369,39 @@ describe RussianPhone do
 
     it 'should fail validation when validate is on and phone is invalid' do
       u = ArUser.new(validated_phone: '123')
-      u.valid?.should be_false
-      u.save.should be_false
+      u.valid?.should be false
+      u.save.should be false
       u.errors.messages.should eq({:validated_phone =>["Неверный телефонный номер"]})
     end
 
     it 'should pass validation when validate is on and phone is valid' do
       u = ArUser.new(validated_phone: '495 121 11 11')
-      u.valid?.should be_true
-      u.save.should be_true
+      u.valid?.should be true
+      u.save.should be true
       ArUser.first.read_attribute(:validated_phone).should eq '+7 (495) 121-11-11'
       ArUser.first.validated_phone.should eq '+7 (495) 121-11-11'
     end
 
     it 'should pass validation when validate is on and phone is valid' do
       u = ArUser.new(validated_phone: '7495 121 11 11')
-      u.valid?.should be_true
-      u.save.should be_true
+      u.valid?.should be true
+      u.save.should be true
       ArUser.first.read_attribute(:validated_phone).should eq '+7 (495) 121-11-11'
       ArUser.first.validated_phone.should eq '+7 (495) 121-11-11'
     end
 
     it 'should pass validation when validate is on and phone is valid' do
       u = ArUser.new(validated_phone: '7 495 121 11 11')
-      u.valid?.should be_true
-      u.save.should be_true
+      u.valid?.should be true
+      u.save.should be true
       ArUser.first.read_attribute(:validated_phone).should eq '+7 (495) 121-11-11'
       ArUser.first.validated_phone.should eq '+7 (495) 121-11-11'
     end
 
     it 'should pass validation when validate is on and phone is valid' do
       u = ArUser.new(validated_phone: '8495 121 11 11')
-      u.valid?.should be_true
-      u.save.should be_true
+      u.valid?.should be true
+      u.save.should be true
       ArUser.first.read_attribute(:validated_phone).should eq '+7 (495) 121-11-11'
       ArUser.first.validated_phone.should eq '+7 (495) 121-11-11'
     end
@@ -401,12 +410,12 @@ describe RussianPhone do
   describe 'when storing with mongoid' do
     it 'should parse, store and retrieve numbers correctly' do
       u = User.new(name: 'test', phone: '906 111 11 11')
-      u.save.should be_true
+      u.save.should be true
       u = User.first
 
       u.phone.should eq '+7 (906) 111-11-11'
-      u.phone.cell?.should be_true
-      u.phone.free?.should be_false
+      u.phone.cell?.should be true
+      u.phone.free?.should be false
 
       u.phone.clean.should eq '79061111111'
 
@@ -416,15 +425,15 @@ describe RussianPhone do
     end
 
     it 'should respect field options' do
-      u = User.create(name: 'test', phone_in_495: '111 11 11', phone_in_812: '222 2222')
-      u.save.should be_true
+      u = User.create(name: 'test', phone_in_495: '+7 (495) 111-11-11', phone_in_812: '222 2222')
+      u.save.should be true
 
       u = User.first
 
       u.phone_in_495.class.name.should eq 'RussianPhone::Number'
       u.phone_in_495.should eq '+7 (495) 111-11-11'
-      u.phone_in_495.cell?.should be_false
-      u.phone_in_495.free?.should be_false
+      u.phone_in_495.cell?.should be false
+      u.phone_in_495.free?.should be false
 
       u.phone_in_495.country.should eq '7'
       u.phone_in_495.city.should eq '495'
@@ -435,8 +444,8 @@ describe RussianPhone do
 
       u.phone_in_812.class.name.should eq 'RussianPhone::Number'
       u.phone_in_812.should eq '+7 (812) 222-22-22'
-      u.phone_in_812.cell?.should be_false
-      u.phone_in_812.free?.should be_false
+      u.phone_in_812.cell?.should be false
+      u.phone_in_812.free?.should be false
 
       u.phone_in_812.country.should eq '7'
       u.phone_in_812.city.should eq '812'
@@ -448,39 +457,39 @@ describe RussianPhone do
 
     it 'should fail validation when validate is on and phone is invalid' do
       u = UserWithValidation.new(phone: '123')
-      u.valid?.should be_false
-      u.save.should be_false
+      u.valid?.should be false
+      u.save.should be false
       u.errors.messages.should eq({:phone =>["Неверный телефонный номер"]})
     end
 
     it 'should pass validation when validate is on and phone is valid' do
       u = UserWithValidation.new(phone: '495 121 11 11')
-      u.valid?.should be_true
-      u.save.should be_true
+      u.valid?.should be true
+      u.save.should be true
       UserWithValidation.first.read_attribute(:phone).should eq '+7 (495) 121-11-11'
       UserWithValidation.first.phone.should eq '+7 (495) 121-11-11'
     end
 
     it 'should pass validation when validate is on and phone is valid' do
       u = UserWithValidation.new(phone: '7495 121 11 11')
-      u.valid?.should be_true
-      u.save.should be_true
+      u.valid?.should be true
+      u.save.should be true
       UserWithValidation.first.read_attribute(:phone).should eq '+7 (495) 121-11-11'
       UserWithValidation.first.phone.should eq '+7 (495) 121-11-11'
     end
 
     it 'should pass validation when validate is on and phone is valid' do
       u = UserWithValidation.new(phone: '7 495 121 11 11')
-      u.valid?.should be_true
-      u.save.should be_true
+      u.valid?.should be true
+      u.save.should be true
       UserWithValidation.first.read_attribute(:phone).should eq '+7 (495) 121-11-11'
       UserWithValidation.first.phone.should eq '+7 (495) 121-11-11'
     end
 
     it 'should pass validation when validate is on and phone is valid' do
       u = UserWithValidation.new(phone: '8495 121 11 11')
-      u.valid?.should be_true
-      u.save.should be_true
+      u.valid?.should be true
+      u.save.should be true
       UserWithValidation.first.read_attribute(:phone).should eq '+7 (495) 121-11-11'
       UserWithValidation.first.phone.should eq '+7 (495) 121-11-11'
     end
@@ -488,103 +497,103 @@ describe RussianPhone do
     it 'should pass validation when validate is on and phone is valid' do
       u = UserWithValidation.new(phone: '7495123-12-12 доб 123')
 
-      u.valid?.should be_true
-      u.save.should be_true
+      u.valid?.should be true
+      u.save.should be true
       UserWithValidation.first.read_attribute(:phone).should eq '+7 (495) 123-12-12 доб 123'
       UserWithValidation.first.phone.should eq '+7 (495) 123-12-12 доб 123'
     end
 
     it 'should pass validation when phone is valid (unknown city code)' do
       u = UserWithAnyCode.new(phone: '7701123-12-12 доб 123')
-      u.valid?.should be_true
-      u.save.should be_true
+      u.valid?.should be true
+      u.save.should be true
       UserWithAnyCode.first.read_attribute(:phone).should eq '+7 (701) 123-12-12 доб 123'
       UserWithAnyCode.first.phone.should eq '+7 (701) 123-12-12 доб 123'
     end
 
     it 'should pass validation when validate is on and phone is valid (unknown city code)' do
       u = UserWithAnyCode.new(phone: '701123-12-12 доб 123')
-      u.valid?.should be_true
-      u.save.should be_true
+      u.valid?.should be true
+      u.save.should be true
       UserWithAnyCode.first.read_attribute(:phone).should eq '+7 (701) 123-12-12 доб 123'
       UserWithAnyCode.first.phone.should eq '+7 (701) 123-12-12 доб 123'
     end
 
     it 'should pass validation when validate is on and phone is valid' do
       u = UserWithValidation.new(phone: '8 495 121 11 11')
-      u.valid?.should be_true
-      u.save.should be_true
+      u.valid?.should be true
+      u.save.should be true
       UserWithValidation.first.read_attribute(:phone).should eq '+7 (495) 121-11-11'
       UserWithValidation.first.phone.should eq '+7 (495) 121-11-11'
     end
 
     it 'should pass validation when validate is on and phone is valid' do
       u = UserWithValidation.new(phone: '+7 495 121 11 11')
-      u.valid?.should be_true
-      u.save.should be_true
+      u.valid?.should be true
+      u.save.should be true
       UserWithValidation.first.read_attribute(:phone).should eq '+7 (495) 121-11-11'
       UserWithValidation.first.phone.should eq '+7 (495) 121-11-11'
     end
 
     it 'should pass validation when validate is on and phone is valid' do
       u = UserWithValidation.new(phone: '495 121 11 11 доб 123')
-      u.valid?.should be_true
-      u.save.should be_true
+      u.valid?.should be true
+      u.save.should be true
       UserWithValidation.first.read_attribute(:phone).should eq '+7 (495) 121-11-11 доб 123'
       UserWithValidation.first.phone.should eq '+7 (495) 121-11-11 доб 123'
     end
 
     it 'should fail validation when validate is on and city is not in allowed_cities' do
       u = UserWithValidation.new(phone: '906 121 11 11')
-      u.valid?.should be_false
-      u.save.should be_false
+      u.valid?.should be false
+      u.save.should be false
       u.errors.messages.should eq({:phone =>["Неверный телефонный номер"]})
     end
 
     it 'should pass validation when validate is off and phone is invalid' do
       u = UserWithoutValidation.new(phone: '123')
 
-      u.valid?.should be_true
-      u.save.should be_true
+      u.valid?.should be true
+      u.save.should be true
     end
 
     it 'should pass validation when validate is off and phone is valid' do
       u = UserWithoutValidation.new(phone: '495 121 11 11')
 
-      u.valid?.should be_true
-      u.save.should be_true
+      u.valid?.should be true
+      u.save.should be true
     end
 
     it 'should pass validation when validate is off and city is not in allowed_cities' do
       u = UserWithoutValidation.new(phone: '906 121 11 11')
 
-      u.valid?.should be_true
-      u.save.should be_true
+      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
+      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
+      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.valid?.should be false
+      u.save.should be false
 
       u = UserWithRequired.new(phone: '')
-      u.valid?.should be_false
-      u.save.should be_false
+      u.valid?.should be false
+      u.save.should be false
     end
   end
 
-end
+end

data/spec/spec_helper.rb

@@ -4,9 +4,11 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'simplecov'
+require 'sqlite3'
 require 'mongoid'
 require 'active_record'
 require 'database_cleaner'
+require 'database_cleaner-mongoid'
 require 'pry'
 SimpleCov.start
 require 'russian_phone'
@@ -31,21 +33,24 @@ ActiveRecord::Base.send :include, RussianPhone::ActiveRecord
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
-DatabaseCleaner.orm = "mongoid"
+# DatabaseCleaner.orm = "mongoid"
 
 RSpec.configure do |config|
   config.before(:all) do
-    DatabaseCleaner.strategy = :truncation
+    DatabaseCleaner.strategy = :deletion
   end
 
   config.before(:each) do
+    DatabaseCleaner[:mongoid].start
     DatabaseCleaner.start
   end
 
   config.after(:each) do
+    DatabaseCleaner[:mongoid].clean
     DatabaseCleaner.clean
     ArUser.destroy_all
   end
 
+  config.expect_with(:rspec) { |c| c.syntax = :should }
   config.mock_with :rspec
 end

data/spec/support/mongoid.yml

@@ -3,5 +3,10 @@ test:
     default:
       database: russian_phone
       hosts:
-        - localhost:27017
+        - localhost:27018
+      options:
+        user: 'admin'
+        password: 'rs123456'
+        auth_source: admin
+
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: russian_phone
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - GlebTv
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-22 00:00:00.000000000 Z
+date: 2024-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -42,44 +42,44 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +112,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner-mongoid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Russian Phone Numbers for Mongoid
 email:
 - glebtv@gmail.com
@@ -202,7 +216,7 @@ files:
 homepage: https://gitlab.com/rocket-science/russian_phone
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -217,8 +231,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.5.9
+signing_key:
 specification_version: 4
 summary: Поле для хранения Российских телефонных номеров в Mongoid
 test_files: