solidus_multi_domain 1.4.3 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d2545d2253799a83e872eb70e9f44a499469a6e
-  data.tar.gz: d50bb04b3174b6db83c15a71000e5965d0ce688a
+  metadata.gz: 812f744b2968486b28df34c88cd4965721bcfec2
+  data.tar.gz: 42a9743f911fcd5e450867f5ba84042d7a78d611
 SHA512:
-  metadata.gz: a0d32348d42d2ab6119ff213a535bb89de4d332e854eaaa3e7b4fdacb225820e2a7d1c8fe48904084dc4a213eee141b4a665d2078b83c9b5df531fb9cbb03aa2
-  data.tar.gz: f6811468a5e38c01716f57f219f526ce1877707e39f69be11fca62142d78ca3d907af3bc9a5174b658c12ef17614b925febd4ebac4a76a5eac7fc252c8b5cb07
+  metadata.gz: d95148f51520b93ace44b703307af470436239abf1bf535f9899625d7f0c007c72b416eddfc7312b710362678117a6bfdbc5de8a3e68de742883006daa58db4d
+  data.tar.gz: 1651ec025bae9621d565ec5167bbc680b718225d30ff1fe0a01aa0f9a2dec1a7a5a8f72e44db2144c4dfd2989f604e8dbdb3c2d488bf277c868b111b2573c963

data/.travis.yml

@@ -1,14 +1,18 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.1.8
+  - 2.3.1
 env:
   matrix:
     - SOLIDUS_BRANCH=v1.1 DB=postgres
     - SOLIDUS_BRANCH=v1.2 DB=postgres
     - SOLIDUS_BRANCH=v1.3 DB=postgres
+    - SOLIDUS_BRANCH=v1.4 DB=postgres
+    - SOLIDUS_BRANCH=v2.0 DB=postgres
     - SOLIDUS_BRANCH=master DB=postgres
     - SOLIDUS_BRANCH=v1.1 DB=mysql
     - SOLIDUS_BRANCH=v1.2 DB=mysql
     - SOLIDUS_BRANCH=v1.3 DB=mysql
+    - SOLIDUS_BRANCH=v1.4 DB=mysql
+    - SOLIDUS_BRANCH=v2.0 DB=mysql
     - SOLIDUS_BRANCH=master DB=mysql

data/Gemfile

@@ -3,6 +3,10 @@ source "https://rubygems.org"
 branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
 gem "solidus", github: "solidusio/solidus", branch: branch
 
+if branch == 'master' || branch >= "v2.0"
+  gem "rails-controller-testing", group: :test
+end
+
 gem 'pg'
 gem 'mysql2'
 

data/lib/solidus_multi_domain.rb

@@ -1,4 +1,3 @@
-require 'sass/rails'
 require 'spree_core'
 require 'spree_multi_domain/engine'
 require 'deface'

data/lib/spree_multi_domain/engine.rb

@@ -33,7 +33,7 @@ module SpreeMultiDomain
 
     initializer "templates with dynamic layouts" do |app|
       ActionView::TemplateRenderer.class_eval do
-        def find_layout_with_multi_store(layout, locals)
+        def find_layout_with_multi_store(layout, *args)
           if @view.respond_to?(:current_store) && @view.current_store && !@view.controller.is_a?(Spree::Admin::BaseController)
             store_layout = if layout.is_a?(String)
                              layout.gsub("layouts/", "layouts/#{@view.current_store.code}/")
@@ -42,12 +42,12 @@ module SpreeMultiDomain
                            end
 
             begin
-              find_layout_without_multi_store(store_layout, locals)
+              find_layout_without_multi_store(store_layout, *args)
             rescue ::ActionView::MissingTemplate
-              find_layout_without_multi_store(layout, locals)
+              find_layout_without_multi_store(layout, *args)
             end
           else
-            find_layout_without_multi_store(layout, locals)
+            find_layout_without_multi_store(layout, *args)
           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.4.3"
+  s.version     = "1.5.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"
@@ -18,8 +18,8 @@ Gem::Specification.new do |s|
   s.require_path = "lib"
   s.requirements << "none"
 
-  s.add_dependency "solidus", '~> 1.1'
-  s.add_dependency "deface"
+  s.add_dependency "solidus", ['>= 1.1', '< 2.1']
+  s.add_dependency "deface", '~> 1.0'
 
   s.add_development_dependency "rspec-rails",  "~> 3.2"
   s.add_development_dependency "simplecov"

metadata

@@ -1,43 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: solidus_multi_domain
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -321,7 +327,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Adds multiple site support to Solidus