phony_rails 0.14.5 → 0.14.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e5820adc5e9ecff0a12904b4b8622784bcc13bf
-  data.tar.gz: 276760afba65090f145ac77fdd6e8bf28a8abf20
+  metadata.gz: 5286e498c6adb68558671f8441c33298b4f21ceb
+  data.tar.gz: 43c4bac232facb55347ce9ea716fac1a9c0d98ec
 SHA512:
-  metadata.gz: a80c625610f3956da0b2841d78f6c6faffe5b66f8b1e24e74024a3071a63f450d221b984bf2d5cd80d3d052b409b9cfe2187bb0cb3536d5d5bf2c080eb7dd133
-  data.tar.gz: 048f69f27476c6590f8ebbef288ce38937821a1b06ef7de7b496e372fa086eb81710f3d864ea662e7cde442693af6efa50f17b0edd85a7a06a1a7531aa4b7f1b
+  metadata.gz: b467fdaa24310f98b25e1a8a6734f7e13c891c8eaa326d8911cee36f7428bd18ad8e6441aa5304c8ce2b6b4cc9ae6d8a45bfb426b83029237c2afeeba1a6c41a
+  data.tar.gz: e93e196d750c260dea3028206070e2fddfe5c7b57b5bf26bd8b487ec73dca41848743813d0d2c669cf039eae836bf061a6252c60a833d6b807faac670687189d

data/Gemfile.lock

@@ -1,40 +1,40 @@
 PATH
   remote: .
   specs:
-    phony_rails (0.14.5)
+    phony_rails (0.14.6)
       activesupport (>= 3.0)
-      phony (~> 2.15)
+      phony (> 2.15)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.0.0.1)
-      activesupport (= 5.0.0.1)
-    activerecord (5.0.0.1)
-      activemodel (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
-      arel (~> 7.0)
-    activesupport (5.0.0.1)
+    activemodel (5.1.1)
+      activesupport (= 5.1.1)
+    activerecord (5.1.1)
+      activemodel (= 5.1.1)
+      activesupport (= 5.1.1)
+      arel (~> 8.0)
+    activesupport (5.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (7.1.4)
+    arel (8.0.0)
     ast (2.3.0)
-    bson (4.1.1)
+    bson (4.2.1)
     coderay (1.1.1)
-    concurrent-ruby (1.0.2)
-    coveralls (0.8.15)
+    concurrent-ruby (1.0.5)
+    coveralls (0.8.21)
       json (>= 1.8, < 3)
-      simplecov (~> 0.12.0)
+      simplecov (~> 0.14.1)
       term-ansicolor (~> 1.3)
-      thor (~> 0.19.1)
-      tins (>= 1.6.0, < 2)
-    diff-lcs (1.2.5)
+      thor (~> 0.19.4)
+      tins (~> 1.6)
+    diff-lcs (1.3)
     docile (1.1.5)
-    ffi (1.9.14)
+    ffi (1.9.18)
     formatador (0.2.5)
-    guard (2.14.0)
+    guard (2.14.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (~> 1.0)
@@ -52,52 +52,55 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    i18n (0.7.0)
-    json (2.0.2)
+    i18n (0.8.4)
+    json (2.1.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    lumberjack (1.0.10)
+    lumberjack (1.0.12)
     method_source (0.8.2)
-    minitest (5.9.1)
-    mongo (2.3.0)
-      bson (~> 4.1)
-    mongoid (6.0.0)
-      activemodel (~> 5.0)
-      mongo (~> 2.3)
+    minitest (5.10.2)
+    mongo (2.4.2)
+      bson (>= 4.2.1, < 5.0.0)
+    mongoid (6.2.0)
+      activemodel (~> 5.1)
+      mongo (>= 2.4.1, < 3.0.0)
     nenv (0.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parser (2.3.1.4)
+    parallel (1.11.2)
+    parser (2.4.0.0)
       ast (~> 2.2)
-    phony (2.15.32)
+    phony (2.15.44)
     powerpack (0.1.1)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rainbow (2.1.0)
-    rake (11.3.0)
-    rb-fsevent (0.9.7)
-    rb-inotify (0.9.7)
-      ffi (>= 0.5.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rainbow (2.2.2)
+      rake
+    rake (12.0.0)
+    rb-fsevent (0.9.8)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    rubocop (0.43.0)
-      parser (>= 2.3.1.1, < 3.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    rubocop (0.49.1)
+      parallel (~> 1.10)
+      parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
@@ -105,21 +108,21 @@ GEM
     ruby-progressbar (1.8.1)
     ruby_dep (1.5.0)
     shellany (0.0.1)
-    simplecov (0.12.0)
+    simplecov (0.14.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
+    simplecov-html (0.10.1)
     slop (3.6.0)
-    sqlite3 (1.3.12)
-    term-ansicolor (1.4.0)
+    sqlite3 (1.3.13)
+    term-ansicolor (1.6.0)
       tins (~> 1.0)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tins (1.12.0)
-    tzinfo (1.2.2)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tins (1.14.0)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    unicode-display_width (1.1.1)
+    unicode-display_width (1.2.1)
 
 PLATFORMS
   ruby
@@ -138,4 +141,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.12.5
+   1.13.5

data/README.md

@@ -43,6 +43,9 @@ class SomeModel < ActiveRecord::Base
 
   # Creates method normalized_fax_number that returns the normalized version of fax_number
   phony_normalized_method :fax_number
+
+  # Conditionally normalizes the attribute
+  phony_normalize :recipient, default_country_code: 'US', if: -> { contact_method == 'phone_number' }
 end
 ```
 

data/lib/phony_rails/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module PhonyRails
-  VERSION = '0.14.5'.freeze
+  VERSION = '0.14.6'.freeze
 end

data/lib/phony_rails.rb

@@ -110,13 +110,8 @@ module PhonyRails
 
   def self.extract_extension(number_and_ext)
     return [nil, nil] if number_and_ext.nil?
-    # :nocov:
-    if subbed = number_and_ext.sub(COMMON_EXTENSIONS, '')
-      [subbed, Regexp.last_match(2)]
-    else
-      [number_and_ext, nil]
-    end
-    # :nocov:
+    subbed = number_and_ext.sub(COMMON_EXTENSIONS, '')
+    [subbed, Regexp.last_match(2)]
   end
 
   def self.format_extension(number, ext)
@@ -162,15 +157,17 @@ module PhonyRails
       # you've geocoded before calling this method!
       def phony_normalize(*attributes)
         options = attributes.last.is_a?(Hash) ? attributes.pop : {}
-        options.assert_valid_keys :country_number, :default_country_number, :country_code, :default_country_code, :add_plus, :as, :enforce_record_country
+        options.assert_valid_keys :country_number, :default_country_number, :country_code, :default_country_code, :add_plus, :as, :enforce_record_country, :if, :unless
         if options[:as].present?
           raise ArgumentError, ':as option can not be used on phony_normalize with multiple attribute names! (PhonyRails)' if attributes.size > 1
         end
 
         options[:enforce_record_country] = true if options[:enforce_record_country].nil?
 
+        conditional = create_before_validation_conditional_hash(options)
+
         # Add before validation that saves a normalized version of the phone number
-        before_validation do
+        before_validation conditional do
           set_phony_normalized_numbers(attributes, options)
         end
       end
@@ -192,12 +189,45 @@ module PhonyRails
           end
         end
       end
+
+      private
+
+      # Creates a hash representing a conditional for before_validation
+      # This allows conditional normalization
+      # Returns something like `{ unless: -> { attribute == 'something' } }`
+      # If no if/unless options passed in, returns `{ if: -> { true } }`
+      def create_before_validation_conditional_hash(options)
+        if options[:if].present?
+          type = :if
+          source = options[:if]
+        elsif options[:unless].present?
+          type = :unless
+          source = options[:unless]
+        else
+          type = :if
+          source = true
+        end
+
+        conditional = {}
+        conditional[type] = if source.respond_to?(:call)
+                              source
+                            elsif source.respond_to?(:to_sym)
+                              -> { send(source.to_sym) }
+                            else
+                              -> { source }
+                            end
+        conditional
+      end
     end
   end
 end
 
 # check whether it is ActiveRecord or Mongoid being used
-ActiveRecord::Base.send :include, PhonyRails::Extension if defined?(ActiveRecord)
+if defined?(ActiveRecord)
+  ActiveSupport.on_load(:active_record) do
+    ActiveRecord::Base.send :include, PhonyRails::Extension
+  end
+end
 
 ActiveModel::Model.send :include, PhonyRails::Extension if defined?(ActiveModel::Model)
 

data/phony_rails.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
   gem.post_install_message = 'PhonyRails v0.10.0 changes the way numbers are stored!'
   gem.post_install_message = "It now adds a '+' to the normalized number when it starts with a country number!"
 
-  gem.add_runtime_dependency 'phony', '~> 2.15'
+  gem.add_runtime_dependency 'phony', '> 2.15'
   gem.add_runtime_dependency 'activesupport', '>= 3.0'
   gem.add_development_dependency 'activerecord', '>= 3.0'
   gem.add_development_dependency 'mongoid', '>= 3.0'

data/spec/lib/phony_rails_spec.rb

@@ -702,6 +702,56 @@ describe PhonyRails do
         expect(model).to be_valid
         expect(model.symboled_phone).to eql('+33606060606')
       end
+
+      context 'conditional normalization' do
+        context 'standalone methods' do
+          it 'should only normalize if the :if conditional is true' do
+            model_klass.phony_normalize :recipient, default_country_code: 'US', if: :use_phone?
+
+            sms_alarm = model_klass.new recipient: '222 333 4444', delivery_method: 'sms'
+            email_alarm = model_klass.new recipient: 'foo123@example.com', delivery_method: 'email'
+            expect(sms_alarm).to be_valid
+            expect(email_alarm).to be_valid
+            expect(sms_alarm.recipient).to eq('+12223334444')
+            expect(email_alarm.recipient).to eq('foo123@example.com')
+          end
+
+          it 'should only normalize if the :unless conditional is false' do
+            model_klass.phony_normalize :recipient, default_country_code: 'US', unless: :use_email?
+
+            sms_alarm = model_klass.new recipient: '222 333 4444', delivery_method: 'sms'
+            email_alarm = model_klass.new recipient: 'foo123@example.com', delivery_method: 'email'
+            expect(sms_alarm).to be_valid
+            expect(email_alarm).to be_valid
+            expect(sms_alarm.recipient).to eq('+12223334444')
+            expect(email_alarm.recipient).to eq('foo123@example.com')
+          end
+        end
+
+        context 'using lambdas' do
+          it 'should only normalize if the :if conditional is true' do
+            model_klass.phony_normalize :recipient, default_country_code: 'US', if: -> { delivery_method == 'sms' }
+
+            sms_alarm = model_klass.new recipient: '222 333 4444', delivery_method: 'sms'
+            email_alarm = model_klass.new recipient: 'foo123@example.com', delivery_method: 'email'
+            expect(sms_alarm).to be_valid
+            expect(email_alarm).to be_valid
+            expect(sms_alarm.recipient).to eq('+12223334444')
+            expect(email_alarm.recipient).to eq('foo123@example.com')
+          end
+
+          it 'should only normalize if the :unless conditional is false' do
+            model_klass.phony_normalize :recipient, default_country_code: 'US', unless: -> { delivery_method == 'email' }
+
+            sms_alarm = model_klass.new recipient: '222 333 4444', delivery_method: 'sms'
+            email_alarm = model_klass.new recipient: 'foo123@example.com', delivery_method: 'email'
+            expect(sms_alarm).to be_valid
+            expect(email_alarm).to be_valid
+            expect(sms_alarm.recipient).to eq('+12223334444')
+            expect(email_alarm.recipient).to eq('foo123@example.com')
+          end
+        end
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -30,7 +30,7 @@ end
 module SharedModelMethods
   extend ActiveSupport::Concern
   included do
-    attr_accessor :phone_method, :phone1_method, :symboled_phone_method, :country_code, :country_code_attribute
+    attr_accessor :phone_method, :phone1_method, :symboled_phone_method, :country_code, :country_code_attribute, :recipient, :delivery_method
     phony_normalized_method :phone_attribute # adds normalized_phone_attribute method
     phony_normalized_method :phone_method # adds normalized_phone_method method
     phony_normalized_method :phone1_method, default_country_code: 'DE' # adds normalized_phone_method method
@@ -38,6 +38,14 @@ module SharedModelMethods
     phony_normalize :phone_number # normalized on validation
     phony_normalize :fax_number, default_country_code: 'AU'
     phony_normalize :symboled_phone, default_country_code: :country_code_attribute
+
+    def use_phone?
+      delivery_method == 'sms'
+    end
+
+    def use_email?
+      delivery_method == 'email'
+    end
   end
 end
 

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: phony_rails
 version: !ruby/object:Gem::Version
-  version: 0.14.5
+  version: 0.14.6
 platform: ruby
 authors:
 - Joost Hietbrink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phony
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '2.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '2.15'
 - !ruby/object:Gem::Dependency