merit 0.6.0 → 0.6.1

data/UPGRADING.md

@@ -1,6 +1,6 @@
 # Upgrading
 
-## to 0.6.0
+## to 0.6.1
 
 <tt>MeritBadgeRules</tt>, <tt>MeritPointRules</tt> and <tt>MeritRankRules</tt>
 are now namespaced into Merit module. Move and change:
@@ -13,6 +13,7 @@ app/models/merit_{badge|point|rank}_rules.rb -> app/models/merit/{badge|point|ra
 -  include Merit::{Badge|Point|Rank}Rules
 +module Merit
 +  class {Badge|Point|Rank}Rules
++  include Merit::{Badge|Point|Rank}RulesMethods
 </pre>
 
 ## to 0.5.0

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

@@ -16,6 +16,8 @@
 
 module Merit
   class BadgeRules
+    include Merit::BadgeRulesMethods
+
     def initialize
       # If it creates user, grant badge
       # Should be "current_user" after registration for badge to be granted.

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

@@ -5,6 +5,8 @@
 
 module Merit
   class PointRules
+    include Merit::PointRulesMethods
+
     def initialize
       # score 10, :on => [
       #   'users#update'

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

@@ -10,6 +10,8 @@
 
 module Merit
   class RankRules
+    include Merit::RankRulesMethods
+
     def initialize
       # set_rank :level => 1, :to => Commiter.active do |commiter|
       #   commiter.repositories.count > 1 && commiter.followers >= 10

data/lib/merit/rules_badge.rb

@@ -29,7 +29,7 @@ module Merit
   #
   # Luego chequea las condiciones sincronizadamente, o mediante un proceso en
   # background, por ejemplo cada 5 minutos (Merit::BadgeRules#check_new_actions).
-  class BadgeRules
+  module BadgeRulesMethods
     # Define rule for granting badges
     def grant_on(action, *args, &block)
       options = args.extract_options!

data/lib/merit/rules_points.rb

@@ -2,7 +2,7 @@ module Merit
   # Points are a simple integer value which are given to "meritable" resources
   # according to rules in +app/models/merit_point_rules.rb+. They are given on
   # actions-triggered.
-  class PointRules
+  module PointRulesMethods
     # Define rules on certaing actions for giving points
     def score(points, *args, &block)
       options = args.extract_options!

data/lib/merit/rules_rank.rb

@@ -8,7 +8,7 @@ module Merit
   # * :+to+ model or scope to check if new rankings apply
   # * :+level_name+ attribute name (default is empty and results in 'level'
   #   attribute, if set it's appended like 'level_#{level_name}')
-  class RankRules
+  module RankRulesMethods
     # Populates +defined_rules+ hash with following hierarchy:
     #   defined_rules[ModelToRank] = { levels => blocks }
     def set_rank(*args, &block)

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.6.0"
+  s.version     = "0.6.1"
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
   s.add_dependency 'ambry'

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

@@ -16,6 +16,8 @@
 
 module Merit
   class BadgeRules
+    include Merit::BadgeRulesMethods
+
     def initialize
       # If it creates user, grant badge
       # Should be "current_user" after registration for badge to be granted.
@@ -23,7 +25,7 @@ module Merit
 
       # If it has 10 comments, grant commenter-10 badge
       grant_on 'comments#create', :badge => 'commenter', :level => 10 do |comment|
-        comment.user.comments.count == 10
+        comment.user.comments.count >= 10
       end
 
       # If it has at least 10 votes, grant relevant-commenter badge

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

@@ -4,6 +4,8 @@
 
 module Merit
   class PointRules
+    include Merit::PointRulesMethods
+
     def initialize
       score 5, :to => :user, :on => [
         'comments#vote'

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

@@ -10,6 +10,8 @@
 
 module Merit
   class RankRules
+    include Merit::RankRulesMethods
+
     def initialize
       # i stars for i chars name
       (1..5).each do |i|

data/test/dummy/config/initializers/merit.rb

@@ -5,4 +5,30 @@ Merit.setup do |config|
 
   # Define ORM. Could be :active_record (default) and :mongo_mapper
   # config.orm = :active_record
-end
+end
+
+# Create application badges (uses https://github.com/norman/ambry)
+badge_id = 0
+[{
+  :id => (badge_id = badge_id+1),
+  :name        => 'commenter',
+  :description => 'You\'ve participated good in our boards!',
+  :level       => 10
+}, {
+  :id => (badge_id = badge_id+1),
+  :name        => 'commenter',
+  :description => 'You\'ve participated great in our boards!'
+}, {
+  :id => (badge_id = badge_id+1),
+  :name        => 'relevant-commenter',
+  :description => 'You\'ve received 5 votes on a comment.'
+}, {
+  :id => (badge_id = badge_id+1),
+  :name        => 'autobiographer',
+  :description => 'You\'ve edited your name and it\'s above 4 characters! (?)'
+}, {
+  :id => (badge_id = badge_id+1),
+  :name => 'just-registered'
+}].each do |badge|
+  Badge.create! badge
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-22 00:00:00.000000000 Z
+date: 2012-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
-  requirement: &70166979392500 !ruby/object:Gem::Requirement
+  requirement: &70267830450700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70166979392500
+  version_requirements: *70267830450700
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70166979391980 !ruby/object:Gem::Requirement
+  requirement: &70267830447420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.10
   type: :development
   prerelease: false
-  version_requirements: *70166979391980
+  version_requirements: *70267830447420
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70166979391560 !ruby/object:Gem::Requirement
+  requirement: &70267830445160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166979391560
+  version_requirements: *70267830445160
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70166981534740 !ruby/object:Gem::Requirement
+  requirement: &70267830443020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166981534740
+  version_requirements: *70267830443020
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70166981531180 !ruby/object:Gem::Requirement
+  requirement: &70267830442080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166981531180
+  version_requirements: *70267830442080
 description: Manage badges, points and rankings (reputation) of resources in a Rails
   application.
 email: tutecosta@gmail.com
@@ -136,7 +136,6 @@ files:
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/test.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/badges_data.rb
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/merit.rb
 - test/dummy/config/initializers/mime_types.rb

data/test/dummy/config/initializers/badges_data.rb

@@ -1,40 +0,0 @@
-# Create badges (Ambry)
-badge_id = 0
-
-# Rank badges (5 stars)
-(1..5).each do |i|
-  Badge.create!(
-    :id => (badge_id = badge_id+1),
-    :name => 'stars',
-    :level => i
-  )
-end
-
-# Normal badges
-[
-  {
-    :id => (badge_id = badge_id+1),
-    :name        => 'commenter',
-    :description => 'You\'ve participated good in our boards!',
-    :level       => 10
-  }, {
-    :id => (badge_id = badge_id+1),
-    :name        => 'commenter',
-    :description => 'You\'ve participated great in our boards!',
-    :level       => 20
-  }, {
-    :id => (badge_id = badge_id+1),
-    :name        => 'relevant-commenter',
-    :description => 'You\'ve received 5 votes on a comment.',
-    :level       => 5
-  }, {
-    :id => (badge_id = badge_id+1),
-    :name        => 'autobiographer',
-    :description => 'You\'ve edited your name and it\'s above 4 characters! (?)'
-  }, {
-    :id => (badge_id = badge_id+1),
-    :name => 'just-registered'
-  }
-].each do |badge|
-  Badge.create! badge
-end