merit 0.9.3 → 0.9.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    merit (0.9.3)
+    merit (0.9.4)
       ambry (~> 0.3.0)
 
 GEM

data/README.md

@@ -140,8 +140,6 @@ end
 # To-do list
 
 * add an error handler for inexistent badges.
-* rails g merit MODEL_NAME shouldn't create general migrations again.
-* Abstract User (rule.rb#51 for instance) into a Merit option.
 * Should namespace app/models into Merit module.
 * rescue ActiveRecord::... should depend on ORM used
 * :value parameter (for star voting for example) should be configurable

data/app/models/merit_action.rb

@@ -21,7 +21,8 @@ class MeritAction
         point_rule = actions_to_point[action_name]
         point_rule[:to].each do |to|
           if to == :action_user
-            if !(target = User.find_by_id(user_id))
+            target = Merit.user_model.find_by_id(user_id)
+            if target.nil?
               Rails.logger.warn "[merit] no user found to grant points"
               return
             end
@@ -33,7 +34,8 @@ class MeritAction
               return
             end
           end
-          target.update_attribute(:points, target.points + point_rule[:score])
+          target.points += point_rule[:score]
+          target.save
           log!("points_granted:#{point_rule[:score]}")
         end
       end
@@ -47,14 +49,18 @@ class MeritAction
     # Grab custom model_name from Rule, or target_model from MeritAction triggered
     klass = model_name || target_model
     klass.singularize.camelize.constantize.find_by_id(target_id)
+  rescue => e
+    Rails.logger.warn "[merit] no target_object found: #{e}"
   end
 
   def log!(str)
-    self.update_attribute :log, "#{self.log}#{str}|"
+    self.log = "#{self.log}#{str}|"
+    self.save
   end
 
   # Mark merit_action as processed
   def processed!
-    self.update_attribute :processed, true
+    self.processed = true
+    self.save
   end
 end

data/lib/generators/merit/templates/merit.rb

@@ -5,6 +5,12 @@ Merit.setup do |config|
 
   # Define ORM. Could be :active_record (default) and :mongo_mapper and :mongoid
   # config.orm = :active_record
+
+  # Define :user_model_name. This model will be used to grand badge if no :to option is given. Default is "User".
+  # config.user_model_name = "User"
+
+  # Define :current_user_method. Similar to previous option. It will be used to retrieve :user_model_name object if no :to option is given. Default is "current_#{user_model_name.downcase}".
+  # config.current_user_method = "current_user"
 end
 
 # Create application badges (uses https://github.com/norman/ambry)

data/lib/merit.rb

@@ -14,6 +14,20 @@ module Merit
   mattr_accessor :orm
   @@orm = :active_record
 
+  # Define user_model_name
+  mattr_accessor :user_model_name
+  @@user_model_name = "User"
+  def self.user_model
+    @@user_model_name.constantize
+  end
+
+  # Define current_user_method
+  mattr_accessor :current_user_method
+  def self.current_user_method
+    @@current_user_method || "current_#{@@user_model_name.downcase}".to_sym
+  end
+
+
   # Load configuration from initializer
   def self.setup
     yield self

data/lib/merit/controller_extensions.rb

@@ -20,7 +20,7 @@ module Merit
 
           # TODO: value should be configurable (now it's params[:value] set in the controller)
           merit_action_id = MeritAction.create(
-            :user_id       => current_user.try(:id),
+            :user_id       => send(Merit.current_user_method).try(:id),
             :action_method => action_name,
             :action_value  => params[:value],
             :had_errors    => target_object.try(:errors).try(:present?),

data/lib/merit/rule.rb

@@ -48,7 +48,7 @@ module Merit
     def sash_to_badge(action)
       target = case to
                when :action_user
-                 User.find_by_id(action.user_id) # _by_id doens't raise ActiveRecord::RecordNotFound
+                 Merit.user_model.find_by_id(action.user_id) # _by_id doens't raise ActiveRecord::RecordNotFound
                when :itself
                  action.target_object(model_name)
                else

data/merit.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.description = "Manage badges, points and rankings (reputation) of resources in a Rails application."
   s.homepage    = "http://github.com/tute/merit"
   s.files       = `git ls-files`.split("\n").reject{|f| f =~ /^\./ }
-  s.version     = "0.9.3"
+  s.version     = "0.9.4"
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
   s.add_dependency 'ambry',  '~> 0.3.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
   prerelease: 
 platform: ruby
 authors: