uk_postcode 0.0.2 → 0.0.3

data/Rakefile

@@ -1,44 +1,8 @@
-require "rubygems"
-require "rake/gempackagetask"
 require "rake/testtask"
 
-task :default => [:test]
-
 Rake::TestTask.new("test") do |t|
-  t.libs   << "test"
   t.pattern = "test/**/test_*.rb"
   t.verbose = true
 end
 
 task :default => :test
-
-require "rake/testtask"
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList["test/**/*_test.rb"]
-  t.verbose = true
-end
-
-spec = Gem::Specification.new do |s|
-  s.name              = "uk_postcode"
-  s.version           = "0.0.2"
-  s.summary           = "UK postcode parsing and validation"
-  s.author            = "Paul Battley"
-  s.email             = "pbattley@gmail.com"
-
-  s.has_rdoc          = true
-
-  s.files             = %w(Rakefile README.md) + Dir.glob("{bin,test,lib}/**/*") - ["test/samples/postzon.list"]
-  s.executables       = FileList["bin/**"].map { |f| File.basename(f) }
-
-  s.require_paths     = ["lib"]
-
-  s.add_development_dependency("thoughtbot-shoulda")
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-
-desc 'Clear out generated packages'
-task :clean => [:clobber_package]

data/lib/uk_postcode/version.rb

@@ -0,0 +1,3 @@
+class UKPostcode
+  VERSION = "0.0.3"
+end

data/lib/uk_postcode.rb

@@ -1,12 +1,14 @@
 class UKPostcode
   MATCH = /\A
-           ( [A-PR-UWYZ][A-Z]? )           # area
+           \s*
+           ( [A-PR-UWYZ01][A-Z01]? )       # area
            ( [0-9IO][0-9A-HJKMNPR-YIO]? )  # district
            (?:
-             \s?
+             \s*
              ( [0-9IO] )                   # sector
              ( [ABD-HJLNPQ-Z10]{2} )       # unit
                                      )?
+           \s*
            \Z/x
 
   attr_reader :raw
@@ -100,3 +102,5 @@ private
     s && s.tr("IO", "10")
   end
 end
+
+require "uk_postcode/version"

data/test/samples/wikipedia.list

@@ -33,4 +33,3 @@ SW1W 0DT
 TS1  3BA
 W1A  1AA
 W1F  9DJ
-GIR  0AA

data/test/test_uk_postcode.rb

@@ -1,3 +1,4 @@
+# -*- coding: undecided -*-
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 require "test/unit"
 require "shoulda"
@@ -164,10 +165,14 @@ class UKPostcodeTest < Test::Unit::TestCase
   end
 
   context "when used as a string" do
-    should "normalise spacing" do
+    should "normalise spacing when no spacing has been used in the input" do
       assert_equal "W1A 1AA", UKPostcode.new("W1A1AA").norm
     end
 
+    should "normalise spacing when too much spacing has been used in the input" do
+      assert_equal "W1A 1AA", UKPostcode.new("W1A  1AA").norm
+    end
+
     should "convert case" do
       assert_equal "W1A 1AA", UKPostcode.new("w1a 1aa").norm
     end
@@ -175,6 +180,10 @@ class UKPostcodeTest < Test::Unit::TestCase
     should "ignore a missing incode" do
       assert_equal "W1A", UKPostcode.new("W1A").norm
     end
+
+    should "trim whitespace from start and end of the string" do
+      assert_equal "W1A 1AA", UKPostcode.new(" W1A 1AA ").norm
+    end
   end
 
   should "return original input for to_s" do
@@ -210,4 +219,24 @@ class UKPostcodeTest < Test::Unit::TestCase
       end
     end
   end
+
+  context "when digits are used instead of letters" do
+    context "in a full postcode" do
+      setup do 
+        @postcode = UKPostcode.new("0X1 0AB")
+      end
+
+      should "be valid" do
+        assert @postcode.valid?
+      end
+
+      should "be full" do
+        assert @postcode.full?
+      end
+
+      should "normalise to letters" do
+        assert_equal "OX1 0AB", @postcode.norm
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: uk_postcode
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Paul Battley
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-09 00:00:00 +00:00
+date: 2010-06-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  name: shoulda
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -33,12 +33,13 @@ extra_rdoc_files: []
 files: 
 - Rakefile
 - README.md
-- test/samples/wikipedia.list
 - test/test_samples.rb
 - test/test_uk_postcode.rb
+- test/samples/wikipedia.list
 - lib/uk_postcode.rb
+- lib/uk_postcode/version.rb
 has_rdoc: true
-homepage: 
+homepage: http://github.com/threedaymonk/uk_postcode
 licenses: []
 
 post_install_message: