msisdn-za 0.1.3 → 0.1.4

data/README.rdoc

@@ -15,7 +15,18 @@ None that I can think of..
 
 == Install
 
-sudo gem install msisdn-za
+  sudo gem install msisdn-za
+
+== Usage
+
+In rails, put this in one of your environment files:
+
+  gem.config 'msisdn-za', :lib => 'msisdn'
+
+Elsewhere, just:
+
+  gem 'msisdn-za'
+  require 'msisdn'
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/msisdn.rb

@@ -27,30 +27,33 @@ class Msisdn
     @country_code = default_country_code
   end
 
-  def international
+  def international_number
     "27#{@local_dialing_code.gsub(/^0+/, '')}#{@national_number}"
   end
 
-  def international_with_prefix
+  def international_number_with_prefix
     "+#{international}"
   end
 
   def valid?
-    valid_national? && valid_local_dialing_code?
+    valid_national_number? && valid_local_dialing_code?
   end
 
   # a national number is valid if it has 7 digits and doesn't start with zeroes
-  def valid_national?
-    @national_number =~ /^\d{7}$/ && @national_number !~ /^0/
+  def valid_national_number?
+    # removing the check for leading zero, since it is breaking things,
+    # like the number 0730711059
+    # @national_number =~ /^\d{7}$/ && @national_number !~ /^0/
+    return (@national_number =~ /^\d{7}$/) ? true : false
   end
 
   # a valid local dialing code should be three digits long and start with a zero
   def valid_local_dialing_code?
-    @local_dialing_code =~ /^[\d][^0]{2}$/
+    return (@local_dialing_code =~ /^[\d][^0]{2}$/) ? true : false
   end
 
   def to_s
-    international
+    international_number
   end
 
 end

data/msisdn-za.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{msisdn-za}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Craig Paterson"]
-  s.date = %q{2010-07-22}
+  s.date = %q{2010-09-22}
   s.description = %q{ZA MSISDN parser simplified, based on work by armanddp}
   s.email = %q{darksavant@gmail.com}
   s.extra_rdoc_files = [

data/test/test_msisdn.rb

@@ -10,8 +10,8 @@ class TestMsisdn < Test::Unit::TestCase
     end
 
     should "return the correct international number" do
-      assert_equal '27835559629', @msisdn.international
-      assert_equal @msisdn.international, @msisdn2.international
+      assert_equal '27835559629', @msisdn.international_number
+      assert_equal @msisdn.international_number, @msisdn2.international_number
     end
     
     should "be valid" do
@@ -29,12 +29,10 @@ class TestMsisdn < Test::Unit::TestCase
 
     should "return the correct country code and international number" do
       assert_equal '27', @msisdn.country_code
-      assert_equal '27835559629', @msisdn.international
+      assert_equal '27835559629', @msisdn.international_number
     end
     
     should "be valid" do
-      puts "CLASS: #{@msisdn.class.name}"
-      puts "DIAL CODE: #{@msisdn.local_dialing_code}"
       assert @msisdn.valid?
     end
     
@@ -44,10 +42,22 @@ class TestMsisdn < Test::Unit::TestCase
 
     should "not be valid" do
       msisdn = Msisdn.new('278259629')
-      puts msisdn.inspect
       assert !msisdn.valid?
     end
 
   end
+  
+  context "a known broken msisdn" do
+    setup do
+      @msisdn = Msisdn.new("0730670000")
+    end
+
+    should "sort its shit out ffs" do
+      assert_equal @msisdn.local_dialing_code, "073"
+      assert_equal @msisdn.national_number, "0670000"
+      assert_equal @msisdn.international_number, "27730670000"
+      assert @msisdn.valid?
+    end
+  end
     
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: msisdn-za
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Craig Paterson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-22 00:00:00 +02:00
+date: 2010-09-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency