solidus_core 1.2.0.rc1 → 1.2.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef1fda7b796bd51ab9e01a449e5354a21efee3b9
-  data.tar.gz: c6a7a3dd7d508844576f5070ec54d05f491f229d
+  metadata.gz: 82876c2eaf3d0b1300b8c2d0903d872a5e214d0a
+  data.tar.gz: efacf0ca0cc2faa62b4e67082a2633505640fec9
 SHA512:
-  metadata.gz: 579a5e3d9ab4ab281a4ffffac65d98d68069b965d0435908033dd492b5e0d26456ca26a90c033a8ce043a53a456052556a1f2ac713d33334c93688163dd4db88
-  data.tar.gz: 432c5b1f58a716abe1d8eac31b2028e7d748ecae28330800e5b6a186749b15d36cc2acee1b7622c9437918417d7fa9fbb830c5d46527ea3a1f4199a53855aff2
+  metadata.gz: 011b1113b9957d987204f53c39658fe8cbb33b9b2de60c96034b7fcac038a209a0b8df568b13d77b5866e2d76691ff44f9cb693957ebe792e738cc7aaab51118
+  data.tar.gz: 2256f27042f878a46bc89cea319e8cec4359a085d82b50ab27a406fcbbc96237b199818e046bd3ff16e24ddee2df805c3e74ac94e98f58302a69d8de9ddd3e94

data/app/models/spree/app_configuration.rb

@@ -17,7 +17,6 @@
 #
 require "spree/core/search/base"
 require "spree/core/search/variant"
-require 'spree/core/stock_configuration'
 
 module Spree
   class AppConfiguration < Preferences::Configuration
@@ -313,7 +312,7 @@ module Spree
     end
 
     def stock
-      Spree::StockConfiguration
+      @stock_configuration ||= Spree::Core::StockConfiguration.new
     end
 
     # all the following can be deprecated when store prefs are no longer supported

data/lib/spree/core.rb

@@ -92,6 +92,7 @@ require 'spree/core/controller_helpers/store'
 require 'spree/core/controller_helpers/strong_parameters'
 require 'spree/core/unreturned_item_charger'
 require 'spree/core/role_configuration'
+require 'spree/core/stock_configuration'
 require 'spree/permission_sets'
 require 'spree/deprecation'
 

data/lib/spree/core/stock_configuration.rb

@@ -1,11 +1,12 @@
 module Spree
-  module StockConfiguration
-    mattr_accessor :estimator_class do
-      '::Spree::Stock::Estimator'
-    end
+  module Core
+    class StockConfiguration
+      attr_writer :estimator_class
 
-    def self.estimator_class
-      @@estimator_class.constantize
+      def estimator_class
+        @estimator_class ||= '::Spree::Stock::Estimator'
+        @estimator_class.constantize
+      end
     end
   end
 end

data/lib/spree/core/version.rb

@@ -5,7 +5,7 @@ module Spree
   end
 
   def self.solidus_version
-    "1.2.0.rc1"
+    "1.2.0.rc2"
   end
 
   def self.solidus_gem_version

data/spec/lib/spree/core/stock_configuration_spec.rb

@@ -1,16 +1,21 @@
 require 'spec_helper'
 
-RSpec.describe Spree::StockConfiguration do
-  before(:all) { @estimator_class = described_class.estimator_class.to_s }
-  after(:all)  { described_class.estimator_class = @estimator_class }
+RSpec.describe Spree::Core::StockConfiguration do
+  describe '#estimator_class' do
+    let(:stock_configuration) { described_class.new }
+    subject { stock_configuration.estimator_class }
 
-  describe '.estimator_class' do
-    subject { described_class.estimator_class }
-    let(:foo) { Struct.new :foo }
+    it "returns Spree::Stock::Estimator" do
+      is_expected.to be ::Spree::Stock::Estimator
+    end
 
-    before { described_class.estimator_class = 'Foo' }
-    before { Foo = foo }
+    context "with another constant name assiged" do
+      MyEstimator = Class.new
+      before { stock_configuration.estimator_class = MyEstimator.to_s }
 
-    it { is_expected.to eq foo }
+      it "returns the constant" do
+        is_expected.to be MyEstimator
+      end
+    end
   end
 end

data/spec/models/spree/app_configuration_spec.rb

@@ -23,6 +23,6 @@ describe Spree::AppConfiguration, :type => :model do
 
   describe '#stock' do
     subject { prefs.stock }
-    it { is_expected.to eq Spree::StockConfiguration }
+    it { is_expected.to be_a Spree::Core::StockConfiguration }
   end
 end

data/spec/models/spree/shipment_spec.rb

@@ -208,7 +208,7 @@ describe Spree::Shipment, type: :model do
       end
 
       it 'uses the pluggable estimator class' do
-        expect(Spree::StockConfiguration).to receive(:estimator_class).and_call_original
+        expect(Spree::Config.stock).to receive(:estimator_class).and_call_original
         shipment.refresh_rates
       end
 

data/spec/models/spree/stock/coordinator_spec.rb

@@ -18,7 +18,7 @@ module Spree
         end
 
         it 'uses the pluggable estimator class' do
-          expect(Spree::StockConfiguration).to receive(:estimator_class).and_call_original
+          expect(Spree::Config.stock).to receive(:estimator_class).and_call_original
           subject.packages
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 1.2.0.rc1
+  version: 1.2.0.rc2
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant