spree_postal_service 2.2.0 → 2.3.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzA1MDY3MDRmZjU5NTllN2RkMWYwZTEwMzBmNmFjN2ExNDNlZmE2Yg==
-  data.tar.gz: !binary |-
-    ZjQxNDk1NGJjOWVkYTBiNTQ1Y2U2MjBlMDVlNWVlYzNmZTAyOWUzMw==
+SHA1:
+  metadata.gz: dd463b0989fbb4dc2bce7543483db1039a1eeb73
+  data.tar.gz: 2902030d6d74477f8773b801d47b29c0e22abeae
 SHA512:
-  metadata.gz: !binary |-
-    YWM1YWQ3ZGU4NTA5ZmM4MjAwMTI3ZWM0NDVkZjczOTNmYzAyMGE0ZmY3NDk3
-    ZDljMGFkYjM4NTJjYjM5MjA2NDQyNmRjM2Q2NGJjMDZkYjRkZWFiZDI1YWYz
-    ZGQwYTcxMmRlMzg3ZThmOTllZmYzMDNjZmE1ZjFiNTJhYzk0MDA=
-  data.tar.gz: !binary |-
-    MzYzZWUwZmIyYmQ1NTI1NmRhNGE0NjVlMzA3MjIyMDliZmIzM2RkOWFlYWNk
-    Zjk5M2MyNDU4YTQ0YjRiN2UyY2I0NWEzYjdiODUxYjU4ODNlZjg1N2QwM2Jj
-    MGE5OWQ5MjFjZmU2Njk5ZGM4NTk1MmI2MTI3Mjg4MzMxMzRhNmY=
+  metadata.gz: 407f1c00f47ccb8e91c0b158b5185f021282d8af5be5e4bf81bcbf755c2d8765456f1864894a0a239c33167c577d8fab75b1ceb4a47d79ff16679eedaba9629d
+  data.tar.gz: 809eb3766cb7bfc9daaf1eff0ae3e2afa80e36919beba8702ec82a7ce4cff5ad5e433536c8f2d16b2f5e7348698ea904714abdacc44fcfca270637ea965e7da0

data/.gitignore

@@ -9,8 +9,9 @@ nbproject
 *.swp
 Gemfile.lock
 .rvmrc
-.localeapp
 coverage
 spec/dummy
 pkg/
-*.gem
+*.gem
+.bundle
+.ruby-version

data/.hound.yml

@@ -0,0 +1,25 @@
+---
+# Too picky.
+LineLength:
+  Enabled: false
+
+# This should truly be on for well documented gems.
+Documentation:
+  Enabled: false
+
+# Neatly aligned code is to swell.
+SingleSpaceBeforeFirstArg:
+  Enabled: false
+
+# Rubocop default is leading but hound-ci use trailing.
+DotPosition:
+  EnforcedStyle: leading
+
+# Don't mess with RSpec DSL.
+Blocks:
+  Exclude:
+    - 'spec/**/*'
+
+# We really like the readability with newline in beginning of classes.
+EmptyLinesAroundBody:
+  Enabled: false

data/.reek

@@ -0,0 +1,19 @@
+---
+UncommunicativeVariableName:
+  accept:
+    - t
+    - c
+NestedIterators:
+  max_allowed_nesting: 2
+DuplicateMethodCall:
+  enabled: false
+IrresponsibleModule:
+  enabled: false
+FeatureEnvy:
+  enabled: false
+TooManyMethods:
+  enabled: false
+TooManyStatements:
+  enabled: false
+UtilityFunction:
+  enabled: false

data/.rspec

@@ -1 +1,3 @@
 --color
+-r spec_helper
+-f documentation

data/.rubocop.yml

@@ -0,0 +1,8 @@
+---
+inherit_from: .hound.yml
+
+AllCops:
+  Exclude:
+    - spec/dummy/**/*
+    - bin/*
+    - Guardfile

data/.ruby-gemset

@@ -0,0 +1 @@
+spree-postal-service

data/.travis.yml

@@ -8,4 +8,4 @@ script:
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1.5

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+# Changelog
+
+See: [Github Release Information](https://github.com/futhr/spree-postal-service/releases)

data/CONTRIBUTING.md

@@ -27,4 +27,4 @@ Starting point:
 
 [1]: http://www.fsf.org/licensing/essays/free-sw.html
 [2]: https://github.com/futhr/spree-postal-service/issues
-[3]: http://www.localeapp.com/projects/4917
+[3]: https://github.com/futhr/spree-postal-service/blob/master/config/locales

data/Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org/'
 
-gemspec
+gemspec

data/Guardfile

@@ -1,5 +1,13 @@
-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" }
-end
+group :red_green_refactor, halt_on_fail: true do
+
+  guard 'rspec', cmd: 'bundle exec rspec' 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" }
+  end
+
+  guard :rubocop, all_on_start: false, cli: ['--format', 'clang', '--rails'] do
+    watch(%r{.+\.rb$})
+    watch(%r{(?:.+/)?\.(rubocop|hound)\.yml$}) { |m| File.dirname(m[0]) }
+  end
+end

data/README.md

@@ -1,34 +1,35 @@
 # Spree Postal Service
 
-[![Build Status](https://api.travis-ci.org/futhr/spree-postal-service.png?branch=2-2-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)
+[![Build Status](https://travis-ci.org/futhr/spree-postal-service.svg?branch=2-3-stable)](https://travis-ci.org/futhr/spree-postal-service)
+[![Coverage Status](https://img.shields.io/coveralls/futhr/spree-postal-service.svg)](https://coveralls.io/r/futhr/spree-postal-service?branch=master)
+[![Code Climate](https://codeclimate.com/github/futhr/spree-postal-service/badges/gpa.svg)](https://codeclimate.com/github/futhr/spree-postal-service)
+[![Gem Version](https://badge.fury.io/rb/spree_postal_service.svg)](http://badge.fury.io/rb/spree_postal_service)
 
-A postal service is delivers based on weight only(*). Like most post services in europe will.
+A postal service is delivers based on weight only(*). Like most post services in Europe will.
 
-This spree extension adds a spree-calculator to model this.
+This Spree extension adds a spree-calculator to model this.
 
 **Other features:**
 
-- Size and weight restrictions can be specified
-- You specify a weight/price table
-- Handling fee may be added ( with a maximum when it won't be applied anymore)
-- Multi-parcel shipments are automatically created
-- You can specify a maximum order price, orders over this will not be charged
+- Size and weight restrictions can be specified.
+- You specify a weight/price table.
+- Handling fee may be added ( with a maximum when it won't be applied anymore).
+- Multi-parcel shipments are automatically created.
+- You can specify a maximum order price, orders over this will not be charged.
 
 Off course this relies on your weight data to be correct (and if you want the restrictions to work, the size data too).
 Use the same measurements as in the product info page.
 
-(*) You may install several ShippingMethods for (usually) different countries.
+_(*) You may install several ShippingMethods for (usually) different countries._
 
 ## Usage
 
 Add to your `Gemfile`:
 ```ruby
-gem 'spree_postal_service', '~> 2.2.0'
+gem 'spree_postal_service', '~> 2.3.0'
 ```
 
-Go to admin interface
+Go to admin interface:
 
 `http://localhost:3000/admin/shipping_methods/new`
 
@@ -56,19 +57,19 @@ With the default settings (measurements in kg and cm):
 
 The Shipping method does not apply to the order if:
 
-- Any items weighs more than 18 kg
-- Any item is longer than 90 cm
+- Any items weighs more than 18 kg.
+- Any item is longer than 90 cm.
 - Any items second longest side (width) is over 60 cm. Eg a 70x70x20 item.
 
 ## Costs
 
-- Items weighing 10 kg of worth 100 Euros will cost 15 Euros
-- Items weighing 10 kg of worth 40 Euros will cost 25 Euros (15 + 10 handling)
-- Items weighing less than 1 kg of worth 60 Euros will cost 6 Euros
-- Items weighing less than 1 kg of worth 40 Euros will cost 16 Euros (6 + 10)
-- Items weighing 25 kg of worth 200 Euros will cost 30 Euros (2 packages, 18 + 12 euro)
-- 3 items without weight information of worth 100 euros will cost 12 Euro
-- Any amount of items costing more than the max_price will cost 0 Euro
+- Items weighing 10 kg of worth 100 Euros will cost 15 Euros.
+- Items weighing 10 kg of worth 40 Euros will cost 25 Euros (15 + 10 handling).
+- Items weighing less than 1 kg of worth 60 Euros will cost 6 Euros.
+- Items weighing less than 1 kg of worth 40 Euros will cost 16 Euros (6 + 10).
+- Items weighing 25 kg of worth 200 Euros will cost 30 Euros (2 packages, 18 + 12 Euro).
+- 3 items without weight information of worth 100 euros will cost 12 Euro.
+- Any amount of items costing more than the max_price will cost 0 Euro.
 
 ---
 

data/bin/rails

@@ -4,4 +4,4 @@ ENGINE_ROOT = File.expand_path('../..', __FILE__)
 ENGINE_PATH = File.expand_path('../../lib/spree_postal_service/engine', __FILE__)
 
 require 'rails/all'
-require 'rails/engine/commands'
+require 'rails/engine/commands'

data/config/locales/en.yml

@@ -11,4 +11,4 @@ en:
     handling_max: "Amount, over which handling fee won't be applied"
     min_price: Minimum price
     default_weight: Default weight
-    max_price: Maximum price
+    max_price: Maximum price

data/config/locales/pt.yml

@@ -11,4 +11,4 @@ pt:
     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
-    max_price: Preço máximo
+    max_price: Preço máximo

data/config/locales/sv.yml

@@ -11,4 +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
+    max_price: Största belopp

data/lib/spree/calculator/shipping/postal_service.rb

@@ -1,73 +1,104 @@
-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)
-  end
+module Spree
+  class Calculator
+    module Shipping
+      class PostalService < Spree::ShippingCalculator
 
-  def self.register
-    super
-  end
+        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 item_oversized?(variant)
-    sizes = [
-      variant.width  ? variant.width  : 0,
-      variant.depth  ? variant.depth  : 0,
-      variant.height ? variant.height : 0
-    ].sort.reverse
+        class << self
+          def description
+            Spree.t(:postal_service)
+          end
 
-    return true if sizes[0] > self.preferred_max_item_length # longest side
-    return true if sizes[1] > self.preferred_max_item_width  # second longest side
-    return false
-  end
+          def register
+            super
+          end
+        end
 
-  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
-    end
-    return true
-  end
+        attr_accessor :line_items
 
-  # as order_or_line_items we always get line items, as calculable we have Coupon, ShippingMethod or ShippingRate
-  def compute(package)
-    order = package.order
+        def item_oversized?(variant)
+          sizes = [
+            variant.width  ? variant.width  : 0,
+            variant.depth  ? variant.depth  : 0,
+            variant.height ? variant.height : 0
+          ].sort.reverse
 
-    total_price, total_weight, shipping = 0, 0, 0
-    prices = self.preferred_price_table.split.map { |price| price.to_f }
+          return true if sizes[0] > preferred_max_item_length # Longest side.
+          return true if sizes[1] > preferred_max_item_width  # Second longest side.
+          false
+        end
 
-    order.line_items.each do |item| # determine total price and weight
-      total_weight += item.quantity * (item.variant.weight || self.preferred_default_weight)
-      total_price  += item.price * item.quantity
-    end
+        # Determine if weight or size goes over bounds.
+        def available?(package)
+          package.order.variants.each do |variant|
+            return false if item_within_bounds?(variant.weight) # 18
+            return false if item_oversized?(variant)
+          end
+          true
+        end
 
-    return 0.0 if total_price > self.preferred_max_price
+        # As order_or_line_items we always get line items, as calculable we have
+        # Coupon, ShippingMethod or ShippingRate.
+        def compute(package)
+          @line_items ||= package.order.line_items
+          total_price, total_weight, shipping = compute_total_price, compute_total_weight, 0
 
-    # determine handling fee
-    handling_fee = self.preferred_handling_max < total_price ? 0 : self.preferred_handling_fee
-    weights      = self.preferred_weight_table.split.map { |weight| weight.to_f }
+          return 0.0 if total_price > preferred_max_price
 
-    while total_weight > weights.last # in several packages if need be
-      total_weight -= weights.last
-      shipping += prices.last
-    end
+          while total_weight > weights.last # In several packages if need be.
+            total_weight -= weights.last
+            shipping += prices.last
+          end
 
-    index = weights.length - 2
-    while index >= 0
-      break if total_weight > weights[index]
-      index -= 1
-    end
+          [shipping, prices[compute_index(total_weight)], handling_fee(total_price)].compact.sum
+        end
 
-    shipping += prices[index + 1]
-    return shipping + handling_fee
+        private
+
+        def compute_total_weight
+          line_items.map do |item|
+            item.quantity * (item.variant.weight || preferred_default_weight)
+          end.reduce(:+)
+        end
+
+        def compute_total_price
+          line_items.map { |item| item.price * item.quantity }.reduce(:+)
+        end
+
+        def compute_index(total_weight)
+          index = weights.length - 2
+          while index >= 0
+            break if total_weight > weights[index]
+            index -= 1
+          end
+          index + 1
+        end
+
+        def item_within_bounds?(weight)
+          weight && weight > preferred_max_item_weight
+        end
+
+        def handling_fee(total_price)
+          preferred_handling_max < total_price ? 0 : preferred_handling_fee
+        end
+
+        def prices
+          @prices ||= preferred_price_table.split.map(&:to_f)
+        end
+
+        def weights
+          @weights ||= preferred_weight_table.split.map(&:to_f)
+        end
+      end
+    end
   end
 end

data/lib/spree_postal_service.rb

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

data/lib/spree_postal_service/engine.rb

@@ -10,4 +10,4 @@ module SpreePostalService
       app.config.spree.calculators.shipping_methods << Spree::Calculator::Shipping::PostalService
     end
   end
-end
+end

data/lib/spree_postal_service/version.rb

@@ -1,16 +1,17 @@
 module SpreePostalService
 
-  # Returns the version of the currently loaded SpreePostalService as a <tt>Gem::Version</tt>
+  # Returns the version of the currently loaded SpreePostalService as a
+  # <tt>Gem::Version</tt>.
   def self.version
     Gem::Version.new VERSION::STRING
   end
 
   module VERSION
     MAJOR = 2
-    MINOR = 2
+    MINOR = 3
     TINY  = 0
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
-end
+end

data/spec/lib/postal_service_spec.rb

@@ -1,131 +1,115 @@
-require 'spec_helper'
+RSpec.describe Spree::Calculator::Shipping::PostalService do
 
-describe Spree::Calculator::Shipping::PostalService do
+  subject { described_class.new }
 
-  let(:postal_service_calculator) { described_class.new }
-
-  describe 'return description' do
-    context 'in english' do
-      before { I18n.locale = :en }
-      specify do
-        expect(postal_service_calculator.description).to eq 'Postal Service'
-      end
-    end
-
-    context 'in any language' do
-      before { I18n.locale = :pt }
-      specify do
-        expect(postal_service_calculator.description).to eq Spree.t(:postal_service)
+  context 'returns description' do
+    %w(en pt sv).each do |locale|
+      it "in supported language: #{locale}" do
+        I18n.with_locale(locale.to_sym) do
+          expect(described_class.description).to eq Spree.t(:postal_service)
+        end
       end
     end
   end
 
-  describe ':using the default weight-price table: [1 2 5 10 20] => [6 9 12 15 18]' do
-    context '#compute:' do
+  describe 'using the default weight-price table: [1 2 5 10 20] => [6 9 12 15 18]' do
+    context '.compute(package)' 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)
+        result = subject.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)
+        result = subject.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)
+        result = subject.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)
+        result = subject.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)
+        subject.preferred_max_price = 250
+        result = subject.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   = create(:order)
+        variant = create(:base_variant, weight: nil)
+        [30.0, 40.0, 30.0].each { |price| create_line_item(order, variant, price: price) }
         order.line_items.reload
-        shipment = create(:shipment, order: order)
-        package = shipment.to_package
-
-        result = postal_service_calculator.compute(shipment)
+        package = create(:shipment, order: order)
+        result  = subject.compute(package)
         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)
+        subject.preferred_max_price = 300
+        result = subject.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
+    context '.available?(package)' 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
+        expect(subject.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
+        expect(subject.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
+        expect(subject.available?(@package)).to be(false)
       end
+    end
 
-      context '#item_oversized?' do
+    context '.item_oversized?(variant)' 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
+        expect(subject.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
+        expect(subject.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
+  def create_our_package(args = {})
+    @variant = create :base_variant, args.except!(:quantity)
+    order = create :order
+    create_line_item(order, @variant, args)
+    order.line_items.reload
+    @package = create :shipment, order: order
+  end
+
+  def create_line_item(order, variant, args = {})
+    create(
+      :line_item,
+      price:    args[:price] || BigDecimal.new('10.00'),
+      quantity: args[:quantity] || 1,
+      order:    order,
+      variant:  variant
+    )
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,25 +1,40 @@
 require 'simplecov'
+require 'coveralls'
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
 SimpleCov.start do
+  add_filter '/.bundle'
   add_filter '/spec/'
   add_filter '/lib/spree_postal_service/engine'
   add_group 'Libraries', 'lib'
 end
 
-ENV['RAILS_ENV'] = 'test'
+ENV['RAILS_ENV'] ||= 'test'
 
 require File.expand_path('../dummy/config/environment.rb',  __FILE__)
 
+require 'pry'
 require 'ffaker'
 require 'rspec/rails'
-require 'i18n-spec'
 
-Dir[Rails.root.join('spec/support/**/*.rb')].each {|f| require f}
-
-require 'spree/testing_support/factories'
+ActiveRecord::Migration.maintain_test_schema!
+ActiveRecord::Migration.check_pending!
 
 RSpec.configure do |config|
+
+  config.fail_fast = false
+  config.filter_run focus: true
+  config.run_all_when_everything_filtered = true
+
   config.mock_with :rspec
-  config.use_transactional_fixtures = true
+  config.raise_errors_for_deprecations!
+  config.infer_spec_type_from_file_location!
+
+  config.expect_with :rspec do |expectations|
+    expectations.syntax = :expect
+  end
+end
 
-  config.include FactoryGirl::Syntax::Methods
-end
+Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |file| require file }

data/spec/support/database_cleaner.rb

@@ -0,0 +1,18 @@
+require 'database_cleaner'
+
+RSpec.configure do |config|
+
+  config.before(:suite) do
+    DatabaseCleaner.strategy = :transaction
+    DatabaseCleaner.clean_with :truncation
+  end
+
+  config.before do
+    DatabaseCleaner.strategy = :transaction
+    DatabaseCleaner.start
+  end
+
+  config.after do
+    DatabaseCleaner.clean
+  end
+end

data/spec/support/factory_girl.rb

@@ -0,0 +1,5 @@
+require 'factory_girl'
+
+RSpec.configure do |config|
+  config.include FactoryGirl::Syntax::Methods
+end

data/spec/support/i18n.rb

@@ -0,0 +1,9 @@
+require 'rspec'
+require 'i18n-spec'
+
+RSpec.configure do |config|
+
+  config.before(:suite) do
+    I18n.locale = :en
+  end
+end

data/spec/support/spree.rb

@@ -0,0 +1 @@
+require 'spree/testing_support/factories'

data/spec/translations/locale_spec.rb

@@ -1,15 +1,14 @@
-require 'spec_helper'
+RSpec.describe 'locale:' do
 
-describe 'locale:' do
   Dir.glob('config/locales/*.yml') do |locale_file|
     context locale_file do
-      it { should be_parseable }
-      it { should have_valid_pluralization_keys }
-      it { should_not have_missing_pluralization_keys }
-      it { should have_one_top_level_namespace }
-      it { should_not have_legacy_interpolations }
-      it { should have_a_valid_locale }
-      it { should be_a_complete_translation_of 'config/locales/en.yml' }
+      it { is_expected.to be_parseable }
+      it { is_expected.to have_valid_pluralization_keys }
+      it { is_expected.not_to have_missing_pluralization_keys }
+      it { is_expected.to have_one_top_level_namespace }
+      it { is_expected.not_to have_legacy_interpolations }
+      it { is_expected.to have_a_valid_locale }
+      it { is_expected.to be_a_complete_translation_of 'config/locales/en.yml' }
     end
   end
 end

data/spree_postal_service.gemspec

@@ -1,6 +1,6 @@
 # coding: utf-8
 lib = File.expand_path('../lib/', __FILE__)
-$:.unshift lib unless $:.include?(lib)
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
 
 require 'spree_postal_service/version'
 
@@ -13,9 +13,9 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9.3'
 
   s.authors      = ['Torsten Rüger', 'Tobias Bohwalli']
-  s.email        = 'hi@futhr.io'
+  s.email        = ['torsten@villataika.fi', 'hi@futhr.io']
   s.homepage     = 'https://github.com/futhr/spree-postal-service'
-  s.license      = %q{BSD-3}
+  s.license      = 'BSD-3'
 
   s.files        = `git ls-files`.split("\n")
   s.test_files   = `git ls-files -- spec/*`.split("\n")
@@ -24,15 +24,21 @@ Gem::Specification.new do |s|
 
   s.has_rdoc = false
 
-  s.add_dependency 'spree_core', '~> 2.2.0'
+  s.add_runtime_dependency 'spree_core', '~> 2.3.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.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 'rspec', '~> 3.1.0'
+  s.add_development_dependency 'rspec-rails', '~> 3.1.0'
+  s.add_development_dependency 'factory_girl', '>= 4.4'
+  s.add_development_dependency 'sqlite3', '~> 1.3.9'
+  s.add_development_dependency 'simplecov', '~> 0.9.0'
+  s.add_development_dependency 'coveralls', '>= 0.7.0'
+  s.add_development_dependency 'i18n-spec', '>= 0.5.1'
+  s.add_development_dependency 'ffaker', '>= 1.24'
+  s.add_development_dependency 'coffee-rails', '~> 4.0.0'
+  s.add_development_dependency 'sass-rails', '~> 4.0.0'
   s.add_development_dependency 'pry-rails', '>= 0.3.2'
-end
+  s.add_development_dependency 'database_cleaner', '1.3.0'
+  s.add_development_dependency 'guard-rspec', '>= 4.2.8'
+  s.add_development_dependency 'guard-rubocop', '>= 1.1.0'
+  s.add_development_dependency 'rubocop', '>= 0.24.1'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_postal_service
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Torsten Rüger
@@ -9,157 +9,248 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-05 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.4'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.9
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: i18n-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: '1.24'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: '1.24'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.8
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.8
+        version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: sass-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: pry-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.2
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.8
+- !ruby/object:Gem::Dependency
+  name: guard-rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.24.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.24.1
 description: Calculate weight based charges for a Spree order
-email: hi@futhr.io
+email:
+- torsten@villataika.fi
+- hi@futhr.io
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".hound.yml"
+- ".reek"
+- ".rspec"
+- ".rubocop.yml"
+- ".ruby-gemset"
+- ".travis.yml"
+- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - Guardfile
@@ -176,6 +267,10 @@ files:
 - lib/spree_postal_service/version.rb
 - spec/lib/postal_service_spec.rb
 - spec/spec_helper.rb
+- spec/support/database_cleaner.rb
+- spec/support/factory_girl.rb
+- spec/support/i18n.rb
+- spec/support/spree.rb
 - spec/translations/locale_spec.rb
 - spree_postal_service.gemspec
 homepage: https://github.com/futhr/spree-postal-service
@@ -188,12 +283,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
@@ -206,4 +301,8 @@ summary: Calculate weight based charges for a Spree order
 test_files:
 - spec/lib/postal_service_spec.rb
 - spec/spec_helper.rb
+- spec/support/database_cleaner.rb
+- spec/support/factory_girl.rb
+- spec/support/i18n.rb
+- spec/support/spree.rb
 - spec/translations/locale_spec.rb