recognition 0.3.1 → 0.3.2

data/lib/recognition/active_record_extension.rb

@@ -11,19 +11,20 @@ module Recognition
     module ClassMethods
       # to be called from user model
       def acts_as_recognizable options = {}
-        include RecognizableInstanceMethods
+        require "recognition/activerecord/recognizable"
+        include Recognition::ActiveRecord::Recognizable
         self.recognizable = true
         self.recognitions ||= {}
         self.recognitions[:initial] = {
           amount: options[:initial]
         }
         after_save :add_initial_points
-        
       end
   
       # to be called from other models
       def recognize recognizable, condition
-        include ObjectInstanceMethods
+        require "recognition/activerecord/model"
+        include Recognition::ActiveRecord::Model
         self.recognitions ||= {}
         self.recognitions[condition[:for]] = {
           recognizable: recognizable,
@@ -55,95 +56,11 @@ module Recognition
 
       # to be called from user-model
       def acts_as_voucher options = {}
-        include VoucherInstanceMethods
+        require "recognition/activerecord/voucher"
+        include Recognition::ActiveRecord::Voucher
         self.recognitions = options
         before_create :regenerate_code
       end
     end
-
-    module RecognizableInstanceMethods
-      # Determine user current balance of points
-      def points
-        Database.get_user_points self.id
-      end
-  
-      def recognition_counter bucket
-        Database.get_user_counter self.id, bucket
-      end
-  
-      def add_initial_points
-        Database.update_points self, :initial, self.class.recognitions[:initial]
-      end
-
-      def update_points amount, bucket
-        Database.log(self.id, amount.to_i, bucket)
-      end
-      
-      def transactions page = 0, per = 20
-        Database.get_user_transactions self.id, page, per
-      end
-    end
-    
-    module ObjectInstanceMethods
-      def recognize_creating
-        if self.id_changed? # Unless we are creating
-          Database.update_points self, :create, self.class.recognitions[:create] unless self.class.recognitions[:create].nil?
-        end
-      end
-  
-      def recognize_updating
-        unless self.id_changed? # Unless we are creating
-          Database.update_points self, :update, self.class.recognitions[:update] unless self.class.recognitions[:update].nil?
-        end
-      end
-  
-      def recognize_destroying
-        Database.update_points self, :destroy, self.class.recognitions[:destroy] unless self.class.recognitions[:destroy].nil?
-      end
-  
-    end
-    
-    module VoucherInstanceMethods
-      def regenerate_code
-        l = self.class.recognitions[:code_length] || 10
-        dict = [('a'..'z'),('A'..'Z'),(0..9)].map{|i| i.to_a}.flatten
-        code = (1..l).map{ dict[rand(dict.length)] }.join
-        # Prevent code collision at all costs
-        if self.class.to_s.constantize.find_all_by_code(code).any?
-          regenerate_code
-        else
-          self.code = code
-          self
-        end
-      end
-      
-      def redeem recognizable
-        # Make sure we have an amount beforehand
-        if defined? self.amount
-          if self.redeemable? recognizable
-            Database.redeem_voucher recognizable.id, self.code, self.amount
-          end
-        end
-      end
-      
-      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?
-            pass = true
-          end
-        else
-          pass = true
-        end
-        pass
-      end
-      
-    end
   end
 end

data/lib/recognition/activerecord/model.rb

@@ -0,0 +1,21 @@
+module Recognition
+  module ActiveRecord
+    module Model
+      def recognize_creating
+        if self.id_changed? # Unless we are creating
+          Database.update_points self, :create, self.class.recognitions[:create] unless self.class.recognitions[:create].nil?
+        end
+      end
+
+      def recognize_updating
+        unless self.id_changed? # Unless we are creating
+          Database.update_points self, :update, self.class.recognitions[:update] unless self.class.recognitions[:update].nil?
+        end
+      end
+
+      def recognize_destroying
+        Database.update_points self, :destroy, self.class.recognitions[:destroy] unless self.class.recognitions[:destroy].nil?
+      end
+    end
+  end
+end

data/lib/recognition/activerecord/recognizable.rb

@@ -0,0 +1,26 @@
+module Recognition
+  module ActiveRecord
+    module Recognizable
+      # Determine user current balance of points
+      def points
+        Database.get_user_points self.id
+      end
+
+      def recognition_counter bucket
+        Database.get_user_counter self.id, bucket
+      end
+
+      def add_initial_points
+        Database.update_points self, :initial, self.class.recognitions[:initial]
+      end
+
+      def update_points amount, bucket
+        Database.log(self.id, amount.to_i, bucket)
+      end
+  
+      def transactions page = 0, per = 20
+        Database.get_user_transactions self.id, page, per
+      end
+    end
+  end
+end

data/lib/recognition/activerecord/voucher.rb

@@ -0,0 +1,45 @@
+module Recognition
+  module ActiveRecord
+    module Voucher
+      def regenerate_code
+        l = self.class.recognitions[:code_length] || 10
+        dict = [('a'..'z'),('A'..'Z'),(0..9)].map{|i| i.to_a}.flatten
+        code = (1..l).map{ dict[rand(dict.length)] }.join
+        # Prevent code collision at all costs
+        if self.class.to_s.constantize.find_all_by_code(code).any?
+          regenerate_code
+        else
+          self.code = code
+          self
+        end
+      end
+    
+      def redeem recognizable
+        # Make sure we have an amount beforehand
+        if defined? self.amount
+          if self.redeemable? recognizable
+            Database.redeem_voucher recognizable.id, self.code, self.amount
+          end
+        end
+      end
+    
+      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?
+            pass = true
+          end
+        else
+          pass = true
+        end
+        pass
+      end
+    end
+  end
+end

data/lib/recognition/version.rb

@@ -1,4 +1,4 @@
 module Recognition
   # Current Version
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recognition
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -151,6 +151,9 @@ files:
 - lib/generators/recognition/templates/recognition.yml
 - lib/recognition/action_controller_extension.rb
 - lib/recognition/active_record_extension.rb
+- lib/recognition/activerecord/model.rb
+- lib/recognition/activerecord/recognizable.rb
+- lib/recognition/activerecord/voucher.rb
 - lib/recognition/backend.rb
 - lib/recognition/condition.rb
 - lib/recognition/database.rb
@@ -177,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 453535705823621240
+      hash: 4318160502676074066
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -186,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 453535705823621240
+      hash: 4318160502676074066
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23