phony_rails 0.1.12 → 0.2.0

data/Gemfile

@@ -1,9 +1,14 @@
 source :rubygems
+
+# Preempt the default loading so that we don't get an unqualified Country class imported.
+gem 'countries', :require => 'iso3166'
+
 gemspec # Specify your gem's dependencies in phony_number.gemspec
 
 # For testing
 gem 'sqlite3'
 
+gem 'rake'
 gem 'rspec',          '~> 2.11.0'
 gem 'guard',          '~> 1.2.0'
 gem 'guard-bundler',  '~> 1.0.0'

data/Gemfile.lock

@@ -1,30 +1,29 @@
 PATH
   remote: .
   specs:
-    phony_rails (0.1.10)
-      activerecord (~> 3.0)
-      countries (~> 0.8.2)
-      phony (~> 1.7.7)
+    phony_rails (0.1.13)
+      activerecord (>= 3.0)
+      countries (>= 0.8.2)
+      phony (>= 1.7.7)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.6)
-      activesupport (= 3.2.6)
+    activemodel (3.2.12)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
-    activerecord (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
+    activerecord (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.6)
+    activesupport (3.2.12)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
-    builder (3.0.0)
-    countries (0.8.2)
-      currencies (= 0.4.0)
-      currencies (>= 0.2.0)
+    builder (3.0.4)
+    countries (0.8.4)
+      currencies (>= 0.4.0)
     currencies (0.4.0)
     diff-lcs (1.1.3)
     ffi (1.1.0)
@@ -37,13 +36,14 @@ GEM
       guard (~> 1.1)
     guard-rspec (1.2.0)
       guard (>= 1.1)
-    i18n (0.6.0)
+    i18n (0.6.1)
     listen (0.4.7)
       rb-fchange (~> 0.0.5)
       rb-fsevent (~> 0.9.1)
       rb-inotify (~> 0.8.8)
-    multi_json (1.3.6)
-    phony (1.7.10)
+    multi_json (1.6.0)
+    phony (1.8.6)
+    rake (10.0.3)
     rb-fchange (0.0.5)
       ffi
     rb-fsevent (0.9.1)
@@ -59,17 +59,19 @@ GEM
     rspec-mocks (2.11.1)
     sqlite3 (1.3.6)
     thor (0.15.4)
-    tzinfo (0.3.33)
+    tzinfo (0.3.35)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  countries
   growl
   guard (~> 1.2.0)
   guard-bundler (~> 1.0.0)
   guard-rspec (~> 1.2.0)
   phony_rails!
+  rake
   rb-fsevent
   rspec (~> 2.11.0)
   sqlite3

data/README.md

@@ -76,7 +76,19 @@ the i18n key is `:improbable_phone`
 
 In your views use:
 
-    <%= "some number string variable".phony_formatted(:format => :international, :spaces => '-') %>
+    <%= "311012341234".phony_formatted(:format => :international, :spaces => '-') %>
+    <%= "+31-10-12341234".phony_formatted(:format => :international, :spaces => '-') %>
+    <%= "+31(0)1012341234".phony_formatted(:format => :international, :spaces => '-') %>    
+
+To first normalize the String to a certain country use:
+
+    <%= "010-12341234".phony_formatted(normalize => :NL, :format => :international, :spaces => '-') %>    
+
+You can also use the bang method (phony_formatted!):
+
+    number = "010-12341234"
+    number.phony_formatted!(normalize => :NL, :format => :international)
+    number # => "+31 10 12341234"
 
 ### Find by normalized number
 

data/Rakefile

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

data/lib/phony_rails.rb

@@ -1,5 +1,5 @@
 require 'phony'
-require 'countries'
+require 'iso3166'
 require 'phony_rails/string_extensions'
 require 'validators/phony_validator'
 require 'phony_rails/version'
@@ -25,14 +25,13 @@ module PhonyRails
       # Add country_number if missing
       number = "#{country_number}#{number}" if not number =~ /^(00|\+)?#{country_number}/
     end
-    number = Phony.normalize(number)
+    number = Phony.normalize(number) if Phony.plausible?(number)
     return number.to_s
   rescue
     number # If all goes wrong .. we still return the original input.
   end
 
-  # This module is added to AR.
-  module ActiveRecordExtension
+  module Extension
 
     def self.extended(base)
       base.send :include, InstanceMethods
@@ -102,7 +101,13 @@ module PhonyRails
 
 end
 
-ActiveRecord::Base.extend PhonyRails::ActiveRecordExtension
+# check whether it is ActiveRecord or Mongoid being used
+ActiveRecord::Base.send :extend, PhonyRails::Extension if defined?(ActiveRecord)
+Mongoid::Document.module_eval do
+  def self.included(base)
+    base.extend PhonyRails::Extension
+  end
+end if defined?(Mongoid)
 
 Dir["#{File.dirname(__FILE__)}/phony_rails/locales/*.yml"].each do |file|
   I18n.load_path << file

data/lib/phony_rails/locales/fr.yml

@@ -1,4 +1,3 @@
-
 fr:
   activerecord:
     errors:

data/lib/phony_rails/string_extensions.rb

@@ -4,8 +4,18 @@
     # 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)
     def phony_formatted(options = {})
-      Phony.formatted(self, options.reverse_merge(:format => :national))
+      normalize_country_code = options.delete(:normalize)
+      s = (normalize_country_code ? PhonyRails.normalize_number(self, :country_code => normalize_country_code.to_s) : self.gsub(/\D/, ''))
+      return if s.blank?
+      Phony.formatted(s, options.reverse_merge(:format => :national))
+    end
+
+    # The bang method
+    def phony_formatted!(options = {})
+      replace(self.phony_formatted(options))
     end
 
   end

data/lib/phony_rails/version.rb

@@ -1,3 +1,3 @@
 module PhonyRails
-  VERSION = "0.1.12"
+  VERSION = "0.2.0"
 end

data/spec/lib/phony_rails_spec.rb

@@ -1,10 +1,70 @@
 require 'spec_helper'
 describe PhonyRails do
 
-  describe 'String extensions' do
-    it "should phony_format a String" do
+  it "should not pollute the global namespace with a Country class" do
+    should_not be_const_defined "Country"
+  end
+
+  describe 'phony_format String extension' do
+
+    describe 'the bang method phony_formatted!' do
+
+      it "should change the String using the bang method" do
+        s = "0101234123"
+        s.phony_formatted!(:normalize => :NL, :format => :international).should eql('+31 10 1234123')
+        s.should eql("+31 10 1234123")
+      end
+      
+    end
+
+    describe 'with normalize option' do
+
+      it "should phony_format" do
+        "0101234123".phony_formatted(:normalize => :NL).should eql('010 1234123')
+        "0101234123".phony_formatted(:normalize => :NL, :format => :international).should eql('+31 10 1234123')
+      end
+
+      it "should not change original String" do
+        s = "0101234123"
+        s.phony_formatted(:normalize => :NL).should eql('010 1234123')
+        s.should eql("0101234123")
+      end
+
+      it "should phony_format String with country code" do
+        "31101234123".phony_formatted(:normalize => :NL).should eql('010 1234123')
+      end
+
+      it "should phony_format String with country code" do
+        "31101234123".phony_formatted(:normalize => :NL).should eql('010 1234123')
+      end
+
+      it "should accept strings with non-digits in it" do
+        "+31-10-1234123".phony_formatted(:normalize => :NL, :format => :international, :spaces => '-').should eql('+31-10-1234123')
+      end
+
+    end
+
+    it "should not change original String" do
+      s = "0101234123"
+      s.phony_formatted(:normalize => :NL).should eql('010 1234123')
+      s.should eql("0101234123")
+    end
+
+    it "should phony_format a digits string with spaces String" do
+      "31 10 1234123".phony_formatted(:format => :international, :spaces => '-').should eql('+31-10-1234123')
+    end
+
+    it "should phony_format a digits String" do
       "31101234123".phony_formatted(:format => :international, :spaces => '-').should eql('+31-10-1234123')
     end
+
+    it "returns nil if implausible phone" do
+      "this is not a phone".phony_formatted.should be_nil
+    end
+
+    it "returns nil on blank string" do
+      "".phony_formatted.should be_nil
+    end
   end
 
   describe 'PhonyRails#normalize_number' do
@@ -30,6 +90,10 @@ describe PhonyRails do
       PhonyRails.normalize_number('+31-70-4157134', :country_code => 'NL').should eql('31704157134')
       PhonyRails.normalize_number('0323-2269497', :country_code => 'BE').should eql('323232269497')
     end
+
+    it "should not normalize an implausible number" do
+      PhonyRails.normalize_number('01').should eql('01')
+    end
   end
 
   describe 'defining ActiveRecord#phony_normalized_method' do
@@ -124,14 +188,14 @@ describe PhonyRails do
       home.normalized_phone1_method(:country_code => 'NL').should eql('31308612906')
     end
 
-    it "should use last passed options" do 
+    it "should use last passed options" do
       home = Home.new(:phone1_method => "(030) 8 61 29 06")
       home.normalized_phone1_method(:country_code => 'NL').should eql('31308612906')
       home.normalized_phone1_method(:country_code => 'DE').should eql('49308612906')
       home.normalized_phone1_method(:country_code => nil).should eql('49308612906')
     end
 
-    it "should use last object method" do 
+    it "should use last object method" do
       home = Home.new(:phone1_method => "(030) 8 61 29 06")
       home.country_code = 'NL'
       home.normalized_phone1_method.should eql('31308612906')
@@ -154,6 +218,6 @@ describe PhonyRails do
       home = Home.new(:phone_number => "+31-(0)10-1234123")
       home.valid?.should be_true
       home.phone_number_as_normalized.should eql('31101234123')
-    end    
+    end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phony_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000 Z
+date: 2013-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phony