solidus_multi_domain 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52d337168f77ee0a5c1645598299ae808ab415e4
-  data.tar.gz: 2bc617558995dfb85db2a816feb05e8be58efab9
+  metadata.gz: 191f8cf6df04e131b0007d89065a3a690f5d4f41
+  data.tar.gz: a9de546369e8aa0d751eba3be96ad2f2077fcc41
 SHA512:
-  metadata.gz: 2d4b32d871c50b2e5a8b8abba49bd16103904da4037a7789d6b849720231712ecf151954d192aef5e3660223c67ba17be04912da400ede556457cbff5068b913
-  data.tar.gz: f491bf9f85566ac2f0b2be660e02cba7ba3654b78b0f3c768591a1d108a3886ed33ff26f4523b87cb8bfeb21dff72b124902428bc6931ed35c9ca6e81644f413
+  metadata.gz: 6867d1c89bc564d8a435258b541bc60e60347406cf4c088e85149d7a99e412da058d02e73f7458b3a4126e9a95fcef9733d2725fc18c60b968817ab62181b959
+  data.tar.gz: 2879bc42a0beef6997ca48528887b2c6d8517f26335312b566d46ee32d66f0926e41fb273a4eb5a2136685b4ffbafe6239c55de18df734c31d5f7d43d796cee5

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "solidus", git: "git@github.com:solidusio/solidus.git", branch: "master"
+gem "solidus", github: "solidusio/solidus"
 
 group :development, :test do
   gem "pry-rails"

data/README.md

@@ -51,7 +51,7 @@ Then run from the command line:
 
 ```shell
 bundle install
-rails g spree_multi_domain:install
+rails g solidus_multi_domain:install
 ```
 
 You should see 'Stores & Domains' in Configuration tab of Spree Admin.

data/app/controllers/concerns/spree_multi_domain/create_line_item_support.rb

@@ -3,7 +3,7 @@ module SpreeMultiDomain::CreateLineItemSupport
 
   included do
     prepend(InstanceMethods)
-    rescue_from SpreeMultiDomain::LineItemDecorator::ProductDoesNotBelongToStoreError, with: :product_does_not_belong_to_store
+    rescue_from SpreeMultiDomain::LineItemConcerns::ProductDoesNotBelongToStoreError, with: :product_does_not_belong_to_store
   end
 
   module InstanceMethods

data/app/models/spree/line_item_decorator.rb

@@ -0,0 +1 @@
+Spree::LineItem.include(SpreeMultiDomain::LineItemConcerns)

data/app/models/spree/order_decorator.rb

@@ -1,7 +1,4 @@
 Spree::Order.class_eval do
-  belongs_to :store
-  scope :by_store, lambda { |store| where(:store_id => store.id) }
-
   def available_payment_methods
     @available_payment_methods ||= Spree::PaymentMethod.available(:front_end, store)
   end

data/app/models/spree_multi_domain/{line_item_decorator.rb → line_item_concerns.rb}

@@ -1,4 +1,4 @@
-module SpreeMultiDomain::LineItemDecorator
+module SpreeMultiDomain::LineItemConcerns
   extend ActiveSupport::Concern
 
   class ProductDoesNotBelongToStoreError < StandardError; end
@@ -12,9 +12,7 @@ module SpreeMultiDomain::LineItemDecorator
     private
 
     def ensure_product_belongs_to_store
-      raise SpreeMultiDomain::LineItemDecorator::ProductDoesNotBelongToStoreError if order.store.present? && !product.stores.include?(order.store)
+      raise ProductDoesNotBelongToStoreError if order.store.present? && !product.stores.include?(order.store)
     end
   end
 end
-
-Spree::LineItem.include(SpreeMultiDomain::LineItemDecorator)

data/db/migrate/20100227180338_create_products_stores.rb

@@ -3,11 +3,11 @@ class CreateProductsStores < ActiveRecord::Migration
     create_table :products_stores, :id => false do |t|
       t.references :product
       t.references :store
-      t.timestamps
+      t.timestamps null: true
     end
   end
 
   def self.down
     drop_table :products_stores
   end
-end
+end

data/db/migrate/20121210224018_add_store_payment_methods.rb

@@ -4,7 +4,7 @@ class AddStorePaymentMethods < ActiveRecord::Migration
       t.integer :store_id
       t.integer :payment_method_id
 
-      t.timestamps
+      t.timestamps null: true
     end
   end
 end

data/db/migrate/20130325231147_add_store_shipping_methods.rb

@@ -4,7 +4,7 @@ class AddStoreShippingMethods < ActiveRecord::Migration
       t.integer :store_id
       t.integer :shipping_method_id
 
-      t.timestamps
+      t.timestamps null: true
     end
 
     add_index :spree_store_shipping_methods, :store_id

data/lib/generators/{spree_multi_domain → solidus_multi_domain}/install/install_generator.rb

@@ -1,4 +1,4 @@
-module SpreeMultiDomain
+module SolidusMultiDomain
   module Generators
     class InstallGenerator < Rails::Generators::Base
       class_option :auto_run_migrations, type: :boolean, default: false

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.0.0"
+  s.version     = "1.0.1"
   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/controllers/spree/api/line_items_controller_spec.rb

@@ -17,7 +17,7 @@ describe Spree::Api::LineItemsController do
     context "A SpreeMultiDomain::LineItemDecorator::ProductDoesNotBelongToStoreError is raised" do
       before(:each) do
         def controller.create
-          raise SpreeMultiDomain::LineItemDecorator::ProductDoesNotBelongToStoreError
+          raise SpreeMultiDomain::LineItemConcerns::ProductDoesNotBelongToStoreError
         end
       end
 

data/spec/controllers/spree/api/products_controller_spec.rb

@@ -27,7 +27,7 @@ describe Spree::Api::ProductsController do
     end
 
     it 'should return 404' do
-      controller.stub(:current_store => store_2)
+      allow(controller).to receive_messages(:current_store => store_2)
       spree_get :show, :id => product.to_param, format: :json
 
       expect(response.response_code) == 404
@@ -42,7 +42,7 @@ describe Spree::Api::ProductsController do
     end
 
     it 'should return 200' do
-      controller.stub(:current_store => store)
+      allow(controller).to receive_messages(:current_store => store)
       spree_get :show, :id => product.to_param, format: :json
 
       expect(response.response_code) == 200

data/spec/controllers/spree/api/shipments_controller_spec.rb

@@ -9,20 +9,20 @@ describe Spree::Api::ShipmentsController do
     let!(:order_from_store2) { FactoryGirl.create(:order, store: store2, user: user) }
 
     before(:each) do
-      controller.stub(current_api_user: user)
+      allow(controller).to receive_messages(current_api_user: user)
     end
 
     it 'should return only shipments from the correct store' do
       FactoryGirl.create(:shipment, order: order_from_store1)
       FactoryGirl.create(:shipment, order: order_from_store2)
 
-      controller.stub(current_store: store1)
+      allow(controller).to receive_messages(current_store: store1)
       controller.mine
 
       expect(assigns(:shipments).length).to eq(1)
       expect(assigns(:shipments).first.order.store_id).to eq(store1.id)
 
-      controller.stub(current_store: store2)
+      allow(controller).to receive_messages(current_store: store2)
       controller.mine
 
       expect(assigns(:shipments).length).to eq(1)
@@ -45,7 +45,7 @@ describe Spree::Api::ShipmentsController do
     context "A SpreeMultiDomain::LineItemDecorator::ProductDoesNotBelongToStoreError is raised" do
       before(:each) do
         def controller.add
-          raise SpreeMultiDomain::LineItemDecorator::ProductDoesNotBelongToStoreError
+          raise SpreeMultiDomain::LineItemConcerns::ProductDoesNotBelongToStoreError
         end
       end
 

data/spec/models/spree/line_item_spec.rb

@@ -24,7 +24,7 @@ describe Spree::LineItem do
       let(:product) { create(:product, stores: [other_store]) }
 
       it 'raises the correct error' do
-        expect{ subject }.to raise_error(SpreeMultiDomain::LineItemDecorator::ProductDoesNotBelongToStoreError)
+        expect{ subject }.to raise_error(SpreeMultiDomain::LineItemConcerns::ProductDoesNotBelongToStoreError)
       end
     end
 

data/spec/models/spree/order_spec.rb

@@ -1,18 +1,4 @@
 require 'spec_helper'
 
 describe Spree::Order do
-
-  before(:each) do
-    @store = FactoryGirl.create(:store)
-    @order = FactoryGirl.create(:order, :store => @store)
-
-    @order2 = FactoryGirl.create(:order)
-  end
-
-  it 'should correctly find products by store' do
-    by_store = Spree::Order.by_store(@store)
-
-    expect(by_store).to include(@order)
-    expect(by_store).to_not include(@order2)
-  end
 end

data/spec/models/spree/tracker_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 
 describe Spree::Tracker do
   before(:each) do
-    store = FactoryGirl.create(:store, default: true)
-    @tracker = FactoryGirl.create(:tracker, store: store)
+    @store = FactoryGirl.create(:store, default: true)
+    @tracker = FactoryGirl.create(:tracker, store: @store)
 
-    another_store = FactoryGirl.create(:store, code: 'STORE2', url: 'completely-different-store.com')
-    @tracker2 = FactoryGirl.create(:tracker, store: another_store)
+    @another_store = FactoryGirl.create(:store, code: 'STORE2', url: 'completely-different-store.com')
+    @tracker2 = FactoryGirl.create(:tracker, store: @another_store)
   end
 
   it "pulls out the current tracker based on store code" do
@@ -14,6 +14,6 @@ describe Spree::Tracker do
   end
 
   it "pulls out the current tracker" do
-    expect(Spree::Tracker.current('www.example.com')).to eq @tracker
+    expect(Spree::Tracker.current(@store.url)).to eq @tracker
   end
 end

data/spec/requests/global_controller_helpers_spec.rb

@@ -6,7 +6,7 @@ describe "Global controller helpers" do
 
   before(:each) do
     @tracker = FactoryGirl.create :tracker, :store => store
-    get '/'
+    get "http://#{store.url}"
   end
 
   it "should include the right tracker" do

data/spec/requests/template_renderer_spec.rb

@@ -10,9 +10,9 @@ describe "Template renderer with dynamic layouts" do
   end
 
   it "should render the layout corresponding to the current store" do
-    FactoryGirl.create :store, code: "my_store"
+    store = FactoryGirl.create :store, code: "my_store"
 
-    get "http://www.example.com"
+    get "http://#{store.url}"
     expect(response.body).to eql("Store layout hello")
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_multi_domain
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus
@@ -160,7 +160,6 @@ files:
 - app/controllers/spree/admin/products_controller_decorator.rb
 - app/controllers/spree/admin/stores_controller.rb
 - app/controllers/spree/api/line_items_controller_decorator.rb
-- app/controllers/spree/api/orders_controller_decorator.rb
 - app/controllers/spree/api/products_controller_decorator.rb
 - app/controllers/spree/api/shipments_controller_decorator.rb
 - app/controllers/spree/home_controller_decorator.rb
@@ -169,6 +168,7 @@ files:
 - app/helpers/spree/products_helper_decorator.rb
 - app/mailers/spree/carton_mailer_decorator.rb
 - app/mailers/spree/order_mailer.rb
+- app/models/spree/line_item_decorator.rb
 - app/models/spree/order_decorator.rb
 - app/models/spree/payment_method_decorator.rb
 - app/models/spree/product_decorator.rb
@@ -180,7 +180,7 @@ files:
 - app/models/spree/taxon_decorator.rb
 - app/models/spree/taxonomy_decorator.rb
 - app/models/spree/tracker_decorator.rb
-- app/models/spree_multi_domain/line_item_decorator.rb
+- app/models/spree_multi_domain/line_item_concerns.rb
 - app/overrides/decorate_admin_configurations_index.rb
 - app/overrides/decorate_admin_products_form.rb
 - app/overrides/decorate_admin_products_index.rb
@@ -222,7 +222,7 @@ files:
 - lib/assets/javascripts/spree/backend/store_picker.js
 - lib/assets/javascripts/spree/frontend/solidus_multi_domain.js
 - lib/assets/stylesheets/spree/frontend/solidus_multi_domain.css
-- lib/generators/spree_multi_domain/install/install_generator.rb
+- lib/generators/solidus_multi_domain/install/install_generator.rb
 - lib/solidus_multi_domain.rb
 - lib/spree/controller_helpers/order_decorator.rb
 - lib/spree/search/multi_domain.rb
@@ -232,7 +232,6 @@ 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/orders_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
@@ -271,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Adds multiple site support to Solidus

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

@@ -1,21 +0,0 @@
-module SpreeMultiStore
-  module Api
-    module OrdersControllerDecorator
-      def self.included(base)
-        base.alias_method_chain :mine, :store_scope
-        base.alias_method_chain :find_current_api_user_orders, :store_scope
-      end
-
-      def mine_with_store_scope
-        mine_without_store_scope
-        @orders = @orders.where(store: current_store) if @orders
-      end
-
-      def find_current_api_user_orders_with_store_scope
-        find_current_api_user_orders_without_store_scope.where(store: current_store)
-      end
-    end
-  end
-end
-
-Spree::Api::OrdersController.include SpreeMultiStore::Api::OrdersControllerDecorator

data/spec/controllers/spree/api/orders_controller_spec.rb

@@ -1,44 +0,0 @@
-require 'spec_helper'
-
-describe Spree::Api::OrdersController do
-  let!(:user) { FactoryGirl.create(:user) }
-  let!(:store1) { FactoryGirl.create(:store) }
-  let!(:store2) { FactoryGirl.create(:store) }
-
-  before(:each) do
-    controller.stub(current_api_user: user)
-  end
-
-  describe '#mine' do
-    it 'should return only orders from the correct store' do
-      FactoryGirl.create(:order, store: store1, user: user)
-      FactoryGirl.create(:order, store: store2, user: user)
-
-      controller.stub(current_store: store1)
-      controller.mine
-
-      expect(assigns(:orders).length).to eq(1)
-      expect(assigns(:orders).first.store_id).to eq(store1.id)
-
-      controller.stub(current_store: store2)
-      controller.mine
-
-      expect(assigns(:orders).length).to eq(1)
-      expect(assigns(:orders).first.store_id).to eq(store2.id)
-    end
-  end
-
-  describe '#find_current_order' do
-
-    it 'should return the latest incomplete order from the correct store' do
-      order1 = FactoryGirl.create(:order, store: store1, state: :cart, user: user)
-      order2 = FactoryGirl.create(:order, store: store2, state: :cart, user: user)
-
-      controller.stub(current_store: store1)
-      expect(controller.send(:find_current_order)).to eql(order1)
-
-      controller.stub(current_store: store2)
-      expect(controller.send(:find_current_order)).to eql(order2)
-    end
-  end
-end