merit 1.5.0 → 1.6.0

data/test/test_helper.rb

@@ -12,11 +12,8 @@ SimpleCov.adapters.define 'rubygem' do
 end
 SimpleCov.start 'rubygem' if ENV["COVERAGE"]
 
-if ENV["ORM"] == "mongoid"
-  require File.expand_path("../dummy-mongoid/config/environment.rb",  __FILE__)
-else
-  require File.expand_path("../dummy/config/environment.rb",  __FILE__)
-end
+require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+
 require "rails/test_help"
 
 ActionMailer::Base.delivery_method = :test
@@ -33,21 +30,9 @@ Capybara.default_selector = :css
 require 'minitest/spec'
 require 'minitest/autorun'
 require 'minitest/mock'
-require "mocha/setup"
-
-if ENV["ORM"] == "mongoid"
-  class ActiveSupport::TestCase
-    def teardown
-      Mongoid.database.collections.each do |collection|
-        collection.remove unless collection.name =~ /^system\./
-      end
-    end
-  end
-else # ActiveRecord
-  # Run any available migration
-  ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
-end
+require 'mocha/setup'
+
+ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
 
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-

data/test/{base_target_finder_test.rb → unit/base_target_finder_test.rb}

@@ -20,7 +20,7 @@ describe Merit::BaseTargetFinder do
     end
 
     describe 'rule has no model_name' do
-      it "should fall back to the action#target_model" do
+      it 'should fall back to the action#target_model' do
         rule = Merit::Rule.new
         rule.to = :itself
         action = Merit::Action.new(target_model: 'users', target_id: 3)

data/test/{merit_unit_test.rb → unit/merit_unit_test.rb}

@@ -1,32 +1,8 @@
 require 'test_helper'
 
+# TODO: Split different objects tests in it's own files
 class MeritUnitTest < ActiveSupport::TestCase
-  test "Rule#applies? depends on provided block" do
-    rule = Merit::Rule.new
-    assert rule.applies?, 'empty conditions should make rule apply'
-
-    str = "string"
-    rule.block = lambda{|obj| obj.length < 4 }
-    assert !rule.applies?(str), 'block should make rule fail'
-
-    rule.block = lambda{|obj| obj.length >= 4 }
-    assert rule.applies?(str), 'block should make rule apply'
-
-    rule.block = lambda{|obj| true }
-    assert !rule.applies?, 'block needs parameter for rule to pass'
-  end
-
-  test "Rule#badge gets related badge or raises exception" do
-    rule = Merit::Rule.new
-    rule.badge_name = 'inexistent'
-    assert_raise(Merit::BadgeNotFound) { rule.badge }
-
-    badge = Merit::Badge.create(id: 98, name: 'test-badge-98')
-    rule.badge_name = badge.name
-    assert_equal Merit::Badge.find(98), rule.badge
-  end
-
-  test "extends only meritable ActiveRecord models" do
+  test 'extends only meritable ActiveRecord models' do
     class User < ActiveRecord::Base
       def self.columns; @columns ||= []; end
       has_merit
@@ -39,7 +15,7 @@ class MeritUnitTest < ActiveSupport::TestCase
     assert !Fruit.method_defined?(:points), 'other models aren\'t extended'
   end
 
-  test "Badges get 'related_models' methods" do
+  test 'Badges get "related_models" methods' do
     class Soldier < ActiveRecord::Base
       def self.columns; @columns ||= []; end
       has_merit
@@ -52,7 +28,7 @@ class MeritUnitTest < ActiveSupport::TestCase
     assert Merit::Badge.method_defined?(:players), 'Badge#players should be defined'
   end
 
-  test "Badge#last_granted returns recently granted badges" do
+  test 'Badge#last_granted returns recently granted badges' do
     # Create sashes, badges and badges_sashes
     sash = Merit::Sash.create
     badge = Merit::Badge.create(id: 20, name: 'test-badge-21')
@@ -70,7 +46,7 @@ class MeritUnitTest < ActiveSupport::TestCase
     assert_equal Merit::Badge.last_granted(since_date: 2.weeks.ago, limit: 1), [badge]
   end
 
-  test "Merit::Score.top_scored returns scores leaderboard" do
+  test 'Merit::Score.top_scored returns scores leaderboard' do
     # Create sashes and add points
     sash_1 = Merit::Sash.create
     sash_1.add_points(10); sash_1.add_points(10)
@@ -79,10 +55,10 @@ class MeritUnitTest < ActiveSupport::TestCase
 
     # Test method options
     assert_equal Merit::Score.top_scored(table_name: :sashes),
-      [{"sash_id"=>sash_1.id, "sum_points"=>20, 0=>1, 1=>20},
-       {"sash_id"=>sash_2.id, "sum_points"=>10, 0=>2, 1=>10}]
+      [{'sash_id'=>sash_1.id, 'sum_points'=>20, 0=>1, 1=>20},
+       {'sash_id'=>sash_2.id, 'sum_points'=>10, 0=>2, 1=>10}]
     assert_equal Merit::Score.top_scored(table_name: :sashes, limit: 1),
-      [{"sash_id"=>sash_1.id, "sum_points"=>20, 0=>1, 1=>20}]
+      [{'sash_id'=>sash_1.id, 'sum_points'=>20, 0=>1, 1=>20}]
   end
 
   test 'unknown ranking raises exception' do
@@ -96,4 +72,10 @@ class MeritUnitTest < ActiveSupport::TestCase
       WeirdRankRules.new.check_rank_rules
     end
   end
+
+  test 'Badge#custom_fields_hash saves correctly' do
+    Merit::Badge.create(id: 99, name: 'test-badge',
+      custom_fields: { key_1: 'value1' })
+    assert_equal 'value1', Merit::Badge.find(99).custom_fields[:key_1]
+  end
 end

data/test/unit/rule_unit_test.rb

@@ -0,0 +1,44 @@
+require 'test_helper'
+
+describe Merit::Rule do
+  before do
+    @rule = Merit::Rule.new
+  end
+
+  describe '#applies (with block)' do
+    before do
+      @rule.block = ->(obj) { obj.length < 4 }
+    end
+
+    it 'truthy block should make rule apply' do
+      @rule.applies?('str').must_be :==, true
+    end
+
+    it 'falsy block should make rule fail' do
+      @rule.applies?('string').must_be :==, false
+    end
+
+    it 'block needs parameter for rule to pass' do
+      @rule.applies?.must_be :==, false
+    end
+  end
+
+  describe '#applies (without block)' do
+    it 'empty condition should make rule apply' do
+      @rule.applies?.must_be :==, true
+    end
+  end
+
+  describe '#badge' do
+    it 'raises exception on inexistent badge' do
+      @rule.badge_name = 'inexistent'
+      ->{ @rule.badge }.must_raise Merit::BadgeNotFound
+    end
+
+    it 'finds related badge' do
+      badge = Merit::Badge.create(id: 98, name: 'test-badge-98')
+      @rule.badge_name = badge.name
+      @rule.badge.must_be :==, Merit::Badge.find(98)
+    end
+  end
+end

data/test/{sash_finder_test.rb → unit/sash_finder_test.rb}

@@ -4,7 +4,7 @@ describe Merit::SashFinder do
 
   it 'should return an array of sashes of the target objects' do
     sash_1 = Merit::Sash.new
-    user_1 = User.new(:_sash => sash_1)
+    user_1 = User.new
     user_1.stubs(:_sash).returns(sash_1)
 
     sash_2 = Merit::Sash.new

data/test/{target_finder_test.rb → unit/target_finder_test.rb}

@@ -45,7 +45,7 @@ describe Merit::TargetFinder do
           rule.to = :action_user
           action = Merit::Action.new(user_id: 22)
 
-          Rails.logger.expects(:warn).with("[merit] no User found with id 22")
+          Rails.logger.expects(:warn).with('[merit] no User found with id 22')
           finder = Merit::TargetFinder.new(rule, action)
           finder.find.must_be_empty
         end
@@ -70,7 +70,7 @@ describe Merit::TargetFinder do
         collection.must_include user
       end
 
-      describe 'the rule#to does not exist as a method on the original target' do
+      describe 'rule#to does not exist as a method on the original target' do
         it 'should warn and return an empty array' do
           rule = Merit::Rule.new
           rule.to = :non_existent
@@ -80,10 +80,10 @@ describe Merit::TargetFinder do
           comment = Comment.new
           Comment.stubs(:find_by_id).with(40).returns(comment)
 
-          message = "[merit] NoMethodError on `Comment#non_existent`"
-          message << " (called from Merit::TargetFinder#other_target)"
+          str = '[merit] NoMethodError on `Comment#non_existent`'
+          str << ' (called from Merit::TargetFinder#other_target)'
 
-          Rails.logger.expects(:warn).with(message)
+          Rails.logger.expects(:warn).with(str)
           finder = Merit::TargetFinder.new(rule, action)
           finder.find.must_be_empty
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-30 00:00:00.000000000 Z
+date: 2013-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -155,38 +155,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.13.3
-- !ruby/object:Gem::Dependency
-  name: bson_ext
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mongoid
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.0
 description: Manage badges, points and rankings (reputation) of resources in a Rails
   application.
 email: tutecosta@gmail.com
@@ -195,7 +163,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
-- Gemfile.lock
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -231,14 +198,15 @@ files:
 - lib/merit/models/mongo_mapper/sash.rb
 - lib/merit/models/mongoid/merit/action.rb
 - lib/merit/models/mongoid/sash.rb
+- lib/merit/observer.rb
 - lib/merit/rule.rb
 - lib/merit/rules_badge_methods.rb
+- lib/merit/rules_matcher.rb
 - lib/merit/rules_points_methods.rb
 - lib/merit/rules_rank_methods.rb
 - lib/merit/sash_finder.rb
 - lib/merit/target_finder.rb
 - merit.gemspec
-- test/base_target_finder_test.rb
 - test/dummy-mongoid/Rakefile
 - test/dummy-mongoid/app/controllers/application_controller.rb
 - test/dummy-mongoid/app/controllers/comments_controller.rb
@@ -293,6 +261,7 @@ files:
 - test/dummy-mongoid/script/rails
 - test/dummy/Rakefile
 - test/dummy/app/controllers/admin/users_controller.rb
+- test/dummy/app/controllers/api/users_controller.rb
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/comments_controller.rb
 - test/dummy/app/controllers/registrations_controller.rb
@@ -356,11 +325,13 @@ files:
 - test/dummy/public/stylesheets/scaffold.css
 - test/dummy/script/rails
 - test/integration/navigation_test.rb
-- test/merit_unit_test.rb
-- test/sash_finder_test.rb
 - test/support/integration_case.rb
-- test/target_finder_test.rb
 - test/test_helper.rb
+- test/unit/base_target_finder_test.rb
+- test/unit/merit_unit_test.rb
+- test/unit/rule_unit_test.rb
+- test/unit/sash_finder_test.rb
+- test/unit/target_finder_test.rb
 homepage: http://github.com/tute/merit
 licenses: []
 post_install_message: 

data/Gemfile.lock

@@ -1,146 +0,0 @@
-PATH
-  remote: .
-  specs:
-    merit (1.5.0)
-      ambry (~> 0.3.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (3.2.3)
-      actionpack (= 3.2.3)
-      mail (~> 2.4.4)
-    actionpack (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.1)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
-      builder (~> 3.0.0)
-    activerecord (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-    activesupport (3.2.3)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    addressable (2.2.7)
-    ambry (0.3.1)
-    arel (3.0.2)
-    bson (1.6.2)
-    bson_ext (1.6.2)
-      bson (~> 1.6.2)
-    builder (3.0.0)
-    capybara (1.1.2)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
-    childprocess (0.3.2)
-      ffi (~> 1.0.6)
-    erubis (2.7.0)
-    ffi (1.0.11)
-    haml (3.1.4)
-    hike (1.2.1)
-    i18n (0.6.0)
-    journey (1.0.3)
-    json (1.7.0)
-    libwebsocket (0.1.3)
-      addressable
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    mime-types (1.18)
-    minitest (4.7.0)
-    minitest-spec (0.0.2.1)
-      minitest (>= 3.0)
-    mocha (0.13.3)
-      metaclass (~> 0.0.1)
-    mongo (1.6.2)
-      bson (~> 1.6.2)
-    mongoid (2.0.2)
-      activemodel (~> 3.0)
-      mongo (~> 1.3)
-      tzinfo (~> 0.3.22)
-    multi_json (1.3.6)
-    nokogiri (1.5.2)
-    polyglot (0.3.3)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rails (3.2.3)
-      actionmailer (= 3.2.3)
-      actionpack (= 3.2.3)
-      activerecord (= 3.2.3)
-      activeresource (= 3.2.3)
-      activesupport (= 3.2.3)
-      bundler (~> 1.0)
-      railties (= 3.2.3)
-    railties (3.2.3)
-      actionpack (= 3.2.3)
-      activesupport (= 3.2.3)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (10.0.4)
-    rdoc (3.12)
-      json (~> 1.4)
-    rubyzip (0.9.8)
-    selenium-webdriver (2.21.2)
-      childprocess (>= 0.2.5)
-      ffi (~> 1.0)
-      libwebsocket (~> 0.1.3)
-      multi_json (~> 1.0)
-      rubyzip
-    simplecov (0.6.4)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-    sprockets (2.1.3)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
-    xpath (0.1.4)
-      nokogiri (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bson_ext
-  capybara
-  haml
-  merit!
-  minitest
-  minitest-spec
-  mocha (= 0.13.3)
-  mongoid (~> 2.0.0)
-  rails (~> 3.2.3)
-  simplecov
-  sqlite3