ideaoforder-shipping 1.6.0 → 1.6.1

data/CVSROOT/checkoutlist

@@ -0,0 +1,13 @@
+# The "checkoutlist" file is used to support additional version controlled
+# administrative files in $CVSROOT/CVSROOT, such as template files.
+#
+# The first entry on a line is a filename which will be checked out from
+# the corresponding RCS file in the $CVSROOT/CVSROOT directory.
+# The remainder of the line is an error message to use if the file cannot
+# be checked out.
+#
+# File format:
+#
+#	[<whitespace>]<filename>[<whitespace><error message>]<end-of-line>
+#
+# comment lines begin with '#'

data/CVSROOT/commitinfo

@@ -0,0 +1,15 @@
+# The "commitinfo" file is used to control pre-commit checks.
+# The filter on the right is invoked with the repository and a list 
+# of files to check.  A non-zero exit of the filter program will 
+# cause the commit to be aborted.
+#
+# The first entry on a line is a regular expression which is tested
+# against the directory that the change is being committed to, relative
+# to the $CVSROOT.  For the first match that is found, then the remainder
+# of the line is the name of the filter to run.
+#
+# If the repository name does not match any of the regular expressions in this
+# file, the "DEFAULT" line is used, if it is specified.
+#
+# If the name "ALL" appears as a regular expression it is always used
+# in addition to the first matching regex or "DEFAULT".

data/CVSROOT/config

@@ -0,0 +1,21 @@
+# Set this to "no" if pserver shouldn't check system users/passwords
+#SystemAuth=no
+
+# Put CVS lock files in this directory rather than directly in the repository.
+LockDir=/var/cvslocks/
+
+# Set `TopLevelAdmin' to `yes' to create a CVS directory at the top
+# level of the new working directory when using the `cvs checkout'
+# command.
+#TopLevelAdmin=no
+
+# Set `LogHistory' to `all' or `TOFEWGCMAR' to log all transactions to the
+# history file, or a subset as needed (ie `TMAR' logs all write operations)
+#LogHistory=TOFEWGCMAR
+
+# Set `RereadLogAfterVerify' to `always' (the default) to allow the verifymsg
+# script to change the log message.  Set it to `stat' to force CVS to verify# that the file has changed before reading it (this can take up to an extra
+# second per directory being committed, so it is not recommended for large
+# repositories.  Set it to `never' (the previous CVS behavior) to prevent
+# verifymsg scripts from changing the log message.
+#RereadLogAfterVerify=always

data/CVSROOT/cvswrappers

@@ -0,0 +1,75 @@
+# This file affects handling of files based on their names.
+#
+# The -m option specifies whether CVS attempts to merge files.
+#
+# The -k option specifies keyword expansion (e.g. -kb for binary).
+#
+# Format of wrapper file ($CVSROOT/CVSROOT/cvswrappers or .cvswrappers)
+#
+#  wildcard	[option value][option value]...
+#
+#  where option is one of
+#  -f		from cvs filter		value: path to filter
+#  -t		to cvs filter		value: path to filter
+#  -m		update methodology	value: MERGE or COPY
+#  -k		expansion mode		value: b, o, kkv, &c
+#
+#  and value is a single-quote delimited value.
+# For example:
+#*.gif -k 'b'
+*.JPG   -k 'b' -m 'COPY'
+*.avi   -k 'b' -m 'COPY'
+*.bin   -k 'b' -m 'COPY'
+*.bz    -k 'b' -m 'COPY'
+*.bz2   -k 'b' -m 'COPY'
+*.doc   -k 'b' -m 'COPY'
+*.exe   -k 'b' -m 'COPY'
+*.gif   -k 'b' -m 'COPY'
+*.gz    -k 'b' -m 'COPY'
+*.hqx   -k 'b' -m 'COPY'
+*.jar   -k 'b' -m 'COPY'
+*.jpeg  -k 'b' -m 'COPY'
+*.jpg   -k 'b' -m 'COPY'
+*.mov   -k 'b' -m 'COPY'
+*.mp3   -k 'b' -m 'COPY'
+*.mpg   -k 'b' -m 'COPY'
+*.pdf   -k 'b' -m 'COPY'
+*.png   -k 'b' -m 'COPY'
+*.ppt   -k 'b' -m 'COPY'
+*.rpm   -k 'b' -m 'COPY'
+*.sit   -k 'b' -m 'COPY'
+*.srpm  -k 'b' -m 'COPY'
+*.swf   -k 'b' -m 'COPY'
+*.tar   -k 'b' -m 'COPY'
+*.tbz   -k 'b' -m 'COPY'
+*.tgz   -k 'b' -m 'COPY'
+*.tif   -k 'b' -m 'COPY'
+*.tiff  -k 'b' -m 'COPY'
+*.xbm   -k 'b' -m 'COPY'
+*.xls   -k 'b' -m 'COPY'
+*.zip   -k 'b' -m 'COPY'
+*.keystore   -k 'b' -m 'COPY'
+# File types added by Borland JBuilder
+*.aiff -k 'b'
+*.midi -k 'b'
+*.jds -k 'b'
+*.asx -k 'b'
+*.wav -k 'b'
+*.war -k 'b'
+*.ear -k 'b'
+*.obj -k 'b'
+*.dcu -k 'b'
+*.class -k 'b'
+*.au -k 'b'
+*.eargrp -k 'b'
+*.jpe -k 'b'
+*.o -k 'b'
+*.asf -k 'b'
+*.rar -k 'b'
+*.library -k 'b'
+*.ejbgrp -k 'b'
+*.ram -k 'b'
+*.ejbgrpx -k 'b'
+*.mid -k 'b'
+*.rmf -k 'b'
+

data/CVSROOT/editinfo

@@ -0,0 +1,21 @@
+# The "editinfo" file is used to allow verification of logging
+# information.  It works best when a template (as specified in the
+# rcsinfo file) is provided for the logging procedure.  Given a
+# template with locations for, a bug-id number, a list of people who
+# reviewed the code before it can be checked in, and an external
+# process to catalog the differences that were code reviewed, the
+# following test can be applied to the code:
+#
+#   Making sure that the entered bug-id number is correct.
+#   Validating that the code that was reviewed is indeed the code being
+#       checked in (using the bug-id number or a seperate review
+#       number to identify this particular code set.).
+#
+# If any of the above test failed, then the commit would be aborted.
+#
+# Actions such as mailing a copy of the report to each reviewer are
+# better handled by an entry in the loginfo file.
+#
+# One thing that should be noted is the the ALL keyword is not
+# supported.  There can be only one entry that matches a given
+# repository.

data/CVSROOT/loginfo

@@ -0,0 +1,27 @@
+# The "loginfo" file controls where "cvs commit" log information
+# is sent.  The first entry on a line is a regular expression which must match
+# the directory that the change is being made to, relative to the
+# $CVSROOT.  If a match is found, then the remainder of the line is a filter
+# program that should expect log information on its standard input.
+#
+# If the repository name does not match any of the regular expressions in this
+# file, the "DEFAULT" line is used, if it is specified.
+#
+# If the name ALL appears as a regular expression it is always used
+# in addition to the first matching regex or DEFAULT.
+#
+# You may specify a format string as part of the
+# filter.  The string is composed of a `%' followed
+# by a single format character, or followed by a set of format
+# characters surrounded by `{' and `}' as separators.  The format
+# characters are:
+#
+#   s = file name
+#   V = old version number (pre-checkin)
+#   v = new version number (post-checkin)
+#
+# For example:
+#DEFAULT (echo ""; id; echo %s; date; cat) >> $CVSROOT/CVSROOT/commitlog
+# or
+#DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog
+#DEFAULT /var/cvs/commitmailer.sh %s tom@infoether.com

data/CVSROOT/modules

@@ -0,0 +1,26 @@
+# Three different line formats are valid:
+#	key	-a    aliases...
+#	key [options] directory
+#	key [options] directory files...
+#
+# Where "options" are composed of:
+#	-i prog		Run "prog" on "cvs commit" from top-level of module.
+#	-o prog		Run "prog" on "cvs checkout" of module.
+#	-e prog		Run "prog" on "cvs export" of module.
+#	-t prog		Run "prog" on "cvs rtag" of module.
+#	-u prog		Run "prog" on "cvs update" of module.
+#	-d dir		Place module in directory "dir" instead of module name.
+#	-l		Top-level directory only -- do not recurse.
+#
+# NOTE:  If you change any of the "Run" options above, you'll have to
+# release and re-checkout any working directories of these modules.
+#
+# And "directory" is a path to a directory relative to $CVSROOT.
+#
+# The "-a" option specifies an alias.  An alias is interpreted as if
+# everything on the right of the "-a" had been typed on the command line.
+#
+# You can encode a module within a module by using the special '&'
+# character to interpose another module into the current module.  This
+# can be useful for creating a module that consists of many directories
+# spread out over the entire source repository.

data/CVSROOT/notify

@@ -0,0 +1,12 @@
+# The "notify" file controls where notifications from watches set by
+# "cvs watch add" or "cvs edit" are sent.  The first entry on a line is
+# a regular expression which is tested against the directory that the
+# change is being made to, relative to the $CVSROOT.  If it matches,
+# then the remainder of the line is a filter program that should contain
+# one occurrence of %s for the user to notify, and information on its
+# standard input.
+#
+# "ALL" or "DEFAULT" can be used in place of the regular expression.
+#
+# For example:
+#ALL mail -s "CVS notification" %s

data/CVSROOT/passwd

@@ -0,0 +1 @@
+anonymous:$1$0H$2/LSjjwDfsSA0gaDYY5Df/:tutorials

data/CVSROOT/rcsinfo

@@ -0,0 +1,13 @@
+# The "rcsinfo" file is used to control templates with which the editor
+# is invoked on commit and import.
+#
+# The first entry on a line is a regular expression which is tested
+# against the directory that the change is being made to, relative to the
+# $CVSROOT.  For the first match that is found, then the remainder of the
+# line is the name of the file that contains the template.
+#
+# If the repository name does not match any of the regular expressions in this
+# file, the "DEFAULT" line is used, if it is specified.
+#
+# If the name "ALL" appears as a regular expression it is always used
+# in addition to the first matching regex or "DEFAULT".

data/CVSROOT/readers

@@ -0,0 +1,2 @@
+anonymous::anonymous
+

data/CVSROOT/taginfo

@@ -0,0 +1,20 @@
+# The "taginfo" file is used to control pre-tag checks.
+# The filter on the right is invoked with the following arguments:
+#
+# $1 -- tagname
+# $2 -- operation "add" for tag, "mov" for tag -F, and "del" for tag -d
+# $3 -- repository
+# $4->  file revision [file revision ...]
+#
+# A non-zero exit of the filter program will cause the tag to be aborted.
+#
+# The first entry on a line is a regular expression which is tested
+# against the directory that the change is being committed to, relative
+# to the $CVSROOT.  For the first match that is found, then the remainder
+# of the line is the name of the filter to run.
+#
+# If the repository name does not match any of the regular expressions in this
+# file, the "DEFAULT" line is used, if it is specified.
+#
+# If the name "ALL" appears as a regular expression it is always used
+# in addition to the first matching regex or "DEFAULT".

data/CVSROOT/verifymsg

@@ -0,0 +1,21 @@
+# The "verifymsg" file is used to allow verification of logging
+# information.  It works best when a template (as specified in the
+# rcsinfo file) is provided for the logging procedure.  Given a
+# template with locations for, a bug-id number, a list of people who
+# reviewed the code before it can be checked in, and an external
+# process to catalog the differences that were code reviewed, the
+# following test can be applied to the code:
+#
+#   Making sure that the entered bug-id number is correct.
+#   Validating that the code that was reviewed is indeed the code being
+#       checked in (using the bug-id number or a seperate review
+#       number to identify this particular code set.).
+#
+# If any of the above test failed, then the commit would be aborted.
+#
+# Actions such as mailing a copy of the report to each reviewer are
+# better handled by an entry in the loginfo file.
+#
+# One thing that should be noted is the the ALL keyword is not
+# supported.  There can be only one entry that matches a given
+# repository.

data/Rakefile

@@ -1,251 +1,14 @@
-require 'rubygems'
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
-require 'rake/contrib/rubyforgepublisher'
-require File.dirname(__FILE__) + '/lib/shipping'
-
-PKG_VERSION = Shipping::VERSION
-PKG_NAME = "shipping"
-PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
-RUBY_FORGE_PROJECT = "shipping"
-RUBY_FORGE_USER = ENV['RUBY_FORGE_USER'] || "cardmagic"
-RELEASE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
-
-PKG_FILES = FileList[
-    "lib/**/*", "bin/*", "test/**/*", "[A-Z]*", "Rakefile", "doc/**/*"
-]
-
-desc "Default Task"
-task :default => [ :test ]
-
-# Run the unit tests
-desc "Run all unit tests"
-Rake::TestTask.new("test") { |t|
-  t.libs << "lib"
-  t.pattern = 'test/*/*_test.rb'
-  t.verbose = true
-}
-
-# Make a console, useful when working on tests
-desc "Generate a test console"
-task :console do
-   verbose( false ) { sh "irb -I lib/ -r 'shipping'" }
-end
-
-# Genereate the RDoc documentation
-desc "Create documentation"
-Rake::RDocTask.new("doc") { |rdoc|
-  rdoc.title = "Ruby Shipping - UPS, FedEx, USPS"
-  rdoc.rdoc_dir = 'html'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-}
-
-# Genereate the package
-spec = Gem::Specification.new do |s|
-
-  #### Basic information.
-
-  s.name = 'shipping'
-  s.version = PKG_VERSION
-  s.summary = <<-EOF
-   A general shipping module to find out the shipping prices via UPS or FedEx.
-  EOF
-  s.description = <<-EOF
-   A general shipping module to find out the shipping prices via UPS or FedEx.
-  EOF
-
-  #### Which files are to be included in this gem?  Everything!  (Except CVS directories.)
-
-  s.files = PKG_FILES
-
-  #### Load-time details: library and application (you will need one or both).
-
-  s.add_dependency('builder', '>= 1.2.0')
-  s.requirements << "An xml-builder library."
-
-  s.require_path = 'lib'
-  s.autorequire = 'shipping'
-
-  #### Documentation and testing.
-
-  s.has_rdoc = true
-
-  #### Author and project details.
-
-  s.author = "Lucas Carlson"
-  s.email = "lucas@rufy.com"
-  s.homepage = "http://shipping.rufy.com/"
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.need_zip = true
-  pkg.need_tar = true
-end
-
-desc "Report code statistics (KLOCs, etc) from the application"
-task :stats do
-  require 'code_statistics'
-  CodeStatistics.new(
-    ["Library", "lib"],
-    ["Units", "test"]
-  ).to_s
-end
-
-desc "Publish new documentation"
-task :publish do
-    Rake::RubyForgePublisher.new('shipping', 'cardmagic').upload
-    `ssh rufy update-shipping-doc`
-end
-
-desc "Publish the release files to RubyForge."
-task :upload => [:package] do
-    files = ["gem", "tgz", "zip"].map { |ext| "pkg/#{PKG_FILE_NAME}.#{ext}" }
-
-    if RUBY_FORGE_PROJECT then
-        require 'net/http'
-        require 'open-uri'
-
-        project_uri = "http://rubyforge.org/projects/#{RUBY_FORGE_PROJECT}/"
-        project_data = open(project_uri) { |data| data.read }
-        group_id = project_data[/[?&]group_id=(\d+)/, 1]
-        raise "Couldn't get group id" unless group_id
-
-        # This echos password to shell which is a bit sucky
-        if ENV["RUBY_FORGE_PASSWORD"]
-            password = ENV["RUBY_FORGE_PASSWORD"]
-        else
-            password = Proc.new do
-              sync = STDOUT.sync
-              begin
-                echo false
-                STDOUT.sync = true
-                print "#{RUBY_FORGE_USER}@rubyforge.org's password: "
-                STDIN.gets.chomp
-              ensure
-                echo true
-                STDOUT.sync = sync
-                puts
-              end
-            end.call
-        end
-
-        login_response = Net::HTTP.start("rubyforge.org", 80) do |http|
-            data = [
-                "login=1",
-                "form_loginname=#{RUBY_FORGE_USER}",
-                "form_pw=#{password}"
-            ].join("&")
-            http.post("/account/login.php", data)
-        end
-
-        cookie = login_response["set-cookie"]
-        raise "Login failed" unless cookie
-        headers = { "Cookie" => cookie }
-
-        release_uri = "http://rubyforge.org/frs/admin/?group_id=#{group_id}"
-        release_data = open(release_uri, headers) { |data| data.read }
-        package_id = release_data[/[?&]package_id=(\d+)/, 1]
-        raise "Couldn't get package id" unless package_id
-
-        first_file = true
-        release_id = ""
-
-        files.each do |filename|
-            basename  = File.basename(filename)
-            file_ext  = File.extname(filename)
-            file_data = File.open(filename, "rb") { |file| file.read }
-
-            puts "Releasing #{basename}..."
-
-            release_response = Net::HTTP.start("rubyforge.org", 80) do |http|
-                release_date = Time.now.strftime("%Y-%m-%d %H:%M")
-                type_map = {
-                    ".zip"    => "3000",
-                    ".tgz"    => "3110",
-                    ".gz"     => "3110",
-                    ".gem"    => "1400"
-                }; type_map.default = "9999"
-                type = type_map[file_ext]
-                boundary = "rubyqMY6QN9bp6e4kS21H4y0zxcvoor"
-
-                query_hash = if first_file then
-                  {
-                    "group_id" => group_id,
-                    "package_id" => package_id,
-                    "release_name" => RELEASE_NAME,
-                    "release_date" => release_date,
-                    "type_id" => type,
-                    "processor_id" => "8000", # Any
-                    "release_notes" => "",
-                    "release_changes" => "",
-                    "preformatted" => "1",
-                    "submit" => "1"
-                  }
-                else
-                  {
-                    "group_id" => group_id,
-                    "release_id" => release_id,
-                    "package_id" => package_id,
-                    "step2" => "1",
-                    "type_id" => type,
-                    "processor_id" => "8000", # Any
-                    "submit" => "Add This File"
-                  }
-                end
-
-                query = "?" + query_hash.map do |(name, value)|
-                    [name, URI.encode(value)].join("=")
-                end.join("&")
-
-                data = [
-                    "--" + boundary,
-                    "Content-Disposition: form-data; name=\"userfile\"; filename=\"#{basename}\"",
-                    "Content-Type: application/octet-stream",
-                    "Content-Transfer-Encoding: binary",
-                    "", file_data, ""
-                    ].join("\x0D\x0A")
-
-                release_headers = headers.merge(
-                    "Content-Type" => "multipart/form-data; boundary=#{boundary}"
-                )
-
-                target = first_file ? "/frs/admin/qrs.php" : "/frs/admin/editrelease.php"
-                http.post(target + query, data, release_headers)
-            end
-
-            if first_file then
-                release_id = release_response.body[/release_id=(\d+)/, 1]
-                raise("Couldn't get release id") unless release_id
-            end
-
-            first_file = false
-        end
-    end
-end
-
 begin
-  if !defined?(USE_TERMIOS) || USE_TERMIOS
-    require 'termios'
-  else
-    raise LoadError
-  end
-
-  # Enable or disable stdin echoing to the terminal.
-  def echo(enable)
-    term = Termios::getattr(STDIN)
-
-    if enable
-      term.c_lflag |= (Termios::ECHO | Termios::ICANON)
-    else
-      term.c_lflag &= ~Termios::ECHO
-    end
-
-    Termios::setattr(STDIN, Termios::TCSANOW, term)
+  require 'jeweler'
+  Jeweler::Tasks.new do |s|
+    s.name = "shipping"
+    s.summary = "A general shipping module to find out the shipping prices via UPS or FedEx"
+    s.email = "mark@sitesteaders.com"
+    s.homepage = "http://github.com/ideaoforder/shipping"
+    s.description = "A general shipping module to find out the shipping prices via UPS or FedEx"
+    s.authors = ["Lucas Carlson", "Jimmy Baker", "Mark Dickson"]
+    s.add_dependency('builder', '>= 1.2.0')  
   end
 rescue LoadError
-  def echo(enable)
-  end
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end

data/VERSION

@@ -0,0 +1 @@
+1.6.1

data/install.rb

@@ -0,0 +1,40 @@
+require 'rbconfig'
+require 'find'
+require 'ftools'
+
+include Config
+
+# this was adapted from rdoc's install.rb by ways of Log4r
+
+$sitedir = CONFIG["sitelibdir"]
+unless $sitedir
+  version = CONFIG["MAJOR"] + "." + CONFIG["MINOR"]
+  $libdir = File.join(CONFIG["libdir"], "ruby", version)
+  $sitedir = $:.find {|x| x =~ /site_ruby/ }
+  if !$sitedir
+    $sitedir = File.join($libdir, "site_ruby")
+  elsif $sitedir !~ Regexp.quote(version)
+    $sitedir = File.join($sitedir, version)
+  end
+end
+
+makedirs = %w{ shipping }
+makedirs.each {|f| File::makedirs(File.join($sitedir, *f.split(/\//)))}
+
+Dir.chdir("lib")
+begin
+	require 'rubygems'
+	require 'rake'
+rescue LoadError
+	puts
+	puts "Please install Gem and Rake from http://rubyforge.org/projects/rubygems and http://rubyforge.org/projects/rake"
+	puts
+	exit(-1)
+end
+
+files = FileList["**/*"]
+
+# File::safe_unlink *deprecated.collect{|f| File.join($sitedir, f.split(/\//))}
+files.each {|f| 
+  File::install(f, File.join($sitedir, *f.split(/\//)), 0644, true)
+}

data/lib/extensions.rb

@@ -0,0 +1,11 @@
+class Object
+ def blank?
+   if respond_to? :empty?
+     empty?
+   elsif respond_to? :zero?
+     zero?
+   else
+     !self
+   end
+ end
+end

data/lib/shipping.rb

@@ -0,0 +1,47 @@
+#--
+# Copyright (c) 2005 Lucas Carlson
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+# Author::    Lucas Carlson  (mailto:lucas@rufy.com)
+# Copyright:: Copyright (c) 2005 Lucas Carlson
+# License::   LGPL
+
+$:.unshift(File.dirname(__FILE__))
+
+begin
+   require 'rubygems'
+rescue LoadError
+   nil
+end
+
+require 'builder'
+require 'yaml'
+require 'rexml/document'
+require 'net/http'
+require 'net/https'
+require 'base64'
+require 'fileutils'
+require 'tempfile'
+
+require 'extensions'
+require 'shipping/base'
+require 'shipping/fedex'
+require 'shipping/ups'

data/lib/shipping/base.rb

@@ -5,8 +5,6 @@
 # Updated:: 12-22-2008 by Mark Dickson (mailto:mark@sitesteaders.com)
 
 module Shipping
-	VERSION = "1.6.0"
-
 	class ShippingError < StandardError; end
 	class ShippingRequiredFieldError < StandardError; end
 
@@ -30,7 +28,7 @@ module Shipping
     attr_accessor :weight_each, :quantity, :max_weight, :max_quantity, :items
 
 		def initialize(options = {})
-			prefs = File.expand_path(options[:prefs] || "~/.shipping.yml")
+			prefs = File.expand_path(options[:prefs] || RAILS_ROOT + "/config/shipping.yml")
 			YAML.load(File.open(prefs)).each {|pref, value| eval("@#{pref} = #{value.inspect}")} if File.exists?(prefs)
 
 			@required = Array.new

data/pkg/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

data/shipping.gemspec

@@ -0,0 +1,71 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{shipping}
+  s.version = "1.6.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Lucas Carlson", "Jimmy Baker", "Mark Dickson"]
+  s.date = %q{2009-09-08}
+  s.description = %q{A general shipping module to find out the shipping prices via UPS or FedEx}
+  s.email = %q{mark@sitesteaders.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README"
+  ]
+  s.files = [
+    "CVSROOT/checkoutlist",
+     "CVSROOT/commitinfo",
+     "CVSROOT/config",
+     "CVSROOT/cvswrappers",
+     "CVSROOT/editinfo",
+     "CVSROOT/loginfo",
+     "CVSROOT/modules",
+     "CVSROOT/notify",
+     "CVSROOT/passwd",
+     "CVSROOT/rcsinfo",
+     "CVSROOT/readers",
+     "CVSROOT/taginfo",
+     "CVSROOT/verifymsg",
+     "LICENSE",
+     "README",
+     "Rakefile",
+     "VERSION",
+     "install.rb",
+     "lib/extensions.rb",
+     "lib/shipping.rb",
+     "lib/shipping/base.rb",
+     "lib/shipping/fedex.rb",
+     "lib/shipping/ups.rb",
+     "pkg/.gitignore",
+     "shipping.gemspec",
+     "test/base/base_test.rb",
+     "test/fedex/fedex_test.rb",
+     "test/test_helper.rb",
+     "test/ups/ups_test.rb"
+  ]
+  s.homepage = %q{http://github.com/ideaoforder/shipping}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{A general shipping module to find out the shipping prices via UPS or FedEx}
+  s.test_files = [
+    "test/base/base_test.rb",
+     "test/fedex/fedex_test.rb",
+     "test/ups/ups_test.rb",
+     "test/test_helper.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>, [">= 1.2.0"])
+    else
+      s.add_dependency(%q<builder>, [">= 1.2.0"])
+    end
+  else
+    s.add_dependency(%q<builder>, [">= 1.2.0"])
+  end
+end

data/test/base/base_test.rb

@@ -0,0 +1,24 @@
+require File.dirname(__FILE__) + '/../test_helper'
+class BaseTest < Test::Unit::TestCase
+	def setup
+		@ship = Shipping::Base.new(
+			:zip => 97202,
+			:state => "OR",
+			:sender_zip => 10001,
+			:sender_state => "New York",
+			:weight => 2
+		)
+	end
+
+	def test_ups
+		ups = @ship.ups
+		assert_instance_of Shipping::UPS, ups
+		assert_equal ups.zip, @ship.zip
+	end
+
+	def test_fedex
+		fedex = @ship.fedex
+		assert_instance_of Shipping::FedEx, fedex
+		assert_equal fedex.zip, @ship.zip
+	end
+end

data/test/fedex/fedex_test.rb

@@ -0,0 +1,88 @@
+require File.dirname(__FILE__) + '/../test_helper'
+class FedExTest < Test::Unit::TestCase
+	def setup
+		@ship = Shipping::FedEx.new(
+			:zip => 97202,
+			:state => "OR",
+			:sender_zip => 10001,
+			:sender_state => "New York",
+			:weight => 2
+		)
+		
+		# use demo environment for tests
+		@ship.fedex_url = 'https://gatewaybeta.fedex.com/GatewayDC'
+	end
+
+	def test_price
+		assert_in_delta 5.80, @ship.price, 1
+	end
+	
+	def test_discount_price
+		assert_in_delta 5.80, @ship.discount_price, 1
+		assert @ship.discount_price < @ship.price
+	end
+	
+	def test_fails
+		ship = Shipping::FedEx.new :zip => 97202, :weight => 2
+		assert_raise(Shipping::ShippingError) { ship.price }
+	end
+	
+	def test_label
+		@ship.name = "Package Receiver"
+		@ship.phone = "555-555-5555"
+		@ship.email = "lucas@rufy.com"
+		@ship.address = "Some address"
+		@ship.city = "Portland"
+	
+		@ship.sender_name = "Package Sender"
+		@ship.sender_phone = "333-333-3333"
+		@ship.sender_email = "john@doe.com"
+		@ship.sender_address = "Ok old address"
+		@ship.sender_city = "New York"
+		
+		assert_nothing_raised { @label = @ship.label }
+		assert_not_nil @label.tracking_number
+		assert_not_nil @label.image.path
+		#assert_equal `file -i -b #{@label.image.path}`, "image/png\n"
+	end
+	
+	def test_void
+		@ship.name = "Package Receiver"
+		@ship.phone = "555-555-5555"
+		@ship.email = "lucas@rufy.com"
+		@ship.address = "Some address"
+		@ship.city = "Portland"
+	
+		@ship.sender_name = "Package Sender"
+		@ship.sender_phone = "333-333-3333"
+		@ship.sender_email = "john@doe.com"
+		@ship.sender_address = "Ok old address"
+		@ship.sender_city = "New York"
+				
+		assert_nothing_raised { @label = @ship.label }
+		
+		assert @ship.void(@label.tracking_number)
+	end
+	
+	def test_available_services
+	  @ship.name = "Package Receiver"
+		@ship.phone = "555-555-5555"
+		@ship.email = "lucas@rufy.com"
+		@ship.address = "Some address"
+		@ship.city = "Portland"
+	
+		@ship.sender_name = "Package Sender"
+		@ship.sender_phone = "333-333-3333"
+		@ship.sender_email = "john@doe.com"
+		@ship.sender_address = "Ok old address"
+		@ship.sender_city = "New York"
+		
+		assert_nothing_raised { @available_services = @ship.available_services }
+		assert_not_nil @available_services
+	end
+	
+	def test_void_fail
+		# made up tracking number
+		assert_raise(Shipping::ShippingError) { @ship.void('470012923511666') }
+	end
+end

data/test/test_helper.rb

@@ -0,0 +1,4 @@
+$:.unshift(File.dirname(__FILE__) + '/../lib')
+
+require 'test/unit'
+require 'shipping'

data/test/ups/ups_test.rb

@@ -0,0 +1,72 @@
+require File.dirname(__FILE__) + '/../test_helper'
+class UpsTest < Test::Unit::TestCase
+	def setup
+		@ship = Shipping::UPS.new(
+			:zip => 97202,
+			:state => "OR",
+			:sender_zip => 10001,
+			:sender_state => "New York",
+			:weight => 2
+		)
+		
+		# use demo environment for tests
+		@ship.ups_url = 'https://wwwcie.ups.com/ups.app/xml'
+	end
+
+	def test_price
+		# price is subject to account details, it seems?
+		assert_in_delta 5.80, @ship.price, 1
+	end
+	
+	def test_valid_address
+		assert !@ship.valid_address?
+		@ship.city = "Portland"
+		assert @ship.valid_address?
+	end
+	
+	def test_label
+		@ship.name = "Package Receiver"
+		@ship.company = "Package Receiver Company"
+		@ship.phone = "555-555-5555"
+		@ship.email = "lucas@rufy.com"
+		@ship.address = "Some address"
+		@ship.city = "Portland"
+	
+		@ship.sender_name = "Package Sender"
+		@ship.sender_company = "Package Sender Company"
+		@ship.sender_phone = "333-333-3333"
+		@ship.sender_email = "john@doe.com"
+		@ship.sender_address = "Ok old address"
+		@ship.sender_city = "New York"
+		
+		assert_nothing_raised { @label = @ship.label }
+		assert_not_nil @label.tracking_number
+		assert_not_nil @label.image.path
+		#assert_equal `file -i -b #{@label.image.path}`, "image/gif\n"
+	end
+	
+	def test_void
+		@ship.name = "Package Receiver"
+		@ship.company = "Package Receiver Company"
+		@ship.phone = "555-555-5555"
+		@ship.email = "lucas@rufy.com"
+		@ship.address = "Some address"
+		@ship.city = "Portland"
+	
+		@ship.sender_name = "Package Sender"
+		@ship.sender_company = "Package Sender Company"
+		@ship.sender_phone = "333-333-3333"
+		@ship.sender_email = "john@doe.com"
+		@ship.sender_address = "Ok old address"
+		@ship.sender_city = "New York"
+		
+		assert_nothing_raised { @label = @ship.label }
+		
+		assert @ship.void(@label.tracking_number)
+	end
+	
+	def test_void_fail
+		# Tracking number from certification process; Time for voiding has expired 
+		assert_raise(Shipping::ShippingError) { @ship.void('1Z12345E0392508488') }
+	end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ideaoforder-shipping
 version: !ruby/object:Gem::Version 
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors: 
 - Lucas Carlson
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-25 00:00:00 -08:00
+date: 2009-09-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,25 +25,49 @@ dependencies:
         version: 1.2.0
     version: 
 description: A general shipping module to find out the shipping prices via UPS or FedEx
-email: lucas@rufy.com
+email: mark@sitesteaders.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- LICENSE
+- README
 files: 
+- CVSROOT/checkoutlist
+- CVSROOT/commitinfo
+- CVSROOT/config
+- CVSROOT/cvswrappers
+- CVSROOT/editinfo
+- CVSROOT/loginfo
+- CVSROOT/modules
+- CVSROOT/notify
+- CVSROOT/passwd
+- CVSROOT/rcsinfo
+- CVSROOT/readers
+- CVSROOT/taginfo
+- CVSROOT/verifymsg
 - LICENSE
-- Rakefile
 - README
+- Rakefile
+- VERSION
+- install.rb
+- lib/extensions.rb
+- lib/shipping.rb
 - lib/shipping/base.rb
 - lib/shipping/fedex.rb
 - lib/shipping/ups.rb
+- pkg/.gitignore
+- shipping.gemspec
+- test/base/base_test.rb
+- test/fedex/fedex_test.rb
+- test/test_helper.rb
+- test/ups/ups_test.rb
 has_rdoc: false
 homepage: http://github.com/ideaoforder/shipping
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -63,7 +87,10 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A general shipping module to find out the shipping prices via UPS or FedEx
-test_files: []
-
+test_files: 
+- test/base/base_test.rb
+- test/fedex/fedex_test.rb
+- test/ups/ups_test.rb
+- test/test_helper.rb