trackerific 0.3.2 → 0.3.3

data/spec/lib/{usps_spec.rb → trackerific/services/usps_spec.rb}

@@ -6,19 +6,26 @@ USPS_TRACK_URL = %r|http://testing\.shippingapis\.com/.*|
 describe Trackerific::USPS do
   include Fixtures
   
-  before(:all) do
-    @package_id = 'EJ958083578US'
-    @usps = Trackerific::USPS.new :user_id => '123USERID4567'
+  describe :required_options do
+    subject { Trackerific::USPS.required_options }
+    it { should include(:user_id) }
   end
   
-  describe "track_package" do
+  describe :package_id_matchers do
+    it "should be an Array of Regexp" do
+      Trackerific::UPS.package_id_matchers.should each { |m| m.should be_a Regexp }
+    end
+  end
+  
+  describe :track_package do
+    before(:all) do
+      @package_id = 'EJ958083578US'
+      @usps = Trackerific::USPS.new :user_id => '123USERID4567'
+    end
+    
     context "with a successful response from the server" do
       before(:all) do
-        FakeWeb.register_uri(
-          :get,
-          USPS_TRACK_URL,
-          :body => load_fixture(:usps_success_response)
-        )
+        FakeWeb.register_uri(:get, USPS_TRACK_URL, :body => load_fixture(:usps_success_response))
         @tracking = @usps.track_package(@package_id)
       end
       specify { @tracking.should be_a Trackerific::Details }
@@ -29,13 +36,10 @@ describe Trackerific::USPS do
         @tracking.summary.should_not be_empty
       end
     end
+    
     context "with an error response from the server" do
       before(:all) do
-        FakeWeb.register_uri(
-          :get,
-          USPS_TRACK_URL,
-          :body => load_fixture(:usps_error_response)
-        )
+        FakeWeb.register_uri(:get, USPS_TRACK_URL, :body => load_fixture(:usps_error_response))
       end
       specify { lambda { @usps.track_package(@package_id) }.should raise_error(Trackerific::Error) }
     end

data/spec/lib/trackerific_spec.rb

@@ -1,50 +1,27 @@
 require 'spec_helper'
 
-class TestBaseClass < Trackerific::Base
-  def required_options
-    [:required, :also_required]
-  end
-end
-
-describe 'Trackerific::Base' do
+describe "Trackerific" do
+  include Trackerific
   
-  before(:all) do
-    @base = Trackerific::Base.new
-  end
-
   describe "tracking_service" do
     include Trackerific
+    
     context "when given a UPS tracking number" do
       specify { tracking_service("1Z12345E0291980793").should eq Trackerific::UPS }
     end
+    
     context "when given a USPS tracking number" do
       specify { tracking_service("EJ958083578US").should eq Trackerific::USPS }
     end
+    
     context "when given a FedEx tracking number" do
       specify { tracking_service("183689015000001").should eq Trackerific::FedEx }
     end
+    
     context "when given an invalid tracking number" do
       specify { tracking_service("invalid tracking number").should be_nil }
     end
-  end
-  
-  context "with a new Trackerific::Base class that has required options" do
-    context "has all the required options" do
-      it "should be able to create a new instance" do
-        t = TestBaseClass.new(:required => true, :also_required => :yup)
-        t.should be_a TestBaseClass
-      end
-    end
-    context "is missing some required options" do
-      it "should raise an ArgumentError" do
-        lambda { TestBaseClass.new() }.should raise_error(ArgumentError)
-      end
-    end
-    context "has an invalid option" do
-      it "should raise an ArgumentError" do
-        lambda { TestBaseClass.new(:unknown => :argument ) }.should raise_error(ArgumentError)
-      end
-    end
+    
   end
   
 end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'bundler/setup'
 require 'trackerific'
+require 'rspec_multi_matchers'
 
 # load all the support files
 Dir["spec/support/**/*.rb"].each { |f| require File.expand_path(f) }

data/trackerific.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{trackerific}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Travis Haynes"]
@@ -46,24 +46,28 @@ Gem::Specification.new do |s|
     "doc/js/jquery.js",
     "doc/method_list.html",
     "doc/top-level-namespace.html",
-    "lib/fedex.rb",
     "lib/trackerific.rb",
-    "lib/trackerific_details.rb",
-    "lib/trackerific_event.rb",
-    "lib/ups.rb",
-    "lib/usps.rb",
+    "lib/trackerific/base.rb",
+    "lib/trackerific/details.rb",
+    "lib/trackerific/error.rb",
+    "lib/trackerific/event.rb",
+    "lib/trackerific/services/fedex.rb",
+    "lib/trackerific/services/ups.rb",
+    "lib/trackerific/services/usps.rb",
     "spec/fixtures/fedex_error_response.xml",
     "spec/fixtures/fedex_success_response.xml",
     "spec/fixtures/ups_error_response.xml",
     "spec/fixtures/ups_success_response.xml",
     "spec/fixtures/usps_error_response.xml",
     "spec/fixtures/usps_success_response.xml",
-    "spec/lib/fedex_spec.rb",
-    "spec/lib/trackerific_details_spec.rb",
-    "spec/lib/trackerific_event_spec.rb",
+    "spec/lib/trackerific/base_spec.rb",
+    "spec/lib/trackerific/details_spec.rb",
+    "spec/lib/trackerific/error_spec.rb",
+    "spec/lib/trackerific/event_spec.rb",
+    "spec/lib/trackerific/services/fedex_spec.rb",
+    "spec/lib/trackerific/services/ups_spec.rb",
+    "spec/lib/trackerific/services/usps_spec.rb",
     "spec/lib/trackerific_spec.rb",
-    "spec/lib/ups_spec.rb",
-    "spec/lib/usps_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/fixtures.rb",
     "spec/support/trackerific.rb",
@@ -74,17 +78,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Trackerific provides package tracking to Rails.}
-  s.test_files = [
-    "spec/lib/fedex_spec.rb",
-    "spec/lib/trackerific_details_spec.rb",
-    "spec/lib/trackerific_event_spec.rb",
-    "spec/lib/trackerific_spec.rb",
-    "spec/lib/ups_spec.rb",
-    "spec/lib/usps_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/support/fixtures.rb",
-    "spec/support/trackerific.rb"
-  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -97,6 +90,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bundler>, [">= 1.0.13"])
       s.add_development_dependency(%q<jeweler>, [">= 1.5.2"])
       s.add_development_dependency(%q<rspec-rails>, [">= 2.6.1"])
+      s.add_development_dependency(%q<rspec_multi_matchers>, [">= 1.1.0"])
       s.add_development_dependency(%q<ruby-debug19>, [">= 0.11.6"])
       s.add_development_dependency(%q<yardstick>, [">= 0.4.0"])
     else
@@ -106,6 +100,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<bundler>, [">= 1.0.13"])
       s.add_dependency(%q<jeweler>, [">= 1.5.2"])
       s.add_dependency(%q<rspec-rails>, [">= 2.6.1"])
+      s.add_dependency(%q<rspec_multi_matchers>, [">= 1.1.0"])
       s.add_dependency(%q<ruby-debug19>, [">= 0.11.6"])
       s.add_dependency(%q<yardstick>, [">= 0.4.0"])
     end
@@ -116,6 +111,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<bundler>, [">= 1.0.13"])
     s.add_dependency(%q<jeweler>, [">= 1.5.2"])
     s.add_dependency(%q<rspec-rails>, [">= 2.6.1"])
+    s.add_dependency(%q<rspec_multi_matchers>, [">= 1.1.0"])
     s.add_dependency(%q<ruby-debug19>, [">= 0.11.6"])
     s.add_dependency(%q<yardstick>, [">= 0.4.0"])
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Travis Haynes
@@ -108,8 +108,23 @@ dependencies:
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug19
+  name: rspec_multi_matchers
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug19
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -121,10 +136,10 @@ dependencies:
         version: 0.11.6
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: yardstick
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -136,7 +151,7 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id009
 description: Trackerific provides USPS, FedEx and UPS package tracking to Rails.
 email: travis.j.haynes@gmail.com
 executables: []
@@ -176,24 +191,28 @@ files:
 - doc/js/jquery.js
 - doc/method_list.html
 - doc/top-level-namespace.html
-- lib/fedex.rb
 - lib/trackerific.rb
-- lib/trackerific_details.rb
-- lib/trackerific_event.rb
-- lib/ups.rb
-- lib/usps.rb
+- lib/trackerific/base.rb
+- lib/trackerific/details.rb
+- lib/trackerific/error.rb
+- lib/trackerific/event.rb
+- lib/trackerific/services/fedex.rb
+- lib/trackerific/services/ups.rb
+- lib/trackerific/services/usps.rb
 - spec/fixtures/fedex_error_response.xml
 - spec/fixtures/fedex_success_response.xml
 - spec/fixtures/ups_error_response.xml
 - spec/fixtures/ups_success_response.xml
 - spec/fixtures/usps_error_response.xml
 - spec/fixtures/usps_success_response.xml
-- spec/lib/fedex_spec.rb
-- spec/lib/trackerific_details_spec.rb
-- spec/lib/trackerific_event_spec.rb
+- spec/lib/trackerific/base_spec.rb
+- spec/lib/trackerific/details_spec.rb
+- spec/lib/trackerific/error_spec.rb
+- spec/lib/trackerific/event_spec.rb
+- spec/lib/trackerific/services/fedex_spec.rb
+- spec/lib/trackerific/services/ups_spec.rb
+- spec/lib/trackerific/services/usps_spec.rb
 - spec/lib/trackerific_spec.rb
-- spec/lib/ups_spec.rb
-- spec/lib/usps_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures.rb
 - spec/support/trackerific.rb
@@ -212,7 +231,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 154150799
+      hash: -940622961
       segments: 
       - 0
       version: "0"
@@ -231,13 +250,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Trackerific provides package tracking to Rails.
-test_files: 
-- spec/lib/fedex_spec.rb
-- spec/lib/trackerific_details_spec.rb
-- spec/lib/trackerific_event_spec.rb
-- spec/lib/trackerific_spec.rb
-- spec/lib/ups_spec.rb
-- spec/lib/usps_spec.rb
-- spec/spec_helper.rb
-- spec/support/fixtures.rb
-- spec/support/trackerific.rb
+test_files: []
+