spree_postal_service 2.3.0 → 2.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: dd463b0989fbb4dc2bce7543483db1039a1eeb73
4
- data.tar.gz: 2902030d6d74477f8773b801d47b29c0e22abeae
3
+ metadata.gz: 582efb4e714f857a677ed0e19a13cdf464739355
4
+ data.tar.gz: 598961e696dcd81a294f92a33fb4bbddc254e9ae
5
5
  SHA512:
6
- metadata.gz: 407f1c00f47ccb8e91c0b158b5185f021282d8af5be5e4bf81bcbf755c2d8765456f1864894a0a239c33167c577d8fab75b1ceb4a47d79ff16679eedaba9629d
7
- data.tar.gz: 809eb3766cb7bfc9daaf1eff0ae3e2afa80e36919beba8702ec82a7ce4cff5ad5e433536c8f2d16b2f5e7348698ea904714abdacc44fcfca270637ea965e7da0
6
+ metadata.gz: c4bbc5b67bfc92abf52c663fb4f0ca98910a3847c452edfe060a2a555b0b6123c7322f415375034438837561c7f1efff80155daa7cafd6eef07ac8dbd578da2b
7
+ data.tar.gz: b76dec1786959b66132dbb9d9f2bcc48258915b602d3ec2b0c679097c2fafdceadde1c2237135bb2581eacaac40d0f507522b964f43c2b839ad0b6beb9375ccf
data/.hound.yml CHANGED
@@ -21,5 +21,11 @@ Blocks:
21
21
  - 'spec/**/*'
22
22
 
23
23
  # We really like the readability with newline in beginning of classes.
24
- EmptyLinesAroundBody:
24
+ EmptyLinesAroundMethodBody:
25
+ Enabled: false
26
+
27
+ EmptyLinesAroundClassBody:
28
+ Enabled: false
29
+
30
+ EmptyLinesAroundModuleBody:
25
31
  Enabled: false
data/Guardfile CHANGED
@@ -5,9 +5,4 @@ group :red_green_refactor, halt_on_fail: true do
5
5
  watch(%r{^spec/(.+)_spec\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
6
6
  watch(%r{^lib/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
7
7
  end
8
-
9
- guard :rubocop, all_on_start: false, cli: ['--format', 'clang', '--rails'] do
10
- watch(%r{.+\.rb$})
11
- watch(%r{(?:.+/)?\.(rubocop|hound)\.yml$}) { |m| File.dirname(m[0]) }
12
- end
13
8
  end
@@ -66,7 +66,8 @@ module Spree
66
66
 
67
67
  def compute_total_weight
68
68
  line_items.map do |item|
69
- item.quantity * (item.variant.weight || preferred_default_weight)
69
+ weight = item.variant.weight > 0 ? item.variant.weight : preferred_default_weight
70
+ item.quantity * weight
70
71
  end.reduce(:+)
71
72
  end
72
73
 
@@ -9,7 +9,7 @@ module SpreePostalService
9
9
  module VERSION
10
10
  MAJOR = 2
11
11
  MINOR = 3
12
- TINY = 0
12
+ TINY = 1
13
13
  PRE = nil
14
14
 
15
15
  STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
@@ -39,6 +39,5 @@ Gem::Specification.new do |s|
39
39
  s.add_development_dependency 'pry-rails', '>= 0.3.2'
40
40
  s.add_development_dependency 'database_cleaner', '1.3.0'
41
41
  s.add_development_dependency 'guard-rspec', '>= 4.2.8'
42
- s.add_development_dependency 'guard-rubocop', '>= 1.1.0'
43
42
  s.add_development_dependency 'rubocop', '>= 0.24.1'
44
43
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_postal_service
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.0
4
+ version: 2.3.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Torsten Rüger
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-11-21 00:00:00.000000000 Z
12
+ date: 2014-11-22 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: spree_core
@@ -207,20 +207,6 @@ dependencies:
207
207
  - - ">="
208
208
  - !ruby/object:Gem::Version
209
209
  version: 4.2.8
210
- - !ruby/object:Gem::Dependency
211
- name: guard-rubocop
212
- requirement: !ruby/object:Gem::Requirement
213
- requirements:
214
- - - ">="
215
- - !ruby/object:Gem::Version
216
- version: 1.1.0
217
- type: :development
218
- prerelease: false
219
- version_requirements: !ruby/object:Gem::Requirement
220
- requirements:
221
- - - ">="
222
- - !ruby/object:Gem::Version
223
- version: 1.1.0
224
210
  - !ruby/object:Gem::Dependency
225
211
  name: rubocop
226
212
  requirement: !ruby/object:Gem::Requirement