recognition 0.6.0 → 0.8.0

data/lib/recognition/models/gift.rb

@@ -6,7 +6,16 @@ module Recognition
       include Recognition::Models::Redeemable
       
       def redeemable? recognizable
-        recognizable.points >= self.amount && is_redeemable?(recognizable)
+        pass = false
+        if recognizable.points >= self.amount
+          if is_redeemable?(recognizable)
+            pass = true
+          end
+        else
+          errors.add(:base, "#{self.class.to_s} has already been redeemed")
+          pass = false
+        end
+        pass
       end
       
       def execute_redemption id

data/lib/recognition/models/recognizable.rb

@@ -1,3 +1,5 @@
+require 'recognition/database'
+
 module Recognition
   module Models
     module Recognizable

data/lib/recognition/models/redeemable.rb

@@ -27,16 +27,21 @@ module Recognition
         # only check if the redeemable did not expire
         if expired?
           Recognition.log self.class.to_s.downcase.to_sym, "validation error for #{self.class.to_s}##{self.id}: expired"
+          errors.add(:base, "#{self.class.to_s} expired")
         else
           # has the redeemable ever been redeemed?
           if transactions.any?
             # has the redeemable ever been redeemed by this user?
             if get_user_counter(recognizable.id) != 0
               Recognition.log self.class.to_s.downcase.to_sym, "validation error for #{self.class.to_s}##{self.id}: user has already redeemed the voucher"
+              errors.add(:base, "#{self.class.to_s} has already been redeemed")
               pass = false
               # is the redeemable reusable?
             elsif defined?(self.reusable?) && self.reusable?
               pass = true
+            else
+              errors.add(:base, "#{self.class.to_s} has already been redeemed")
+              pass = false
             end
           else
             pass = true

data/lib/recognition/rails/railtie.rb

@@ -1,6 +1,6 @@
-require "recognition/extensions/active_record"
-require "recognition/extensions/action_controller"
-require "rails"
+require 'recognition/extensions/active_record'
+require 'recognition/extensions/action_controller'
+require 'rails'
 
 module Recognition
   class Railtie < ::Rails::Railtie
@@ -12,5 +12,8 @@ module Recognition
         ActionController::Base.send(:include, Recognition::Extensions::ActionController)
       end
     end
+    initializer 'recognition.logger' do
+      Recognition.logger = ::Rails.logger
+    end
   end
 end

data/lib/recognition/version.rb

@@ -1,4 +1,4 @@
 module Recognition
   # Current Version
-  VERSION = "0.6.0"
+  VERSION = "0.8.0"
 end

data/lib/recognition.rb

@@ -1,12 +1,9 @@
 require "recognition/version"
-require "recognition/logger"
 require "recognition/rails/engine"
 require "recognition/rails/railtie"
 require "redis"
 
 module Recognition
-  extend Recognition::Logger
-  
   mattr_accessor :redis
   # Redis Db connection parameters
   @@redis = 'localhost:6378'
@@ -15,6 +12,10 @@ module Recognition
   # Show debugging messages in log
   @@debug = false
 
+  mattr_accessor :logger
+  # Set logger class
+  @@logger = ::Logger.new(STDOUT)
+
   mattr_accessor :backend
   # Redis Db active connection
   @@backend = nil
@@ -24,6 +25,10 @@ module Recognition
     yield self
   end
   
+  def self.log key, message
+    Recognition.logger.info("[recognition] [#{key}] #{message}") if Recognition.debug
+  end
+  
   # Connect to Redis Db
   def self.backend
     if self.redis['redis://']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recognition
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -156,7 +156,6 @@ files:
 - lib/recognition/database.rb
 - lib/recognition/extensions/action_controller.rb
 - lib/recognition/extensions/active_record.rb
-- lib/recognition/logger.rb
 - lib/recognition/models/gift.rb
 - lib/recognition/models/recognizable.rb
 - lib/recognition/models/recognizer.rb
@@ -185,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2674790401115674200
+      hash: 3026903823241376003
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -194,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2674790401115674200
+      hash: 3026903823241376003
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/recognition/logger.rb

@@ -1,22 +0,0 @@
-require 'logger'
-
-module Recognition
-  module Logger
-    def log key, message
-      logger.info("[recognition] [#{key}] #{message}") if logging?
-    end
-
-    def logger #:nodoc:
-      @logger ||= ::Logger.new(STDOUT)
-    end
-
-    def logger=(logger)
-      @logger = logger
-    end
-
-    def logging? #:nodoc:
-      # TODO: Add an option to toggle logging
-      Recognition.debug
-    end
-  end
-end