open-charities 0.0.1 → 0.0.2

data/README.md

@@ -10,7 +10,7 @@ $ gem install open-charities
 ```
 or as a dependency in a Gemfile
 ```ruby
-gem "open-charities", "~> 0.1.0", require: 'open_charities'
+gem "open-charities", "~> 0.2.0", require: 'open_charities'
 ```
 
 ## Usage

data/lib/open_charities/request.rb

@@ -25,8 +25,9 @@ module OpenCharities
     def validate(reg_number)
       number = reg_number.to_s.strip
 
-      # match 7-digit numbers *only*
-      charities_regex = Regexp.new("\\A\\d{7}\\z")
+      # match any 6/7 digit number OR 6/7 digit number followed by a dash and
+      # another 1 or 2 numbers
+      charities_regex = /\A\d{6,7}\z|\A\d{6,7}\-\d{1,2}\z/
 
       msg = "#{number} is not a valid UK charity registration number"
       raise InvalidRegistration.new(msg) unless number =~ charities_regex

data/lib/open_charities/version.rb

@@ -1,3 +1,3 @@
 module OpenCharities
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.0.2'.freeze
 end

data/spec/open_charities/request_spec.rb

@@ -6,16 +6,12 @@ describe OpenCharities::Request do
 
   describe "#new" do
     context "throws an exception" do
-      it "with a number that's too short" do
-        expect {
-          subject.new "123456"
-        }.to raise_exception OpenCharities::InvalidRegistration
-      end
-
-      it "that's too long" do
-        expect {
-          subject.new "12345678"
-        }.to raise_exception OpenCharities::InvalidRegistration
+      %W(12345 12345678 #{"123 ABC"} #{"123?!56"}).each do |n|
+        specify do
+          expect {
+            subject.new n
+          }.to raise_exception OpenCharities::InvalidRegistration
+        end
       end
 
       it "that's nil" do
@@ -23,20 +19,15 @@ describe OpenCharities::Request do
           subject.new nil
         }.to raise_exception OpenCharities::InvalidRegistration
       end
+    end
 
-      it "that contains spaces" do
-        expect {
-          subject.new "1234 ABC"
-        }.to raise_exception OpenCharities::InvalidRegistration
-      end
-
-      it "that contains non alphanumeric chars" do
-        expect {
-          subject.new "1234?456"
-        }.to raise_exception OpenCharities::InvalidRegistration
+    context 'is valid' do
+      %w(123456 1234567 123456-1 1234567-1 123456-12 1234567-12).each do |n|
+        specify do
+          expect { subject.new(n) }.to_not raise_exception
+        end
       end
     end
-
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: open-charities
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-27 00:00:00.000000000 Z
+date: 2013-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec