merit 0.4.2 → 0.5.0

data/Gemfile

@@ -1,10 +1,2 @@
 source "http://rubygems.org"
-
 gemspec
-
-group :development, :test do
-  gem "rails", "~> 3.0.10"
-  gem "sqlite3"
-  gem "haml"
-  gem "capybara"
-end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    merit (0.4.0)
+    merit (0.4.2)
       ambry
 
 GEM
@@ -80,7 +80,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (0.9.2.2)
+    rake (0.9.3.beta.1)
     rdoc (3.12)
       json (~> 1.4)
     rubyzip (0.9.6.1)

data/README.md

@@ -112,17 +112,11 @@ Check for rules on a rake task executed in background like:
 
 ---
 
-# MongoMapper support (experimental)
-
-You may use <tt>merit</tt> with <tt>mongo_mapper</tt> ORM by calling
-<tt>rails g merit MODEL_NAME --orm mongo_mapper</tt> in the third step of the
-installation, and configuring <tt>config.orm = :mongo_mapper</tt> in
-<tt>config/initializers/merit.rb</tt>.
-
----
-
 # To-do list
 
+* Abstract User (rule.rb#51 for instance) into a Merit option.
+* What happens if 'class MeritPointRules; include Merit::PointRules' is changed by 'module Merit::PointRules'?
+* Should namespace app/models into Merit module.
 * rescue ActiveRecord::... should depend on ORM used (MongoMapper?)
 * Why 1.8.7 tests are not passing?
 * :value parameter (for star voting for example) should be configurable
@@ -133,6 +127,7 @@ installation, and configuring <tt>config.orm = :mongo_mapper</tt> in
 
 # Contributors
 
-* [A4bandas media](https://github.com/a4bandas)
+* [Tute Costa](https://github.com/tute)
 * [Juan Schwindt](https://github.com/jschwindt)
 * [Eric Knudtson](https://github.com/ek)
+* [A4bandas media](https://github.com/a4bandas)

data/UPGRADING.md

@@ -1,5 +1,9 @@
 # Upgrading
 
+## to 0.5.0
+
+Add <tt>log:string</tt> column to <tt>merit_actions</tt> table.
+
 ## to 0.4.0
 
 Rankings are now integer attributes (<tt>level</tt>), they are not badges

data/app/models/badge.rb

@@ -27,13 +27,23 @@ class Badge
   def grant_to(object_or_sash)
     object_or_sash.create_sash_if_none unless object_or_sash.kind_of?(Sash)
     sash = object_or_sash.respond_to?(:sash) ? object_or_sash.sash : object_or_sash
-    sash.add_badge(id) unless sash.badge_ids.include?(id)
+    if sash.badge_ids.include?(id)
+      return false
+    else
+      sash.add_badge(id)
+      return true
+    end
   end
 
   # Take out badge from sash
   def delete_from(object_or_sash)
     object_or_sash.create_sash_if_none unless object_or_sash.kind_of?(Sash)
     sash = object_or_sash.respond_to?(:sash) ? object_or_sash.sash : object_or_sash
-    sash.rm_badge(id) if sash.badge_ids.include?(id)
+    if sash.badge_ids.include?(id)
+      sash.rm_badge(id)
+      return true
+    else
+      return false
+    end
   end
 end

data/app/models/merit_action.rb

@@ -32,6 +32,7 @@ class MeritAction
             end
           end
           target.update_attribute(:points, target.points + point_rule[:score])
+          log!("points_granted:#{point_rule[:score]}")
         end
       end
     end
@@ -46,6 +47,10 @@ class MeritAction
     klass.singularize.camelize.constantize.find_by_id(target_id)
   end
 
+  def log!(str)
+    self.update_attribute :log, "#{self.log}#{str}|"
+  end
+
   # Mark merit_action as processed
   def processed!
     self.update_attribute :processed, true

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

@@ -8,6 +8,7 @@ class CreateMeritActions < ActiveRecord::Migration
       t.string  :target_model
       t.integer :target_id
       t.boolean :processed, :default => false
+      t.string  :log, :default => nil
       t.timestamps
     end
   end

data/lib/merit/rule.rb

@@ -28,14 +28,19 @@ module Merit
     # Grant badge if rule applies. If it doesn't, and the badge is temporary,
     # then remove it.
     def grant_or_delete_badge(action)
-      if sash = sash_to_badge(action)
-        if applies? action.target_object(model_name)
-          badge.grant_to sash
-        elsif temporary?
-          badge.delete_from sash
-        end
-      else
+      unless (sash = sash_to_badge(action))
         Rails.logger.warn "[merit] no sash found on Rule#grant_or_delete_badge"
+        return
+      end
+
+      if applies? action.target_object(model_name)
+        if badge.grant_to(sash)
+          action.log!("badge_granted:#{badge.name}")
+        end
+      elsif temporary?
+        if badge.delete_from(sash)
+          action.log!("badge_removed:#{badge.name}")
+        end
       end
     end
 

data/merit.gemspec

@@ -1,15 +1,14 @@
-# Provide a simple gemspec so you can easily use your enginex
-# project in your rails apps through git.
 Gem::Specification.new do |s|
   s.name        = "merit"
   s.summary     = "General reputation Rails engine."
-  s.description = "General reputation Rails engine."
+  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.4.2"
+  s.version     = "0.5.0"
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
   s.add_dependency 'ambry'
-  s.add_development_dependency 'rails'
+  s.add_development_dependency 'rails', '~> 3.0.10'
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'haml'
   s.add_development_dependency 'capybara'

data/test/dummy/db/migrate/20120318022217_create_merit_actions.rb

@@ -8,6 +8,7 @@ class CreateMeritActions < ActiveRecord::Migration
       t.string  :target_model
       t.integer :target_id
       t.boolean :processed, :default => false
+      t.string  :log, :default => nil
       t.timestamps
     end
   end
@@ -15,4 +16,4 @@ class CreateMeritActions < ActiveRecord::Migration
   def self.down
     drop_table :merit_actions
   end
-end
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120309191345) do
+ActiveRecord::Schema.define(:version => 20120318022220) do
 
   create_table "badges_sashes", :id => false, :force => true do |t|
     t.integer  "badge_id"
@@ -41,6 +41,7 @@ ActiveRecord::Schema.define(:version => 20120309191345) do
     t.string   "target_model"
     t.integer  "target_id"
     t.boolean  "processed",     :default => false
+    t.string   "log"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -56,6 +57,7 @@ ActiveRecord::Schema.define(:version => 20120309191345) do
     t.datetime "updated_at"
     t.integer  "sash_id"
     t.integer  "points",     :default => 0
+    t.integer  "level",      :default => 0
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-10 00:00:00.000000000 Z
+date: 2012-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
-  requirement: &70244741311580 !ruby/object:Gem::Requirement
+  requirement: &70296877186780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70244741311580
+  version_requirements: *70296877186780
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70244741310660 !ruby/object:Gem::Requirement
+  requirement: &70296877186260 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.10
   type: :development
   prerelease: false
-  version_requirements: *70244741310660
+  version_requirements: *70296877186260
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70244740748260 !ruby/object:Gem::Requirement
+  requirement: &70296877185840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70244740748260
+  version_requirements: *70296877185840
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70244740747620 !ruby/object:Gem::Requirement
+  requirement: &70296879096200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70244740747620
+  version_requirements: *70296879096200
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70244740746780 !ruby/object:Gem::Requirement
+  requirement: &70296879094600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,8 +65,9 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70244740746780
-description: General reputation Rails engine.
+  version_requirements: *70296879094600
+description: Manage badges, points and rankings (reputation) of resources in a Rails
+  application.
 email: tutecosta@gmail.com
 executables: []
 extensions: []
@@ -99,7 +100,6 @@ files:
 - lib/merit/models/active_record/sash.rb
 - lib/merit/models/mongo_mapper/merit_action.rb
 - lib/merit/models/mongo_mapper/sash.rb
-- lib/merit/railtie.rb
 - lib/merit/rule.rb
 - lib/merit/rules_badge.rb
 - lib/merit/rules_points.rb
@@ -169,7 +169,7 @@ files:
 - test/merit_unit_test.rb
 - test/support/integration_case.rb
 - test/test_helper.rb
-homepage: 
+homepage: http://github.com/tute/merit
 licenses: []
 post_install_message: 
 rdoc_options: []

data/lib/merit/railtie.rb

@@ -1,7 +0,0 @@
-require 'merit'
-require 'rails'
-
-module Merit
-  class Engine < Rails::Engine
-  end
-end