solidus_multi_domain 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6efd8a195f9ef9cce20361a7fda8a8a97a32d769
-  data.tar.gz: ee4102db3fbc47787f5d4446a92d1ac53d73a8af
+  metadata.gz: 0d2545d2253799a83e872eb70e9f44a499469a6e
+  data.tar.gz: d50bb04b3174b6db83c15a71000e5965d0ce688a
 SHA512:
-  metadata.gz: 8a9f833abc9d7bbd3f5c22281093d773305e1a19e6c68ff9c9d15adaf68c8832803f3c328c18ea6a360309c84cb3bd22bcd12b31ae6e782c76b78efa4bf06d78
-  data.tar.gz: 76e9eca1a23e3c0e96fc2eb4a56357c26cad4b97fe3e7f518735c05b5ad36fdca6a1fca8b14901e139b0a9c91ac34beaf78ce2f20f6dc1b8795cf14203fd1224
+  metadata.gz: a0d32348d42d2ab6119ff213a535bb89de4d332e854eaaa3e7b4fdacb225820e2a7d1c8fe48904084dc4a213eee141b4a665d2078b83c9b5df531fb9cbb03aa2
+  data.tar.gz: f6811468a5e38c01716f57f219f526ce1877707e39f69be11fca62142d78ca3d907af3bc9a5174b658c12ef17614b925febd4ebac4a76a5eac7fc252c8b5cb07

data/app/controllers/spree/admin/products_controller_decorator.rb

@@ -2,11 +2,11 @@ Spree::Admin::ProductsController.class_eval do
   update.before :set_stores
 
   private
+
   def set_stores
     # Remove all store associations if store data is being passed and no stores are selected
     if params[:update_store_ids] && !params[:product].key?(:store_ids)
       @product.stores.clear
     end
   end
-
-end
+end if SpreeMultiDomain::Engine.admin_available?

data/app/controllers/spree/api/line_items_controller_decorator.rb

@@ -1 +1,3 @@
-Spree::Api::LineItemsController.include SpreeMultiDomain::CreateLineItemSupport
+if SpreeMultiDomain::Engine.api_available?
+  Spree::Api::LineItemsController.include(SpreeMultiDomain::CreateLineItemSupport)
+end

data/app/controllers/spree/api/products_controller_decorator.rb

@@ -1 +1,3 @@
-Spree::Api::ProductsController.include(SpreeMultiDomain::ShowProductSupport)
+if SpreeMultiDomain::Engine.api_available?
+  Spree::Api::ProductsController.include(SpreeMultiDomain::ShowProductSupport)
+end

data/app/controllers/spree/api/shipments_controller_decorator.rb

@@ -13,5 +13,7 @@ module SpreeMultiStore
   end
 end
 
-Spree::Api::ShipmentsController.include SpreeMultiStore::Api::ShipmentsControllerDecorator
-Spree::Api::ShipmentsController.include SpreeMultiDomain::CreateLineItemSupport
+if SpreeMultiDomain::Engine.api_available?
+  Spree::Api::ShipmentsController.include(SpreeMultiStore::Api::ShipmentsControllerDecorator)
+  Spree::Api::ShipmentsController.include(SpreeMultiDomain::CreateLineItemSupport)
+end

data/app/controllers/spree/home_controller_decorator.rb

@@ -4,4 +4,4 @@ Spree::HomeController.class_eval do
     @products = @searcher.retrieve_products
     @taxonomies = get_taxonomies
   end
-end
+end if SpreeMultiDomain::Engine.frontend_available?

data/app/controllers/spree/products_controller_decorator.rb

@@ -1 +1,3 @@
-Spree::ProductsController.include(SpreeMultiDomain::ShowProductSupport)
+if SpreeMultiDomain::Engine.frontend_available?
+  Spree::ProductsController.include(SpreeMultiDomain::ShowProductSupport)
+end

data/app/controllers/spree/taxons_controller_decorator.rb

@@ -7,4 +7,4 @@ Spree::TaxonsController.class_eval do
     @products = @searcher.retrieve_products
     @taxonomies = get_taxonomies
   end
-end
+end if SpreeMultiDomain::Engine.frontend_available?

data/lib/spree/search/multi_domain.rb

@@ -1,7 +1,7 @@
 module Spree::Search
   class MultiDomain < Spree::Core::Search::Base
     def get_base_scope
-      base_scope = @cached_product_group ? @cached_product_group.products.active : Spree::Product.active
+      base_scope = @cached_product_group ? @cached_product_group.products.available : Spree::Product.available
       base_scope = base_scope.by_store(current_store_id) if current_store_id
       base_scope = base_scope.in_taxon(taxon) unless taxon.blank?
 

data/lib/spree_multi_domain/engine.rb

@@ -4,15 +4,29 @@ module SpreeMultiDomain
 
     config.autoload_paths += %W(#{config.root}/lib)
 
-    def self.activate
-      ['app', 'lib'].each do |dir|
-        Dir.glob(File.join(File.dirname(__FILE__), "../../#{dir}/**/*_decorator*.rb")) do |c|
-          Rails.application.config.cache_classes ? require(c) : load(c)
+    class << self
+      def activate
+        ['app', 'lib'].each do |dir|
+          Dir.glob(File.join(File.dirname(__FILE__), "../../#{dir}/**/*_decorator*.rb")) do |c|
+            Rails.application.config.cache_classes ? require(c) : load(c)
+          end
         end
+
+        Spree::Config.searcher_class = Spree::Search::MultiDomain
+        ApplicationController.send :include, SpreeMultiDomain::MultiDomainHelpers
+      end
+
+      def admin_available?
+        const_defined?('Spree::Backend::Engine')
       end
 
-      Spree::Config.searcher_class = Spree::Search::MultiDomain
-      ApplicationController.send :include, SpreeMultiDomain::MultiDomainHelpers
+      def api_available?
+        const_defined?('Spree::Api::Engine')
+      end
+
+      def frontend_available?
+        const_defined?('Spree::Frontend::Engine')
+      end
     end
 
     config.to_prepare &method(:activate).to_proc

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.4.2"
+  s.version     = "1.4.3"
   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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_multi_domain
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-23 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus