piggybak 0.4.6 → 0.4.7

data/VERSION

@@ -1 +1 @@
-0.4.6
+0.4.7

data/app/models/piggybak/order.rb

@@ -104,7 +104,7 @@ module Piggybak
       self.total += self.tax_charge
 
       shipments.each do |shipment|
-        if shipment.new_record? && shipment.shipping_method
+        if (shipment.new_record? || shipment.status != "shipped") && shipment.shipping_method
           calculator = shipment.shipping_method.klass.constantize
           shipment.total = calculator.rate(shipment.shipping_method, self)
         end

data/piggybak.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "piggybak"
-  s.version = "0.4.6"
+  s.version = "0.4.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steph Skardal", "Brian Buchalter"]
-  s.date = "2012-07-10"
+  s.date = "2012-07-12"
   s.description = "Mountable ecommerce"
   s.email = "steph@endpoint.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piggybak
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-10 00:00:00.000000000 Z
+date: 2012-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries
-  requirement: &18516240 !ruby/object:Gem::Requirement
+  requirement: &18300580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18516240
+  version_requirements: *18300580
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &18531600 !ruby/object:Gem::Requirement
+  requirement: &18297300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *18531600
+  version_requirements: *18297300
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &18528980 !ruby/object:Gem::Requirement
+  requirement: &18385500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *18528980
+  version_requirements: *18385500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &18528100 !ruby/object:Gem::Requirement
+  requirement: &18382620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18528100
+  version_requirements: *18382620
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &18526400 !ruby/object:Gem::Requirement
+  requirement: &18460820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *18526400
+  version_requirements: *18460820
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &18524560 !ruby/object:Gem::Requirement
+  requirement: &18458720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18524560
+  version_requirements: *18458720
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &18539260 !ruby/object:Gem::Requirement
+  requirement: &18456180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18539260
+  version_requirements: *18456180
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &18537580 !ruby/object:Gem::Requirement
+  requirement: &18543120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18537580
+  version_requirements: *18543120
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &18535840 !ruby/object:Gem::Requirement
+  requirement: &18608200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18535840
+  version_requirements: *18608200
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &18535300 !ruby/object:Gem::Requirement
+  requirement: &18603280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18535300
+  version_requirements: *18603280
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &18533940 !ruby/object:Gem::Requirement
+  requirement: &18629500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18533940
+  version_requirements: *18629500
 - !ruby/object:Gem::Dependency
   name: rails_admin
-  requirement: &18532340 !ruby/object:Gem::Requirement
+  requirement: &18623460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18532340
+  version_requirements: *18623460
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &18547780 !ruby/object:Gem::Requirement
+  requirement: &18649380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18547780
+  version_requirements: *18649380
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &18546980 !ruby/object:Gem::Requirement
+  requirement: &18855800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18546980
+  version_requirements: *18855800
 - !ruby/object:Gem::Dependency
   name: countries
-  requirement: &18546240 !ruby/object:Gem::Requirement
+  requirement: &18854400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,10 +176,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18546240
+  version_requirements: *18854400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &18545380 !ruby/object:Gem::Requirement
+  requirement: &18853620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -187,10 +187,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18545380
+  version_requirements: *18853620
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &18544560 !ruby/object:Gem::Requirement
+  requirement: &18852540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -198,10 +198,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18544560
+  version_requirements: *18852540
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &18543980 !ruby/object:Gem::Requirement
+  requirement: &18851460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -209,10 +209,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18543980
+  version_requirements: *18851460
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &18543320 !ruby/object:Gem::Requirement
+  requirement: &18849720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -220,10 +220,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18543320
+  version_requirements: *18849720
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &18542760 !ruby/object:Gem::Requirement
+  requirement: &18848780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -231,7 +231,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18542760
+  version_requirements: *18848780
 description: Mountable ecommerce
 email: steph@endpoint.com
 executables: []
@@ -390,7 +390,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1493470679873479469
+      hash: 4216702766256084999
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: