solidus_multi_domain 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 191f8cf6df04e131b0007d89065a3a690f5d4f41
-  data.tar.gz: a9de546369e8aa0d751eba3be96ad2f2077fcc41
+  metadata.gz: 473989c53e12907163063b0b48d04279f8524a5e
+  data.tar.gz: 607a4ca0c1d8b1912a9eaf5d03ff7cc882c9173b
 SHA512:
-  metadata.gz: 6867d1c89bc564d8a435258b541bc60e60347406cf4c088e85149d7a99e412da058d02e73f7458b3a4126e9a95fcef9733d2725fc18c60b968817ab62181b959
-  data.tar.gz: 2879bc42a0beef6997ca48528887b2c6d8517f26335312b566d46ee32d66f0926e41fb273a4eb5a2136685b4ffbafe6239c55de18df734c31d5f7d43d796cee5
+  metadata.gz: f3d34f22e52a395d5ed7ae65a92513f1a131b0155d596bc3fb2a8a2863151419c41b121f377c208079c0fd0d049953b86ef0564e215bb1c37820f9316d2c90bc
+  data.tar.gz: 9b512125660409f4f0ea10804d7844850eb09ea19544b26951057e44d3bebc648875a4aee49c2cff7bc38b7eed87a096e67a517eb436a5f07737b26dfdebfd32

data/Gemfile

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

data/README.md

@@ -56,10 +56,13 @@ rails g solidus_multi_domain:install
 
 You should see 'Stores & Domains' in Configuration tab of Spree Admin.
 
-Features To-do
---------------
+Authorization
+-------------
+
+For discrete authorization, two permission sets have been added to allow for granular display in the admin.
+
+`Spree::PermissionSets::StoreDisplay` and `Spree::PermissionSets::StoreManagement` have been added and can be assigned via [RoleConfiguration](http://docs.solidus.io/Spree/RoleConfiguration.html)
 
-1. Taxonomies - associate stores with taxonomies.
 
 Testing
 -------

data/app/models/spree/permission_sets/store_display.rb

@@ -0,0 +1,9 @@
+module Spree
+  module PermissionSets
+    class StoreDisplay < PermissionSets::Base
+      def activate!
+        can [:display, :admin], Spree::Store
+      end
+    end
+  end
+end

data/app/models/spree/permission_sets/store_management.rb

@@ -0,0 +1,9 @@
+module Spree
+  module PermissionSets
+    class StoreManagement < PermissionSets::Base
+      def activate!
+        can :manage, Spree::Store
+      end
+    end
+  end
+end

data/app/overrides/decorate_admin_configurations_index.rb

@@ -1,5 +1,7 @@
-Deface::Override.new(:virtual_path => "spree/admin/shared/_configuration_menu",
-                     :name => "multi_domain_admin_configurations_menu",
-                     :insert_bottom => "[data-hook='admin_configurations_sidebar_menu']",
-                     :text => "<%= configurations_sidebar_menu_item Spree.t(:stores_admin), admin_stores_url %>",
-                     :disabled => false)
+Deface::Override.new(
+  virtual_path: "spree/admin/shared/_configuration_menu",
+  name: "multi_domain_admin_configurations_menu",
+  insert_bottom: "[data-hook='admin_configurations_sidebar_menu']",
+  disabled: false,
+  partial: "spree/shared/multi_domain_sidebar_entry"
+)

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

@@ -5,9 +5,11 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:new_store), new_object_url,  :icon => 'icon-plus', :id => 'admin_new_store_link' %>
-  </li>
+  <% if can?(:create, Spree::Store) %>
+    <li>
+      <%= button_link_to Spree.t(:new_store), new_object_url,  :icon => 'icon-plus', :id => 'admin_new_store_link' %>
+    </li>
+  <% end %>
 <% end %>
 
 <table class="index" id='listing_stores'>
@@ -34,8 +36,12 @@
         <td><%= store.mail_from_address %></td>
         <td><%= store.url %></td>
         <td data-hook="admin_stores_index_row_actions" class="actions">
-          <%= link_to_edit store, :no_text => true %> &nbsp;
-          <%= link_to_delete store, :no_text => true %>
+          <% if can? :update, store %>
+            <%= link_to_edit store, :no_text => true %>
+          <% end %>
+          <% if can? :destroy, store %>
+            <%= link_to_delete store, :no_text => true %>
+          <% end %>
         </td>
       </tr>
     <% end %>

data/app/views/spree/shared/_multi_domain_sidebar_entry.html.erb

@@ -0,0 +1,3 @@
+<% if can?(:display, Spree::Store) %>
+  <%= configurations_sidebar_menu_item Spree.t(:stores_admin), admin_stores_url %>
+<% 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.0.1"
+  s.version     = "1.0.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"
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.require_path = "lib"
   s.requirements << "none"
 
-  s.add_dependency "solidus", [">= 1.0.0.pre", "< 2"]
+  s.add_dependency "solidus", "~> 1.0.0"
 
   s.add_development_dependency "rspec-rails",  "~> 3.2"
   s.add_development_dependency "simplecov"

data/spec/models/spree/permission_sets/store_display_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Spree::PermissionSets::StoreDisplay do
+  let(:ability) { Spree::Ability.new nil }
+
+  subject { ability }
+
+  context "when activated" do
+    before do
+      described_class.new(ability).activate!
+    end
+
+    it { should be_able_to(:display, Spree::Store) }
+    it { should be_able_to(:admin, Spree::Store) }
+  end
+
+  context "when not activated" do
+    it { should_not be_able_to(:display, Spree::Store) }
+    it { should_not be_able_to(:admin, Spree::Store) }
+  end
+end
+

data/spec/models/spree/permission_sets/store_management_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe Spree::PermissionSets::StoreManagement do
+  let(:ability) { Spree::Ability.new nil }
+
+  subject { ability }
+
+  context "when activated" do
+    before do
+      described_class.new(ability).activate!
+    end
+
+    it { should be_able_to(:manage, Spree::Store) }
+  end
+
+  context "when not activated" do
+    it { should_not be_able_to(:manage, Spree::Store) }
+  end
+end
+

data/spec/spec_helper.rb

@@ -17,6 +17,8 @@ require 'spree/testing_support/preferences'
 require 'spree/api/testing_support/helpers'
 require 'spree/api/testing_support/setup'
 
+require 'cancan/matchers'
+
 Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each { |f| require f }
 
 RSpec.configure do |config|

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: solidus_multi_domain
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2015-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0.pre
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0.pre
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -166,11 +160,11 @@ files:
 - app/controllers/spree/products_controller_decorator.rb
 - app/controllers/spree/taxons_controller_decorator.rb
 - 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/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
@@ -199,6 +193,7 @@ files:
 - app/views/spree/admin/trackers/_index_rows.html.erb
 - app/views/spree/admin/trackers/_store.html.erb
 - app/views/spree/shared/_google_analytics.html.erb
+- app/views/spree/shared/_multi_domain_sidebar_entry.html.erb
 - bin/rails
 - circle.yml
 - config/locales/en.yml
@@ -236,10 +231,11 @@ files:
 - spec/controllers/spree/api/shipments_controller_spec.rb
 - spec/controllers/spree/products_controller_spec.rb
 - spec/helpers/products_helper_decorator_spec.rb
-- spec/mailers/carton_mailer_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
 - spec/models/spree/shipping_method_decorator_spec.rb
 - spec/models/spree/store_spec.rb
@@ -270,8 +266,29 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.5
 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/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
+- 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

data/app/mailers/spree/carton_mailer_decorator.rb

@@ -1,13 +0,0 @@
-Spree::CartonMailer.class_eval do
-  def from_address_with_multidomain
-    order = @carton.orders.first
-
-    if order.store
-      order.store.mail_from_address
-    else
-      from_address_without_multidomain
-    end
-  end
-
-  alias_method_chain :from_address, :multidomain
-end

data/app/mailers/spree/order_mailer.rb

@@ -1,35 +0,0 @@
-module Spree
-  class OrderMailer < BaseMailer
-    def confirm_email(order, resend = false)
-      find_order(order)
-      subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
-      subject += "#{Spree::Store.default.name} #{Spree.t('order_mailer.confirm_email.subject')} ##{@order.number}"
-      mail_params = {:to => @order.email, :subject => subject}
-      if @order.store.present? && @order.store.mail_from_address.present?
-        mail_params[:from] = @order.store.mail_from_address
-      else
-        mail_params[:from] = Spree::Store.default.mail_from_address
-      end
-      mail(mail_params)
-    end
-
-    def cancel_email(order, resend = false)
-      find_order(order)
-      subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
-      subject += "#{Spree::Store.default.name} #{Spree.t('order_mailer.cancel_email.subject')} ##{@order.number}"
-      mail_params = {:to => @order.email, :subject => subject}
-      if @order.store.present? && @order.store.mail_from_address.present?
-        mail_params[:from] = @order.store.mail_from_address
-      else
-        mail_params[:from] = Spree::Store.default.mail_from_address
-      end
-      mail(mail_params)
-    end
-
-    private
-
-    def find_order(order)
-      @order = order.is_a?(Spree::Order) ? order : Spree::Order.find(order)
-    end
-  end
-end

data/spec/mailers/carton_mailer_spec.rb

@@ -1,41 +0,0 @@
-require 'spec_helper'
-
-describe Spree::CartonMailer do
-  let(:mail) { Spree::CartonMailer.shipped_email(carton.id) }
-
-  let(:carton) do
-    FactoryGirl.create(:carton, inventory_units: order.inventory_units)
-  end
-
-  let(:order) do
-    FactoryGirl.create(:order_ready_to_ship, line_items_count: 1)
-  end
-
-  describe 'from address' do
-    subject do
-      mail.from
-    end
-
-    context 'the order does not have a store' do
-      let(:order) do
-        FactoryGirl.create(:order_ready_to_ship, line_items_count: 1, store: nil)
-      end
-
-      it { is_expected.to eq [Spree::Config[:mails_from]] }
-    end
-
-    context 'the order has a store' do
-      let(:order) do
-        FactoryGirl.create(
-          :order_ready_to_ship,
-          line_items_count: 1,
-          store: store,
-        )
-      end
-
-      let(:store) { FactoryGirl.create(:store, mail_from_address: 'store@example.com') }
-      it { is_expected.to eq ['store@example.com'] }
-    end
-  end
-
-end