merit 0.3.2 → 0.3.3

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

@@ -9,7 +9,14 @@ class Sash < ActiveRecord::Base
     BadgesSash.create(sash_id: self.id, badge_id: badge_id)
   end
   def rm_badge(badge_id)
-    ActiveRecord::Base.connection.execute("DELETE FROM badges_sashes
-      WHERE badge_id = #{badge_id} AND sash_id = #{self.id}")
+    badges_sashes = BadgesSash.where(:badge_id => badge_id, :sash_id => self.id)
+    # ActiveRecord::Relation#delete doesn't work with composite keys.
+    # Badge is not AR model (Ambry) so can't do self.badges.find(badge_id).delete
+    badges_sash = badges_sashes.first
+    badges_sashes.delete_all
+    # delete doesn't run callbacks, do it by hand
+    if Object.const_defined?('BadgesSashObserver')
+      BadgesSashObserver.instance.after_delete(badges_sash)
+    end
   end
 end

data/merit.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.summary     = "General reputation Rails engine."
   s.description = "General reputation Rails engine."
   s.files       = `git ls-files`.split("\n").reject{|f| f =~ /^\./ }
-  s.version     = "0.3.2"
+  s.version     = "0.3.3"
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
   s.add_dependency 'ambry'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-25 00:00:00.000000000 Z
+date: 2012-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
-  requirement: &70149933327660 !ruby/object:Gem::Requirement
+  requirement: &70294954461660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70149933327660
+  version_requirements: *70294954461660
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70149933326900 !ruby/object:Gem::Requirement
+  requirement: &70294954459920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70149933326900
+  version_requirements: *70294954459920
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70149933326280 !ruby/object:Gem::Requirement
+  requirement: &70294954482520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70149933326280
+  version_requirements: *70294954482520
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70149933325200 !ruby/object:Gem::Requirement
+  requirement: &70294954481580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70149933325200
+  version_requirements: *70294954481580
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70149933323220 !ruby/object:Gem::Requirement
+  requirement: &70294954480960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70149933323220
+  version_requirements: *70294954480960
 description: General reputation Rails engine.
 email: tutecosta@gmail.com
 executables: []