merit 0.9.5 → 0.10.0

data/Gemfile

@@ -1,7 +1,3 @@
 source "http://rubygems.org"
 
-# TODO: Why do we need them here if they are in .gemspec?
-gem 'bson_ext'
-gem 'mongoid', '2.4.8'
-
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    merit (0.9.5)
+    merit (0.10.0)
       ambry (~> 0.3.0)
 
 GEM
@@ -66,8 +66,8 @@ GEM
     mime-types (1.18)
     mongo (1.6.2)
       bson (~> 1.6.2)
-    mongoid (2.4.8)
-      activemodel (~> 3.1)
+    mongoid (2.0.2)
+      activemodel (~> 3.0)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
     multi_json (1.3.6)
@@ -131,7 +131,7 @@ DEPENDENCIES
   capybara
   haml
   merit!
-  mongoid (= 2.4.8)
+  mongoid (~> 2.0.0)
   rails (~> 3.2.3)
   simplecov
   sqlite3

data/README.md

@@ -15,6 +15,8 @@
 5. Define badges you will use in `config/initializers/merit.rb`
 6. Configure reputation rules for your application in `app/models/merit/*`
 
+NOTE: Mongoid support is experimental.
+
 ---
 
 # Defining badge rules

data/UPGRADING.md

@@ -1,5 +1,22 @@
 # Upgrading
 
+## to 0.10.0
+
+`badges_sashes` table gets a primary key `id` column. Run the following migration:
+
+    class AddIdToBadgesSashes < ActiveRecord::Migration
+      def self.up
+        add_column :badges_sashes, :id, :primary_key
+      end
+
+      def self.down
+        remove_column :badges_sashes, :id
+      end
+    end
+
+`set_notified!(badge = nil, sash = nil)` no longer exists, just call `set_notified!`
+over the `badge_sash` object, with no parameters.
+
 ## to 0.9.0
 
 Adds `allow_multiple` boolean option to `Badge#grant_to` (defaults to

data/lib/generators/active_record/templates/create_badges_sashes.rb

@@ -1,6 +1,6 @@
 class CreateBadgesSashes < ActiveRecord::Migration
   def self.up
-    create_table :badges_sashes, :id => false do |t|
+    create_table :badges_sashes do |t|
       t.integer :badge_id, :sash_id
       t.boolean :notified_user, :default => false
       t.datetime :created_at

data/lib/merit/model_additions.rb

@@ -3,7 +3,7 @@ module Merit
 
   module ClassMethods
     def has_merit(options = {})
-      belongs_to :sash
+      belongs_to :sash, :dependent => :destroy
 
       if Merit.orm == :mongo_mapper
         plugin Merit
@@ -24,7 +24,7 @@ module Merit
 
   def badges
     create_sash_if_none
-    sash.badge_ids.collect{|b_id| Badge.find(b_id) }
+    sash.badges
   end
 
   # Create sash if doesn't have

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

@@ -6,10 +6,8 @@ class BadgesSash < ActiveRecord::Base
   end
 
   # To be used in the application, mark badge granting as notified to user
-  def set_notified!(badge, sash)
-    # With composite keys ARel complained, had to use SQL
-    ActiveRecord::Base.connection.execute("UPDATE badges_sashes
-      SET notified_user = TRUE
-      WHERE badge_id = #{badge.id} AND sash_id = #{sash.id}")
+  def set_notified!
+    self.notified_user = true
+    save
   end
 end

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

@@ -1,5 +1,9 @@
 class Sash < ActiveRecord::Base
-  has_many :badges_sashes
+  has_many :badges_sashes, :dependent => :destroy
+
+  def badges
+    badge_ids.collect { |b_id| Badge.find(b_id) }
+  end
 
   def badge_ids
     badges_sashes.collect(&:badge_id)
@@ -7,19 +11,11 @@ class Sash < ActiveRecord::Base
 
   def add_badge(badge_id)
     bs = BadgesSash.new
-    bs.sash_id = self.id
     bs.badge_id = badge_id
-    bs.save
+    badges_sashes << bs
   end
+
   def rm_badge(badge_id)
-    badges_sashes = BadgesSash.where(:badge_id => badge_id, :sash_id => self.id)
-    # ActiveRecord::Relation#delete|destroy(_all) 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') && badges_sash.present?
-      BadgesSashObserver.instance.after_delete(badges_sash)
-    end
+    badges_sashes.find_by_badge_id(badge_id).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.9.5"
+  s.version     = "0.10.0"
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
   s.add_dependency 'ambry',  '~> 0.3.0'

data/test/dummy/db/migrate/20120318022219_create_badges_sashes.rb

@@ -1,6 +1,6 @@
 class CreateBadgesSashes < ActiveRecord::Migration
   def self.up
-    create_table :badges_sashes, :id => false do |t|
+    create_table :badges_sashes do |t|
       t.integer :badge_id, :sash_id
       t.boolean :notified_user, :default => false
       t.datetime :created_at

data/test/dummy/db/schema.rb

@@ -13,7 +13,7 @@
 
 ActiveRecord::Schema.define(:version => 20120318022220) do
 
-  create_table "badges_sashes", :id => false, :force => true do |t|
+  create_table "badges_sashes", :force => true do |t|
     t.integer  "badge_id"
     t.integer  "sash_id"
     t.boolean  "notified_user", :default => false

metadata

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