merit 0.8.0 → 0.8.1

data/Gemfile.lock

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

data/README.md

@@ -14,10 +14,11 @@
 1. Add `gem 'merit'` to your `Gemfile`
 2. Run `rails g merit:install`
 3. Run `rails g merit MODEL_NAME`
-4.
+4. Depending on your ORM
   * ActiveRecord: Run `rake db:migrate`
   * Mongoid: Set `config.orm = :mongoid` in `config/initializers/merit.rb`
-5. Configure reputation rules for your application
+5. Define badges you will use in `config/initializers/merit.rb`
+6. Configure reputation rules for your application in `app/models/merit/*`
 
 ---
 
@@ -132,6 +133,7 @@ end
 
 # To-do list
 
+* `Badge#grant_to` should accept a second `multiple` parameter
 * Can infer params[:id] = instance_variable.id in create actions, for having
   the object in the rule method parameter, so we don't need it in controllers.
 * add an error handler for inexistent badges.
@@ -150,5 +152,5 @@ end
 
 * [Tute Costa](https://github.com/tute)
 * [Juan Schwindt](https://github.com/jschwindt)
-* [Eric Knudtson](https://github.com/ek)
+* [Eric Knudtson](https://github.com/ek) ([Chef Surfing](https://chefsurfing.com/))
 * [A4bandas media](https://github.com/a4bandas)

data/lib/merit/model_additions.rb

@@ -16,6 +16,10 @@ module Merit
         field :level, :type => Integer, :default => 0
       end
     end
+
+    def find_by_id(id)
+      Merit.orm == :mongoid ? where(:_id => id).first : super(id)
+    end
   end
 
   def badges

data/lib/merit/rule.rb

@@ -14,7 +14,7 @@ module Merit
         if target_obj.present?
           return block.call(target_obj)
         else
-          Rails.logger.warn "[merit] no target_obj found on Rule#applies?"
+          Rails.logger.warn "[merit] no target_obj found on Rule#applies?. MeritAction: #{action.inspect}"
           return false
         end
       when 0 # evaluates to boolean

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.8.0"
+  s.version     = "0.8.1"
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
   s.add_dependency 'ambry',  '~> 0.3.0'

data/test/dummy-mongoid/app/models/comment.rb

@@ -10,8 +10,4 @@ class Comment
   attr_accessible :name, :comment, :user_id, :votes
 
   validates :name, :comment, :user_id, :presence => true
-
-  def self.find_by_id(id)
-    where(:_id => id).first
-  end
 end

data/test/dummy-mongoid/app/models/user.rb

@@ -10,10 +10,6 @@ class User
 
   attr_accessible :name
 
-  def self.find_by_id(id)
-    where(:_id => id).first
-  end
-
   def show_badges
     create_sash_if_none
     badges_uniq = Badge.find_by_id(sash.badge_ids)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-11 00:00:00.000000000 Z
+date: 2012-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
-  requirement: &70205487291520 !ruby/object:Gem::Requirement
+  requirement: &70334081390280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70205487291520
+  version_requirements: *70334081390280
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70205487291040 !ruby/object:Gem::Requirement
+  requirement: &70334081389800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.2.3
   type: :development
   prerelease: false
-  version_requirements: *70205487291040
+  version_requirements: *70334081389800
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70205487290660 !ruby/object:Gem::Requirement
+  requirement: &70334081409880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70205487290660
+  version_requirements: *70334081409880
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70205487290200 !ruby/object:Gem::Requirement
+  requirement: &70334081409420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70205487290200
+  version_requirements: *70334081409420
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70205487289780 !ruby/object:Gem::Requirement
+  requirement: &70334081409000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70205487289780
+  version_requirements: *70334081409000
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70205487289360 !ruby/object:Gem::Requirement
+  requirement: &70334081408580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70205487289360
+  version_requirements: *70334081408580
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70205487288940 !ruby/object:Gem::Requirement
+  requirement: &70334081408160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70205487288940
+  version_requirements: *70334081408160
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70205487288440 !ruby/object:Gem::Requirement
+  requirement: &70334081407660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *70205487288440
+  version_requirements: *70334081407660
 description: Manage badges, points and rankings (reputation) of resources in a Rails
   application.
 email: tutecosta@gmail.com