merit 0.8.1 → 0.9.0

data/Gemfile.lock

@@ -70,7 +70,7 @@ GEM
       activemodel (~> 3.1)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
-    multi_json (1.3.2)
+    multi_json (1.3.6)
     nokogiri (1.5.2)
     polyglot (0.3.3)
     rack (1.4.1)

data/README.md

@@ -83,14 +83,20 @@ score 10, :on => [
   'users#update'
 ]
 
-score 15, :on => 'reviews#create', :to => [:reviewer, :reviewed]
-
 score 20, :on => [
   'comments#create',
   'photos#create'
 ]
 ```
 
+`:to` method(s) work as in badge rules: they are sent to the target_object.
+In the following example, after a review gets created both `review.reviewer`
+and `review.reviewed` are granted 15 points:
+
+```ruby
+score 15, :on => 'reviews#create', :to => [:reviewer, :reviewed]
+```
+
 ---
 
 # Defining rank rules
@@ -133,7 +139,6 @@ 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.
@@ -141,7 +146,6 @@ end
 * 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
-* Why 1.8.7 tests are not passing?
 * :value parameter (for star voting for example) should be configurable
   (depends on params[:value] on the controller).
 * Make fixtures for integration testing (now creating objects on test file!).

data/UPGRADING.md

@@ -1,6 +1,23 @@
 # Upgrading
 
-## to 0.6.1
+## to 0.9.0
+
+Adds `allow_multiple` boolean option to `Badge#grant_to` (defaults to
+`false`). If you used this method to grant a badge it will now grant only if
+resource doesn't have the badge.
+
+Use `grant_to resource, :allow_multiple => true` where needed.
+
+## to 0.8.0
+
+No changes needed. Adds Mongoid support.
+
+## to 0.7.0
+
+No changes needed. Adds `:multiple` boolean option to `grant_on` to grant
+badge multiple times.
+
+## to 0.6.0
 
 <tt>MeritBadgeRules</tt>, <tt>MeritPointRules</tt> and <tt>MeritRankRules</tt>
 are now namespaced into Merit module. Move and change:

data/app/models/badge.rb

@@ -12,8 +12,8 @@ class Badge
 
   filters do
     def find_by_id(ids)
-      ids = ids.kind_of?(Array) ? ids : [ids]
-      find{|b| ids.include? b.id }
+      ids = Array.wrap(ids)
+      find{|b| ids.include? b[:id] }
     end
     def by_name(name)
       find{|b| b.name == name.to_s }
@@ -24,11 +24,20 @@ class Badge
   end
 
   # Grant badge to sash
-  def grant_to(object_or_sash)
+  # Accepts :allow_multiple boolean option, defaults to false
+  def grant_to(object_or_sash, *args)
     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)
-    return true
+
+    options = args.extract_options!
+    options[:allow_multiple] ||= false
+
+    if !sash.badge_ids.include?(id) || options[:allow_multiple]
+      sash.add_badge(id)
+      return true
+    else
+      return false
+    end
   end
 
   # Take out badge from sash

data/lib/merit/rule.rb

@@ -17,12 +17,11 @@ module Merit
           Rails.logger.warn "[merit] no target_obj found on Rule#applies?. MeritAction: #{action.inspect}"
           return false
         end
-      when 0 # evaluates to boolean
+      else # evaluates to boolean. block.arity returns 0 in Ruby 1.9.3 and -1 in Ruby 1.8.7
         return block.call
       end
     end
 
-    def multiple?; self.multiple; end
     def temporary?; self.temporary; end
 
     # Grant badge if rule applies. If it doesn't, and the badge is temporary,
@@ -34,8 +33,7 @@ module Merit
       end
 
       if applies? action.target_object(model_name)
-        if !sash.badge_ids.include?(badge.id) || multiple?
-          badge.grant_to(sash)
+        if badge.grant_to(sash, :allow_multiple => self.multiple)
           to_action_user = (to.to_sym == :action_user ? '_to_action_user' : '')
           action.log!("badge_granted#{to_action_user}:#{badge.id}")
         end

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

data/test/dummy/app/models/merit/badge_rules.rb

@@ -23,7 +23,7 @@ module Merit
       # Should be "current_user" after registration for badge to be granted.
       # Example rule with block with no parameters
       grant_on 'users#create', :badge => 'just-registered', :to => :itself do
-        Date.today > 1.year.ago.to_date
+        true
       end
 
       # Example rule for multiple badge granting

data/test/merit_unit_test.rb

@@ -22,4 +22,16 @@ class MeritUnitTest < ActiveSupport::TestCase
     badge_sash.badge_id = 99
     assert_equal Badge.find(99), badge_sash.badge
   end
+
+  test "Badge#grant_to allow_multiple option" do
+    badge = Badge.create(:id => 99, :name => 'test-badge')
+    sash = Sash.create(:id => 99)
+    assert_equal 0, sash.badge_ids.count
+    badge.grant_to sash
+    assert_equal 1, sash.reload.badge_ids.count
+    badge.grant_to sash
+    assert_equal 1, sash.reload.badge_ids.count
+    badge.grant_to sash, :allow_multiple => true
+    assert_equal 2, sash.reload.badge_ids.count
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-27 00:00:00.000000000 Z
+date: 2012-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
-  requirement: &70334081390280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70334081390280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70334081389800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 3.2.3
   type: :development
   prerelease: false
-  version_requirements: *70334081389800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.3
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70334081409880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334081409880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70334081409420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334081409420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70334081409000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334081409000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70334081408580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334081408580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70334081408160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334081408160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70334081407660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +133,12 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *70334081407660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 description: Manage badges, points and rankings (reputation) of resources in a Rails
   application.
 email: tutecosta@gmail.com
@@ -277,7 +317,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: General reputation Rails engine.