phony 1.3.2 → 1.3.3

data/lib/countries.rb

@@ -73,7 +73,8 @@ Phony.define do
   country '58', fixed(3) >> split(7) # Venezuela (Bolivarian Republic of)
 
   # country '60', Phony::Countries::Malaysia
-  country '61', fixed(1) >> split(4,4)   # Australia
+  country '61', match(/^(4\d\d)\d+$/) >> split(3,3) | # Australia
+                fixed(1)              >> split(4,4)
   country '62', fixed(2) >> split(3,2,2) # TODO Indonesia (Republic of)
   country '63', fixed(2) >> split(3,2,2) # TODO Philippines (Republic of the)
   country '64', fixed(1) >> split(3,4)   # New Zealand

data/lib/phony/dsl.rb

@@ -4,9 +4,10 @@
 #
 # # Germany. Too big, we use a separate file:
 # #
-# include Phony::DSL
-# country '49', match(...) >> split([...]) ||
-#               one_of([...], :max_length => 5) >> split([...])
+# Phony.define do
+#   country '49', match(...) >> split([...]) ||
+#                 one_of([...], :max_length => 5) >> split([...])
+# end
 #
 # # Denmark:
 # #
@@ -18,7 +19,9 @@
 #         match(/^104|105|107|112/) >> split([3,3]) ||
 #         one_of([1], :max_length => 2) >> split([3,4])
 # )
-
+#
+# Note: Perhaps the DSL should operate directly on country codes.
+#
 module Phony
 
   # For country definitions.

data/spec/lib/countries_spec.rb

@@ -18,6 +18,10 @@ describe 'country descriptions' do
       Phony.split('433161234567891').should == ['43', '316', '1234567891'] # Graz
       Phony.split('432164123456789').should == ['43', '2164', '123456789'] # Rohrau
     end
+    it "handles australian numbers" do
+      Phony.split('61512341234').should == ['61', '5', '1234', '1234'] # Landline
+      Phony.split('61423123123').should == ['61', '423', '123', '123'] # Mobile
+    end
     it 'handles belgian numbers' do
       Phony.split('3235551212').should == ['32', '3', '555', '1212']   # Antwerpen
       Phony.split('32505551212').should == ['32', '50', '555', '1212'] # Brugge

metadata

@@ -2,7 +2,7 @@
 name: phony
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors: 
 - Florian Hanke
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-07 00:00:00 +01:00
+date: 2011-04-19 00:00:00 +10:00
 default_executable: 
 dependencies: []