recognition 0.3.3 → 0.3.4

data/README.md

@@ -16,8 +16,12 @@ Then, you need to run the generator:
 
     $ rails generate recogintion:install
 
+And finally, configure your REDIS server connection parameters in: `config/recognition.yml`
+
 ## Usage
 
+### Points
+
 Assuming you have two models User and Post and you want to give users points for the following:
 
 5 points for registration
@@ -54,8 +58,28 @@ app/controllers/profiles_controller.rb:
       end
     end
 
+### Vouchers
+
+Use an existing model or generate a new one. Your model might have the following attributes:
+
+*  `:code` **required**
+*  `:amount` **required**
+*  `:expires_at` _optional_
+*  `:reusable` _optional_
+
+app/models/voucher.rb:
+
+    class Voucher < ActiveRecord::Base
+      attr_accessible :code, :amount, :expires_at, :reusable
+      acts_as_voucher code_length: 14
+    end
+
+Then, you may do:
+
+    voucher = Voucher.create!(amount: 20, expires_at: (DateTime.now + 1.day), reusable: true)
+    voucher.redeem current_user
 
-### Note
+**Note:**
 Due to the way Ruby method aliasing work, if you need to recognize users for 
 non-ActiveRecord actions (anything that's not :create, :update and :destroy),
 make sure you add the `recognize` line *after* the method you want to 

data/lib/recognition/activerecord/voucher.rb

@@ -26,20 +26,27 @@ module Recognition
       def redeemable? recognizable
         # default: not redeemable
         pass = false
-        # has the voucher ever been redeemed?
-        if Database.get_voucher_transactions(self.code).any?
-          # has the voucher ever been redeemed by this user?
-          if Database.get_user_voucher(recognizable.id, code) != 0
-            pass = false
-            # is the voucher reusable?
-          elsif defined?(self.reusable?) && self.reusable?
+        # only check if the voucher did not expire
+        unless expired?
+          # has the voucher ever been redeemed?
+          if Database.get_voucher_transactions(self.code).any?
+            # has the voucher ever been redeemed by this user?
+            if Database.get_user_voucher(recognizable.id, code) != 0
+              pass = false
+              # is the voucher reusable?
+            elsif defined?(self.reusable?) && self.reusable?
+              pass = true
+            end
+          else
             pass = true
           end
-        else
-          pass = true
         end
         pass
       end
+      
+      def expired?
+        defined?(self.expires_at) && self.expires_at.present? && self.expires_at < DateTime.now
+      end
     end
   end
 end

data/lib/recognition/version.rb

@@ -1,4 +1,4 @@
 module Recognition
   # Current Version
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recognition
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000 Z
+date: 2013-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -180,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -708415274929764439
+      hash: 582050913544218696
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -708415274929764439
+      hash: 582050913544218696
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23