solidus_multi_domain 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc79c8c6d9ed544b44283fe022948098973b838c
-  data.tar.gz: 0f50104cabfc247f3db4dc0d539ebc702a5db618
+  metadata.gz: 1b9c1fa3385d3591e2108d27bf82b62191b0de5b
+  data.tar.gz: 87f182e7c3081372437abd54cca46068b9bc77eb
 SHA512:
-  metadata.gz: 40a54ce0b981f3825561180b91f9aa335b877861f172f62bb0d71e83bf1e7d3f214b5eb5055d1d01a2e859370a188ec23ad7757511d67e11642eb2fbc90659a8
-  data.tar.gz: e5d9ab6db83f1f38e70d7e8e42a6a64ec976194bbd47abe8b7a3fa692979839564eae8c8fe46129c0fb22325f4b39bc8d762314f3576e8f76d0c70d9fe0573d1
+  metadata.gz: 22245c44898f38230eca433a29d6e8605db1987ac25e7a0513acb5a1fc93c0c3fecfa12bd29e2e84061c428f525780d57859f3901bba585b673d1ad86427c02f
+  data.tar.gz: 8785ecb9d2d1fc91146b2374c9ef7d717fa355b7be15e4aed53ac0649a0a5d7933796c0782975612b423d3460909ecc921c958da27e8e5eff8494dbf206a6367

data/.travis.yml

@@ -0,0 +1,12 @@
+sudo: false
+language: ruby
+rvm:
+  - 2.1.8
+env:
+  matrix:
+    - SOLIDUS_BRANCH=v1.1 DB=postgres
+    - SOLIDUS_BRANCH=v1.2 DB=postgres
+    - SOLIDUS_BRANCH=master DB=postgres
+    - SOLIDUS_BRANCH=v1.1 DB=mysql
+    - SOLIDUS_BRANCH=v1.2 DB=mysql
+    - SOLIDUS_BRANCH=master DB=mysql

data/Gemfile

@@ -1,6 +1,10 @@
 source "https://rubygems.org"
 
-gem "solidus", github: "solidusio/solidus"
+branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
+gem "solidus", github: "solidusio/solidus", branch: branch
+
+gem 'pg'
+gem 'mysql2'
 
 group :development, :test do
   gem "pry-rails"

data/LICENSE.md

@@ -0,0 +1,27 @@
+Copyright (c) 2016, Solidus
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of solidus_multi_domain nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -5,6 +5,8 @@ This extension allows a single Solidus instance to have several customer facing
 stores, with a single shared backend administration system (i.e. multi-store,
 single-vendor).
 
+[![Build Status](https://travis-ci.org/solidusio/solidus_multi_domain.svg?branch=master)](https://travis-ci.org/solidusio/solidus_multi_domain)
+
 Current features:
 ------------------
 
@@ -56,6 +58,15 @@ rails g solidus_multi_domain:install
 
 You should see 'Stores & Domains' in Configuration tab of Spree Admin.
 
+Development
+-------
+
+To see if your stores indeed do point to the correct and unique domains, start your server with 
+```shell
+rails s -p 3000 -b lvh.me
+```
+and give a store a domain like http://store1.lvh.me:3000/.
+
 Authorization
 -------------
 

data/app/models/spree/store_decorator.rb

@@ -11,8 +11,8 @@ Spree::Store.class_eval do
   has_attached_file :logo,
     styles: { mini: '48x48>', small: '100x100>', medium: '250x250>' },
     default_style: :medium,
-    url: 'stores/:id/:style/:basename.:extension',
-    path: 'stores/:id/:style/:basename.:extension',
+    url: '/spree/stores/:id/:style/:basename.:extension',
+    path: ':rails_root/public/spree/stores/:id/:style/:basename.:extension',
     convert_options: { all: '-strip -auto-orient' }
 
   validates_attachment_file_name :logo, matches: [/png\Z/i, /jpe?g\Z/i],

data/app/overrides/decorate_admin_trackers_index.rb

@@ -2,7 +2,7 @@ Deface::Override.new(
   :virtual_path => "spree/admin/trackers/index",
   :name => "multi_domain_admin_trackers_index_headers",
   :insert_before => "[data-hook='admin_trackers_index_headers'] th:last",
-  :text => "<th><%= I18n.t(:store) %></th>",
+  :text => "<th><%= Spree.t(:store) %></th>",
   :disabled => false)
 
 Deface::Override.new(

data/app/views/spree/admin/stores/_form.html.erb

@@ -19,8 +19,8 @@
     <%= f.field_container :default do %>
       <%= f.label :default, Spree.t(:default) %>
       <ul>
-        <li><%= f.radio_button :default, "true", :class => 'fullwidth' %> <%= Spree.t(:yes) %></li>
-        <li><%= f.radio_button :default, "false", :class => 'fullwidth' %> <%= Spree.t(:no) %></li>
+        <li><%= f.radio_button :default, "true", :class => 'fullwidth' %> <%= Spree.t(:say_yes) %></li>
+        <li><%= f.radio_button :default, "false", :class => 'fullwidth' %> <%= Spree.t(:say_no) %></li>
       </ul>
       <%= error_message_on :store, :default %>
     <% end %>

data/app/views/spree/admin/stores/edit.html.erb

@@ -6,7 +6,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:back_to_stores_list), spree.admin_stores_path, :icon => 'icon-arrow-left' %>
+    <%= button_link_to Spree.t(:back_to_store_list), spree.admin_stores_path, :icon => 'icon-arrow-left' %>
   </li>
 <% end %>
 

data/app/views/spree/admin/stores/new.html.erb

@@ -6,7 +6,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:back_to_stores_list), spree.admin_stores_path, :icon => 'icon-arrow-left' %>
+    <%= button_link_to Spree.t(:back_to_store_list), spree.admin_stores_path, :icon => 'icon-arrow-left' %>
   </li>
 <% end %>
 

data/lib/spree_multi_domain/multi_domain_helpers.rb

@@ -1,12 +1,17 @@
 module SpreeMultiDomain
   module MultiDomainHelpers
-    def self.included(receiver)
-      receiver.send :helper, 'spree/products'
-      receiver.send :helper, 'spree/taxons'
+    extend ActiveSupport::Concern
 
-      receiver.send :before_filter, :add_current_store_id_to_params
-      receiver.send :helper_method, :current_store
-      receiver.send :helper_method, :current_tracker
+    include Spree::Core::ControllerHelpers::Common #layout :get_layout
+    include Spree::Core::ControllerHelpers::Store #current_store
+
+    included do
+      helper 'spree/products'
+      helper 'spree/taxons'
+
+      before_filter :add_current_store_id_to_params
+      helper_method :current_store
+      helper_method :current_tracker
     end
 
     def current_tracker

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.2"
+  s.version     = "1.1.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"

data/spec/requests/template_renderer_spec.rb

@@ -9,17 +9,36 @@ describe "Template renderer with dynamic layouts" do
       )]
   end
 
-  it "should render the layout corresponding to the current store" do
-    store = FactoryGirl.create :store, code: "my_store"
+  let(:store) { FactoryGirl.create :store, code: "my_store" }
 
+  it "should render the layout corresponding to the current store" do
     get "http://#{store.url}"
     expect(response.body).to eql("Store layout hello")
   end
 
   it "should fall back to the default layout if none are found for the current store" do
-    allow(ApplicationController).to receive(:current_store).and_return(nil)
-
     get "http://www.example.com"
     expect(response.body).to eql("Default layout hello")
   end
+
+  context "for a controller inheriting from ApplicationController" do
+    NormalController = Class.new(ApplicationController)
+
+    before do
+      ApplicationController.view_paths += [ActionView::FixtureResolver.new(
+          "normal/index.html.erb" => "just normal"
+        )]
+      Rails.application.routes.draw do
+        get 'normal', to: 'normal#index'
+      end
+    end
+    it "should fall back to the default layout for unmatched store" do
+      get "http://www.example.com/normal"
+      expect(response.body).to eq("Default layout just normal")
+    end
+    it "should render the layout for the current store" do
+      get "http://#{store.url}/normal"
+      expect(response.body).to eq("Store layout just normal")
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_multi_domain
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus
@@ -145,7 +145,9 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
+- LICENSE.md
 - README.md
 - Rakefile
 - app/controllers/concerns/spree_multi_domain/create_line_item_support.rb
@@ -261,8 +263,28 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Adds multiple site support to Solidus
-test_files: []
+test_files:
+- spec/controllers/spree/admin/products_controller_spec.rb
+- spec/controllers/spree/admin/stores_controller_spec.rb
+- spec/controllers/spree/api/line_items_controller_spec.rb
+- spec/controllers/spree/api/products_controller_spec.rb
+- spec/controllers/spree/api/shipments_controller_spec.rb
+- spec/controllers/spree/products_controller_spec.rb
+- spec/helpers/products_helper_decorator_spec.rb
+- spec/models/spree/line_item_spec.rb
+- spec/models/spree/order_spec.rb
+- spec/models/spree/permission_sets/store_display_spec.rb
+- spec/models/spree/permission_sets/store_management_spec.rb
+- spec/models/spree/product_spec.rb
+- spec/models/spree/shipping_method_decorator_spec.rb
+- spec/models/spree/store_spec.rb
+- spec/models/spree/taxon_decorator_spec.rb
+- spec/models/spree/tracker_spec.rb
+- spec/requests/global_controller_helpers_spec.rb
+- spec/requests/template_renderer_spec.rb
+- spec/spec_helper.rb
+- spec/support/factory_overrides.rb