spree_zero_stock_products 2.0.0 → 2.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0ad3df76675515354b52c60af398f0ca74908a53
+  data.tar.gz: c4918e30f68ef32b1d4c588cec5714b5f2de4868
+SHA512:
+  metadata.gz: c4d5340c1f2e73075193d10952e6226eba34bf04a90f74a506cafc83adb807af118b1e0976ffe2168b5f40506d3992720723ae7a18cf0d0980ad4541516fa5fa
+  data.tar.gz: 0523fc527d6bb5272579809826ce5c385e03aa39344ff271b88f0f75e8f6feeabec37388367fd862f73f2d6458644aa3495570852af9adf977e7ff64b41b82d0

data/.gitignore

@@ -13,3 +13,4 @@ pkg
 *.swp
 spec/dummy
 .ruby*
+doc/

data/.travis.yml

@@ -6,10 +6,18 @@ rvm:
   - 1.9.3
   - 2.0.0
   - ruby-head
+  - jruby-19mode
+env:
+  - DB=sqlite
+  - DB=mysql
+  - DB=postgres
 language: ruby
 matrix:
   allow_failures:
     - rvm: ruby-head
+  exclude:
+    - rvm: jruby-19mode
+      env: DB=mysql
 notifications:
   recipients:
     - swrobel@gmail.com

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+# Spree Zero Stock Products Changelog
+
+## 2.0.1
+
+* Backorderable products will now be shown even if `show_zero_stock_products = false`
+* Using durable_decorator by @jumph4x to DRY-up method overrides & warn about changes to overridden code
+* Tested against jruby, postgres & mysql
+
+## 2.0.0
+Initial release

data/Gemfile

@@ -1,3 +1,15 @@
 source 'https://rubygems.org'
 
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter'
+  gem 'activerecord-jdbcpostgresql-adapter'
+  gem 'activerecord-jdbcmysql-adapter'
+end
+
+platforms :ruby do
+  gem 'sqlite3'
+  gem 'pg'
+  gem 'mysql2'
+end
+
 gemspec

data/README.md

@@ -34,6 +34,20 @@ Profit.
 
 Testing
 -------
+This extension is tested against the following rubies:
+
+* 1.9.3
+* 2.0.0
+* jruby-19mode (but not w/ mysql until bug is fixed)
+* ruby-head (Travis failures allowed)
+
+As well as the following databases:
+
+* sqlite
+* postgres
+* mysql
+
+### Running the tests locally
 
 Be sure to bundle your dependencies and then create a dummy test app for the specs to run against.
 

data/app/models/product_decorator.rb

@@ -1,5 +1,22 @@
 Spree::Product.class_eval do
+  # Returns only products that are in stock or backorderable
   add_search_scope :on_hand do
-    where("#{table_name}.id IN (SELECT product_id FROM #{Spree::Variant.table_name} v JOIN #{Spree::StockItem.table_name} i ON v.id = i.variant_id WHERE deleted_at IS NULL GROUP BY product_id HAVING SUM(count_on_hand) > 0)")
+    where(
+      <<-SQL
+        #{table_name}.id IN
+        (
+          SELECT product_id FROM #{Spree::Variant.table_name} v
+          JOIN #{Spree::StockItem.table_name} i
+          ON v.id = i.variant_id
+          WHERE deleted_at IS NULL
+          GROUP BY product_id
+          HAVING SUM(count_on_hand) > 0
+            OR MAX(CASE backorderable
+                    WHEN #{ActiveRecord::Base.connection.quoted_true} THEN 1
+                    ELSE 0
+                  END) > 0
+        )
+      SQL
+    )
   end
 end

data/app/models/search/base_decorator.rb

@@ -1,12 +1,11 @@
 Spree::Core::Search::Base.class_eval do
 
 protected
-  def get_base_scope
-    base_scope = Spree::Product.active
-    base_scope = base_scope.in_taxon(taxon) unless taxon.blank?
-    base_scope = get_products_conditions_for(base_scope, keywords)
-    base_scope = base_scope.on_hand unless Spree::Config[:show_zero_stock_products]
-    base_scope = add_search_scopes(base_scope)
-    base_scope
+  durably_decorate :get_base_scope, mode: 'soft', sha: '0030f517d06459bfcde9ae18157806c3b702a71f' do
+    if Spree::Config[:show_zero_stock_products]
+      original_get_base_scope
+    else
+      original_get_base_scope.on_hand
+    end
   end
 end

data/app/models/taxon_decorator.rb

@@ -1,7 +1,10 @@
 Spree::Taxon.class_eval do
-  def active_products
-    scope = products.active
-    scope = scope.on_hand unless Spree::Config[:show_zero_stock_products]
-    scope
+  # Returns products in this taxon that are active (and in stock, depending on settings)
+  durably_decorate :active_products, mode: 'soft', sha: 'd2da9b539628597db39f535ea8aa2da241d61881' do
+    if Spree::Config[:show_zero_stock_products]
+      original_active_products
+    else
+      original_active_products.on_hand
+    end
   end
 end

data/lib/spree_zero_stock_products/engine.rb

@@ -17,7 +17,7 @@ module SpreeZeroStockProducts
       end
     end
 
-    def self.activate
+    def self.activate #:nodoc:
       Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')) do |c|
         Rails.configuration.cache_classes ? require(c) : load(c)
       end

data/lib/spree_zero_stock_products.rb

@@ -1,2 +1,3 @@
 require 'spree_core'
+require 'durable_decorator'
 require 'spree_zero_stock_products/engine'

data/spec/lib/search/base_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Spree::Core::Search::Base do
 
   before do
-    stock_location = create(:stock_location)
+    stock_location = create(:stock_location, backorderable_default: false)
     @product_with_stock = create(:product)
     @product_out_of_stock = create(:product)
 
@@ -17,10 +17,11 @@ describe Spree::Core::Search::Base do
       Spree::Config[:show_zero_stock_products] = false
     end
 
-    it "returns all products by default" do
+    it "returns only in stock products" do
       params = { :per_page => "" }
       searcher = Spree::Core::Search::Base.new(params)
-      searcher.retrieve_products.count.should == 1
+      searcher.retrieve_products.should include @product_with_stock
+      searcher.retrieve_products.should_not include @product_out_of_stock
     end
   end
 
@@ -30,10 +31,11 @@ describe Spree::Core::Search::Base do
       Spree::Config[:show_zero_stock_products] = true
     end
 
-    it "returns all products by default" do
+    it "returns all products regardless of stock status" do
       params = { :per_page => "" }
       searcher = Spree::Core::Search::Base.new(params)
-      searcher.retrieve_products.count.should == 2
+      searcher.retrieve_products.should include @product_with_stock
+      searcher.retrieve_products.should include @product_out_of_stock
     end
   end
 end

data/spec/models/spree/product/scopes_spec.rb

@@ -4,12 +4,17 @@ describe "Product scopes" do
 
   context "with scope on_hand" do
     before do
-      stock_location = create(:stock_location)
+      stock_location = create(:stock_location, backorderable_default: false)
+
       @product_with_stock = create(:product)
+      stock_location.stock_items.where(variant_id: @product_with_stock.master.id).first.adjust_count_on_hand(10)
+
       @product_out_of_stock = create(:product)
+      stock_location.stock_items.where(variant_id: @product_out_of_stock.master.id).first.adjust_count_on_hand(0)
 
-      stock_location.stock_items.where(:variant_id => @product_with_stock.master.id).first.adjust_count_on_hand(10)
-      stock_location.stock_items.where(:variant_id => @product_out_of_stock.master.id).first.adjust_count_on_hand(0)
+      @product_backorderable = create(:product)
+      stock_location.stock_items.where(variant_id: @product_backorderable.master.id).first.adjust_count_on_hand(0)
+      stock_location.stock_items.where(variant_id: @product_backorderable.master.id).first.update_attribute(:backorderable, true)
     end
 
     it "includes a product with available stock" do
@@ -19,5 +24,9 @@ describe "Product scopes" do
     it "excludes a product without available stock" do
       Spree::Product.on_hand.should_not include @product_out_of_stock
     end
+
+    it "includes a product without stock that is backorderable" do
+      Spree::Product.on_hand.should include @product_backorderable
+    end
   end
 end

data/spec/models/spree/taxon/taxon_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Spree::Taxon do
 
   before do
-    stock_location = create(:stock_location)
+    stock_location = create(:stock_location, backorderable_default: false)
     @product_with_stock = create(:product)
     @product_out_of_stock = create(:product)
 

data/spec/spec_helper.rb

@@ -1,12 +1,15 @@
-# Run Coverage report
-require 'simplecov'
-SimpleCov.start do
-  add_group 'Controllers', 'app/controllers'
-  add_group 'Helpers', 'app/helpers'
-  add_group 'Mailers', 'app/mailers'
-  add_group 'Models', 'app/models'
-  add_group 'Views', 'app/views'
-  add_group 'Libraries', 'lib'
+unless ENV['TRAVIS']
+  # Run Coverage report
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter 'spec/dummy'
+    add_group 'Controllers', 'app/controllers'
+    add_group 'Helpers', 'app/helpers'
+    add_group 'Mailers', 'app/mailers'
+    add_group 'Models', 'app/models'
+    add_group 'Views', 'app/views'
+    add_group 'Libraries', 'lib'
+  end
 end
 
 # Configure Rails Environment
@@ -15,7 +18,6 @@ ENV['RAILS_ENV'] = 'test'
 require File.expand_path('../dummy/config/environment.rb',  __FILE__)
 
 require 'rspec/rails'
-require 'database_cleaner'
 require 'ffaker'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
@@ -44,27 +46,7 @@ RSpec.configure do |config|
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
   config.fixture_path = "#{::Rails.root}/spec/fixtures"
 
-  # Capybara javascript drivers require transactional fixtures set to false, and we use DatabaseCleaner
-  # to cleanup after each test instead.  Without transactional fixtures set to false the records created
-  # to setup a test will be unavailable to the browser, which runs under a seperate server instance.
-  config.use_transactional_fixtures = false
-
-  # Ensure Suite is set to use transactions for speed.
-  config.before :suite do
-    DatabaseCleaner.strategy = :transaction
-    DatabaseCleaner.clean_with :truncation
-  end
-
-  # Before each spec check if it is a Javascript test and switch between using database transactions or not where necessary.
-  config.before :each do
-    DatabaseCleaner.strategy = example.metadata[:js] ? :truncation : :transaction
-    DatabaseCleaner.start
-  end
-
-  # After each spec clean the database.
-  config.after :each do
-    DatabaseCleaner.clean
-  end
+  config.use_transactional_fixtures = true
 
   config.fail_fast = ENV['FAIL_FAST'] || false
 end

data/spree_zero_stock_products.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_zero_stock_products'
-  s.version     = '2.0.0'
+  s.version     = '2.0.1'
   s.summary     = 'Restore show_zero_stock_products functionality in Spree 2.0+'
   s.description = 'Restore show_zero_stock_products functionality in Spree 2.0+'
   s.required_ruby_version = '>= 1.9.3'
@@ -18,11 +18,11 @@ Gem::Specification.new do |s|
   s.requirements << 'none'
 
   s.add_dependency 'spree_core', '~> 2.0.0'
+  s.add_dependency 'durable_decorator', '~> 0.2.0'
 
-  s.add_development_dependency 'database_cleaner', '< 1.1.0' # >= 1.1.0 is broken w/ SQLite3 https://github.com/bmabey/database_cleaner/issues/224
   s.add_development_dependency 'factory_girl', '~> 4.2'
   s.add_development_dependency 'ffaker'
   s.add_development_dependency 'rspec-rails',  '~> 2.13'
   s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'durable_decorator_rails', '~> 0.1.0'
 end

metadata

@@ -1,128 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: spree_zero_stock_products
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Stefan Wrobel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-19 00:00:00.000000000 Z
+date: 2013-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.0
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: durable_decorator
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :development
+        version: 0.2.0
+  type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency
-  name: factory_girl
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: factory_girl
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency
-  name: ffaker
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: ffaker
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.13'
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency
-  name: simplecov
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.13'
+- !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency
-  name: sqlite3
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: durable_decorator_rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 description: Restore show_zero_stock_products functionality in Spree 2.0+
 email: swrobel@gmail.com
 executables: []
@@ -132,6 +117,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -154,28 +140,27 @@ files:
 homepage: https://github.com/swrobel/spree_zero_stock_products
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Restore show_zero_stock_products functionality in Spree 2.0+
 test_files:
 - spec/lib/search/base_spec.rb