solidus_multi_domain 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b9c1fa3385d3591e2108d27bf82b62191b0de5b
-  data.tar.gz: 87f182e7c3081372437abd54cca46068b9bc77eb
+  metadata.gz: 7b8bdc0340da89be57fbe0bc2b9bb9bf6044576e
+  data.tar.gz: 5973b260b06c23a72a87aa8e8337ae441dec038f
 SHA512:
-  metadata.gz: 22245c44898f38230eca433a29d6e8605db1987ac25e7a0513acb5a1fc93c0c3fecfa12bd29e2e84061c428f525780d57859f3901bba585b673d1ad86427c02f
-  data.tar.gz: 8785ecb9d2d1fc91146b2374c9ef7d717fa355b7be15e4aed53ac0649a0a5d7933796c0782975612b423d3460909ecc921c958da27e8e5eff8494dbf206a6367
+  metadata.gz: d66c31d78d2f144edd1b3b145ca0226968f9e52eb7e15fc332c8583287ae906f6c047c924e42b0f5ed6e84b78a46da7210df147667771d3027ad7b3d55091869
+  data.tar.gz: d3f62ce75db1290aa3eb6369d18dbcfec2c77b1f213777ad846b693b9032a27af584ed36cfc008e6bc386aaa82a52ca59c89bd15bc6af8d5aa483c03febb3bbb

data/app/models/spree/tracker_decorator.rb

@@ -1,7 +1,19 @@
 Spree::Tracker.class_eval do
   belongs_to :store
 
-  def self.current(store_key)
-    Spree::Tracker.where(active: true).joins(:store).where("spree_stores.code = ? OR spree_stores.url LIKE ?", store_key, "%#{store_key}%").first
+  def self.current(store)
+    if store.is_a?(Spree::Store)
+      Spree::Tracker.where(active: true, store_id: store).first
+    else
+      # TODO: Remove in 2.0
+      ActiveSupport::Deprecation.warn <<-EOS.squish, caller
+        Calling Spree::Tracker.current with a string is DEPRECATED. Instead
+        pass it an instance of Spree::Store.
+      EOS
+      Spree::Tracker.where(active: true).joins(:store).where(
+        "spree_stores.code = ? OR spree_stores.url LIKE ?",
+        store, "%#{store}%"
+      ).first
+    end
   end
 end

data/lib/spree_multi_domain/multi_domain_helpers.rb

@@ -15,7 +15,7 @@ module SpreeMultiDomain
     end
 
     def current_tracker
-      @current_tracker ||= Spree::Tracker.current(store_key)
+      @current_tracker ||= Spree::Tracker.current(current_store)
     end
 
     def get_taxonomies
@@ -27,10 +27,5 @@ module SpreeMultiDomain
     def add_current_store_id_to_params
       params[:current_store_id] = current_store.try(:id)
     end
-
-    private
-    def store_key
-      request.headers['HTTP_SPREE_STORE'] || request.env['SERVER_NAME']
-    end
   end
 end

data/solidus_multi_domain.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = "solidus_multi_domain"
-  s.version     = "1.1.3"
+  s.version     = "1.2.0"
   s.summary     = "Adds multiple site support to Solidus"
   s.description = "Multiple Solidus stores on different domains - single unified backed for processing orders."
   s.required_ruby_version = ">= 2.1"

data/spec/models/spree/tracker_spec.rb

@@ -9,11 +9,21 @@ describe Spree::Tracker do
     @tracker2 = FactoryGirl.create(:tracker, store: @another_store)
   end
 
-  it "pulls out the current tracker based on store code" do
-    expect(Spree::Tracker.current('STORE2')).to eq @tracker2
+  it "finds tracker by store" do
+    expect(Spree::Tracker.current(@store)).to eq @tracker
   end
 
-  it "pulls out the current tracker" do
-    expect(Spree::Tracker.current(@store.url)).to eq @tracker
+  it "finds tracker based on store code" do
+    aggregate_failures do
+      expect(ActiveSupport::Deprecation).to receive(:warn)
+      expect(Spree::Tracker.current('STORE2')).to eq @tracker2
+    end
+  end
+
+  it "finds tracker based on store url" do
+    aggregate_failures do
+      expect(ActiveSupport::Deprecation).to receive(:warn)
+      expect(Spree::Tracker.current(@store.url)).to eq @tracker
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_multi_domain
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Solidus Team