merit 0.10.0 → 0.10.1

data/Gemfile.lock

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

data/README.md

@@ -141,6 +141,7 @@ end
   (depends on params[:value] on the controller).
 * Make fixtures for integration testing (now creating objects on test file!).
 * Rules should be cached? Calling *Rules.new more than once
+* Add badges_sashes timestamps
 
 ---
 

data/lib/merit/controller_extensions.rb

@@ -38,7 +38,7 @@ module Merit
               granted = log.split('|').select{|log| log =~ /badge_granted_to_action_user/ }
               granted.each do |badge|
                 badge_id = badge.split(':').last.to_i
-                flash[:merit] = t('merit.flashs.badge_granted', :badge => Badge.find(badge_id).name)
+                flash[:merit] = t('merit.flashs.badge_granted', :badge => t("badges.#{Badge.find(badge_id).name}.name"))
               end
             end
           end

data/lib/merit/model_additions.rb

@@ -3,7 +3,10 @@ module Merit
 
   module ClassMethods
     def has_merit(options = {})
-      belongs_to :sash, :dependent => :destroy
+      # :dependent => destroy may raise
+      # ERROR: update or delete on table "sashes" violates foreign key constraint "users_sash_id_fk"
+      # https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/1079-belongs_to-dependent-destroy-should-destroy-self-before-assocation
+      belongs_to :sash
 
       if Merit.orm == :mongo_mapper
         plugin Merit

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

@@ -16,6 +16,6 @@ class Sash < ActiveRecord::Base
   end
 
   def rm_badge(badge_id)
-    badges_sashes.find_by_badge_id(badge_id).destroy
+    badges_sashes.find_by_badge_id(badge_id).try(:destroy)
   end
 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.10.0"
+  s.version     = '0.10.1'
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
   s.add_dependency 'ambry',  '~> 0.3.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-06 00:00:00.000000000 Z
+date: 2012-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry