phony_rails 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0995738663fcaf74c4d16fcd132e826cf36f463
-  data.tar.gz: afe9c6ae8831a0bd1fe3c9f3cceab16f3d9cdea3
+  metadata.gz: 6000f96b00258917b5399b860088a5d1d11d1fff
+  data.tar.gz: 666250cc63932a0d10563cd122ea2a8835032d90
 SHA512:
-  metadata.gz: 7a07bee573a1fc7a166b77346012eec5d5e75d68e339bd59dabbee25e311896fcd05c5431b8b47daea45a00fd7e3ca8c2946160665ace3fd1b590bfaa9e7a34e
-  data.tar.gz: 1744da3879089e47af553e672859a88ccca9f4b85a91a21beeb7074eff1e972bf721a6b2e90b6887b9ac72401c196d5c594af979fbcf3ddebced839a6f2b6644
+  metadata.gz: 935b0168ab070efdef52c294a886c8ac1c8e9a50c9e8a428be7762a449c63fd57ce3275b4b1f91e5772966ceb40c525101afc73e517bf3c82ca1d132d49511d8
+  data.tar.gz: cd99b5a59f9a1478480380b2df006b5f7869809fa2b520d669b5477188f70ff6e47e69df311782760ddb8652c868ab70338a046ac2ea34d77a4b9bb419818524

data/.rubocop.yml

@@ -0,0 +1 @@
+inherit_from: .rubocop_todo.yml

data/.rubocop_todo.yml

@@ -0,0 +1,63 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2016-03-12 20:44:43 +0100 using RuboCop version 0.38.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 2
+# Configuration parameters: AllowSafeAssignment.
+Lint/AssignmentInCondition:
+  Exclude:
+    - 'lib/phony_rails.rb'
+
+# Offense count: 2
+Lint/UnderscorePrefixedVariableName:
+  Exclude:
+    - 'lib/phony_rails.rb'
+
+# Offense count: 4
+Metrics/AbcSize:
+  Max: 41
+
+# Offense count: 3
+Metrics/CyclomaticComplexity:
+  Max: 21
+
+# Offense count: 162
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 166
+
+# Offense count: 4
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 25
+
+# Offense count: 2
+Metrics/PerceivedComplexity:
+  Max: 23
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Performance/StartWith:
+  Exclude:
+    - 'lib/phony_rails.rb'
+
+# Offense count: 1
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: nested, compact
+Style/ClassAndModuleChildren:
+  Exclude:
+    - 'lib/phony_rails.rb'
+
+# Offense count: 7
+Style/Documentation:
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'lib/phony_rails.rb'
+    - 'lib/phony_rails/string_extensions.rb'
+    - 'lib/validators/phony_validator.rb'

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
-  - "1.9.3"
-  - "2.1.3"
-  - "2.2.1"
-  - rbx
-script: bundle exec rspec spec
+  - '1.9.3'
+  - '2.1.3'
+  - '2.2.1'
+script:
+  - bundle exec rspec spec
+  - bundle exec rubocop

data/CHANGELOG.md

@@ -1,8 +1,8 @@
 # Change Log
 
-## [Unreleased](https://github.com/joost/phony_rails/tree/HEAD)
+## [v0.13.0](https://github.com/joost/phony_rails/tree/v0.13.0) (2016-03-12)
 
-[Full Changelog](https://github.com/joost/phony_rails/compare/v0.12.11...HEAD)
+[Full Changelog](https://github.com/joost/phony_rails/compare/v0.12.11...v0.13.0)
 
 **Closed issues:**
 

data/Gemfile

@@ -6,8 +6,9 @@ gemspec # Specify your gem's dependencies in phony_number.gemspec
 gem 'sqlite3'
 
 gem 'rake'
-gem 'rspec'#,          '~> 2.14.0'
-gem 'guard'#,          '~> 2.10.1'
-gem 'guard-bundler'#,  '~> 2.0.0'
-gem 'guard-rspec'#,    '~> 4.2.0'
-gem 'coveralls', require: false
+gem 'rspec' # ,          '~> 2.14.0'
+gem 'guard' # ,          '~> 2.10.1'
+gem 'guard-bundler' # ,  '~> 2.0.0'
+gem 'guard-rspec' # ,    '~> 4.2.0'
+gem 'coveralls', require: false
+gem 'rubocop'

data/Gemfile.lock

@@ -22,6 +22,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     arel (6.0.3)
+    ast (2.2.0)
     bson (4.0.4)
     builder (3.2.2)
     coderay (1.1.1)
@@ -73,11 +74,15 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     origin (2.2.0)
+    parser (2.3.0.6)
+      ast (~> 2.2)
     phony (2.15.17)
+    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)
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
@@ -95,6 +100,13 @@ 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)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.7.5)
     shellany (0.0.1)
     simplecov (0.11.2)
       docile (~> 1.1.0)
@@ -110,6 +122,7 @@ GEM
     tins (1.6.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    unicode-display_width (1.0.2)
 
 PLATFORMS
   ruby
@@ -124,4 +137,5 @@ DEPENDENCIES
   phony_rails!
   rake
   rspec
+  rubocop
   sqlite3

data/Guardfile

@@ -8,5 +8,5 @@ end
 guard 'rspec', cmd: 'bundle exec rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
+  watch('spec/spec_helper.rb')  { 'spec' }
 end

data/Rakefile

@@ -1,6 +1,6 @@
 #!/usr/bin/env rake
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
-task :default => :spec
+task default: :spec

data/lib/phony_rails.rb

@@ -27,7 +27,7 @@ module PhonyRails
   def self.normalize_number(number, options = {})
     return if number.nil?
     original_number = number
-    number = number.clone # Just to be sure, we don't want to change the original.
+    number = number.dup # Just to be sure, we don't want to change the original.
     number.gsub!(/[^\(\)\d\+]/, '') # Strips weird stuff from the number
     return if number.blank?
     if _country_number = options[:country_number] || country_number_for(options[:country_code])
@@ -86,15 +86,15 @@ module PhonyRails
       # This methods sets the attribute to the normalized version.
       # It also adds the country_code (number), eg. 31 for NL numbers.
       def set_phony_normalized_numbers(attributes, options = {})
-        options = options.clone
-        if self.respond_to?(:country_code)
+        options = options.dup
+        if respond_to?(:country_code)
           set_country_as = options[:enforce_record_country] ? :country_code : :default_country_code
-          options[set_country_as] ||= self.country_code
+          options[set_country_as] ||= country_code
         end
         attributes.each do |attribute|
           attribute_name = options[:as] || attribute
-          fail(RuntimeError, "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)
+          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
         end
       end
@@ -128,11 +128,11 @@ module PhonyRails
         main_options = attributes.last.is_a?(Hash) ? attributes.pop : {}
         main_options.assert_valid_keys :country_code, :default_country_code
         attributes.each do |attribute|
-          fail(StandardError, "Instance method normalized_#{attribute} already exists on #{self.name} (PhonyRails)") if method_defined?(:"normalized_#{attribute}")
+          raise(StandardError, "Instance method normalized_#{attribute} already exists on #{name} (PhonyRails)") if method_defined?(:"normalized_#{attribute}")
           define_method :"normalized_#{attribute}" do |*args|
             options = args.first || {}
-            fail(ArgumentError, "No attribute/method #{attribute} found on #{self.class.name} (PhonyRails)") unless self.respond_to?(attribute)
-            options[:country_code] ||= country_code if self.respond_to?(:country_code)
+            raise(ArgumentError, "No attribute/method #{attribute} found on #{self.class.name} (PhonyRails)") unless respond_to?(attribute)
+            options[:country_code] ||= country_code if respond_to?(:country_code)
             PhonyRails.normalize_number(send(attribute), main_options.merge(options))
           end
         end

data/lib/phony_rails/string_extensions.rb

@@ -1,46 +1,41 @@
-  class String
-
-    # Usage:
-    #   "+31 (0)30 1234 123".phony_normalized # => '+31301234123'
-    #   "(0)30 1234 123".phony_normalized # => '301234123'
-    #   "(0)30 1234 123".phony_normalized(country_code: 'NL') # => '301234123'
-    def phony_normalized(options = {})
-      raise ArgumentError, "Expected options to be a Hash, got #{options.inspect}" if not options.is_a?(Hash)
-      options = options.dup
-      PhonyRails.normalize_number(self, options)
-    end
-
-    # Add a method to the String class so we can easily format phone numbers.
-    # This enables:
-    #   "31612341234".phony_formatted # => '06 12341234'
-    #   "31612341234".phony_formatted(:spaces => '-') # => '06-12341234'
-    # To first normalize a String use:
-    #   "010-12341234".phony_formatted(:normalize => :NL)
-    # To return nil when a number is not correct (checked using Phony.plausible?) use
-    #   "010-12341234".phony_formatted(strict: true)
-    # When an error occurs during conversion it will return the original String.
-    # To raise an error use:
-    #   "somestring".phone_formatted(raise: true)
-    def phony_formatted(options = {})
-      raise ArgumentError, "Expected options to be a Hash, got #{options.inspect}" if not options.is_a?(Hash)
-      options = options.dup
-      normalize_country_code = options.delete(:normalize)
-      s = (normalize_country_code ? PhonyRails.normalize_number(self, :default_country_code => normalize_country_code.to_s, :add_plus => false) : self.gsub(/\D/, ''))
-      return if s.blank?
-      return if options[:strict] && !Phony.plausible?(s)
-      Phony.format(s, options.reverse_merge(:format => :national))
-    rescue
-      if options[:raise]
-        raise
-      else
-        s
-      end
-    end
+class String
+  # Usage:
+  #   "+31 (0)30 1234 123".phony_normalized # => '+31301234123'
+  #   "(0)30 1234 123".phony_normalized # => '301234123'
+  #   "(0)30 1234 123".phony_normalized(country_code: 'NL') # => '301234123'
+  def phony_normalized(options = {})
+    raise ArgumentError, "Expected options to be a Hash, got #{options.inspect}" unless options.is_a?(Hash)
+    options = options.dup
+    PhonyRails.normalize_number(self, options)
+  end
 
-    # The bang method
-    def phony_formatted!(options = {})
-      raise ArgumentError, "The :strict options is only supported in the phony_formatted (non bang) method." if options[:strict]
-      replace(self.phony_formatted(options))
-    end
+  # Add a method to the String class so we can easily format phone numbers.
+  # This enables:
+  #   "31612341234".phony_formatted # => '06 12341234'
+  #   "31612341234".phony_formatted(:spaces => '-') # => '06-12341234'
+  # To first normalize a String use:
+  #   "010-12341234".phony_formatted(:normalize => :NL)
+  # To return nil when a number is not correct (checked using Phony.plausible?) use
+  #   "010-12341234".phony_formatted(strict: true)
+  # When an error occurs during conversion it will return the original String.
+  # To raise an error use:
+  #   "somestring".phone_formatted(raise: true)
+  def phony_formatted(options = {})
+    raise ArgumentError, "Expected options to be a Hash, got #{options.inspect}" unless options.is_a?(Hash)
+    options = options.dup
+    normalize_country_code = options.delete(:normalize)
+    s = (normalize_country_code ? PhonyRails.normalize_number(self, default_country_code: normalize_country_code.to_s, add_plus: false) : gsub(/\D/, ''))
+    return if s.blank?
+    return if options[:strict] && !Phony.plausible?(s)
+    Phony.format(s, options.reverse_merge(format: :national))
+  rescue
+    raise if options[:raise]
+    s
+  end
 
+  # The bang method
+  def phony_formatted!(options = {})
+    raise ArgumentError, 'The :strict options is only supported in the phony_formatted (non bang) method.' if options[:strict]
+    replace(phony_formatted(options))
   end
+end

data/lib/phony_rails/version.rb

@@ -1,3 +1,3 @@
 module PhonyRails
-  VERSION = '0.13.0'
+  VERSION = '0.13.1'.freeze
 end

data/lib/validators/phony_validator.rb

@@ -3,15 +3,14 @@
 #   validate :phone_number, :phony_plausible => true
 require 'active_model'
 class PhonyPlausibleValidator < ActiveModel::EachValidator
-
   # Validates a String using Phony.plausible? method.
   def validate_each(record, attribute, value)
     return if value.blank?
 
     @record = record
 
-    value = PhonyRails.normalize_number value, default_country_code: normalized_country_code if normalized_country_code
-    @record.errors.add(attribute, error_message) if not Phony.plausible?(value, cc: country_number)
+    value = PhonyRails.normalize_number(value.dup, default_country_code: normalized_country_code) if normalized_country_code
+    @record.errors.add(attribute, error_message) unless Phony.plausible?(value, cc: country_number)
   end
 
   private
@@ -43,22 +42,19 @@ class PhonyPlausibleValidator < ActiveModel::EachValidator
   def normalized_country_code
     options[:normalized_country_code]
   end
-
 end
 
 module ActiveModel
   module Validations
     module HelperMethods
-
       def validates_plausible_phone(*attr_names)
         # merged attributes are modified somewhere, so we are cloning them for each validator
         merged_attributes = _merge_attributes(attr_names)
 
-        validates_with PresenceValidator, merged_attributes.clone if merged_attributes[:presence]
-        validates_with FormatValidator, merged_attributes.clone if (merged_attributes[:with] or merged_attributes[:without])
-        validates_with PhonyPlausibleValidator, merged_attributes.clone
+        validates_with PresenceValidator, merged_attributes.dup if merged_attributes[:presence]
+        validates_with FormatValidator, merged_attributes.dup if merged_attributes[:with] || merged_attributes[:without]
+        validates_with PhonyPlausibleValidator, merged_attributes.dup
       end
-
     end
   end
 end

data/phony_rails.gemspec

@@ -2,25 +2,25 @@
 require File.expand_path('../lib/phony_rails/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Joost Hietbrink"]
-  gem.email         = ["joost@joopp.com"]
-  gem.description   = %q{This Gem adds useful methods to your Rails app to validate, display and save phone numbers.}
-  gem.summary       = %q{This Gem adds useful methods to your Rails app to validate, display and save phone numbers.}
-  gem.homepage      = "https://github.com/joost/phony_rails"
+  gem.authors       = ['Joost Hietbrink']
+  gem.email         = ['joost@joopp.com']
+  gem.description   = 'This Gem adds useful methods to your Rails app to validate, display and save phone numbers.'
+  gem.summary       = 'This Gem adds useful methods to your Rails app to validate, display and save phone numbers.'
+  gem.homepage      = 'https://github.com/joost/phony_rails'
   gem.license       = 'MIT'
 
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "phony_rails"
-  gem.require_paths = ["lib"]
+  gem.name          = 'phony_rails'
+  gem.require_paths = ['lib']
   gem.version       = PhonyRails::VERSION
 
-  gem.post_install_message = "PhonyRails v0.10.0 changes the way numbers are stored!"
+  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_dependency "phony", '~> 2.12'
-  gem.add_dependency "activesupport", ">= 3.0"
-  gem.add_development_dependency "activerecord", ">= 3.0"
-  gem.add_development_dependency "mongoid", ">= 3.0"
+  gem.add_dependency 'phony', '~> 2.12'
+  gem.add_dependency 'activesupport', '>= 3.0'
+  gem.add_development_dependency 'activerecord', '>= 3.0'
+  gem.add_development_dependency 'mongoid', '>= 3.0'
 end

data/spec/lib/phony_rails_spec.rb

@@ -8,9 +8,9 @@ describe PhonyRails do
   describe 'phony_format String extension' do
     describe 'the phony_formatted method' do
       it 'should not modify the original options Hash' do
-        options = {normalize: :NL, format: :international}
+        options = { normalize: :NL, format: :international }
         '0101234123'.phony_formatted(options)
-        expect(options).to eql({normalize: :NL, format: :international})
+        expect(options).to eql(normalize: :NL, format: :international)
       end
 
       describe 'with the bang!' do
@@ -69,7 +69,7 @@ describe PhonyRails do
         context 'when raise is true' do
           it 'should raise the error' do
             expect(lambda do
-              "8887716095".phony_formatted(format: :international, raise: true)
+              '8887716095'.phony_formatted(format: :international, raise: true)
             end).to raise_error(NoMethodError)
           end
         end
@@ -89,12 +89,12 @@ describe PhonyRails do
 
         # https://github.com/joost/phony_rails/issues/42
         it 'should pass Github issue #42' do
-          expect(PhonyRails.normalize_number("0606060606", default_country_code: 'FR')).to eq('+33606060606')
+          expect(PhonyRails.normalize_number('0606060606', default_country_code: 'FR')).to eq('+33606060606')
         end
 
         it 'should pass Github issue #85' do
-          expect(PhonyRails.normalize_number("47386160", default_country_code: 'NO')).to eq('+4747386160')
-          expect(PhonyRails.normalize_number("47386160", country_number: '47')).to eq('+4747386160')
+          expect(PhonyRails.normalize_number('47386160', default_country_code: 'NO')).to eq('+4747386160')
+          expect(PhonyRails.normalize_number('47386160', country_number: '47')).to eq('+4747386160')
         end
 
         it 'should pass Github issue #87' do
@@ -126,9 +126,9 @@ describe PhonyRails do
 
         it 'should pass Github issue #113' do
           number = '(951) 703-593'
-          expect(lambda {
+          expect(lambda do
             number.phony_formatted!(normalize: 'US', spaces: '-', strict: true)
-          }).to raise_error(ArgumentError)
+          end).to raise_error(ArgumentError)
         end
 
         it 'should pass Github issue #95' do
@@ -192,7 +192,7 @@ describe PhonyRails do
           normal.phone_number = 'HAHA'
           expect(normal).to_not be_valid
           expect(normal.phone_number).to eq('HAHA')
-          expect(normal.errors.messages).to include(phone_number: ["is an invalid number"])
+          expect(normal.errors.messages).to include(phone_number: ['is an invalid number'])
         end
       end
 
@@ -215,7 +215,7 @@ describe PhonyRails do
       end
 
       it 'returns nil on blank string' do
-        expect("".phony_formatted).to be_nil
+        expect(''.phony_formatted).to be_nil
       end
     end
 
@@ -225,9 +225,9 @@ describe PhonyRails do
       end
 
       it 'should not modify the original options Hash' do
-        options = {normalize: :NL, format: :international}
+        options = { normalize: :NL, format: :international }
         '0101234123'.phony_normalized(options)
-        expect(options).to eql({normalize: :NL, format: :international})
+        expect(options).to eql(normalize: :NL, format: :international)
       end
 
       context 'when String misses a country_code' do
@@ -295,7 +295,6 @@ describe PhonyRails do
       it 'should recognize lowercase country codes' do
         expect(PhonyRails.normalize_number('010-1234123', country_code: 'nl')).to eql('+31101234123')
       end
-
     end
 
     it 'should handle some edge cases (with country_code)' do
@@ -336,7 +335,7 @@ describe PhonyRails do
       is_expected.to be_plausible_number valid_number, country_code: 'US'
     end
 
-    it "should return false for an invalid number" do
+    it 'should return false for an invalid number' do
       is_expected.not_to be_plausible_number invalid_number, country_code: 'US'
     end
 
@@ -381,9 +380,9 @@ describe PhonyRails do
       end
 
       it 'should raise error on existing methods' do
-        expect(lambda {
+        expect(lambda do
           model_klass.phony_normalized_method(:phone_method)
-        }).to raise_error(StandardError)
+        end).to raise_error(StandardError)
       end
 
       it 'should raise error on not existing attribute' do
@@ -414,15 +413,15 @@ describe PhonyRails do
       end
 
       it 'should accept :as option with single existing attribute name' do
-        expect(lambda {
+        expect(lambda do
           model_klass.phony_normalize(:phone_number, as: 'phone_number_as_normalized')
-        }).to_not raise_error
+        end).to_not raise_error
       end
 
       it 'should accept a non existing attribute name' do
-        expect(lambda {
+        expect(lambda do
           dummy_klass.phony_normalize(:non_existing_attribute)
-        }).to_not raise_error
+        end).to_not raise_error
       end
 
       it 'should accept supported options' do
@@ -448,7 +447,7 @@ describe PhonyRails do
         expect(model.normalized_phone_attribute).to eql('+31101234123')
       end
 
-      it "should return a normalized version of a method" do
+      it 'should return a normalized version of a method' do
         model = model_klass.new(phone_method: '+31-(0)10-1234123')
         expect(model.normalized_phone_method).to eql('+31101234123')
       end
@@ -526,17 +525,17 @@ describe PhonyRails do
       it 'should raise a RuntimeError at validation if the attribute doesn\'t exist' do
         dummy_klass.phony_normalize :non_existing_attribute
         dummy = dummy_klass.new
-        expect(lambda {
+        expect(lambda do
           dummy.valid?
-        }).to raise_error(RuntimeError)
+        end).to raise_error(RuntimeError)
       end
 
       it 'should raise a RuntimeError at validation if the :as option attribute doesn\'t exist' do
         dummy_klass.phony_normalize :phone_number, as: :non_existing_attribute
         dummy = dummy_klass.new
-        expect(lambda {
+        expect(lambda do
           dummy.valid?
-        }).to raise_error(RuntimeError)
+        end).to raise_error(RuntimeError)
       end
     end
   end
@@ -564,11 +563,11 @@ describe PhonyRails do
       let(:model_klass)  { RelaxedActiveRecordModel }
       let(:record)       { model_klass.new }
 
-      before {
+      before do
         record.phone_number = phone_number
         record.country_code = 'DE'
         record.valid? # run the empty validation chain to execute the before hook (normalized the number)
-      }
+      end
 
       context 'when the country_code attribute does not match the country number' do
         context 'when the number is prefixed with a country number and a plus' do

data/spec/lib/validators/phony_validator_spec.rb

@@ -101,25 +101,25 @@ end
 #--------------------
 class AustralianHelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number
-  validates_plausible_phone :phone_number, country_number: "61"
+  validates_plausible_phone :phone_number, country_number: '61'
 end
 
 #--------------------
 class PolishHelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number
-  validates_plausible_phone :phone_number, country_code: "PL"
+  validates_plausible_phone :phone_number, country_code: 'PL'
 end
 
 #--------------------
 class BigHelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number
-  validates_plausible_phone :phone_number, presence: true, with: /\A\+\d+/, country_number: "33"
+  validates_plausible_phone :phone_number, presence: true, with: /\A\+\d+/, country_number: '33'
 end
 
 #--------------------
 class MismatchedHelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number, :country_code
-  validates :phone_number, phony_plausible: {ignore_record_country_code: true}
+  validates :phone_number, phony_plausible: { ignore_record_country_code: true }
 end
 
 #--------------------
@@ -129,7 +129,7 @@ class InvalidCountryCodeHelpfulHome < ActiveRecord::Base
   validates_plausible_phone :phone_number
 
   def country_code
-    "--"
+    '--'
   end
 end
 #-----------------------------------------------------------------------------------------------------------------------
@@ -137,65 +137,63 @@ end
 #-----------------------------------------------------------------------------------------------------------------------
 
 I18n.locale = :en
-VALID_NUMBER = '1 555 555 5555'
-NORMALIZABLE_NUMBER = '555 555 5555'
-AUSTRALIAN_NUMBER_WITH_COUNTRY_CODE = '61390133997'
-POLISH_NUMBER_WITH_COUNTRY_CODE = '48600600600'
-FORMATTED_AUSTRALIAN_NUMBER_WITH_COUNTRY_CODE = '+61 390133997'
-FRENCH_NUMBER_WITH_COUNTRY_CODE = '33627899541'
-FORMATTED_FRENCH_NUMBER_WITH_COUNTRY_CODE = '+33 627899541'
-INVALID_NUMBER = '123456789 123456789 123456789 123456789'
-NOT_A_NUMBER = 'HAHA'
-JAPAN_COUNTRY = 'jp'
+VALID_NUMBER = '1 555 555 5555'.freeze
+NORMALIZABLE_NUMBER = '555 555 5555'.freeze
+AUSTRALIAN_NUMBER_WITH_COUNTRY_CODE = '61390133997'.freeze
+POLISH_NUMBER_WITH_COUNTRY_CODE = '48600600600'.freeze
+FORMATTED_AUSTRALIAN_NUMBER_WITH_COUNTRY_CODE = '+61 390133997'.freeze
+FRENCH_NUMBER_WITH_COUNTRY_CODE = '33627899541'.freeze
+FORMATTED_FRENCH_NUMBER_WITH_COUNTRY_CODE = '+33 627899541'.freeze
+INVALID_NUMBER = '123456789 123456789 123456789 123456789'.freeze
+NOT_A_NUMBER = 'HAHA'.freeze
+JAPAN_COUNTRY = 'jp'.freeze
 
 #-----------------------------------------------------------------------------------------------------------------------
 describe PhonyPlausibleValidator do
-
   #--------------------
   describe '#validates' do
-
     before(:each) do
       @home = SimpleHome.new
     end
 
-    it "should validate an empty number" do
+    it 'should validate an empty number' do
       expect(@home).to be_valid
     end
 
-    it "should validate a valid number" do
+    it 'should validate a valid number' do
       @home.phone_number = VALID_NUMBER
       expect(@home).to be_valid
     end
 
-    it "should invalidate an invalid number" do
+    it 'should invalidate an invalid number' do
       @home.phone_number = INVALID_NUMBER
       expect(@home).to_not be_valid
-      expect(@home.errors.messages).to include(phone_number: ["is an invalid number"])
+      expect(@home.errors.messages).to include(phone_number: ['is an invalid number'])
     end
 
-    it "should invalidate not a number" do
+    it 'should invalidate not a number' do
       @home.phone_number = NOT_A_NUMBER
       expect(@home).to_not be_valid
-      expect(@home.errors.messages).to include(phone_number: ["is an invalid number"])
+      expect(@home.errors.messages).to include(phone_number: ['is an invalid number'])
     end
 
-    it "should translate the error message in Dutch" do
+    it 'should translate the error message in Dutch' do
       I18n.with_locale(:nl) do
         @home.phone_number = INVALID_NUMBER
         @home.valid?
-        expect(@home.errors.messages).to include(phone_number: ["is geen geldig nummer"])
+        expect(@home.errors.messages).to include(phone_number: ['is geen geldig nummer'])
       end
     end
 
-    it "should translate the error message in English" do
+    it 'should translate the error message in English' do
       I18n.with_locale(:en) do
         @home.phone_number = INVALID_NUMBER
         @home.valid?
-        expect(@home.errors.messages).to include(phone_number: ["is an invalid number"])
+        expect(@home.errors.messages).to include(phone_number: ['is an invalid number'])
       end
     end
 
-    it "should translate the error message in French" do
+    it 'should translate the error message in French' do
       I18n.with_locale(:fr) do
         @home.phone_number = INVALID_NUMBER
         @home.valid?
@@ -203,7 +201,7 @@ describe PhonyPlausibleValidator do
       end
     end
 
-    it "should translate the error message in Japanese" do
+    it 'should translate the error message in Japanese' do
       I18n.with_locale(:ja) do
         @home.phone_number = INVALID_NUMBER
         @home.valid?
@@ -211,7 +209,7 @@ describe PhonyPlausibleValidator do
       end
     end
 
-    it "should translate the error message in Khmer" do
+    it 'should translate the error message in Khmer' do
       I18n.with_locale(:km) do
         @home.phone_number = INVALID_NUMBER
         @home.valid?
@@ -219,7 +217,7 @@ describe PhonyPlausibleValidator do
       end
     end
 
-    it "should translate the error message in Ukrainian" do
+    it 'should translate the error message in Ukrainian' do
       I18n.with_locale(:uk) do
         @home.phone_number = INVALID_NUMBER
         @home.valid?
@@ -227,7 +225,7 @@ describe PhonyPlausibleValidator do
       end
     end
 
-    it "should translate the error message in Russian" do
+    it 'should translate the error message in Russian' do
       I18n.with_locale(:ru) do
         @home.phone_number = INVALID_NUMBER
         @home.valid?
@@ -239,254 +237,234 @@ end
 
 #-----------------------------------------------------------------------------------------------------------------------
 describe ActiveModel::Validations::HelperMethods do
-
   #--------------------
   describe '#validates_plausible_phone' do
-
     #--------------------
     context 'when a number is optional' do
-
       before(:each) do
         @home = HelpfulHome.new
       end
 
-      it "should validate an empty number" do
+      it 'should validate an empty number' do
         expect(@home).to be_valid
       end
 
-      it "should validate a valid number" do
+      it 'should validate a valid number' do
         @home.phone_number = VALID_NUMBER
         expect(@home).to be_valid
       end
 
-      it "should invalidate an invalid number" do
+      it 'should invalidate an invalid number' do
         @home.phone_number = INVALID_NUMBER
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(phone_number: ["is an invalid number"])
+        expect(@home.errors.messages).to include(phone_number: ['is an invalid number'])
       end
-
     end
 
     #--------------------
     context 'when a number is required (:presence = true)' do
-
       before(:each) do
         @home = RequiredHelpfulHome.new
       end
 
-      it "should invalidate an empty number" do
+      it 'should invalidate an empty number' do
         expect(@home).to_not be_valid
         expect(@home.errors.messages).to include(phone_number: ["can't be blank"])
       end
 
-      it "should validate a valid number" do
+      it 'should validate a valid number' do
         @home.phone_number = VALID_NUMBER
         expect(@home).to be_valid
       end
 
-      it "should invalidate an invalid number" do
+      it 'should invalidate an invalid number' do
         @home.phone_number = INVALID_NUMBER
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(phone_number: ["is an invalid number"])
+        expect(@home.errors.messages).to include(phone_number: ['is an invalid number'])
       end
-
     end
 
     #--------------------
     context 'when a number is not required (!presence = false)' do
-
       before(:each) do
         @home = OptionalHelpfulHome.new
       end
 
-      it "should validate an empty number" do
+      it 'should validate an empty number' do
         expect(@home).to be_valid
       end
 
-      it "should validate a valid number" do
+      it 'should validate a valid number' do
         @home.phone_number = VALID_NUMBER
         expect(@home).to be_valid
       end
 
-      it "should invalidate an invalid number" do
+      it 'should invalidate an invalid number' do
         @home.phone_number = INVALID_NUMBER
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(phone_number: ["is an invalid number"])
+        expect(@home.errors.messages).to include(phone_number: ['is an invalid number'])
       end
-
     end
 
     #--------------------
     context 'when a number must be formatted (:with)' do
-
       before(:each) do
         @home = FormattedHelpfulHome.new
       end
 
-      it "should invalidate an empty number" do
+      it 'should invalidate an empty number' do
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(phone_number: ["is invalid"])
+        expect(@home.errors.messages).to include(phone_number: ['is invalid'])
       end
 
-      it "should validate a well formatted valid number" do
+      it 'should validate a well formatted valid number' do
         @home.phone_number = "+#{VALID_NUMBER}"
         expect(@home).to be_valid
       end
 
-      it "should invalidate a bad formatted valid number" do
+      it 'should invalidate a bad formatted valid number' do
         @home.phone_number = VALID_NUMBER
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(phone_number: ["is invalid"])
+        expect(@home.errors.messages).to include(phone_number: ['is invalid'])
       end
-
     end
 
     #--------------------
     context 'when a number must not be formatted (:without)' do
-
       before(:each) do
         @home = NotFormattedHelpfulHome.new
       end
 
-      it "should validate an empty number" do
+      it 'should validate an empty number' do
         expect(@home).to be_valid
       end
 
-      it "should validate a well formatted valid number" do
+      it 'should validate a well formatted valid number' do
         @home.phone_number = VALID_NUMBER
         expect(@home).to be_valid
       end
 
-      it "should invalidate a bad formatted valid number" do
+      it 'should invalidate a bad formatted valid number' do
         @home.phone_number =  "+#{VALID_NUMBER}"
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(phone_number: ["is invalid"])
+        expect(@home.errors.messages).to include(phone_number: ['is invalid'])
       end
-
     end
 
     #--------------------
     context 'when a number must include a specific country number' do
-
       before(:each) do
         @home = AustralianHelpfulHome.new
       end
 
-      it "should validate an empty number" do
+      it 'should validate an empty number' do
         expect(@home).to be_valid
       end
 
-      it "should validate a valid number with the right country code" do
+      it 'should validate a valid number with the right country code' do
         @home.phone_number = AUSTRALIAN_NUMBER_WITH_COUNTRY_CODE
         expect(@home).to be_valid
       end
 
-      it "should invalidate a valid number with the wrong country code" do
+      it 'should invalidate a valid number with the wrong country code' do
         @home.phone_number = FRENCH_NUMBER_WITH_COUNTRY_CODE
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(phone_number: ["is an invalid number"])
+        expect(@home.errors.messages).to include(phone_number: ['is an invalid number'])
       end
 
-      it "should invalidate a valid number without a country code" do
+      it 'should invalidate a valid number without a country code' do
         @home.phone_number = VALID_NUMBER
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(phone_number: ["is an invalid number"])
+        expect(@home.errors.messages).to include(phone_number: ['is an invalid number'])
       end
-
     end
 
     #--------------------
     context 'when a number must be validated after normalization' do
-
       before(:each) do
         @home = NormalizableHelpfulHome.new
       end
 
-      it "should validate an empty number" do
+      it 'should validate an empty number' do
         expect(@home).to be_valid
       end
 
-      it "should validate a valid number" do
+      it 'should validate a valid number' do
         @home.phone_number = VALID_NUMBER
         expect(@home).to be_valid
       end
 
-      it "should validate a normalizable number" do
+      it 'should validate a normalizable number' do
         @home.phone_number = NORMALIZABLE_NUMBER
         expect(@home).to be_valid
       end
 
-      it "should invalidate an invalid number" do
+      it 'should invalidate an invalid number' do
         @home.phone_number = INVALID_NUMBER
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(phone_number: ["is an invalid number"])
+        expect(@home.errors.messages).to include(phone_number: ['is an invalid number'])
       end
-
     end
 
     #--------------------
     context 'when a number must include a specific country code' do
-
       before(:each) do
         @home = PolishHelpfulHome.new
       end
 
-      it "should validate an empty number" do
+      it 'should validate an empty number' do
         expect(@home).to be_valid
       end
 
-      it "should validate a valid number with the right country code" do
+      it 'should validate a valid number with the right country code' do
         @home.phone_number = POLISH_NUMBER_WITH_COUNTRY_CODE
         expect(@home).to be_valid
       end
 
-      it "should invalidate a valid number with the wrong country code" do
+      it 'should invalidate a valid number with the wrong country code' do
         @home.phone_number = FRENCH_NUMBER_WITH_COUNTRY_CODE
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(phone_number: ["is an invalid number"])
+        expect(@home.errors.messages).to include(phone_number: ['is an invalid number'])
       end
 
-      it "should invalidate a valid number without a country code" do
+      it 'should invalidate a valid number without a country code' do
         @home.phone_number = VALID_NUMBER
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(phone_number: ["is an invalid number"])
+        expect(@home.errors.messages).to include(phone_number: ['is an invalid number'])
       end
-
     end
 
     context 'when lots of things are being validated simultaneously' do
-
       before(:each) do
         @home = BigHelpfulHome.new
       end
 
-      it "should invalidate an empty number" do
+      it 'should invalidate an empty number' do
         expect(@home).to_not be_valid
       end
 
-      it "should invalidate an invalid number" do
+      it 'should invalidate an invalid number' do
         @home.phone_number = INVALID_NUMBER
         expect(@home).to_not be_valid
-        expect(@home.errors.messages[:phone_number]).to include "is an invalid number"
+        expect(@home.errors.messages[:phone_number]).to include 'is an invalid number'
       end
 
-      it "should invalidate a badly formatted number with the right country code" do
+      it 'should invalidate a badly formatted number with the right country code' do
         @home.phone_number = FRENCH_NUMBER_WITH_COUNTRY_CODE
         expect(@home).to_not be_valid
-        expect(@home.errors.messages[:phone_number]).to include "is invalid"
+        expect(@home.errors.messages[:phone_number]).to include 'is invalid'
       end
 
-      it "should invalidate a properly formatted number with the wrong country code" do
+      it 'should invalidate a properly formatted number with the wrong country code' do
         @home.phone_number = FORMATTED_AUSTRALIAN_NUMBER_WITH_COUNTRY_CODE
         expect(@home).to_not be_valid
-        expect(@home.errors.messages[:phone_number]).to include "is an invalid number"
+        expect(@home.errors.messages[:phone_number]).to include 'is an invalid number'
       end
 
-      it "should validate a properly formatted number with the right country code" do
+      it 'should validate a properly formatted number with the right country code' do
         @home.phone_number = FORMATTED_FRENCH_NUMBER_WITH_COUNTRY_CODE
         expect(@home).to be_valid
       end
-
     end
 
     #--------------------
@@ -497,34 +475,32 @@ describe ActiveModel::Validations::HelperMethods do
         @home.phone_number = FRENCH_NUMBER_WITH_COUNTRY_CODE
       end
 
-      it "should allow this number" do
+      it 'should allow this number' do
         expect(@home).to be_valid
       end
     end
 
-        #--------------------
+    #--------------------
     context 'when a country code is set to something invalid' do
       before(:each) do
         @home = InvalidCountryCodeHelpfulHome.new
       end
 
-      it "should allow any valid number" do
+      it 'should allow any valid number' do
         @home.phone_number = FRENCH_NUMBER_WITH_COUNTRY_CODE
         expect(@home).to be_valid
       end
 
-      it "should not allow any invalid number" do
+      it 'should not allow any invalid number' do
         @home.phone_number = INVALID_NUMBER
         expect(@home).to_not be_valid
       end
 
-      it "should not raise a NoMethodError when looking up a country fails (Regression)" do
-        expect {
+      it 'should not raise a NoMethodError when looking up a country fails (Regression)' do
+        expect do
           @home.valid?
-        }.to_not raise_error
+        end.to_not raise_error
       end
     end
-
   end
-
 end

data/spec/spec_helper.rb

@@ -11,8 +11,8 @@ require 'mongoid'
 require 'phony_rails'
 
 ActiveRecord::Base.establish_connection(
-  adapter: "sqlite3",
-  database: ":memory:"
+  adapter: 'sqlite3',
+  database: ':memory:'
 )
 
 ActiveRecord::Schema.define do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony_rails
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Joost Hietbrink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-12 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phony
@@ -76,6 +76,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile