merit 0.3.0 → 0.3.1

data/README.markdown

@@ -2,6 +2,8 @@
 
 ![Merit](http://i567.photobucket.com/albums/ss118/DeuceBigglebags/th_nspot26_300.jpg)
 
+[![Build Status](https://secure.travis-ci.org/tute/merit.png?branch=master)](http://travis-ci.org/tute/merit)
+
 
 # Installation
 
@@ -124,33 +126,20 @@ installation, and configuring <tt>config.orm = :mongo_mapper</tt> in
 
 ---
 
-# Upgrade to 0.3.0
+# Notes on upgrades
+
+## to 0.3.0
 
 Badges data is now stored in <tt>config/initializers/merit.rb</tt> using
 <tt>ambry</tt> syntax (not in the DB anymore, as that table needed to be in
 sync in all development environments).
 
-# Upgrade to 0.2.0
+## to 0.2.0
 
 Added <tt>had_errors</tt> boolean attribute to <tt>merit_actions</tt> table.
 
 ---
 
-# Test application
-
-To run tests follow:
-
-    cd test/dummy
-    rails g merit:install # Next n's for not overriding already defined rules
-    n
-    n
-    n
-    rails g merit user
-    rake db:migrate ; rake db:seed
-    cd ../.. ; rake test
-
----
-
 # To-do list
 
 * Use ActiveSupport's Array#wrap where I build arrays by hand

data/Rakefile

@@ -7,7 +7,7 @@ rescue LoadError
 end
 
 require 'rake'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 require 'rake/testtask'
 

data/lib/merit/model_additions.rb

@@ -15,7 +15,7 @@ module Merit
 
   def badges
     create_sash_if_none
-    Badge.find_by_id(sash.badge_ids).to_a
+    Badge.find_by_id(sash.badge_ids)
   end
 
   # Create sash if doesn't have

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

@@ -1,7 +1,10 @@
 class BadgesSash < ActiveRecord::Base
-  belongs_to :badge
   belongs_to :sash
 
+  def badge
+    Badge.find(badge_id)
+  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

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

@@ -1,9 +1,12 @@
 class Sash < ActiveRecord::Base
   has_many :badges_sashes
-  has_many :badges, :through => :badges_sashes
+
+  def badge_ids
+    badges_sashes.collect(&:badge_id)
+  end
 
   def add_badge(badge_id)
-    BadgesSash.create(sash: self, badge_id: badge_id)
+    BadgesSash.create(sash_id: self.id, badge_id: badge_id)
   end
   def rm_badge(badge_id)
     ActiveRecord::Base.connection.execute("DELETE FROM badges_sashes

data/lib/merit/rules_rank.rb

@@ -32,7 +32,7 @@ module Merit
       defined_rules.each do |scoped_model, rankings| # For each model
         rankings.each do |ranking, rules| # For each model's ranking (stars, etc)
           rules.each do |rule|            # For each ranking's rule (level)
-            scoped_model.all.each {|obj| grant_rank(rule, obj) }
+            scoped_model.all.each{|obj| grant_rank(rule, obj) }
           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.0"
+  s.version     = "0.3.1"
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
   s.add_dependency 'ambry'

data/test/dummy/config/initializers/merit.rb

@@ -0,0 +1,8 @@
+# Use this hook to configure merit parameters
+Merit.setup do |config|
+  # Check rules on each request or in background
+  # config.checks_on_each_request = true
+
+  # Define ORM. Could be :active_record (default) and :mongo_mapper
+  # config.orm = :active_record
+end

data/test/dummy/db/migrate/20120318022217_create_merit_actions.rb

@@ -0,0 +1,18 @@
+class CreateMeritActions < ActiveRecord::Migration
+  def self.up
+    create_table :merit_actions do |t|
+      t.integer :user_id # source
+      t.string  :action_method
+      t.integer :action_value
+      t.boolean :had_errors
+      t.string  :target_model
+      t.integer :target_id
+      t.boolean :processed, :default => false
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :merit_actions
+  end
+end

data/test/dummy/db/migrate/20120318022218_create_sashes.rb

@@ -0,0 +1,11 @@
+class CreateSashes < ActiveRecord::Migration
+  def self.up
+    create_table :sashes do |t|
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :sashes
+  end
+end

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

@@ -0,0 +1,16 @@
+class CreateBadgesSashes < ActiveRecord::Migration
+  def self.up
+    create_table :badges_sashes, :id => false do |t|
+      t.integer :badge_id, :sash_id
+      t.boolean :notified_user, :default => false
+      t.datetime :created_at
+    end
+    add_index :badges_sashes, [:badge_id, :sash_id]
+    add_index :badges_sashes, :badge_id
+    add_index :badges_sashes, :sash_id
+  end
+
+  def self.down
+    drop_table :badges_sashes
+  end
+end

data/test/dummy/db/migrate/20120318022220_add_fields_to_users.rb

@@ -0,0 +1,12 @@
+class AddFieldsToUsers < ActiveRecord::Migration
+  def self.up
+    add_column :users, :sash_id, :integer
+    add_column :users, :points, :integer, :default => 0
+    User.all.each{|user| user.update_attribute(:points, 0) } # Update existing entries
+  end
+
+  def self.down
+    remove_column :users, :sash_id
+    remove_column :users, :points
+  end
+end

data/test/integration/navigation_test.rb

@@ -28,7 +28,7 @@ class NavigationTest < ActiveSupport::IntegrationCase
     click_button('Create Comment')
 
     user = User.where(:name => 'test-user').first
-    assert_equal [Badge.by_name('commenter').by_level(10).first], user.badges
+    assert_equal [Badge.by_name('commenter').by_level(10).first], user.badges.to_a
 
     # Vote (to 5) a user's comment, assert relevant-commenter badge granted
     relevant_comment = user.comments.where(:votes => 8).first
@@ -38,13 +38,13 @@ class NavigationTest < ActiveSupport::IntegrationCase
     end
 
     relevant_badge = Badge.by_name('relevant-commenter').first
-    user_badges    = User.where(:name => 'test-user').first.badges
+    user_badges    = User.where(:name => 'test-user').first.badges.to_a
     assert user_badges.include?(relevant_badge), "User badges: #{user.badges.collect(&:name).inspect} should contain relevant-commenter badge."
 
     # Edit user's name by long name
     # tests ruby code in grant_on is being executed, and gives badge
     user = User.where(:name => 'test-user').first
-    user_badges = user.badges
+    user_badges = user.badges.to_a
 
     visit "/users/#{user.id}/edit"
     fill_in 'Name', :with => 'long_name!'
@@ -52,7 +52,7 @@ class NavigationTest < ActiveSupport::IntegrationCase
 
     user = User.where(:name => 'long_name!').first
     autobiographer_badge = Badge.by_name('autobiographer').first
-    assert user.badges.include?(autobiographer_badge), "User badges: #{user.badges.collect(&:name).inspect} should contain autobiographer badge."
+    assert user.badges.to_a.include?(autobiographer_badge), "User badges: #{user.badges.collect(&:name).inspect} should contain autobiographer badge."
 
     # Edit user's name by short name
     # tests ruby code in grant_on is being executed, and removes badge
@@ -61,7 +61,7 @@ class NavigationTest < ActiveSupport::IntegrationCase
     click_button('Update User')
 
     user = User.where(:name => 'abc').first
-    assert !user.badges.include?(autobiographer_badge), "User badges: #{user.badges.collect(&:name).inspect} should remove autobiographer badge."
+    assert !user.badges.to_a.include?(autobiographer_badge), "User badges: #{user.badges.collect(&:name).inspect} should remove autobiographer badge."
   end
 
   test 'user workflow should add up points at some times' do
@@ -107,7 +107,7 @@ class NavigationTest < ActiveSupport::IntegrationCase
     user = User.where(:name => 'ab').first
     stars2 = Badge.by_name(:stars).by_level(2).first
     MeritRankRules.new.check_rank_rules
-    assert_equal user.badges, [stars2], "User badges: #{user.badges.collect(&:name).inspect} should contain only 2-stars badge."
+    assert_equal user.badges.to_a, [stars2], "User badges: #{user.badges.collect(&:name).inspect} should contain only 2-stars badge."
 
     # Edit user's name by short name. Doesn't go back to previous rank.
     visit "/users/#{user.id}/edit"
@@ -116,7 +116,7 @@ class NavigationTest < ActiveSupport::IntegrationCase
 
     user = User.where(:name => 'a').first
     MeritRankRules.new.check_rank_rules
-    assert_equal user.badges, [stars2], "User badges: #{user.badges.collect(&:name).inspect} should contain only 2-stars badge."
+    assert_equal user.badges.to_a, [stars2], "User badges: #{user.badges.collect(&:name).inspect} should contain only 2-stars badge."
 
     # Edit user's name by 5 chars name
     visit "/users/#{user.id}/edit"
@@ -127,6 +127,7 @@ class NavigationTest < ActiveSupport::IntegrationCase
     stars5 = Badge.by_name(:stars).by_level(5).first
     assert_equal Badge.find_by_id(user.sash.badge_ids).by_name(:stars).count, 1, "Should not contain more than 2 stars ranking."
     MeritRankRules.new.check_rank_rules
-    assert user.badges.include?(stars5), "User badges: #{user.badges.collect(&:name).inspect} should contain 5-stars badge."
+    user.reload
+    assert user.badges.to_a.include?(stars5), "User badges: #{user.badges.collect(&:inspect)} should contain 5-stars badge."
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-16 00:00:00.000000000 Z
+date: 2012-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
-  requirement: &70301339044400 !ruby/object:Gem::Requirement
+  requirement: &70196766610980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70301339044400
+  version_requirements: *70196766610980
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70301339043920 !ruby/object:Gem::Requirement
+  requirement: &70196766610400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301339043920
+  version_requirements: *70196766610400
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70301339043500 !ruby/object:Gem::Requirement
+  requirement: &70196766609980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301339043500
+  version_requirements: *70196766609980
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70301339043080 !ruby/object:Gem::Requirement
+  requirement: &70196766609560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301339043080
+  version_requirements: *70196766609560
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70301339042640 !ruby/object:Gem::Requirement
+  requirement: &70196766609100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301339042640
+  version_requirements: *70196766609100
 description: General reputation Rails engine.
 email: tutecosta@gmail.com
 executables: []
@@ -139,6 +139,7 @@ files:
 - test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/badges_data.rb
 - test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/merit.rb
 - test/dummy/config/initializers/mime_types.rb
 - test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/session_store.rb
@@ -146,6 +147,10 @@ files:
 - test/dummy/config/routes.rb
 - test/dummy/db/migrate/20110421191249_create_users.rb
 - test/dummy/db/migrate/20110421191250_create_comments.rb
+- test/dummy/db/migrate/20120318022217_create_merit_actions.rb
+- test/dummy/db/migrate/20120318022218_create_sashes.rb
+- test/dummy/db/migrate/20120318022219_create_badges_sashes.rb
+- test/dummy/db/migrate/20120318022220_add_fields_to_users.rb
 - test/dummy/db/schema.rb
 - test/dummy/db/seeds.rb
 - test/dummy/public/404.html