solidus_multi_domain 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 098985ec80349cc626444c51ed5dc087f24e3c45
-  data.tar.gz: 183006f5dd4b9df940748cad1bd00668bdb2eb53
+  metadata.gz: dc0b4763e90a463bb84869227fe5220a1a986618
+  data.tar.gz: edfe91b27a069951cf9a7b1a1fa1652a4a77b3b8
 SHA512:
-  metadata.gz: daa7ec76b99e1692175da20803924bcb01f5f97a353a5a9fe8430ef7e70fe844651ff6c3be56f79cc74901a5fcdfb280bbd51dd7e88b44f4a1b213fa4c92fcb5
-  data.tar.gz: e2464782a80ab6a0aecefcd75ffdbd80151419bc2e4f549bcd664b0f6f286fbbc75e94b86886c8a9a2fab6e692628c876703ac02d4828039d9dc8d037c52b4cc
+  metadata.gz: 6c49ec4ebeccfce595a2683bc63f870ff2bb937df2cb614552fda28ce9a9673b0a19cdcf22a19d4e8d048f4926951f6b9fbf97e241a16e7d7906280dc377a88f
+  data.tar.gz: 9f9d9f5d36186f26547d303a5ad9d1b232e64d116a0c837801f1158300d87ac03f523a9ba00035b3140ef252cfc8828c322f8fb4680c14f0dbfed681167293f7

data/app/models/spree/store_decorator.rb

@@ -1,22 +1,20 @@
-module Spree
-  Store.class_eval do
-    has_and_belongs_to_many :products, join_table: 'spree_products_stores'
-    has_many :taxonomies
-    has_many :orders
+Spree::Store.class_eval do
+  has_and_belongs_to_many :products, join_table: 'spree_products_stores'
+  has_many :taxonomies
+  has_many :orders
 
-    has_many :store_shipping_methods
-    has_many :shipping_methods, through: :store_shipping_methods
+  has_many :store_shipping_methods
+  has_many :shipping_methods, through: :store_shipping_methods
 
-    has_and_belongs_to_many :promotion_rules, class_name: 'Spree::Promotion::Rules::Store', join_table: 'spree_promotion_rules_stores', association_foreign_key: 'promotion_rule_id'
+  has_and_belongs_to_many :promotion_rules, class_name: 'Spree::Promotion::Rules::Store', join_table: 'spree_promotion_rules_stores', association_foreign_key: 'promotion_rule_id'
 
-    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',
-      convert_options: { all: '-strip -auto-orient' }
+  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',
+    convert_options: { all: '-strip -auto-orient' }
 
-      validates_attachment_file_name :logo, matches: [/png\Z/i, /jpe?g\Z/i],
-        if: -> { respond_to?(:logo_file_name) }
-  end
+  validates_attachment_file_name :logo, matches: [/png\Z/i, /jpe?g\Z/i],
+    if: -> { respond_to?(:logo_file_name) }
 end

data/app/models/spree/tracker_decorator.rb

@@ -2,6 +2,6 @@ Spree::Tracker.class_eval do
   belongs_to :store
 
   def self.current(store_key)
-    Spree::Tracker.where(active: true, environment: Rails.env).joins(:store).where("spree_stores.code = ? OR spree_stores.url LIKE ?", store_key, "%#{store_key}%").first
+    Spree::Tracker.where(active: true).joins(:store).where("spree_stores.code = ? OR spree_stores.url LIKE ?", store_key, "%#{store_key}%").first
   end
 end

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

@@ -66,7 +66,7 @@
           <label class="sub">
             <%= check_box_tag 'store[payment_method_ids][]', payment_method.id, @store.payment_methods.include?(payment_method) %>
           </label> &nbsp;
-          <%= "#{payment_method.name} (#{payment_method.environment})" %>
+          <%= payment_method.name %>
           <br>
         <% end %>
         <%= hidden_field_tag 'store[payment_method_ids][]', '' %>

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.0"
+  s.version     = "1.1.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"
@@ -18,14 +18,14 @@ Gem::Specification.new do |s|
   s.require_path = "lib"
   s.requirements << "none"
 
-  s.add_dependency "solidus", [">= 1.1.0.pre", "< 2"]
+  s.add_dependency "solidus", [">= 1.1.0.pre", "< 1.2.0"]
 
   s.add_development_dependency "rspec-rails",  "~> 3.2"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "sqlite3"
-  s.add_development_dependency "sass-rails", "~> 4.0.2"
-  s.add_development_dependency "coffee-rails", "~> 4.0.0"
-  s.add_development_dependency "factory_girl", "~> 4.5.0"
-  s.add_development_dependency "capybara", "~> 2.4"
+  s.add_development_dependency "sass-rails"
+  s.add_development_dependency "coffee-rails"
+  s.add_development_dependency "factory_girl", "~> 4.5"
+  s.add_development_dependency "capybara"
   s.add_development_dependency "ffaker"
 end

data/spec/controllers/spree/admin/stores_controller_spec.rb

@@ -3,10 +3,23 @@ require 'spec_helper'
 describe Spree::Admin::StoresController do
   stub_authorization!
 
-  describe "on :index" do
-    it "renders index" do
+  describe '#index' do
+    render_views
+
+    it 'renders' do
       spree_get :index
       expect(response).to be_success
     end
   end
+
+  describe '#edit' do
+    render_views
+
+    let(:store) { create(:store) }
+
+    it 'renders' do
+      spree_get :edit, id: store.to_param
+      expect(response).to be_success
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_multi_domain
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2015-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus
@@ -19,7 +19,7 @@ dependencies:
         version: 1.1.0.pre
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 1.1.0.pre
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -76,58 +76,58 @@ dependencies:
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: '4.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: '4.5'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +151,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".ruby-version"
 - Gemfile
 - README.md
 - Rakefile
@@ -218,6 +217,7 @@ files:
 - lib/assets/javascripts/spree/backend/solidus_multi_domain.js
 - lib/assets/javascripts/spree/backend/store_picker.js
 - lib/assets/javascripts/spree/frontend/solidus_multi_domain.js
+- lib/assets/stylesheets/spree/backend/solidus_multi_domain.css
 - lib/assets/stylesheets/spree/frontend/solidus_multi_domain.css
 - lib/generators/solidus_multi_domain/install/install_generator.rb
 - lib/solidus_multi_domain.rb
@@ -267,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Adds multiple site support to Solidus

data/.ruby-version

@@ -1 +0,0 @@
-2.1.6