merit 0.1.3 → 0.2.0

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "rails", "3.0.10"
+gem "rails", "~> 3.0.10"
 gem "sqlite3"
 gem "haml"
 gem "capybara"

data/README.rdoc

@@ -107,6 +107,11 @@ You may also add badges/rank "by hand" from controller actions:
    Badge.find(3).grant_to(current_user)
 
 
+= Upgrade to 0.2.0
+
+Added +had_errors+ boolean attribute to +merit_actions+ table.
+
+
 = Test application
 
 To run the test application inside this gem follow:

data/app/models/merit_action.rb

@@ -3,32 +3,34 @@ class MeritAction < ActiveRecord::Base
   def check_badge_rules(defined_rules)
     action_name = "#{target_model}\##{action_method}"
 
-    # Check Badge rules
-    if defined_rules[action_name].present?
-      defined_rules[action_name].each do |rule|
-        rule.grant_or_delete_badge(self)
+    unless had_errors
+      # Check Badge rules
+      if defined_rules[action_name].present?
+        defined_rules[action_name].each do |rule|
+          rule.grant_or_delete_badge(self)
+        end
       end
-    end
 
-    # Check Point rules
-    actions_to_point = MeritPointRules.new.actions_to_point
-    if actions_to_point[action_name].present?
-      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))
-            Rails.logger.warn "[merit] no user found to grant points"
-            return
-          end
-        else
-          begin
-            target = target_object.send(to)
-          rescue
-            Rails.logger.warn "[merit] No target_object found on check_badge_rules."
-            return
+      # Check Point rules
+      actions_to_point = MeritPointRules.new.actions_to_point
+      if actions_to_point[action_name].present?
+        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))
+              Rails.logger.warn "[merit] no user found to grant points"
+              return
+            end
+          else
+            begin
+              target = target_object.send(to)
+            rescue
+              Rails.logger.warn "[merit] No target_object found on check_badge_rules."
+              return
+            end
           end
+          target.update_attribute(:points, target.points + point_rule[:score])
         end
-        target.update_attribute(:points, target.points + point_rule[:score])
       end
     end
 
@@ -43,6 +45,6 @@ class MeritAction < ActiveRecord::Base
 
   # Mark merit_action as processed
   def processed!
-    self.update_attribute(:processed, true)
+    self.update_attribute :processed, true
   end
 end

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

@@ -4,6 +4,7 @@ class CreateMeritActions < ActiveRecord::Migration
       t.integer :user_id # source
       t.string  :action_method
       t.integer :action_value
+      t.boolean :had_errors
       t.string  :target_model
       t.integer :target_id
       t.boolean :processed, :default => false

data/lib/merit/controller_extensions.rb

@@ -11,8 +11,9 @@ module Merit
         if badge_rules.defined_rules[action].present? || point_rules.actions_to_point[action].present?
           target_id = params[:id]
           # TODO: target_object should be configurable (now it's singularized controller name)
+          target_object = instance_variable_get(:"@#{controller_name.singularize}")
           unless target_id =~ /^[0-9]+$/ # id nil, or string (friendly_id)?
-            target_id = instance_variable_get(:"@#{controller_name.singularize}").try(:id)
+            target_id = target_object.try(:id)
           end
 
           # TODO: value relies on params[:value] on the controller, should be configurable
@@ -21,6 +22,7 @@ module Merit
             :user_id       => current_user.try(:id),
             :action_method => action_name,
             :action_value  => value,
+            :had_errors    => target_object.try(:errors).try(:present?),
             :target_model  => controller_name,
             :target_id     => target_id
           )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-25 00:00:00.000000000 Z
+date: 2012-02-06 00:00:00.000000000 Z
 dependencies: []
 description: General reputation Rails engine.
 email: tutecosta@gmail.com
@@ -18,30 +18,30 @@ extensions: []
 extra_rdoc_files: []
 files:
 - app/models/badge.rb
-- app/models/merit_action.rb
 - app/models/badges_sash.rb
+- app/models/merit_action.rb
 - app/models/sash.rb
-- lib/merit/rules_points.rb
-- lib/merit/rule.rb
-- lib/merit/railtie.rb
-- lib/merit/core_extensions.rb
-- lib/merit/model_additions.rb
-- lib/merit/rules_rank.rb
-- lib/merit/controller_extensions.rb
-- lib/merit/rules_badge.rb
-- lib/merit.rb
-- lib/generators/merit/templates/merit_rank_rules.rb
+- lib/generators/active_record/merit_generator.rb
+- lib/generators/active_record/templates/add_fields_to_model.rb
+- lib/generators/merit/install_generator.rb
+- lib/generators/merit/merit_generator.rb
+- lib/generators/merit/templates/create_badges.rb
+- lib/generators/merit/templates/create_badges_sashes.rb
 - lib/generators/merit/templates/create_merit_actions.rb
-- lib/generators/merit/templates/merit_point_rules.rb
 - lib/generators/merit/templates/create_sashes.rb
 - lib/generators/merit/templates/merit.rb
-- lib/generators/merit/templates/create_badges.rb
-- lib/generators/merit/templates/create_badges_sashes.rb
 - lib/generators/merit/templates/merit_badge_rules.rb
-- lib/generators/merit/merit_generator.rb
-- lib/generators/merit/install_generator.rb
-- lib/generators/active_record/templates/add_fields_to_model.rb
-- lib/generators/active_record/merit_generator.rb
+- lib/generators/merit/templates/merit_point_rules.rb
+- lib/generators/merit/templates/merit_rank_rules.rb
+- lib/merit/controller_extensions.rb
+- lib/merit/core_extensions.rb
+- lib/merit/model_additions.rb
+- lib/merit/railtie.rb
+- lib/merit/rule.rb
+- lib/merit/rules_badge.rb
+- lib/merit/rules_points.rb
+- lib/merit/rules_rank.rb
+- lib/merit.rb
 - MIT-LICENSE
 - Rakefile
 - Gemfile
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: General reputation Rails engine.