shopping_mall 0.0.4 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74c4b187808c6221adf48e43422b69d56ac71cfb
-  data.tar.gz: 0538b25abf28709c37a52843ab4307e7c9b7f759
+  metadata.gz: 7c31f20bcc6bebef0f76579bc3f50ba5d928bc1f
+  data.tar.gz: 48d1d76291834d7ab8fbe02b453a98956f800bfb
 SHA512:
-  metadata.gz: 0ce2ce527e9f5bd0d35f147dc60e0494f8bfb1dd444191c1b8f59378c163f4f92fb70a3e4e922181529ca3c17bb2209893ce2cd84bd1767201c2f79ff2783b51
-  data.tar.gz: 67574904f5bb721ed8db80049c11b9ccd321c50b911851e0ea0c3a7fe9efaf2133e6dd33643b81ea41a5edcd2ecc76b37f53b2b4328159b4555f43f31e571492
+  metadata.gz: 32942545208ca96bbf3ed987fd4cfdd43497488838222f15287b628fa42e4fc5548a73386b3dc3f3fdc38fb81c7bf94064062359a6136173eb450815005d4d39
+  data.tar.gz: adddba58ba6137d73cff51a5c2dc110f22301dd9636cc5718fa38fdf5e8d22e2aa69005cb5406cd4561edd5adb5f9387692cbcab85271add378d4773e0cfb808

data/README.md

@@ -1,6 +1,6 @@
 # Shopping Mall
 
-Multi-tenancy for Spree 2.4.x using the [Apartment](https://github.com/influitive/apartment) gem and [Postgres](http://www.postgresql.org/) as the database. This is very alpha. Pull requests are welcomed.
+Multi-tenancy for Spree 3.0.x using the [Apartment](https://github.com/influitive/apartment) gem and [Postgres](http://www.postgresql.org/) as the database.
 
 [![Build Status](https://travis-ci.org/groundctrl/shopping_mall.svg?branch=master)](https://travis-ci.org/groundctrl/shopping_mall)
 [![Code Climate](https://codeclimate.com/github/groundctrl/shopping_mall.png)](https://codeclimate.com/github/groundctrl/shopping_mall)

data/Rakefile

@@ -2,7 +2,7 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
-require 'spree/testing_support/common_rake'
+require 'spree/testing_support/extension_rake'
 
 RSpec::Core::RakeTask.new
 
@@ -12,5 +12,5 @@ desc 'Generates a dummy app for testing'
 task :test_app do
   ENV['LIB_NAME'] = 'shopping_mall'
   ENV['DB'] = 'postgres'
-  Rake::Task['common:test_app'].invoke 'Spree::User'
+  Rake::Task["extension:test_app"].invoke
 end

data/app/models/spree/zone_decorator.rb

@@ -3,30 +3,4 @@ Spree::Zone.class_eval do
   has_many :shipping_methods,
            through: :shipping_methods_zones,
            class_name: 'Spree::ShippingMethod'
-
-  scope :order_by_members, -> { order(:zone_members_count, :created_at) }
-  scope :where_country_or_state, ->(address) {
-    where(Spree::ZoneMember.arel_where_country_or_state(address))
-  }
-  scope :matching_zones_for, ->(address) {
-    includes(:zone_members).
-      where_country_or_state(address).
-        order_by_members.
-          references(:zones)
-  }
-
-  class << self
-    alias_method :old_match, :match
-  end
-
-  def self.match(address)
-    return unless address && matches = matching_zones_for(address)
-
-    %w(state country).each do |zone_kind|
-      match = matches.detect { |zone| zone_kind == zone.kind }
-      return match if match
-    end
-
-    matches.first
-  end
 end

data/lib/shopping_mall/version.rb

@@ -1,3 +1,3 @@
 module ShoppingMall
-  VERSION = '0.0.4'
+  VERSION = '3.0.0'
 end

data/spec/spec_helper.rb

@@ -1,5 +1,8 @@
 require 'simplecov'
-SimpleCov.start 'rails'
+
+SimpleCov.start do
+  add_filter 'spec/dummy'
+end
 
 ENV['RAILS_ENV'] = 'test'
 
@@ -10,34 +13,35 @@ rescue LoadError
   exit
 end
 
+require 'pry-byebug'
 require 'rspec/rails'
-require 'shoulda-matchers'
-require 'ffaker'
-require 'database_cleaner'
 require 'capybara'
-require 'capybara/rspec'
-require 'capybara/rails'
 require 'capybara/poltergeist'
+require 'capybara/rails'
+require 'capybara/rspec'
+require 'database_cleaner'
+require 'ffaker'
+require 'shoulda-matchers'
 
 Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each {|f| require f }
 
-require 'spree/testing_support/factories'
-require 'spree/testing_support/controller_requests'
 require 'spree/testing_support/authorization_helpers'
-require 'spree/testing_support/url_helpers'
 require 'spree/testing_support/capybara_ext'
+require 'spree/testing_support/controller_requests'
+require 'spree/testing_support/factories'
+require 'spree/testing_support/url_helpers'
 
 FactoryGirl.find_definitions
 
 RSpec.configure do |config|
-  config.deprecation_stream = 'rspec.log'
-  config.include Spree::TestingSupport::ControllerRequests
-  config.include FactoryGirl::Syntax::Methods
+  config.infer_spec_type_from_file_location!
+
   config.include Spree::TestingSupport::UrlHelpers
   config.include Devise::TestHelpers, type: :controller
+  config.include FactoryGirl::Syntax::Methods
+
   config.use_transactional_fixtures = false
   config.expose_current_running_example_as :example
-  config.infer_spec_type_from_file_location!
 
   config.before(:suite) do
     DatabaseCleaner.strategy = :transaction

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopping_mall
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 3.0.0
 platform: ruby
 authors:
 - Vincent Franco
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 3.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 3.0.3
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
@@ -194,19 +194,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -235,7 +235,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
-description: Multi-tenancy for Spree 2.4.x
+description: Multi-tenancy for Spree 3.x.x
 email: 
 executables: []
 extensions: []
@@ -263,7 +263,6 @@ files:
 - app/models/spree/user_decorator.rb
 - app/models/spree/variant_decorator.rb
 - app/models/spree/zone_decorator.rb
-- app/models/spree/zone_member_decorator.rb
 - config/initializers/shopping_mall_initializer.rb
 - db/migrate/20140611225105_hatbm_to_hmt.rb
 - lib/generators/shopping_mall/install_generator.rb
@@ -301,7 +300,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -313,7 +312,7 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Multi-tenancy for Spree 2.4.x
+summary: Multi-tenancy for Spree 3.x.x
 test_files:
 - spec/features/tenancy_spec.rb
 - spec/models/spree/option_type_decorator_spec.rb

data/app/models/spree/zone_member_decorator.rb

@@ -1,16 +0,0 @@
-Spree::ZoneMember.class_eval do
-  %w(country state).each do |type|
-    define_singleton_method "arel_and_in_#{type}_id" do |type_id|
-      send(:"with_#{type}_id", type_id).where_values.reduce(:and)
-    end
-
-    scope :"with_#{type}_id", ->(type_id) {
-      where(zoneable_type: "Spree::#{type.capitalize}", zoneable_id: type_id)
-    }
-  end
-
-  def self.arel_where_country_or_state(address)
-    countries = arel_and_in_country_id address.country_id
-    countries.or(arel_and_in_state_id address.state_id)
-  end
-end