merit 1.6.0 → 1.6.1

data/README.md

@@ -169,5 +169,4 @@ end
 
 * Move level from meritable model into Sash
 * `ActivityLog` should replace `add_points` `log` parameter
-* Extract logging from `Judge` to an Observer. See http://www.rubytapas.com/episodes/21-Domain-Model-Events
 * FIXMES and TODOS.

data/lib/merit/models/active_record/merit/sash.rb

@@ -30,11 +30,11 @@ module Merit
     end
 
 
-    def points(category = :default)
+    def points(category = 'default')
       scores.where(category: category).first.points
     end
 
-    def add_points(num_points, log = 'Manually granted', category = :default)
+    def add_points(num_points, log = 'Manually granted', category = 'default')
       point = Merit::Score::Point.new
       point.log = log
       point.num_points = num_points
@@ -42,7 +42,7 @@ module Merit
       point
     end
 
-    def substract_points(num_points, log = 'Manually granted', category = :default)
+    def substract_points(num_points, log = 'Manually granted', category = 'default')
       add_points -num_points, log, category
     end
 

data/lib/merit/models/active_record/merit/score.rb

@@ -33,7 +33,7 @@ FROM #{options[:table_name]}
   LEFT JOIN merit_scores ON merit_scores.sash_id = #{sash_id_column}
   LEFT JOIN merit_score_points ON merit_score_points.score_id = merit_scores.id
 WHERE merit_score_points.created_at > '#{options[:since_date]}'
-GROUP BY merit_scores.sash_id
+GROUP BY #{options[:table_name]}.id, merit_scores.sash_id
 ORDER BY sum_points DESC
 LIMIT #{options[:limit]}
 SQL

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry