solidus_core 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 8a31523e3874a6773f96fd486e8bdfc6595cb8bf5bbef206cb9132bbb6bd14d2
-  data.tar.gz: f468e20eefa314539fc495f03cf7d384c0af29d0449250d04f8a893ce5c83c83
+SHA1:
+  metadata.gz: 48f10b1e610d9546a4aa2cc4c4d7397e1a8db8e1
+  data.tar.gz: 540e9bd7ad64cb204b70e8d906f7df957fcbe59c
 SHA512:
-  metadata.gz: 0feccfc066aac21535db10499e51dcb2331747af672fc1d52d397f20f047ddff64572f98e1e5d687d967307f7fbbdbfe708bc841939e0b368f1177d35bad7422
-  data.tar.gz: e06cd0ad6f2d2e8b33055ce6c13ba1810c0191c6ad0e29467e330ba482a05a631c12549599a59594aa3483026388976d23827748efaa022504f73d0aa325e9cb
+  metadata.gz: 84976624f26ca20850a29d41fa740d10401d8f9145a840e2756d23852639b5d35ee01ab6db8a980e73a5b914cb44f898bce8a87fae58273b9295009e3d1cb7be
+  data.tar.gz: d5d02c798fbefe6d1bdd1eddc66c17812a76b70b1795eae1ba6d511c4bd0ae946c396eb21ca285a11929b1fdaf8ee6168663acd45a186aba0ae2da7fa1098daa

data/app/models/spree/distributed_amounts_handler.rb

@@ -36,12 +36,8 @@ module Spree
       elligible_amounts.sum
     end
 
-    def weights
-      elligible_amounts.map { |amount| amount.to_f / subtotal.to_f }
-    end
-
     def allocated_amounts
-      total_amount.to_money.allocate(weights).map(&:to_money)
+      total_amount.to_money.allocate(elligible_amounts).map(&:to_money)
     end
   end
 end

data/lib/spree/core/version.rb

@@ -2,7 +2,7 @@
 
 module Spree
   def self.solidus_version
-    "2.6.0"
+    "2.6.1"
   end
 
   def self.solidus_gem_version

data/solidus_core.gemspec

@@ -35,9 +35,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'discard', '~> 1.0'
   s.add_dependency 'friendly_id', '~> 5.0'
   s.add_dependency 'kaminari-activerecord', '~> 1.1'
-  s.add_dependency 'monetize', '~> 1.1'
+  s.add_dependency 'monetize', '~> 1.8'
   s.add_dependency 'paperclip', ['>= 4.2', '< 6']
   s.add_dependency 'paranoia', '~> 2.4'
-  s.add_dependency 'ransack', '~> 1.8'
+  s.add_dependency 'ransack', '~> 2.0'
   s.add_dependency 'state_machines-activerecord', '~> 0.4'
 end

data/spec/models/spree/order_spec.rb

@@ -379,13 +379,13 @@ RSpec.describe Spree::Order, type: :model do
 
         it "does nothing if any shipments are ready" do
           shipment = create(:shipment, order: subject, state: "ready")
-          expect { subject.ensure_updated_shipments }.not_to change { subject.reload.shipments }
+          expect { subject.ensure_updated_shipments }.not_to change { subject.reload.shipments.pluck(:id) }
           expect { shipment.reload }.not_to raise_error
         end
 
         it "does nothing if any shipments are shipped" do
           shipment = create(:shipment, order: subject, state: "shipped")
-          expect { subject.ensure_updated_shipments }.not_to change { subject.reload.shipments }
+          expect { subject.ensure_updated_shipments }.not_to change { subject.reload.shipments.pluck(:id) }
           expect { shipment.reload }.not_to raise_error
         end
       end
@@ -1102,11 +1102,12 @@ RSpec.describe Spree::Order, type: :model do
 
     it "raises an error if any shipments are ready" do
       shipment = create(:shipment, order: subject, state: "ready")
+
       expect {
         expect {
           subject.create_proposed_shipments
         }.to raise_error(Spree::Order::CannotRebuildShipments)
-      }.not_to change { subject.reload.shipments }
+      }.not_to change { subject.reload.shipments.pluck(:id) }
 
       expect { shipment.reload }.not_to raise_error
     end
@@ -1117,7 +1118,7 @@ RSpec.describe Spree::Order, type: :model do
         expect {
           subject.create_proposed_shipments
         }.to raise_error(Spree::Order::CannotRebuildShipments)
-      }.not_to change { subject.reload.shipments }
+      }.not_to change { subject.reload.shipments.pluck(:id) }
 
       expect { shipment.reload }.not_to raise_error
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-16 00:00:00.000000000 Z
+date: 2018-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -294,14 +294,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -342,14 +342,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: state_machines-activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -1195,7 +1195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.