merit 1.6.2 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d0a820341d6408878856c250741dc432cf69e87
-  data.tar.gz: 5c62d13ececa1fbc100635867a24f1ede459ea7b
+  metadata.gz: be995bc6f76b25bcfd157f902124baba46eb05a7
+  data.tar.gz: 3905b409c862c55b11e05a892bdad1fca4371653
 SHA512:
-  metadata.gz: 8701d647ca74706f02beabb79392e7e35015719b05aef83476a97ae2f86810bace21184065bf1aed45a6f08b40ace8a94e5957a04cd743162e158f0ee433f4b4
-  data.tar.gz: 321f7574c41b967a5e13af373f387b48b47cc7817397b5777d1c84ef75192edaa97de25cd96ca87b370e2783d59872636fac5fcc1b319a7d5d5a909d02ce70c3
+  metadata.gz: 30548a8373a7db2b1a37621bc8dbd08d60e7c2d11bf164b139e5098e245179acfcaec8bde96e4b6bf3a9b0edba238e9b45a65099abed95350bf0aa8d0b9370f5
+  data.tar.gz: 1ecac2b778294d30882a0bba7ddcb165b0c328f12f74972cf0dba7dd65a207fa6fb8af151063c1ecd9769f4296bad0712583ab3f003433f8156d850d3652d9ec

data/Gemfile

@@ -14,3 +14,15 @@ when '3.2'
 end
 
 gem 'rails', rails
+
+group :development, :test do
+  gem 'activerecord-jdbcsqlite3-adapter', :platforms => [:jruby]
+  gem 'sqlite3', :platforms => [:ruby, :mswin, :mingw]
+end
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'rubysl-test-unit'
+  gem 'rubinius-developer_tools'
+end

data/README.md

@@ -112,6 +112,9 @@ action user or to the method(s) defined in the `:to` option. Define rules on
 
 `score` accepts:
 
+* `score`
+  * `Integer`
+  * `Proc`, or any object that accepts `call` which takes one argument, where the target_object is passed in and the return value is used as the score.
 * `:on` action as string or array of strings (similar to Rails routes)
 * `:to` method(s) to send to the target_object (who should be scored?)
 * `:model_name` (optional) to specify the model name if it cannot be guessed from the controller.
@@ -135,6 +138,9 @@ score 20, on: [
 ]
 
 score 15, on: 'reviews#create', to: [:reviewer, :reviewed]
+
+calculate = lambda { |photo| PhotoPointsCalculator.calculate_score_for(photo) }
+score calculate, on: 'photos#create'
 ```
 
 ```ruby
@@ -143,7 +149,7 @@ current_user.points # Returns an integer
 
 # Score manually
 current_user.add_points(20, 'Optional log message')
-current_user.substract_points(10)
+current_user.subtract_points(10)
 ```
 
 ```ruby

data/Rakefile

@@ -7,7 +7,6 @@ rescue LoadError
 end
 
 require 'rake'
-require 'rdoc/task'
 
 require 'rake/testtask'
 
@@ -20,10 +19,16 @@ end
 
 task :default => :test
 
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Merit'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.md')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+begin
+  require 'rdoc/task'
+
+  Rake::RDocTask.new(:rdoc) do |rdoc|
+    rdoc.rdoc_dir = 'rdoc'
+    rdoc.title    = 'Merit'
+    rdoc.options << '--line-numbers' << '--inline-source'
+    rdoc.rdoc_files.include('README.md')
+    rdoc.rdoc_files.include('lib/**/*.rb')
+  end
+rescue LoadError
+  puts 'This platform does not support RDocTask'
 end

data/UPGRADING.md

@@ -1,5 +1,12 @@
 # Upgrading
 
+## 1.7.0
+
+* Adds support for dynamic scoring
+* `substract_points` is deprecated in favor of `subtract_points`. Careless
+  computers didn't mind my misspellings. ;-)
+* JRuby and Rubinius compatibility
+
 ## 1.6.0
 
 * Rails 4 ready.

data/lib/merit/judge.rb

@@ -26,7 +26,7 @@ module Merit
     def apply_points
       return unless rule_applies?
       @sashes.each do |sash|
-        point = sash.add_points @rule.score
+        point = sash.add_points points
         notify_observers(@action.id, point)
       end
     end
@@ -52,11 +52,22 @@ module Merit
       !sash.badge_ids.include?(badge.id) || @rule.multiple
     end
 
+    def rule_object
+      BaseTargetFinder.find(@rule, @action)
+    end
+
     def rule_applies?
-      rule_object = BaseTargetFinder.find(@rule, @action)
       @rule.applies? rule_object
     end
 
+    def points
+      if @rule.score.respond_to?(:call)
+        @rule.score.call(rule_object)
+      else
+        @rule.score
+      end
+    end
+
     def badge
       @rule.badge
     end

data/lib/merit/model_additions.rb

@@ -19,7 +19,7 @@ module Merit
     def _merit_delegate_methods_to_sash
       methods = %w(badge_ids badges points
         add_badge rm_badge
-        add_points substract_points)
+        add_points substract_points subtract_points)
       methods.each { |method| delegate method, to: :_sash }
     end
 
@@ -40,7 +40,7 @@ module Merit
     end
 
     def _merit_define_badge_related_entries_method
-      meritable_class_name = caller[1][/`.*'/][8..-3]
+      meritable_class_name = name.demodulize
       Badge._define_related_entries_method(meritable_class_name)
     end
 

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

@@ -42,7 +42,13 @@ module Merit
       point
     end
 
+    # DEPRECATED: Please use <tt>subtract_points</tt> instead.
     def substract_points(num_points, log = 'Manually granted', category = 'default')
+      warn "[DEPRECATION] `substract_points` is deprecated.  Please use `subtract_points` instead."
+      subtract_points num_points, log, category
+    end
+
+    def subtract_points(num_points, log = 'Manually granted', category = 'default')
       add_points -num_points, log, category
     end
 

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

@@ -37,7 +37,11 @@ GROUP BY #{options[:table_name]}.id, merit_scores.sash_id
 ORDER BY sum_points DESC
 LIMIT #{options[:limit]}
 SQL
-      ActiveRecord::Base.connection.execute(sql_query)
+      results = ActiveRecord::Base.connection.execute(sql_query)
+      results.map do |h|
+        h.keep_if { |k, v| (k == alias_id_column) || (k == 'sum_points') }
+      end
+      results
     end
 
     def points

data/lib/merit/rules_matcher.rb

@@ -7,7 +7,9 @@ module Merit
     end
 
     def select_from(rules)
-      rules.select { |glob, _| entire_path =~ Regexp.new(glob) }.values.flatten
+      rules.select do |glob, _|
+        entire_path =~ /^#{Regexp.new(glob)}$/
+      end.values.flatten
     end
 
     def any_matching?

data/merit.gemspec

@@ -4,15 +4,15 @@ 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     = '1.6.2'
+  s.license     = 'MIT'
+  s.version     = '1.7.0'
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
 
   s.required_ruby_version = '>= 1.9.2'
 
   s.add_dependency 'ambry',  '~> 0.3.0'
-  s.add_development_dependency 'rails', '~> 3.2.0'
-  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'rails', '>= 3.2.0'
   s.add_development_dependency 'capybara'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'minitest-rails'

data/test/dummy/app/models/merit/point_rules.rb

@@ -29,6 +29,10 @@ module Merit
           true
         end
       end
+
+      score lambda { |comment| comment.comment.to_i }, to: :user, on: 'comments#create' do |object|
+        object.comment.to_i > 0
+      end
     end
   end
 end

data/test/integration/navigation_test.rb

@@ -77,7 +77,7 @@ class NavigationTest < ActiveSupport::IntegrationCase
     assert_equal 0, Merit::Score::Point.count
     user.add_points 15
     assert_equal 15, user.points
-    user.substract_points 15
+    user.subtract_points 15
     assert_equal 0, user.points
     assert_equal 2, Merit::Score::Point.count
 
@@ -172,6 +172,15 @@ class NavigationTest < ActiveSupport::IntegrationCase
     visit "/comments/#{Comment.last.id}/vote/4"
     user = User.first
     assert_equal 46, user.points, 'Voting comments should grant 5 points for voted, and 1 point for voting'
+
+    visit '/comments/new'
+    fill_in 'Name', with: 'Hi'
+    fill_in 'Comment', with: '4'
+    fill_in 'User', with: user.id
+    click_button('Create Comment')
+
+    user = User.where(name: 'a').first
+    assert_equal 50, user.points, 'Commenting should grant the integer in comment points if comment is an integer'
   end
 
   test 'user workflow should grant levels at some times' do

data/test/unit/merit_unit_test.rb

@@ -54,10 +54,10 @@ class MeritUnitTest < ActiveSupport::TestCase
     sash_2.add_points(5); sash_2.add_points(5)
 
     # Test method options
-    assert_equal [{'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 [{'sash_id'=>sash_1.id, 'sum_points'=>20},
+      {'sash_id'=>sash_2.id, 'sum_points'=>10}],
       Merit::Score.top_scored(table_name: :sashes)
-    assert_equal  [{'sash_id'=>sash_1.id, 'sum_points'=>20, 0=>1, 1=>20}],
+    assert_equal  [{'sash_id'=>sash_1.id, 'sum_points'=>20}],
       Merit::Score.top_scored(table_name: :sashes, limit: 1)
   end
 

data/test/unit/rules_matcher_test.rb

@@ -0,0 +1,34 @@
+require 'test_helper'
+
+describe Merit::RulesMatcher do
+
+  describe 'rules actions are treated as a regexp' do
+    it 'selects matching rules (suffix)' do
+      matcher = Merit::RulesMatcher.new('comments', 'update')
+      matcher.select_from({
+        'comments#update' => 'comments#update',
+        'comments#up'     => 'comments#up',
+        'comments#up$'   => 'comments#up$',
+        'comments#up.+$' => 'comments#up.+$',
+      }).must_be :==, ['comments#update', 'comments#up.+$']
+
+      matcher = Merit::RulesMatcher.new('comments', 'up')
+      matcher.select_from({
+        'comments#update' => 'comments#update',
+        'comments#up'     => 'comments#up',
+        'comments#up$'   => 'comments#up$',
+        'comments#up.+$' => 'comments#up.+$',
+      }).must_be :==, ['comments#up', 'comments#up$']
+    end
+
+    it 'selects matching rules (prefix)' do
+      matcher = Merit::RulesMatcher.new('/posts/1/comments', 'create')
+      matcher.select_from({
+        'comments#create' => 'comments#create',
+        '^comments#create' => '^comments#create',
+        '^.*/comments#create' => '^.*/comments#create',
+      }).must_be :==, ['^.*/comments#create']
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.7.0
 platform: ruby
 authors:
 - Tute Costa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-10 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
@@ -26,32 +26,18 @@ dependencies:
         version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.0
-- !ruby/object:Gem::Dependency
-  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -284,10 +270,12 @@ files:
 - test/unit/base_target_finder_test.rb
 - test/unit/merit_unit_test.rb
 - test/unit/rule_unit_test.rb
+- test/unit/rules_matcher_test.rb
 - test/unit/sash_finder_test.rb
 - test/unit/target_finder_test.rb
 homepage: http://github.com/tute/merit
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -305,9 +293,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: General reputation Rails engine.
 test_files: []
-has_rdoc: