spree_promo_user_usage_limit 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 636e079492eaf566d3b051530ea304d4ab133004
-  data.tar.gz: 0e4a08429e6d0d849f4bc951848da204db7fe0ae
+  metadata.gz: 9d5e59ecb09944735c773b5bee331d1cfe76a0ab
+  data.tar.gz: ad369b442f5b3fb1bf22743c2122887377929274
 SHA512:
-  metadata.gz: 75d57ac71f476ddd46bc1fdfaa0373e13a208aa2139b8e273e3352ed9ce00d662d311694425e16744229a3b29fc510eede4ec6fc48f2e5ba28977e17addc0e3d
-  data.tar.gz: 6239d6f46fbc2f1ce857597c1f45d77e17784080f01fe4f099516e504684f63957140a11b6f0b68bc886b4792b6deebfa820077617f86a7b8fc954eeee0e444f
+  metadata.gz: 05a5e46264982167f35059cba74aa8ac90dea3b090a875656a69e9132aa82a5ba6df1c8d85b1049f3c4d8e1138f0b5f177756470b44c827be9098644177eb85a
+  data.tar.gz: 735e8c4522d767fb4df2ef2f084262e97c4710d914c0aad512eb7b22c2298f805342a5e10090281ed1776fb9c1294920de38608a1e6d06ff40afe10b797361eb

data/README.md

@@ -1,6 +1,6 @@
 Spree Promo User Usage Limit
 ======================
-[![Build Status](http://img.shields.io/travis/swrobel/spree_promo_user_usage_limit/2-1-stable.svg)](https://travis-ci.org/swrobel/spree_promo_user_usage_limit) [![Dependency Status](http://img.shields.io/gemnasium/swrobel/spree_promo_user_usage_limit.svg)](https://gemnasium.com/swrobel/spree_promo_user_usage_limit) [![Coverage Status](http://img.shields.io/coveralls/swrobel/spree_promo_user_usage_limit/2-1-stable.svg)](https://coveralls.io/r/swrobel/spree_promo_user_usage_limit) [![Code Climate](http://img.shields.io/codeclimate/github/swrobel/spree_promo_user_usage_limit.svg)](https://codeclimate.com/github/swrobel/spree_promo_user_usage_limit)
+[![Build Status](http://img.shields.io/travis/swrobel/spree_promo_user_usage_limit/2-2-stable.svg?style=flat)](https://travis-ci.org/swrobel/spree_promo_user_usage_limit) [![Dependency Status](http://img.shields.io/gemnasium/swrobel/spree_promo_user_usage_limit.svg?style=flat)](https://gemnasium.com/swrobel/spree_promo_user_usage_limit) [![Coverage Status](http://img.shields.io/coveralls/swrobel/spree_promo_user_usage_limit/2-2-stable.svg?style=flat)](https://coveralls.io/r/swrobel/spree_promo_user_usage_limit) [![Code Climate](http://img.shields.io/codeclimate/github/swrobel/spree_promo_user_usage_limit.svg?style=flat)](https://codeclimate.com/github/swrobel/spree_promo_user_usage_limit)
 
 Adding this rule to a promo will allow you to set a limit on the number of completed orders for which a given user can apply it (default 1 use).
 
@@ -25,6 +25,11 @@ Installation
 
 1. Profit.
 
+TODO
+----
+
+* Friendlier error messages when promo can't be applied
+
 Versioning
 ----------
 Versions files the pattern MAJOR.MINOR.PATCH [SemVer-style](http://semver.org/). MAJOR.MINOR version will always match the Spree version that gem is compatible with. PATCH version is incremented as new bugfix releases of this gem come out, indepently of new Spree PATCH versions.

data/app/models/spree/promotion/rules/user_usage_limit.rb

@@ -18,7 +18,7 @@ module Spree
             return false
           end
           action_ids = promotion.actions.pluck(:id)
-          promotion_count = Spree::Adjustment.promotion.where(adjustable_id: order_ids).where(originator_id: action_ids).count
+          promotion_count = Spree::Adjustment.promotion.where(adjustable_id: order_ids).where(source_id: action_ids).count
 
           promotion_count < preferred_uses
         end

data/spec/models/spree/promotion/rules/user_usage_limit_spec.rb

@@ -43,15 +43,15 @@ describe Spree::Promotion::Rules::UserUsageLimit do
       end
 
       context "that used the promo" do
-        before { create(:adjustment, adjustable: order, source: order, originator: promotion.actions.first) }
+        before { create(:adjustment, adjustable: order, source: promotion.actions.first) }
 
-        it { rule.should_not be_eligible(order) }
+        it { rule.should_not be_eligible(order)}
       end
     end
 
     context "with an incomplete order that used the promo" do
       let(:order) { create(:order_with_totals, user: user) }
-      before { create(:adjustment, adjustable: order, source: order, originator: promotion.actions.first) }
+      before { create(:adjustment, adjustable: order, source: promotion.actions.first) }
 
       it { rule.should be_eligible(order) }
     end
@@ -66,7 +66,7 @@ describe Spree::Promotion::Rules::UserUsageLimit do
     end
 
     context "with another order" do
-      before { create(:adjustment, adjustable: order, source: order, originator: promotion.actions.first) }
+      before { create(:adjustment, adjustable: order, source: promotion.actions.first) }
 
       it { rule.should_not be_eligible(order) }
     end

data/spree_promo_user_usage_limit.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_promo_user_usage_limit'
-  s.version     = '2.1.0'
+  s.version     = '2.2.0'
   s.summary     = 'Allow each user to use a promotion a maximum of N times'
   s.description = 'Adding this rule to a promo will allow you to set a limit on the number of completed orders for which a given user can apply it (default 1 use).'
   s.required_ruby_version = '>= 1.9.3'
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'spree_core', '~> 2.1.0'
+  s.add_dependency 'spree_core', '~> 2.2.0'
 
   s.add_development_dependency 'factory_girl', '~> 4.4'
   s.add_development_dependency 'ffaker'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_promo_user_usage_limit
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Stefan Wrobel
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement