binarylogic-shippinglogic 1.0.2 → 1.0.3

data/CHANGELOG.rdoc

@@ -1,7 +1,11 @@
-== 1.0.2
+== 1.0.3 released 2009-07-08
+
+* Rails uses United States not United State of America
+
+== 1.0.2 released 2009-07-08
 
 * Remove notifications with a successful severity in the errors message.
-* Added country code mapping so that we can pass full country named and have it convert it to a FedEx friendly code behind the scenes.
+* Added country code mapping so that we can pass full country names and have it convert it to a FedEx friendly code behind the scenes.
 
 == 1.0.1 released 2009-07-08
 

data/Rakefile

@@ -11,10 +11,11 @@ begin
     gem.homepage = "http://github.com/binarylogic/shippinglogic"
     gem.authors = ["Ben Johnson of Binary Logic"]
     gem.rubyforge_project = "shippinglogic"
+    gem.add_development_dependency "rspec"
     gem.add_dependency "activesupport", ">= 2.2.0"
     gem.add_dependency "httparty", ">= 0.4.4"
   end
-
+  Jeweler::RubyforgeTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
@@ -32,14 +33,3 @@ Spec::Rake::SpecTask.new(:rcov) do |spec|
 end
 
 task :default => :spec
-
-begin
-  require 'rake/contrib/sshpublisher'
-  namespace :rubyforge do
-    desc "Release gem to RubyForge"
-    task :release => ["rubyforge:release:gem"]
-  end
-rescue LoadError
-  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
-end
-

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 2
-:major: 1
 :minor: 0
+:patch: 3
+:major: 1

data/lib/shippinglogic/fedex/enumerations.rb

@@ -59,7 +59,7 @@ module Shippinglogic
       DROP_OFF_TYPES = ["REGULAR_PICKUP", "REQUEST_COURIER", "DROP_BOX", "BUSINESS_SERVICE_CENTER", "STATION"]
       RATE_REQUEST_TYPES = ["ACCOUNT", "LIST", "MULTIWEIGHT"]
       
-      COUNTRY_CODES = {
+      FEDEX_COUNTRY_CODES = {
         "Albania" => "AL",
         "Algeria" => "DZ",
         "American Samoa" => "AS",
@@ -246,7 +246,6 @@ module Shippinglogic
         "U.A.E." => "AE",
         "U.S. Virgin Islands" => "VI",
         "U.S.A." => "US",
-        "United States of America" => "US",
         "Uganda" => "UG",
         "Ukraine" => "UA",
         "United Kingdom" => "GB",
@@ -261,6 +260,10 @@ module Shippinglogic
         "Zambia" => "ZM",
         "Zimbabwe" => "ZW"
       }
+      
+      RAILS_COUNTRY_CODES = {
+        "United States" => "US"
+      }
     end
   end
 end

data/lib/shippinglogic/fedex/request.rb

@@ -92,11 +92,7 @@ module Shippinglogic
         end
         
         def country_code(value)
-          if Enumerations::COUNTRY_CODES.key?(value.to_s)
-            Enumerations::COUNTRY_CODES[value.to_s]
-          else
-            value.to_s
-          end
+          Enumerations::FEDEX_COUNTRY_CODES[value.to_s] || Enumerations::RAILS_COUNTRY_CODES[value.to_s] || value.to_s
         end
     end
   end

data/shippinglogic.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shippinglogic}
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Johnson of Binary Logic"]
@@ -92,13 +92,16 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 2.2.0"])
       s.add_runtime_dependency(%q<httparty>, [">= 0.4.4"])
     else
+      s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 2.2.0"])
       s.add_dependency(%q<httparty>, [">= 0.4.4"])
     end
   else
+    s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 2.2.0"])
     s.add_dependency(%q<httparty>, [">= 0.4.4"])
   end

data/spec/fedex/request_spec.rb

@@ -4,6 +4,6 @@ describe "FedEx Attributes" do
   it "should convert full country names to country codes" do
     fedex = new_fedex
     rates = fedex.rate
-    rates.send(:country_code, "United States of America").should == "US"
+    rates.send(:country_code, "United States").should == "US"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: binarylogic-shippinglogic
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -12,6 +12,16 @@ cert_chain: []
 date: 2009-08-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
   type: :runtime