usps 0.1.0 → 0.1.1

data/Rakefile

@@ -1,55 +1,16 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-
-  Jeweler::Tasks.new do |gem|
-    gem.name = "usps"
-    gem.summary = "USPS Webtools API for Ruby"
-    gem.description = "USPS Webtools API for Ruby."
-    gem.email = "gaffneyc@gmail.com"
-    gem.homepage = "http://github.com/gaffneyc/usps"
-    gem.authors = ["Chris Gaffney"]
-
-    gem.add_dependency 'builder',  '>= 2.1.2'
-    gem.add_dependency 'nokogiri', '>= 1.4.1'
-    gem.add_dependency 'typhoeus', '>= 0.1.18'
-
-    gem.add_development_dependency "mocha", ">= 0.9.8"
-    gem.add_development_dependency "rspec", ">= 1.3.0"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+require 'bundler/setup'
+Bundler::GemHelper.install_tasks
 
+require 'rake'
 require 'spec/rake/spectask'
+
 Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.libs << 'lib' << 'spec'
   spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
-
 task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "usps #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
 desc "Run the certification tests against USPS's API. Requires ENV['USPS_USER'] to be set or passed in."
 task :certify do
   ruby "-rubygems -Ilib -rusps lib/usps/test.rb"

data/lib/usps.rb

@@ -8,6 +8,7 @@ module USPS
   autoload :Client,   'usps/client'
   autoload :Address,  'usps/address'
   autoload :Request,  'usps/request'
+  autoload :VERSION,  'usps/version'
   autoload :Response, 'usps/response'
 
   class << self

data/lib/usps/client.rb

@@ -5,11 +5,9 @@ module USPS
     def request(request, &block)
       server = server(request)
 
-      # The USPS documentation shows all requests as being GET requests, but
-      # the servers also appear to support POST. We're using POST here so we
-      # don't need to escape the request and to keep from running into any
-      # concerns with data length.
-      response = Typhoeus::Request.post(server, {
+      # Make the API request to the USPS servers. Used to support POST, now it's
+      # just GET request *grumble*.
+      response = Typhoeus::Request.get(server, {
         :timeout => USPS.config.timeout,
         :params => {
           "API" => request.api,

data/lib/usps/request/signature_confirmation.rb

@@ -0,0 +1,44 @@
+module USPS::Request
+  class SignatureConfirmation < Base
+    config(
+      :api => 'DeliveryConfirmationV3',
+      :tag => 'DeliveryConfirmationV3.0Request',
+      :secure => true,
+      :response => USPS::Response::DeliveryConfirmation
+    )
+
+    attr_reader :to, :from, :weight, :service
+
+    def initialize(to, from, weight, service = 'Priority')
+      @to = to
+      @from = from
+      @weight = weight
+      @service = service
+    end
+
+    def build
+      super do |builder|
+        builder.tag!('Option', '1')
+        builder.tag!('ImageParameters')
+
+        [
+          [self.from, 'From'],
+          [self.to,   'To']
+        ].each do |address, prefix|
+          builder.tag!("#{prefix}Name",  address.name)
+          builder.tag!("#{prefix}Firm",  address.company)
+          builder.tag!("#{prefix}Address1", address.extra_address)
+          builder.tag!("#{prefix}Address2", address.address)
+          builder.tag!("#{prefix}City",  address.city)
+          builder.tag!("#{prefix}State", address.state)
+          builder.tag!("#{prefix}Zip5",  address.zip5)
+          builder.tag!("#{prefix}Zip4",  address.zip4)
+        end
+
+        builder.tag!('WeightInOunces', self.weight)
+        builder.tag!('ServiceType', self.service)
+        builder.tag!('ImageType', 'TIF')
+      end
+    end
+  end
+end

data/lib/usps/version.rb

@@ -0,0 +1,3 @@
+module USPS
+  VERSION = '0.1.1'
+end

data/spec/address_spec.rb

@@ -48,7 +48,7 @@ describe USPS::Address do
       :zip => 20006
     )
 
-    USPS.client.expects(:request).returns(
+    USPS.client.should_receive(:request).and_return(
       USPS::Response::AddressStandardization.new(
         addy, load_xml('address_standardization_1.xml')
       )
@@ -58,7 +58,7 @@ describe USPS::Address do
 
     error = USPS::Error.new('error', '1234', 'source')
     # Failure
-    USPS.client.expects(:request).raises(error)
+    USPS.client.should_receive(:request).and_raise(error)
     addy.valid?.should be_false
     addy.error.should be(error)
   end

data/spec/spec_helper.rb

@@ -1,23 +1,11 @@
-$:.unshift(File.dirname(__FILE__))
-$:.unshift(File.join(File.dirname(__FILE__), %w(.. lib)))
-
-require 'rubygems'
+require 'bundler/setup'
+Bundler.require(:default, :development)
 
 require 'usps'
-require 'spec'
-require 'spec/autorun'
-
-require 'builder'
-require 'nokogiri'
-
-Spec::Runner.configure do |config|
-  config.mock_with :mocha
-end
-
 USPS.username = 'TESTING'
 
 def load_data(path)
-  (@_file_cache ||= {})[path] ||= File.read(File.expand_path(File.join(File.dirname(__FILE__), 'data', path)))
+  (@_file_cache ||= {})[path] ||= File.read(File.expand_path("../data/#{path}", __FILE__))
 end
 
 def load_xml(path)

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: usps
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  hash: 25
+  prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Chris Gaffney
@@ -9,100 +15,94 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-05 00:00:00 -05:00
+date: 2011-02-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: builder
+  prerelease: false
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: builder
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 1
+        - 2
         version: 2.1.2
-    version: 
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  prerelease: false
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: nokogiri
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 4
+        - 1
         version: 1.4.1
-    version: 
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: typhoeus
+  prerelease: false
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: typhoeus
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 1
+        - 18
         version: 0.1.18
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.8
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.3.0
-    version: 
-description: USPS Webtools API for Ruby.
-email: gaffneyc@gmail.com
+  requirement: *id003
+description: 
+email: 
+- gaffneyc@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
-- .document
-- .gitignore
-- LICENSE
-- README.rdoc
-- Rakefile
-- VERSION
-- lib/usps.rb
 - lib/usps/address.rb
 - lib/usps/client.rb
 - lib/usps/configuration.rb
 - lib/usps/errors.rb
-- lib/usps/request.rb
 - lib/usps/request/address_standardization.rb
 - lib/usps/request/base.rb
 - lib/usps/request/city_and_state_lookup.rb
 - lib/usps/request/delivery_confirmation.rb
 - lib/usps/request/delivery_confirmation_certify.rb
+- lib/usps/request/signature_confirmation.rb
 - lib/usps/request/tracking_lookup.rb
 - lib/usps/request/zip_code_lookup.rb
-- lib/usps/response.rb
+- lib/usps/request.rb
 - lib/usps/response/address_standardization.rb
 - lib/usps/response/base.rb
 - lib/usps/response/city_and_state_lookup.rb
 - lib/usps/response/delivery_confirmation.rb
 - lib/usps/response/tracking_lookup.rb
-- lib/usps/test.rb
+- lib/usps/response.rb
 - lib/usps/test/address_verification.rb
 - lib/usps/test/city_and_state_lookup.rb
 - lib/usps/test/delivery_confirmation.rb
 - lib/usps/test/tracking_lookup.rb
 - lib/usps/test/zip_code_lookup.rb
+- lib/usps/test.rb
+- lib/usps/version.rb
+- lib/usps.rb
 - spec/address_spec.rb
 - spec/configuration_spec.rb
 - spec/data/address_standardization_1.xml
@@ -118,61 +118,54 @@ files:
 - spec/request/city_and_state_lookup_spec.rb
 - spec/request/delivery_confirmation_certify_spec.rb
 - spec/request/delivery_confirmation_spec.rb
+- spec/request/signature_confirmation_spec.rb
 - spec/request/tracking_spec.rb
 - spec/request/zip_code_lookup_spec.rb
 - spec/response/address_standardization_spec.rb
 - spec/response/base_spec.rb
 - spec/response/city_and_state_lookup_spec.rb
 - spec/response/delivery_confirmation_spec.rb
+- spec/response/signature_confirmation_spec.rb
 - spec/response/tracking_lookup_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/usps_spec.rb
-- usps.gemspec
+- Rakefile
+- LICENSE
+- README.rdoc
 has_rdoc: true
 homepage: http://github.com/gaffneyc/usps
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: USPS Webtools API for Ruby
-test_files: 
-- spec/address_spec.rb
-- spec/configuration_spec.rb
-- spec/request/address_standardization_spec.rb
-- spec/request/base_spec.rb
-- spec/request/city_and_state_lookup_spec.rb
-- spec/request/delivery_confirmation_certify_spec.rb
-- spec/request/delivery_confirmation_spec.rb
-- spec/request/signature_confirmation_spec.rb
-- spec/request/tracking_spec.rb
-- spec/request/zip_code_lookup_spec.rb
-- spec/response/address_standardization_spec.rb
-- spec/response/base_spec.rb
-- spec/response/city_and_state_lookup_spec.rb
-- spec/response/delivery_confirmation_spec.rb
-- spec/response/signature_confirmation_spec.rb
-- spec/response/tracking_lookup_spec.rb
-- spec/spec_helper.rb
-- spec/usps_spec.rb
+test_files: []
+

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC

data/VERSION

@@ -1 +0,0 @@
-0.1.0

data/usps.gemspec

@@ -1,129 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{usps}
-  s.version = "0.1.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Chris Gaffney"]
-  s.date = %q{2010-02-05}
-  s.description = %q{USPS Webtools API for Ruby.}
-  s.email = %q{gaffneyc@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/usps.rb",
-     "lib/usps/address.rb",
-     "lib/usps/client.rb",
-     "lib/usps/configuration.rb",
-     "lib/usps/errors.rb",
-     "lib/usps/request.rb",
-     "lib/usps/request/address_standardization.rb",
-     "lib/usps/request/base.rb",
-     "lib/usps/request/city_and_state_lookup.rb",
-     "lib/usps/request/delivery_confirmation.rb",
-     "lib/usps/request/delivery_confirmation_certify.rb",
-     "lib/usps/request/tracking_lookup.rb",
-     "lib/usps/request/zip_code_lookup.rb",
-     "lib/usps/response.rb",
-     "lib/usps/response/address_standardization.rb",
-     "lib/usps/response/base.rb",
-     "lib/usps/response/city_and_state_lookup.rb",
-     "lib/usps/response/delivery_confirmation.rb",
-     "lib/usps/response/tracking_lookup.rb",
-     "lib/usps/test.rb",
-     "lib/usps/test/address_verification.rb",
-     "lib/usps/test/city_and_state_lookup.rb",
-     "lib/usps/test/delivery_confirmation.rb",
-     "lib/usps/test/tracking_lookup.rb",
-     "lib/usps/test/zip_code_lookup.rb",
-     "spec/address_spec.rb",
-     "spec/configuration_spec.rb",
-     "spec/data/address_standardization_1.xml",
-     "spec/data/address_standardization_2.xml",
-     "spec/data/city_and_state_lookup_1.xml",
-     "spec/data/city_and_state_lookup_2.xml",
-     "spec/data/delivery_confirmation_1.xml",
-     "spec/data/delivery_confirmation_2.xml",
-     "spec/data/tracking_lookup_1.xml",
-     "spec/data/tracking_lookup_2.xml",
-     "spec/request/address_standardization_spec.rb",
-     "spec/request/base_spec.rb",
-     "spec/request/city_and_state_lookup_spec.rb",
-     "spec/request/delivery_confirmation_certify_spec.rb",
-     "spec/request/delivery_confirmation_spec.rb",
-     "spec/request/tracking_spec.rb",
-     "spec/request/zip_code_lookup_spec.rb",
-     "spec/response/address_standardization_spec.rb",
-     "spec/response/base_spec.rb",
-     "spec/response/city_and_state_lookup_spec.rb",
-     "spec/response/delivery_confirmation_spec.rb",
-     "spec/response/tracking_lookup_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "spec/usps_spec.rb",
-     "usps.gemspec"
-  ]
-  s.homepage = %q{http://github.com/gaffneyc/usps}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{USPS Webtools API for Ruby}
-  s.test_files = [
-    "spec/address_spec.rb",
-     "spec/configuration_spec.rb",
-     "spec/request/address_standardization_spec.rb",
-     "spec/request/base_spec.rb",
-     "spec/request/city_and_state_lookup_spec.rb",
-     "spec/request/delivery_confirmation_certify_spec.rb",
-     "spec/request/delivery_confirmation_spec.rb",
-     "spec/request/signature_confirmation_spec.rb",
-     "spec/request/tracking_spec.rb",
-     "spec/request/zip_code_lookup_spec.rb",
-     "spec/response/address_standardization_spec.rb",
-     "spec/response/base_spec.rb",
-     "spec/response/city_and_state_lookup_spec.rb",
-     "spec/response/delivery_confirmation_spec.rb",
-     "spec/response/signature_confirmation_spec.rb",
-     "spec/response/tracking_lookup_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/usps_spec.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<builder>, [">= 2.1.2"])
-      s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.1"])
-      s.add_runtime_dependency(%q<typhoeus>, [">= 0.1.18"])
-      s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
-      s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
-    else
-      s.add_dependency(%q<builder>, [">= 2.1.2"])
-      s.add_dependency(%q<nokogiri>, [">= 1.4.1"])
-      s.add_dependency(%q<typhoeus>, [">= 0.1.18"])
-      s.add_dependency(%q<mocha>, [">= 0.9.8"])
-      s.add_dependency(%q<rspec>, [">= 1.3.0"])
-    end
-  else
-    s.add_dependency(%q<builder>, [">= 2.1.2"])
-    s.add_dependency(%q<nokogiri>, [">= 1.4.1"])
-    s.add_dependency(%q<typhoeus>, [">= 0.1.18"])
-    s.add_dependency(%q<mocha>, [">= 0.9.8"])
-    s.add_dependency(%q<rspec>, [">= 1.3.0"])
-  end
-end
-