solidus_multi_domain 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 473989c53e12907163063b0b48d04279f8524a5e
-  data.tar.gz: 607a4ca0c1d8b1912a9eaf5d03ff7cc882c9173b
+  metadata.gz: 098985ec80349cc626444c51ed5dc087f24e3c45
+  data.tar.gz: 183006f5dd4b9df940748cad1bd00668bdb2eb53
 SHA512:
-  metadata.gz: f3d34f22e52a395d5ed7ae65a92513f1a131b0155d596bc3fb2a8a2863151419c41b121f377c208079c0fd0d049953b86ef0564e215bb1c37820f9316d2c90bc
-  data.tar.gz: 9b512125660409f4f0ea10804d7844850eb09ea19544b26951057e44d3bebc648875a4aee49c2cff7bc38b7eed87a096e67a517eb436a5f07737b26dfdebfd32
+  metadata.gz: daa7ec76b99e1692175da20803924bcb01f5f97a353a5a9fe8430ef7e70fe844651ff6c3be56f79cc74901a5fcdfb280bbd51dd7e88b44f4a1b213fa4c92fcb5
+  data.tar.gz: e2464782a80ab6a0aecefcd75ffdbd80151419bc2e4f549bcd664b0f6f286fbbc75e94b86886c8a9a2fab6e692628c876703ac02d4828039d9dc8d037c52b4cc

data/Gemfile

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

data/app/models/spree/store_decorator.rb

@@ -4,9 +4,6 @@ module Spree
     has_many :taxonomies
     has_many :orders
 
-    has_many :store_payment_methods
-    has_many :payment_methods, through: :store_payment_methods
-
     has_many :store_shipping_methods
     has_many :shipping_methods, through: :store_shipping_methods
 

data/config/locales/en.yml

@@ -6,7 +6,6 @@ en:
       products_from_different_stores_may_not_be_added_to_this_order: Products from different stores may not be added to this order.
     send_mail_as: Send Mail As
     logo: Logo
-    payment_method: Payment Method
     shipping_method: Shipping Method
     store: Store
     stores: Stores

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.3"
+  s.version     = "1.1.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,7 +18,7 @@ Gem::Specification.new do |s|
   s.require_path = "lib"
   s.requirements << "none"
 
-  s.add_dependency "solidus", "~> 1.0.0"
+  s.add_dependency "solidus", [">= 1.1.0.pre", "< 2"]
 
   s.add_development_dependency "rspec-rails",  "~> 3.2"
   s.add_development_dependency "simplecov"

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: solidus_multi_domain
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2015-08-26 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.0.pre
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0.pre
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -161,15 +167,12 @@ files:
 - app/controllers/spree/taxons_controller_decorator.rb
 - app/helpers/spree/products_helper_decorator.rb
 - app/models/spree/line_item_decorator.rb
-- app/models/spree/order_decorator.rb
-- app/models/spree/payment_method_decorator.rb
 - app/models/spree/permission_sets/store_display.rb
 - app/models/spree/permission_sets/store_management.rb
 - app/models/spree/product_decorator.rb
 - app/models/spree/promotion/rules/store.rb
 - app/models/spree/shipping_method_decorator.rb
 - app/models/spree/store_decorator.rb
-- app/models/spree/store_payment_method.rb
 - app/models/spree/store_shipping_method.rb
 - app/models/spree/taxon_decorator.rb
 - app/models/spree/taxonomy_decorator.rb
@@ -208,7 +211,6 @@ files:
 - db/migrate/20110601125650_remove_datetime_columns_from_products_stores.rb
 - db/migrate/20110601145424_add_indexes_to_products_stores.rb
 - db/migrate/20120223183401_namespace.rb
-- db/migrate/20121210224018_add_store_payment_methods.rb
 - db/migrate/20130308084714_add_logo_to_stores.rb
 - db/migrate/20130325231147_add_store_shipping_methods.rb
 - db/migrate/20130412212659_add_spree_promotion_rules_stores.rb
@@ -233,7 +235,6 @@ files:
 - spec/helpers/products_helper_decorator_spec.rb
 - spec/models/spree/line_item_spec.rb
 - spec/models/spree/order_spec.rb
-- spec/models/spree/payment_method_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
@@ -266,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Adds multiple site support to Solidus
@@ -280,7 +281,6 @@ test_files:
 - spec/helpers/products_helper_decorator_spec.rb
 - spec/models/spree/line_item_spec.rb
 - spec/models/spree/order_spec.rb
-- spec/models/spree/payment_method_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

data/app/models/spree/order_decorator.rb

@@ -1,5 +0,0 @@
-Spree::Order.class_eval do
-  def available_payment_methods
-    @available_payment_methods ||= Spree::PaymentMethod.available(:front_end, store)
-  end
-end

data/app/models/spree/payment_method_decorator.rb

@@ -1,13 +0,0 @@
-Spree::PaymentMethod.class_eval do
-  has_many :store_payment_methods
-  has_many :stores, :through => :store_payment_methods
-
-  def self.available(display_on = 'both', store = nil)
-    result = all.select do |p|
-      p.active &&
-        (p.environment == Rails.env || p.environment.blank?) &&
-        (store.nil? || store.payment_methods.empty? || store.payment_methods.include?(p)) &&
-        (p.display_on == display_on.to_s || p.display_on.blank?)
-    end
-  end
-end

data/app/models/spree/store_payment_method.rb

@@ -1,6 +0,0 @@
-module Spree
-  class StorePaymentMethod < ActiveRecord::Base
-    belongs_to :store
-    belongs_to :payment_method
-  end
-end

data/db/migrate/20121210224018_add_store_payment_methods.rb

@@ -1,10 +0,0 @@
-class AddStorePaymentMethods < ActiveRecord::Migration
-  def change
-    create_table :spree_store_payment_methods do |t|
-      t.integer :store_id
-      t.integer :payment_method_id
-
-      t.timestamps null: true
-    end
-  end
-end

data/spec/models/spree/payment_method_spec.rb

@@ -1,33 +0,0 @@
-require 'spec_helper'
-
-describe 'PaymentMethod' do
-  describe '.available' do
-    subject { Spree::PaymentMethod.available(:front_end, store) }
-
-    let!(:check_payment_method) { FactoryGirl.create :check_payment_method }
-    let(:payment_method_store) { FactoryGirl.create :store, :payment_methods => [check_payment_method] }
-
-    context "when store is not specified" do
-      let(:store) { nil }
-
-      it { is_expected.to include(check_payment_method) }
-    end
-
-    context "when store is specified" do
-      let(:store) { payment_method_store }
-
-      context "when store has payment methods" do
-        let(:non_matching_check_payment_method) { FactoryGirl.create :check_payment_method }
-
-        it { is_expected.to include(check_payment_method) }
-        it { is_expected.not_to include(non_matching_check_payment_method) }
-      end
-
-      context "when store does not have payment_methods" do
-        let(:payment_method_store) { FactoryGirl.create :store }
-
-        it { is_expected.to include(check_payment_method) }
-      end
-    end
-  end
-end