Some fixes

.gitignore

@@ -14,6 +14,9 @@ doc
 # jeweler generated
 pkg
 
+# rvm
+.rvmrc
+
 # Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
 #
 # * Create a file at ~/.gitignore
@@ -46,3 +49,9 @@ pkg
 
 # For rubinius:
 #*.rbc
+
+# Sample labels created by integration tests
+test/images/*.gif
+test/images/*.jpg
+test/images/*.png
+test/images/*.pdf

Gemfile

@@ -1,14 +1,18 @@
 source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
-#   gem "activesupport", ">= 2.3.5"
+gem "activesupport", ">= 2.3.5"
+gem "i18n", ">= 0.6.0"
 gem "httparty", ">= 0.4.4"
+gem "builder", ">= 3.0.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  # gem "shoulda", ">= 0"
+  gem "shoulda", ">= 0"
+  gem "mocha", ">= 0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.0"
   gem "rcov", ">= 0"
+  gem "nokogiri", ">= 0"
 end

Gemfile.lock

@@ -1,22 +1,34 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    activesupport (3.0.9)
+    builder (3.0.0)
     crack (0.1.6)
     git (1.2.5)
     httparty (0.5.2)
       crack (= 0.1.6)
+    i18n (0.6.0)
     jeweler (1.6.0)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
+    mocha (0.9.12)
+    nokogiri (1.5.0)
     rake (0.8.7)
     rcov (0.9.9)
+    shoulda (2.11.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport (>= 2.3.5)
+  builder (>= 3.0.0)
   bundler (~> 1.0.0)
   httparty (>= 0.4.4)
+  i18n (>= 0.6.0)
   jeweler (~> 1.6.0)
+  mocha
+  nokogiri
   rcov
+  shoulda

README.rdoc

@@ -1,36 +1,63 @@
 = endicia
 
-This gem allows you to connect to your Endicia API to print USPS labels. It is in no way meant to be exhaustive--fork away!
-
+This gem allows you to connect to your Endicia API to print USPS labels. It is
+in no way meant to be exhaustive--fork away!
+
 == Configuration
-You'll need an endicia.yml file in config, with:
-	AccountID (6 digits)
-	RequesterID (string--you have to request this from Endicia)
-	PassPhrase (string)
-and optionally
-	Test (set this to true while in testing and/or in development env)
-
+
+If you're using Rails, you'll want an endicia.yml file in config, with:
+
+  development: &development
+    AccountID: (any 6 digit number for dev)
+    RequesterID: (any string for dev)
+    PassPhrase: (any string for dev)
+    Test: YES
+
+  test:
+    <<: *development
+
+  production:
+    AccountID: (6 digits)
+    RequesterID (string--you have to request this from Endicia)
+    PassPhrase (string)
+    Test: NO
+
 Additionally, you may want to set a few defaults like your address:
-	FromCompany
-	FromCity
-	FromState
-	FromPostalCode
-	ReturnCompany
-	ReturnCity
-	ReturnState
-	ReturnCode
 
-You can also specify any of the options that Endicia allows for 'GetPostageLabel' as defaults. Most of them you'll want to pass in, but you might find it convenient to switch the default image format globally, for instance. Any options you pass in directly will override that defaults in the config file.
+  FromCompany:
+  FromCity:
+  FromState:
+  FromPostalCode:
+  ReturnCompany:
+  ReturnCity:
+  ReturnState:
+  ReturnCode:
+
+You can also specify any of the options that Endicia allows for
+'GetPostageLabel' as defaults. Most of them you'll want to pass in, but you
+might find it convenient to switch the default image format globally, for
+instance. Any options you pass in directly will override that defaults in the
+config file.
+
+Outside of Rails, you will need to pass these options to Endicia.get_label.
 
 Cheers!
 
 == Usage
-There's only one method--_get_label_.
 
-Ex. Endicia.get_label({:ToPostalCode => RECIPIENT ZIP, :ToAddress1 => RECIPIENT ADDRESS, :ToCity => RECIPIENT CITY, :ToState => RECIPIENT STATE, :PartnerTransactionID => GENERALLY THE ORDER (OR SOME MODEL) ID, :PartnerCustomerID => GENERALLY CUSTOMER/USER ID, :MailClass => SHIPPING METHOD, :WeightOz => INTEGER WEIGHT})
+  label = Endicia.get_label({
+    :ToPostalCode => RECIPIENT ZIP,
+    :ToAddress1 => RECIPIENT ADDRESS,
+    :ToCity => RECIPIENT CITY,
+    :ToState => RECIPIENT STATE,
+    :PartnerTransactionID => GENERALLY THE ORDER (OR SOME MODEL) ID,
+    :PartnerCustomerID => GENERALLY CUSTOMER/USER ID,
+    :MailClass => SHIPPING METHOD,
+    :WeightOz => INTEGER WEIGHT
+  })
 
 == Contributing to endicia
- 
+
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
 * Fork the project
@@ -43,4 +70,3 @@ Ex. Endicia.get_label({:ToPostalCode => RECIPIENT ZIP, :ToAddress1 => RECIPIENT
 
 Copyright (c) 2011 Mark Dickson. See LICENSE.txt for
 further details.
-

Rakefile

@@ -32,6 +32,17 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
+namespace(:test) do
+  Rake::TestTask.new(:integration) do |test|
+    test.libs << 'lib' << 'test'
+    test.pattern = 'test/integration.rb'
+    test.verbose = true
+  end
+
+  desc "Run unit and integration tests"
+  task(:all => ['test', 'test:integration'])
+end  
+
 require 'rcov/rcovtask'
 Rcov::RcovTask.new do |test|
   test.libs << 'test'

VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1