merit 1.3.0 → 1.3.1

data/Gemfile.lock

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

data/README.md

@@ -61,6 +61,14 @@ current_user.add_badge(badge.id)
 current_user.rm_badge(badge.id)
 ```
 
+```ruby
+# List 10 badge grants in the last month
+Badge.last_granted
+
+# List 20 badge grants in the last week
+Badge.last_granted(since_date: 1.week.ago, limit: 20)
+```
+
 ---
 
 # Defining point rules
@@ -102,6 +110,18 @@ current_user.add_points(20, 'Optional log message')
 current_user.substract_points(10)
 ```
 
+```ruby
+# List top 10 scored users in the last month
+Merit::Score.top_scored
+
+# List top 25 scored lists in the last week
+Merit::Score.top_scored(
+  table_name: :lists,
+  since_date: 1.week.ago,
+  limit: 25
+)
+```
+
 ---
 
 # Defining rank rules
@@ -144,3 +164,4 @@ end
 # To-do list
 
 * Should namespace Badge, BadgesSash and Sash into Merit module.
+* Move level from meritable model into Sash

data/UPGRADING.md

@@ -4,7 +4,7 @@
 
 Adds two methods meant to display a leaderboard.
 
-* `Badge#last_granted(options = {})`. Accepts options:
+* `Badge.last_granted(options = {})`. Accepts options:
   * `:since_date` (`1.month.ago` by default)
   * `:limit` (10 by default).
 

data/app/models/merit/action.rb

@@ -1,4 +1,4 @@
-require "merit/models/#{Merit.orm}/merit/action"
+require_dependency "merit/models/#{Merit.orm}/merit/action"
 
 # Merit::Action general schema
 #   ______________________________________________________________
@@ -30,7 +30,7 @@ module Merit
     end
 
     def log_activity(str)
-      self.update_attribute :log, "#{self.log}#{str}|"
+      self.update_attribute :log, "#{self.log}#{str}|"[0,240]
     end
 
     def target_object(model_name = nil)

data/lib/merit/controller_extensions.rb

@@ -16,12 +16,12 @@ module Merit
 
     def log_merit_action
       Merit::Action.create(
-        :user_id       => send(Merit.current_user_method).try(:id),
-        :action_method => action_name,
-        :action_value  => params[:value],
-        :had_errors    => had_errors?,
-        :target_model  => controller_path,
-        :target_id     => target_id
+        user_id:       send(Merit.current_user_method).try(:id),
+        action_method: action_name,
+        action_value:  params[:value],
+        had_errors:    had_errors?,
+        target_model:  controller_path,
+        target_id:     target_id
       ).id
     end
 
@@ -44,8 +44,10 @@ module Merit
 
     def target_id
       target_id = params[:id] || target_object.try(:id)
-      # using friendly_id if id is nil or string but an object was found
-      if target_object.present? && (target_id.nil? || !(target_id =~ /^[0-9]+$/))
+      # If params[:id] is a string (slug, using friendly_id for instance)
+      # then object exists but can't store params[:id] as the foreign key.
+      # Then we grab object's id.
+      if target_object && (target_id.nil? || !(target_id.to_s =~ /^[0-9]+$/))
         target_id = target_object.id
       end
       target_id

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

data/test/merit_unit_test.rb

@@ -28,6 +28,12 @@ class MeritUnitTest < ActiveSupport::TestCase
     assert_equal Badge.find(98), rule.badge
   end
 
+  test "Merit::Action#log_activity doesn't grow larger than 240 chars" do
+    m = Merit::Action.create
+    m.log_activity('a' * 250)
+    assert m.log.length <= 240, 'Log shouldn\'t grow larger than 240 chars'
+  end
+
   test "Extends only meritable ActiveRecord models" do
     class MeritableModel < ActiveRecord::Base
       def self.columns; @columns ||= []; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-17 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry