phony_rails 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebc2d2e0d7c8552d406ca7527590181a8d7f1437
-  data.tar.gz: 6e0ca4a8dd0e4447bd6d31469de69cc3e0781d3d
+  metadata.gz: a94ea35203b1527927eaf9a83b224ae5e587edf9
+  data.tar.gz: 8bc0db14a7ad0ab389f6d709d73fd562f9473c79
 SHA512:
-  metadata.gz: 0f615e9274fca0cadab38bcbac8e58172c4102450d2f79e285c34dbcd88a2cf6c4c6ba476be24cfbb8e866113819daceb96f93d1e9c800e1c91656eceaf1de80
-  data.tar.gz: 5c6d09cb08448d47462afce4f448f6e3e15e46bd9c46f4016c4e961802cb231aff5ee4a2ecd9a49211b1d1caaba347a364cb5262ddfe9206a3573e88f2b4b953
+  metadata.gz: 029272fcd410ec0a990ca107d47db48bf910dc4cfc8260e818e6810c3826dd74a7df347a6cef50f258d746b26fe49cc353684c0c80bcbac7209042dd4cba7636
+  data.tar.gz: cc4a133e257531605b669ff9137e7fc35147fc86b488c8d475fb71d3e4cebb18be6d0af12ffa8fc98b2870a0d3b3e668836d67a04474afcf0bfdb323e42e44ad

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change Log
 
+## [v0.14.1](https://github.com/joost/phony_rails/tree/v0.14.1) (2016-05-08)
+
+[Full Changelog](https://github.com/joost/phony_rails/compare/v0.14.0...v0.14.1)
+
+**Closed issues:**
+
+- Pull request \#139 \(released in 0.14.0\) breaks message: :improbable\_phone option [\#140](https://github.com/joost/phony_rails/issues/140)
+
+**Merged pull requests:**
+
+- Fixed a bug that prevents a normalized attribute from being set to nil [\#142](https://github.com/joost/phony_rails/pull/142) ([kylerippey](https://github.com/kylerippey))
+
+- Read message value directly from options [\#141](https://github.com/joost/phony_rails/pull/141) ([monfresh](https://github.com/monfresh))
+
 ## [v0.14.0](https://github.com/joost/phony_rails/tree/v0.14.0) (2016-04-21)
 
 [Full Changelog](https://github.com/joost/phony_rails/compare/v0.13.0...v0.14.0)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    phony_rails (0.14.0)
+    phony_rails (0.14.1)
       activesupport (>= 3.0)
       phony (~> 2.12)
 
@@ -23,7 +23,7 @@ GEM
       tzinfo (~> 1.1)
     arel (6.0.3)
     ast (2.2.0)
-    bson (4.0.4)
+    bson (4.1.0)
     builder (3.2.2)
     coderay (1.1.1)
     coveralls (0.8.13)
@@ -50,7 +50,7 @@ GEM
       guard (~> 2.2)
       guard-compat (~> 1.1)
     guard-compat (1.2.1)
-    guard-rspec (4.6.4)
+    guard-rspec (4.6.5)
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
@@ -64,7 +64,7 @@ GEM
     minitest (5.8.4)
     mongo (2.2.4)
       bson (~> 4.0)
-    mongoid (5.1.1)
+    mongoid (5.1.3)
       activemodel (~> 4.0)
       mongo (~> 2.1)
       origin (~> 2.2)
@@ -74,16 +74,16 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     origin (2.2.0)
-    parser (2.3.0.6)
+    parser (2.3.0.7)
       ast (~> 2.2)
-    phony (2.15.17)
+    phony (2.15.21)
     powerpack (0.1.1)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
     rainbow (2.1.0)
-    rake (11.1.0)
+    rake (11.1.2)
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
@@ -100,8 +100,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    rubocop (0.38.0)
-      parser (>= 2.3.0.6, < 3.0)
+    rubocop (0.39.0)
+      parser (>= 2.3.0.7, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
@@ -122,7 +122,7 @@ GEM
     tins (1.6.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    unicode-display_width (1.0.2)
+    unicode-display_width (1.0.3)
 
 PLATFORMS
   ruby

data/lib/phony_rails.rb

@@ -144,7 +144,7 @@ module PhonyRails
           attribute_name = options[:as] || attribute
           raise("No attribute #{attribute_name} found on #{self.class.name} (PhonyRails)") unless self.class.attribute_method?(attribute_name)
           new_value = PhonyRails.normalize_number(send(attribute), options)
-          send("#{attribute_name}=", new_value) if new_value
+          send("#{attribute_name}=", new_value) if new_value || attribute_name != attribute
         end
       end
 

data/lib/phony_rails/version.rb

@@ -1,3 +1,3 @@
 module PhonyRails
-  VERSION = '0.14.0'.freeze
+  VERSION = '0.14.1'.freeze
 end

data/lib/validators/phony_validator.rb

@@ -15,7 +15,7 @@ class PhonyPlausibleValidator < ActiveModel::EachValidator
   private
 
   def error_message
-    options_value(:message) || :improbable_phone
+    options[:message] || :improbable_phone
   end
 
   def country_number
@@ -43,11 +43,11 @@ class PhonyPlausibleValidator < ActiveModel::EachValidator
   end
 
   def options_value(option)
-    if options[option].is_a?(Symbol)
-      @record.send(options[option])
-    else
-      options[option]
-    end
+    option_value = options[option]
+
+    return option_value unless option_value.is_a?(Symbol)
+
+    @record.send(option_value)
   end
 end
 

data/spec/lib/phony_rails_spec.rb

@@ -634,6 +634,13 @@ describe PhonyRails do
         expect(model.phone_number).to eql('+31101234123')
       end
 
+      it 'should nilify attribute when it is set to nil' do
+        model = model_klass.new(phone_number: '+31-(0)10-1234123')
+        model.phone_number = nil
+        expect(model).to be_valid
+        expect(model.phone_number).to eql(nil)
+      end
+
       it 'should set a normalized version of an attribute using :as option' do
         model_klass.phony_normalize :phone_number, as: :phone_number_as_normalized
         model = model_klass.new(phone_number: '+31-(0)10-1234123')
@@ -641,6 +648,14 @@ describe PhonyRails do
         expect(model.phone_number_as_normalized).to eql('+31101234123')
       end
 
+      it 'should nilify normalized version of an attribute when it is set to nil using :as option ' do
+        model_klass.phony_normalize :phone_number, as: :phone_number_as_normalized
+        model = model_klass.new(phone_number: '+31-(0)10-1234123', phone_number_as_normalized: '+31101234123')
+        model.phone_number = nil
+        expect(model).to be_valid
+        expect(model.phone_number_as_normalized).to eq(nil)
+      end
+
       it 'should not add a + using :add_plus option' do
         model_klass.phony_normalize :phone_number, add_plus: false
         model = model_klass.new(phone_number: '+31-(0)10-1234123')

data/spec/lib/validators/phony_validator_spec.rb

@@ -143,6 +143,28 @@ class SymbolizableHelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number, :phone_number_country_code
   validates_plausible_phone :phone_number, country_code: :phone_number_country_code
 end
+
+#--------------------
+class NoModelMethod < HelpfulHome
+  attr_accessor :phone_number
+  validates_plausible_phone :phone_number, country_code: :nonexistent_method
+end
+
+#--------------------
+class MessageOptionUndefinedInModel < HelpfulHome
+  attr_accessor :phone_number
+  validates_plausible_phone :phone_number, message: :email
+end
+
+#--------------------
+class MessageOptionSameAsModelMethod < HelpfulHome
+  attr_accessor :phone_number
+  validates_plausible_phone :phone_number, message: :email
+
+  def email
+    'user@example.com'
+  end
+end
 #-----------------------------------------------------------------------------------------------------------------------
 # Tests
 #-----------------------------------------------------------------------------------------------------------------------
@@ -544,5 +566,37 @@ describe ActiveModel::Validations::HelperMethods do
         expect(@home.errors.messages).to include(phone_number: ['is an invalid number'])
       end
     end
+
+    #--------------------
+    context 'when a nonexistent method is passed as a symbol to an option other than message' do
+      it 'raises NoMethodError' do
+        @home = NoModelMethod.new
+        @home.phone_number = FRENCH_NUMBER_WITH_COUNTRY_CODE
+
+        expect { @home.save }.to raise_error(NoMethodError)
+      end
+    end
+
+    #--------------------
+    context 'when a nonexistent method is passed as a symbol to the message option' do
+      it 'does not raise an error' do
+        @home = MessageOptionUndefinedInModel.new
+        @home.phone_number = INVALID_NUMBER
+
+        expect { @home.save }.to_not raise_error
+      end
+    end
+
+    #--------------------
+    context 'when an existing Model method is passed as a symbol to the message option' do
+      it 'does not use the Model method' do
+        @home = MessageOptionSameAsModelMethod.new
+        @home.phone_number = INVALID_NUMBER
+
+        expect(@home).to_not receive(:email)
+
+        @home.save
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony_rails
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Joost Hietbrink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2016-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phony