spree_postal_service 2.0.1 → 2.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGYwYzRhZWY1OTRhZjk2ZDQ4MGE3ODVlOTIwNmQ2NDg0NTUzNzYwMg==
+    YjZlZTU2MGZhYmRiNDNiODQwOWVjNmUzMjkwZjk5ZTBkODVkODM4Mg==
   data.tar.gz: !binary |-
-    ODhiYWM1YzE4ZjQyNTAyMjJkZDhlNGZhY2M3MTc5YjAyYjllZjY3Mg==
+    YzRiMmY3ZDU5MDAwNWIwYjg5Yjk5MGNjOGNkYjQ2YTMzM2VjNGRlZQ==
 SHA512:
   metadata.gz: !binary |-
-    Yzg5ZTY2MzhjODA3ODEwOWQ2MTcyZjliY2YzOGMwZTE3MDI4MjUzZTFhMTAw
-    MWIwYTY2ZDg5ODRmMjI5MDU5MmNjMjk3NmVhNDc3NzZjMzVhZGZkYzFlYmJk
-    NGMyNmU1NzhmOTg1MDBmMWQ5M2E2MGJlYjhiOGU1ZWNhN2VjODM=
+    YjZmZmNlYWRiNjdkYTBhYmUxNWI5NjIxNGYwYzg3NTkwMmU0ODhhZDgzNDBk
+    M2ZmMzY5YmNiMzZlYmM0ZTUyOGVhYWYzZDM4ODZhNjdiODNhMzlmOGJiZTUw
+    MzRlODg1M2EzZGM2MTQ2NWI4NDQ5NzVjNDBkZjhkMTA3Y2U1ZDI=
   data.tar.gz: !binary |-
-    YThmNjk3MDQ0NzYxMTQzZjM2ZmRlNmMwNzlhM2U1MDFjZWM0YWI5MDc1MWQ1
-    MGM5NjFhNGZmYzhhZjIyNGExMGJmOTc2ZGY3NjQ4ZDhjNWViODhhOTA2N2I2
-    MGFiNWFiMzViMjM0MTMyYjkzZDg1N2VmMGJlYjQyYTk0NDRlNWQ=
+    NTBhOWJmYWRiNWYyMDc5ZDk5NTU4NTZiZTA2ZTVhYjYyZGZjZjJlMTNmMDEw
+    NGM3NTI1YjhkMGY3MDZmODU1MmRkZmU4OGNjZWMyMTA3MTU2MGI2MDlkZDc3
+    OTFhZThhYjZiNDhiNzBmMzhlNDQ1NTRiY2NjNDk1YmFhYmFmY2E=

data/Guardfile

@@ -1,4 +1,4 @@
-guard 'rspec', :cmd => 'bundle exec rspec', :all_on_start => true do
+guard 'rspec', cmd: 'bundle exec rspec', all_on_start: true do
   watch('spec/spec_helper.rb')    { 'spec' }
   watch(%r{^spec/(.+)_spec\.rb$}) { |m| "spec/#{m[1]}_spec.rb"}
   watch(%r{^lib/(.+)\.rb$})       { |m| "spec/#{m[1]}_spec.rb" }

data/README.md

@@ -1,6 +1,6 @@
 # Spree Postal Service
 
-[![Build Status](https://api.travis-ci.org/futhr/spree-postal-service.png?branch=2-0-stable)](https://travis-ci.org/futhr/spree-postal-service)
+[![Build Status](https://api.travis-ci.org/futhr/spree-postal-service.png?branch=2-1-stable)](https://travis-ci.org/futhr/spree-postal-service)
 [![Code Climate](https://codeclimate.com/github/futhr/spree-postal-service.png)](https://codeclimate.com/github/futhr/spree-postal-service)
 [![Gem Version](https://badge.fury.io/rb/spree_postal_service.png)](http://badge.fury.io/rb/spree_postal_service)
 
@@ -25,7 +25,7 @@ Use the same measurements as in the product info page.
 
 Add to your `Gemfile`:
 ```ruby
-gem 'spree_postal_service', '~> 2.0.0'
+gem 'spree_postal_service', '~> 2.1.0'
 ```
 
 Go to admin interface

data/Rakefile

@@ -1,15 +1,13 @@
-# encoding: utf-8
 require 'bundler'
 Bundler::GemHelper.install_tasks
 Bundler.setup
 
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new
-
 require 'spree/testing_support/common_rake'
 
-desc 'Default Task'
-task :default => [:spec]
+RSpec::Core::RakeTask.new
+
+task default: [:spec]
 
 desc 'Generates a dummy app for testing'
 task :test_app do

data/config/locales/en.yml

@@ -9,5 +9,6 @@ en:
     max_item_length: Max length of one item
     handling_fee: Handling fee
     handling_max: "Amount, over which handling fee won't be applied"
-    min_price: Minimum total of the order
-    default_weight: Default weight
+    min_price: Minimum price
+    default_weight: Default weight
+    max_price: Maximum price

data/config/locales/pt.yml

@@ -10,4 +10,5 @@ pt:
     handling_fee: Taxa de tratamento
     handling_max: Valor a partir do qual a taxa de tratamento não é aplicada
     min_price: Preço mínimo
-    default_weight: Peso por omissão
+    default_weight: Peso por omissão
+    max_price: Preço máximo

data/config/locales/sv.yml

@@ -11,3 +11,4 @@ sv:
     handling_max: "Belopp, över vilken expeditionsavgift inte skall tillämpas"
     min_price: Minsta belopp
     default_weight: Förvald vikt
+    max_price: Största belopp

data/lib/spree/calculator/{postal_service.rb → shipping/postal_service.rb}

@@ -1,23 +1,13 @@
-class Spree::Calculator::PostalService < Spree::Calculator
-  preference :weight_table,    :string,  :default => '1 2 5 10 20'
-  preference :price_table,     :string,  :default => '6 9 12 15 18'
-  preference :max_item_weight, :decimal, :default => 18
-  preference :max_item_width,  :decimal, :default => 60
-  preference :max_item_length, :decimal, :default => 120
-  preference :max_price,       :decimal, :default => 120
-  preference :handling_max,    :decimal, :default => 50
-  preference :handling_fee,    :decimal, :default => 10
-  preference :default_weight,  :decimal, :default => 1
-
-  attr_accessible :preferred_weight_table,
-                  :preferred_price_table,
-                  :preferred_max_item_weight,
-                  :preferred_max_item_width,
-                  :preferred_max_item_length,
-                  :preferred_max_price,
-                  :preferred_handling_max,
-                  :preferred_handling_fee,
-                  :preferred_default_weight
+class Spree::Calculator::Shipping::PostalService < Spree::ShippingCalculator
+  preference :weight_table,    :string,  default: '1 2 5 10 20'
+  preference :price_table,     :string,  default: '6 9 12 15 18'
+  preference :max_item_weight, :decimal, default: 18
+  preference :max_item_width,  :decimal, default: 60
+  preference :max_item_length, :decimal, default: 120
+  preference :max_price,       :decimal, default: 120
+  preference :handling_max,    :decimal, default: 50
+  preference :handling_fee,    :decimal, default: 10
+  preference :default_weight,  :decimal, default: 1
 
   def self.description
     Spree.t(:postal_service)
@@ -35,12 +25,12 @@ class Spree::Calculator::PostalService < Spree::Calculator
     ].sort.reverse
 
     return true if sizes[0] > self.preferred_max_item_length # longest side
-    return true if sizes[0] > self.preferred_max_item_width  # second longest side
+    return true if sizes[1] > self.preferred_max_item_width  # second longest side
     return false
   end
 
-  def available?(shipment)
-    variants = shipment.line_items.map(&:variant)
+  def available?(package)
+    variants = package.contents.map(&:variant)
     variants.each do |variant| # determine if weight or size goes over bounds
       return false if variant.weight && variant.weight > self.preferred_max_item_weight # 18
       return false if item_oversized? variant
@@ -49,8 +39,8 @@ class Spree::Calculator::PostalService < Spree::Calculator
   end
 
   # as order_or_line_items we always get line items, as calculable we have Coupon, ShippingMethod or ShippingRate
-  def compute(shipment)
-    order = shipment.order
+  def compute(package)
+    order = package.order
 
     total_price, total_weight, shipping = 0, 0, 0
     prices = self.preferred_price_table.split.map { |price| price.to_f }

data/lib/spree_postal_service.rb

@@ -1,3 +1,3 @@
-require 'spree/core'
+require 'spree_core'
 require 'spree_postal_service/engine'
 require 'spree_postal_service/version'

data/lib/spree_postal_service/engine.rb

@@ -1,13 +1,13 @@
 module SpreePostalService
   class Engine < Rails::Engine
+    isolate_namespace Spree
     engine_name 'spree_postal_service'
 
     config.autoload_paths += %W(#{config.root}/lib)
 
     initializer 'spree.register.calculators' do |app|
-      require 'spree/calculator/postal_service'
-
-      app.config.spree.calculators.shipping_methods << Spree::Calculator::PostalService
+      require 'spree/calculator/shipping/postal_service'
+      app.config.spree.calculators.shipping_methods << Spree::Calculator::Shipping::PostalService
     end
   end
 end

data/lib/spree_postal_service/version.rb

@@ -7,8 +7,8 @@ module SpreePostalService
 
   module VERSION
     MAJOR = 2
-    MINOR = 0
-    TINY  = 1
+    MINOR = 1
+    TINY  = 0
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/spec/lib/postal_service_spec.rb

@@ -1,124 +1,131 @@
 require 'spec_helper'
 
-describe Spree::Calculator::PostalService do
+describe Spree::Calculator::Shipping::PostalService do
 
-	let(:postal_service_calculator) { described_class.new }
+  let(:postal_service_calculator) { described_class.new }
 
   describe 'return description' do
     context 'in english' do
       before { I18n.locale = :en }
       specify do
-        postal_service_calculator.description.should == 'Postal Service'
+        expect(postal_service_calculator.description).to eq 'Postal Service'
       end
     end
 
     context 'in any language' do
       before { I18n.locale = :pt }
       specify do
-        postal_service_calculator.description.should == Spree.t(:postal_service)
+        expect(postal_service_calculator.description).to eq Spree.t(:postal_service)
       end
     end
   end
 
-	describe ':using the default weight-price table: [1 2 5 10 20] => [6 9 12 15 18]' do
-		context '#compute:' do
-			it 'gives 15.0 when total price is 100 and weight is 10kg' do
-				create_our_package(:weight => 10.0, :price => 100.0, :quantity => 1)
-				postal_service_calculator.compute(@shipment).should == 15.0
-			end
-
-			it 'gives 25.0 when total price is 40 and weight is 10kg' do
-				create_our_package(:weight => 10.0, :price => 40.0, :quantity => 1)
-				postal_service_calculator.compute(@shipment).should == 25.0
-			end
-
-			it 'gives 6 when total price is 60 and weight is less than 1kg' do
-				create_our_package(:weight => 0.5, :price => 60.0, :quantity => 1)
-				postal_service_calculator.compute(@shipment).should == 6.0
-			end
-
-			it 'gives 16 when total price is 40 and weight is less than 1kg' do
-				create_our_package(:weight => 0.5, :price => 40.0, :quantity => 1)
-				postal_service_calculator.compute(@shipment).should == 16.0
-			end
-
-			it 'gives 30 when total price is 200 and weight is 25kg (split into two)' do
-				create_our_package(:weight => 25.0, :price => 200.0, :quantity => 1)
-				postal_service_calculator.preferred_max_price = 250
-				postal_service_calculator.compute(@shipment).should == 30.0
-			end
-
-			it 'gives 12 when total price is 100, there are three items and their weight is unknown' do
-				order = create(:order)
-				[30.0, 40.0, 30.0].each do |price|
-					create(:line_item,
-						:price => price,
-						:quantity => 1,
-						:order => order,
-						:variant => create(:variant, :weight => nil))
-				end
-				order.line_items.reload
-				shipment = create(:shipment, :order => order)
-
-				postal_service_calculator.compute(shipment).should == 12.0
-			end
-
-			it 'gives 0 when total price is more than the MAX, for any number of items' do
-				create_our_package(:weight => 25.0, :price => 350.0, :quantity => 1)
-				postal_service_calculator.preferred_max_price = 300
-				postal_service_calculator.compute(@shipment).should == 0.0
-			end
-		end
-	end
-
-	describe 'when preferred max weight, length and width are 18 kg, 120 cm and 60 cm' do
-		context '#available?' do
-			it 'is false when item weighs more than 18kg' do
-			  create_our_package(:weight => 20, :height => 70, :width => 30, :depth => 30)
-			  postal_service_calculator.available?(@shipment).should be_false
-			end
-
-			it 'is false when item is longer than 120cm' do
-			  create_our_package(:weight => 10, :height => 130, :width => 30, :depth => 30)
-			  postal_service_calculator.available?(@shipment).should be_false
-			end
-
-			it 'is false when item is wider than 60cm' do
-			  create_our_package(:weight => 10, :height => 80, :width => 70, :depth => 30)
-			  postal_service_calculator.available?(@shipment).should be_false
-			end
-		end
-
-		context '#item_oversized?' do
-			it 'is true if the longest side is more than 120cm' do
-			  create_our_package(:weight => 10, :height => 130, :width => 40, :depth => 30)
-			  postal_service_calculator.item_oversized?(@variant).should be_true
-			end
-
-			it 'is true if the second longest side is more than 60cm' do
-			  create_our_package(:weight => 10, :height => 80, :width => 70, :depth => 30)
-			  postal_service_calculator.item_oversized?(@variant).should be_true
-			end
-		end
-	end
-
-	def create_our_package(args={})
-		order = create(:order)
-
-		params = {}
-		params.merge!(:weight => args[:weight]) if args[:weight]
-		params.merge!(:height => args[:height]) if args[:height]
-		params.merge!(:width  => args[:width])  if args[:width]
-		params.merge!(:depth  => args[:depth])  if args[:depth]
-		@variant = create(:variant, params)
-
-		params = { :variant => @variant, :order => order }
-		params.merge!(:price => args[:price])       if args[:price]
-		params.merge!(:quantity => args[:quantity]) if args[:quantity]
-		line_item = create(:line_item, params)
-
-		order = line_item.order
-		order.line_items.reload
-		@shipment = create(:shipment, :order => order)
-	end
-end
+  describe ':using the default weight-price table: [1 2 5 10 20] => [6 9 12 15 18]' do
+    context '#compute:' do
+      it 'gives 15.0 when total price is 100 and weight is 10kg' do
+        create_our_package(weight: 10.0, price: 100.0, quantity: 1)
+        result = postal_service_calculator.compute(@package)
+        expect(result).to eq(15.0)
+      end
+
+      it 'gives 25.0 when total price is 40 and weight is 10kg' do
+        create_our_package(weight: 10.0, price: 40.0, quantity: 1)
+        result = postal_service_calculator.compute(@package)
+        expect(result).to eq(25.0)
+      end
+
+      it 'gives 6 when total price is 60 and weight is less than 1kg' do
+        create_our_package(weight: 0.5, price: 60.0, quantity: 1)
+        result = postal_service_calculator.compute(@package)
+        expect(result).to eq(6.0)
+      end
+
+      it 'gives 16 when total price is 40 and weight is less than 1kg' do
+        create_our_package(weight: 0.5, price: 40.0, quantity: 1)
+        result = postal_service_calculator.compute(@package)
+        expect(result).to eq(16.0)
+      end
+
+      it 'gives 30 when total price is 200 and weight is 25kg (split into two)' do
+        create_our_package(weight: 25.0, price: 200.0, quantity: 1)
+        postal_service_calculator.preferred_max_price = 250
+        result = postal_service_calculator.compute(@package)
+        expect(result).to eq(30.0)
+      end
+
+      it 'gives 12 when total price is 100, there are three items and their weight is unknown' do
+        order = create(:order)
+        [30.0, 40.0, 30.0].each do |price|
+          create(:line_item,
+            price: price,
+            quantity: 1,
+            order: order,
+            variant: create(:base_variant, weight: nil))
+        end
+        order.line_items.reload
+        shipment = create(:shipment, order: order)
+        package = shipment.to_package
+
+        result = postal_service_calculator.compute(shipment)
+        expect(result).to eq(12.0)
+      end
+
+      it 'gives 0 when total price is more than the MAX, for any number of items' do
+        create_our_package(weight: 25.0, price: 350.0, quantity: 1)
+        postal_service_calculator.preferred_max_price = 300
+        result = postal_service_calculator.compute(@package)
+        expect(result).to eq(0.0)
+      end
+    end
+  end
+
+  describe 'when preferred max weight, length and width are 18 kg, 120 cm and 60 cm' do
+    context '#available?' do
+      it 'is false when item weighs more than 18kg' do
+        create_our_package(weight: 20, height: 70, width: 30, depth: 30)
+        expect(postal_service_calculator.available?(@package)).to be_false
+      end
+
+      it 'is false when item is longer than 120cm' do
+        create_our_package(weight: 10, height: 130, width: 30, depth: 30)
+        expect(postal_service_calculator.available?(@package)).to be_false
+      end
+
+      it 'is false when item is wider than 60cm' do
+        create_our_package(weight: 10, height: 80, width: 70, depth: 30)
+        expect(postal_service_calculator.available?(@package)).to be_false
+      end
+      end
+
+      context '#item_oversized?' do
+      it 'is true if the longest side is more than 120cm' do
+        create_our_package(weight: 10, height: 130, width: 40, depth: 30)
+        expect(postal_service_calculator.item_oversized?(@variant)).to be_true
+      end
+
+      it 'is true if the second longest side is more than 60cm' do
+        create_our_package(weight: 10, height: 80, width: 70, depth: 30)
+        expect(postal_service_calculator.item_oversized?(@variant)).to be_true
+      end
+    end
+  end
+
+  def create_our_package(args={})
+    params = {}
+    params.merge!(weight: args[:weight]) if args[:weight]
+    params.merge!(height: args[:height]) if args[:height]
+    params.merge!(width:  args[:width])  if args[:width]
+    params.merge!(depth:  args[:depth])  if args[:depth]
+    @variant = create(:base_variant, params)
+
+    params = { variant: @variant }
+    params.merge!(price: args[:price])       if args[:price]
+    params.merge!(quantity: args[:quantity]) if args[:quantity]
+    @line_item = create(:line_item, params)
+
+    @order = @line_item.order
+    @order.line_items.reload
+    @shipment = create(:shipment, order: @order)
+    @package = @shipment.to_package
+  end
+end

data/spree_postal_service.gemspec

@@ -24,15 +24,15 @@ Gem::Specification.new do |s|
 
   s.has_rdoc = false
 
-  s.add_dependency 'spree_core', '~> 2.0.0'
+  s.add_dependency 'spree_core', '~> 2.1.0'
 
   s.add_development_dependency 'rspec', '~> 2.14.0'
   s.add_development_dependency 'rspec-rails', '~> 2.14.0'
-  s.add_development_dependency 'factory_girl', '~> 4.2'
-  s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'i18n-spec'
-  s.add_development_dependency 'ffaker'
-  s.add_development_dependency 'guard-rspec'
-  s.add_development_dependency 'pry-rails'
-end
+  s.add_development_dependency 'factory_girl', '~> 4.4'
+  s.add_development_dependency 'sqlite3', '>= 1.3.9'
+  s.add_development_dependency 'simplecov', '>= 0.7.1'
+  s.add_development_dependency 'i18n-spec', '>= 0.4.1'
+  s.add_development_dependency 'ffaker', '>= 1.24.0'
+  s.add_development_dependency 'guard-rspec', '>= 4.2.8'
+  s.add_development_dependency 'pry-rails', '>= 0.3.2'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_postal_service
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Torsten Rüger
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -59,98 +59,98 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.4'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.9
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: i18n-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.24.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.24.0
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.8
 - !ruby/object:Gem::Dependency
   name: pry-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.2
 description: Calculate weight based charges for a Spree order
 email: hi@futhr.io
 executables: []
@@ -166,14 +166,14 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
+- bin/rails
 - config/locales/en.yml
 - config/locales/pt.yml
 - config/locales/sv.yml
-- lib/spree/calculator/postal_service.rb
+- lib/spree/calculator/shipping/postal_service.rb
 - lib/spree_postal_service.rb
 - lib/spree_postal_service/engine.rb
 - lib/spree_postal_service/version.rb
-- script/rails
 - spec/lib/postal_service_spec.rb
 - spec/spec_helper.rb
 - spec/translations/locale_spec.rb