russian_phone 0.6.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8079e8b8283f79b72b447060cf33368019a0d0f3ce1103f793743145c958caaa
-  data.tar.gz: 19dca849fe9d7928554589337a14122a397938a2c13549a13468757a91aae316
+  metadata.gz: 1e7aeaf94f764188fd507b23450b75c326c3ffc6074a56f5500701fd23256ce2
+  data.tar.gz: 54cd7b0a6ee69ba2a7e434b33dee4ef70ea8a98411e953957d51407e1e2ab80e
 SHA512:
-  metadata.gz: bebce5e5d1740b7fb8e494b9266f7e5620190384490a7b3dff9db5ffdbc4d6611b9bddd2bde03eaded1e92e0894d7912cf967d495a9c7028cb110fbe5b06f833
-  data.tar.gz: 19678d0c4b312138816cc1ab936be1e378639b44c4b14a8ee4ee2ee4b679c06d781c48f1bac36ba555596ca52c486a17146c47991db2cd7d16284ca2a80073b7
+  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

@@ -1,4 +1,5 @@
 # coding: utf-8
+# https://github.com/floere/phony/blob/master/lib/phony/countries/russia_kazakhstan_abkhasia_south_ossetia.rb
 
 module RussianPhone
   class Codes
@@ -7,20 +8,21 @@ module RussianPhone
         %w(30130 30131 30132 30133 30134 30135 30136 30137 30138 30140 30141 30142 30143 30144
           30145 30146 30147 30148 30149 30150 30153 30230 30231 30232 30233 30234 30235 30236 30237 30238 30239 30240 30241
           30242 30243 30244 30245 30246 30247 30248 30249 30251 30252 30253 30255 30256 30257 30261 30262 30264 30265 30266
+          33622
           34126 34130 34132 34133 34134 34136 34138 34139 34141 34145 34147 34150 34151 34152 34153 34154 34155 34157 34158
-          34159 34161 34162 34163 34164 34166 34240 34241 34242 34243 34244 34245 34246 34248 34249 34250 34251 34252 34253
+          34159 34161 34162 34163 34164 34166 34240 34241 34243 34244 34245 34246 34248 34249 34250 34251 34252 34253
           34254 34255 34256 34257 34258 34259 34260 34261 34262 34263 34265 34266 34268 34269 34271 34272 34273 34274 34275
           34276 34277 34278 34279 34291 34292 34293 34294 34296 34297 34298 34341 34342 34343 34344 34345 34346 34347 34349
           34350 34355 34356 34357 34358 34360 34361 34362 34363 34364 34365 34367 34368 34369 34370 34371 34372 34373 34374
           34375 34376 34377 34380 34383 34384 34385 34386 34387 34388 34389 34391 34394 34395 34397 34398 34531 34533 34535
           34537 34539 34541 34542 34543 34544 34545 34546 34547 34550 34551 34553 34554 34555 34556 34557 34561 34634 34638
-          34643 34667 34668 34669 34670 34672 34673 34674 34675 34676 34677 34678 34731 34739 34740 34741 34742 34743 34744
+          34643 34667 34668 34669 34670 34672 34674 34675 34676 34677 34678 34731 34739 34740 34741 34742 34743 34744
           34745 34746 34747 34748 34749 34750 34751 34752 34753 34754 34755 34756 34757 34758 34759 34760 34761 34762 34763
           34764 34765 34766 34767 34768 34769 34770 34771 34772 34773 34774 34775 34776 34777 34778 34779 34780 34781 34782
           34783 34784 34785 34786 34787 34788 34789 34791 34792 34794 34795 34796 34797 34798 34922 34932 34934 34936 34938
           34940 34948 34949 34992 34993 34994 34995 34996 34997 35130 35131 35133 35134 35138 35139 35140 35141 35142 35143
           35144 35145 35146 35147 35148 35149 35150 35151 35152 35153 35154 35155 35156 35157 35158 35159 35160 35161 35163
-          35164 35165 35166 35167 35168 35169 35190 35191 3522 35230 35231 35232 35233 35234 35235 35236 35237 35238 35239
+          35164 35165 35166 35167 35168 35169 35190 35191 35230 35231 35232 35233 35234 35235 35236 35237 35238 35239
           35240 35241 35242 35243 35244 35245 35247 35248 35249 35251 35252 35253 35256 35257 35330 35331 35332 35333 35334
           35335 35336 35337 35338 35339 35341 35342 35344 35345 35346 35347 35348 35349 35351 35352 35354 35355 35356 35357
           35358 35359 35361 35362 35363 35364 35365 35366 35367 35368 35379 38141 38150 38151 38152 38153 38154 38155 38156
@@ -67,7 +69,9 @@ module RussianPhone
           49146 49147 49148 49151 49152 49153 49154 49155 49156 49157 49158 49231 49232 49233 49234 49235 49236 49237 49238
           49241 49242 49243 49244 49245 49246 49247 49248 49254 49331 49333 49334 49336 49337 49339 49341 49343 49344 49345
           49346 49347 49349 49351 49352 49353 49354 49355 49356 49357 49430 49431 49432 49433 49434 49435 49436 49437 49438
-          49439 49440 49441 49442 49443 49444 49445 49446 49447 49448 49449 49450 49451 49452 49453 81131 81132 81133 81134
+          49439 49440 49441 49442 49443 49444 49445 49446 49447 49448 49449 49450 49451 49452 49453 71036 71063 71133 71237
+          71336 71337 71431 71433 71435 71536 71538 71543 71630 71636 71644 71645 71651 71837 72137 72153 72251 72335 72336
+          72340 72433 72533 72537 72636 72752 72771 72772 72774 72775 72834 72835 81131 81132 81133 81134
           81135 81136 81137 81138 81139 81140 81141 81142 81143 81144 81145 81146 81147 81148 81149 81150 81151 81152 81153
           81361 81362 81363 81364 81365 81366 81367 81368 81369 81370 81371 81372 81373 81374 81375 81376 81378 81379 81430
           81431 81433 81434 81436 81437 81439 81450 81451 81452 81454 81455 81456 81457 81458 81459 81530 81531 81532 81533
@@ -91,7 +95,7 @@ module RussianPhone
           84377 84378 84379 84396 84442 84443 84444 84445 84446 84447 84452 84453 84454 84455 84456 84457 84458 84461 84462
           84463 84464 84465 84466 84467 84468 84472 84473 84474 84475 84476 84477 84478 84479 84492 84493 84494 84495 84540
           84542 84543 84544 84545 84548 84549 84550 84551 84552 84554 84555 84557 84558 84560 84561 84562 84563 84564 84565
-          84566 84567 84568 84573 84574 84575 84576 84577 84578 84579 84591 84592 84593 84595 84596 84630 84635 84639 84646
+          84566 84567 84568 84573 84574 84575 84576 84577 84578 84579 84591 84592 84593 84595 84596 84635 84639 84646
           84647 84648 84650 84651 84652 84653 84654 84655 84656 84657 84658 84660 84661 84663 84664 84666 84667 84670 84671
           84672 84673 84674 84675 84676 84677 84722 84731 84732 84733 84734 84735 84736 84741 84742 84743 84744 84745 84746
           84747 84862 85140 85141 85142 85143 85144 85145 85146 85147 85148 85149 85171 85172 85549 85551 85552 85555 85556
@@ -111,16 +115,19 @@ module RussianPhone
       end
 
       def ndcs_with_6_subscriber_digits
-        %w(3012 3022 3412 3435 3439 3452 3456 3462 3463 3466 3473 3494 3496 3513 3519 3532 3537
-          3812 3822 3823 3842 3843 3846 3852 3854 3882 3902 3919 3942 3952 3953 3955 4012 4112 4132 4152 4162 4212 4217 423 4234
-          4236 4242 4712 4722 4725 4742 4752 4812 4822 4832 4842 4852 4855 4862 4872 4912 4922 4932 4942 8112 8142 8152 8162
-          8172 8202 8212 8216 8313 8332 8342 8352 8362 8412 8422 8442 8443 8452 8453 8464 8482 8512 8552 8553 8555 8557 8617
-          862 8634 8635 8636 8639 8652 8662 8672 8712 8722 8732 8772 8782 8793
+        %w(3012 3022 3412 3424 3435 3439 3452 3456 3462 3463 3466 3467 3473 3494 3496 3513 3519
+          3522 3532 3537 3812 3822 3823 3842 3843 3846 3852 3854 3882 3902 3919 3942 3952 3953 3955 4012 4112 4132 4152 4162
+          4212 4217 4234 4236 4242 4712 4722 4725 4742 4752 4812 4822 4832 4842 4852 4855 4862 4872 4912 4922 4932 4942
+          7102 7112 7122 7132 7142 7152 7162 7172 7182 7187 7212 7213 7222 7232 7242 7252 7262 7272 7282 7292 8112 8142 8152
+          8162 8172 8202 8212 8216 8313 8332 8342 8352 8362 8412 8422 8442 8443 8452 8453 8464 8482 8512 8552 8553 8555 8557
+          8617 8622 8634 8635 8636 8639 8652 8662 8672 8712 8722 8732 8772 8782 8793
         )
       end
 
       def ndcs_with_7_subscriber_digits
-        %w(342 343 347 351 383 391 473 495 496 498 499 812 818 831 843 844 846 861 862 863)
+        %w(342 343 347 351 365 383 391 423 473 495 496 498 499 700 701 702 727 777 778 804 812 818 831 843 844 846 861 863
+          869 900 958 966 968 969 977 978 986 992 993 995 996 999
+        )
       end
 
       def cell_codes
@@ -134,8 +141,10 @@ module RussianPhone
           ndcs_with_6_subscriber_digits
         elsif digits == 5
           ndcs_with_5_subscriber_digits
+        else
+          []
         end
       end
     end
   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.6.1"
+  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.6.1
+  version: 0.8.0
 platform: ruby
 authors:
 - GlebTv
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-05 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,9 +231,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.5.9
+signing_key:
 specification_version: 4
 summary: Поле для хранения Российских телефонных номеров в Mongoid
 test_files: