phoney 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91ea215316dbde0a1e0ab7c0a8ee480c17021db9264ad5949f20ad87a9fb01c2
-  data.tar.gz: 8010af03683d901660a83ecd03a2b8fa6ff9e5e4ae19ce50a7c74b04d33f20ab
+  metadata.gz: df8b354ee38ecd41a897ac6b3feff7a24ebb76e7d5ae2bf0741befab07e492ef
+  data.tar.gz: d0be4c600e60567460ad5bcfbfd2605918d5498198b43016d8ec6b29079f1573
 SHA512:
-  metadata.gz: 9803f88389d58b814d942589496dbca4e74b3891066c8501f375e2a6ebc6c5a97dc946f91287f5867d5a8f48a2fce8e31149ad2ca08db3abe3790a4280047d29
-  data.tar.gz: b8a687dcb6fbf2d00d4f4491aa36eb5d74a7ba45c2ec466ed48fba9000fbd3f3183a16ae3218e06dbcb8fbb9356b8d38f0908d18f1bbeeec9b157a378c5133a4
+  metadata.gz: 964df0850ab58f3a62384a0896ec08dca432189deeefdbdcbd97b366a6a4e3d3baab3042a74af515dd66f0e65cbd65d66b981dac6a810440f5163223de22a4a1
+  data.tar.gz: c2fd3d4e309e842897c2494491e8ff7a998ecc096ceb4ff4f4f19085c62090760362705764c4d0532f4142e6a95df7901323a70a775774b75d2d285d56a2dbb2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    phoney (0.9.9)
+    phoney (0.2.0)
 
 GEM
   remote: http://rubygems.org/
@@ -16,3 +16,6 @@ DEPENDENCIES
   minitest
   phoney!
   rake
+
+BUNDLED WITH
+   1.17.1

data/README.rdoc

@@ -14,66 +14,17 @@ Source:: <tt>git clone git://github.com/habermann24/phoney.git</tt>
 
     require 'phoney'
     # region defaults to US
-    pn = Phoney.new("+17041234567")
-    pn.to_s          # "+1 (704) 123-4567"
-    pn.area_code     # "704"
-    pn.country_code  # "1"
-    pn.number        # "1234567"
-    
+    Phoney.format("+17041234567")
+    # => "+1 (704) 123-4567"
+
 * Deals with many specific region formatting rules (e.g. DE)
 
     require 'phoney'
-    
-    Phoney.region = :de
-    
-    pn = Phoney.new("04105456789")
-    pn.to_s           # "+49 4105 456789"
-    pn.area_code      # "4105"
-    pn.country_code   # "49"
-    pn.number         # "456789"
-    
-== Creating Phoney instances
-
-Phoney gives you a Phoney class that wraps all the logic of phone number parsing and representation.
-The default region phoney uses for formatting is the US-region format. So if you want to parse phone numbers from a different country, you have to set Phoney.region or pass the region code every time!
-
-  Phoney.region = :us
 
-The most common way to create a Phoney object is by parsing from a string:
-  Phoney.new("7041231234")         # uses region :us
-  Phoney.new("01805708090", :de)   # uses region :de
-  
-Or instead of parsing a string, you can provide a hash for the first parameter:
-  Phoney.new(:number => "1231234", :area_code => "704", :country_code => "1")
-  
-  # falls back to US region, so also uses "1" for <tt>country_code</tt>
-  Phoney.new(:number => "1231234", :area_code => "704")
-  
-== Formatting  
-
-Formating is done via the <tt>format</tt> method. The method accepts a <tt>Symbol</tt> or a <tt>String</tt>.
-
-When given a string, it interpolates the string with the following fields:
-
-* %c - country_code (385)
-* %a - area_code (91)
-* %n - number (5125486)
+    Phoney.region = :de
 
-    pn = Phoney.new('+446546546546')
-    
-    pn.to_s                     # => "+44 65 4654 6546"
-    pn.format("%a/%n")          # => "64/46546546"
-    pn.format("+ %c (%a) %n")   # => "+ 44 (65) 46546546"
-    
-Usually you will just want Phoney to figure out how to format the number correctly.
-When given a symbol you can let the parser guess the best format and pass in one of the following auto-formatting symbols:
-    pn.format(:default) # => "+44 65 4654 6546"
-    
-    # :national omits the country code and assumes a representation within the region
-    pn.format(:national) # => "65 4654 6546"
-    
-    # :local even omits the area code and assumes a default area, so be careful!
-    pn.format(:local) # => "46 5465 46"
+    Phoney.format("04105456789")
+    # => "04105 456789"
 
 == TODOs
 

data/lib/phoney.rb

@@ -8,8 +8,12 @@ module Phoney
   PLACEHOLDER_CHAR = '#'
   DIGITS           = '0123456789'
   NUMPAD_CHARS     = '+#*'+DIGITS
-  
+
   class << self
+    def format(input, options = {})
+      Phoney::Parser.parse(input, options)
+    end
+
     def region
       @region ||= Region[:us]
     end
@@ -29,77 +33,12 @@ module Phoney
     def area_code=(area_code)
       @area_code = area_code
     end
-    
+
     def version
       VERSION::STRING
     end
   end
-
-  def initialize(params, region_code=nil)
-    region       = Region.find(region_code)
-    country_code = region.country_code.to_s if region
-    
-    if params.is_a?(String)
-      params = Parser.parse_to_parts(params, region_code)
-    end 
-
-    self.number = params[:number].to_s
-    # The rare case when some digits are in front of the area code
-    self.prefix_code = params[:prefix_code].to_s
-    # Can be empty, because some special numbers just don't have an area code (e.g. 911)
-    self.area_code = params[:area_code].to_s || self.class.area_code
-    self.country_code = params[:country_code].to_s || country_code || self.class.country_code
-    
-    raise "Must enter number" if(self.number.nil? || self.number.empty?)
-    raise "Must enter country code or set default country code" if(self.country_code.nil? || self.country_code.empty?)
-  end
-
-  # Does this number belong to the default country code?
-  def has_default_country_code?
-    country_code.to_s == self.class.country_code.to_s
-  end
-
-  # Does this number belong to the default area code?
-  def has_default_area_code?
-    (!area_code.to_s.empty? && area_code.to_s == self.class.area_code.to_s)
-  end
-  
-  # Formats the phone number.
-  # If the method argument is a String, it is used as a format string, with the following fields being interpolated:
-  #
-  # * %c - country_code (385)
-  # * %a - area_code (91)
-  # * %n - number (5125486)
-  #
-  # If the method argument is a Symbol, we use one of the default formattings and let the parser do the rest.
-  def format(fmt)
-    if fmt.is_a?(Symbol)
-      case fmt
-      when :default
-        Parser::parse("+#{country_code} #{prefix_code}#{area_code} #{number}", country_code)
-      when :national
-        Parser::parse("#{area_code} #{number}", country_code)
-      when :local
-        STDERR.puts "Warning: Using local format without setting a default area code!?" if Phoney.area_code.nil?
-        Parser::parse(number, country_code)
-      else
-        raise "The format #{fmt} doesn't exist'"
-      end
-    else
-      format_number(fmt)
-    end
-  end
-
-  # The default format is the canonical format: "+{country_code} {area_code} {number}"
-  def to_s
-    format(:default)
-  end
-  
-  private
-    def format_number(fmt)
-      fmt.gsub("%c", country_code || "").gsub("%a", area_code || "").gsub("%n", number || "")
-    end
 end
 
 # Load our region file when we require the library
-Phoney::Region.load
+Phoney::Region.load

data/lib/phoney/version.rb

@@ -1,3 +1,3 @@
 module Phoney
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phoney
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jan Habermann