recognition 0.3.7 → 0.3.8

data/README.md

@@ -61,6 +61,12 @@ app/models/post.rb:
       recognize :user, for: :destroy, loss: 2, maximum: 4
     end
 
+**Important:**
+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 
+recognize the user for.
+
 app/controllers/profiles_controller.rb:
 
     class ProfilesController < ApplicationController
@@ -86,6 +92,11 @@ Your model might have the following attributes:
 *  `:expires_at` _optional_
 *  `:reusable` _optional_
 
+You can specify the following extra parameters for vouchers:
+
+* `:prefix` can be a number, string or method name or even an anonymous function.
+* `:suffix` can be a number, string or method name or even an anonymous function.
+
 app/models/voucher.rb:
 
     class Voucher < ActiveRecord::Base
@@ -98,12 +109,6 @@ Then, you may do:
     voucher = Voucher.create!(amount: 20, expires_at: (DateTime.now + 1.day), reusable: true)
     voucher.redeem current_user
 
-**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 
-recognize the user for.
-
 ## Example
 The following won't work:
 

data/lib/recognition/activerecord/voucher.rb

@@ -1,12 +1,12 @@
 module Recognition
   module ActiveRecord
     module Voucher
-      # class_attribute :voucher_validators
-      
       def regenerate_code
-        l = self.class.recognitions[:code_length] || 10
+        prefix = Recognition::Database.parse_voucher_part(self.class.recognitions[:prefix], self)
+        suffix = Recognition::Database.parse_voucher_part(self.class.recognitions[:suffix], self)
+        l = (self.class.recognitions[:code_length] - (prefix.length + suffix.length)) || 10
         dict = [('a'..'z'),('A'..'Z'),(0..9)].map{|i| i.to_a}.flatten
-        code = (1..l).map{ dict[rand(dict.length)] }.join
+        code = (1..l).map{ dict[rand(dict.length)] }.prepend(prefix).append(suffix).join
         # Prevent code collision at all costs
         if self.class.to_s.constantize.find_all_by_code(code).any?
           regenerate_code

data/lib/recognition/database.rb

@@ -71,6 +71,26 @@ module Recognition
       Database.get_user_counter id, bucket
     end
     
+    def self.parse_voucher_part part, object
+      case part.class.to_s
+      when 'String'
+        value = part
+      when 'Integer'
+        value = part.to_s
+      when 'Fixnum'
+        value = part.to_s
+      when 'Symbol'
+        value = object.send(part).to_s
+      when 'Proc'
+        value = part.call(object).to_s
+      when 'NilClass'
+        # Do not complain about nil amounts
+      else
+        raise ArgumentError, "type mismatch for voucher part: expecting 'Integer', 'Fixnum', 'Symbol' or 'Proc' but got '#{ amount.class.to_s }' instead."
+      end
+      value || ''
+    end
+    
     private
     
     def self.get_transactions keypart, start, stop
@@ -103,6 +123,7 @@ module Recognition
     def self.parse_amount amount, object
       case amount.class.to_s
       when 'Integer'
+        value = amount
       when 'Fixnum'
         value = amount
       when 'Symbol'

data/lib/recognition/version.rb

@@ -1,4 +1,4 @@
 module Recognition
   # Current Version
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recognition
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -181,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 111551344428763194
+      hash: 1363284435597105623
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 111551344428763194
+      hash: 1363284435597105623
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23