merit 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bceef6c4f4123e4b5aa45f35c90f51779803eccb
-  data.tar.gz: f64bea2e08e184c8b413e5410c02424f51b44c35
+  metadata.gz: b7d2cd9366ca515998303997aa8b9f30d7ab3e9f
+  data.tar.gz: 7be13cb7255f3d90760360827f07f6d57a2b1376
 SHA512:
-  metadata.gz: 22924df6b8915eb8dde70a0360141d2551eaf42d21cc8c45fbd8375354ff5897bd8e68433963cf426265be38eac3adfe4487c7c95376739b43f93d7d297bc075
-  data.tar.gz: 9d1324c2c32759030bb54e7aa9b37face51cf7e82da3ab53462b818a200e1efbb9d05d83fb896345cb112dfab21047c38bcd1c348e7175de72337df67b6f4007
+  metadata.gz: d1ee7dde0226e826d7244c5370ceb9edc8d9bd2d6340a36ba2219c229ea2103e2e891f4fef00708afd9e024bc4b6352fb1a07ba6825a7fc5168385ba18b1abab
+  data.tar.gz: 150e480cb899d7f88ad9ff85f4f7fe4bd19ce2936823454717d27b50ed286809e2a7e6b92b2f0f3fd81600132189f381c8e79ad95aa6e39279537182e392b919

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 2.3.0
+
+- [#206] Allow Rule to find Badge by `badge_id`
+- [#197] SVG badges in favor of PNG in the readme.
+- [#195] migrations refactor
+- Tests with Rails 4.2
+
 ## 2.2.0
 
 - [#181] Rescue `ActiveRecord` only if constant is defined (doesn't trigger

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-version = ENV['RAILS_VERSION'] || '4.1'
+version = ENV['RAILS_VERSION'] || '4.2'
 rails = case version
 when 'master'
   { github: 'rails/rails' }
@@ -12,7 +12,7 @@ when '4.0-protected-attributes'
 when /4\.0|4\.1/
   "~> #{version}.0"
 when /4\.2/
-  "~> #{version}.0.beta1"
+  "~> #{version}.0.rc3"
 when '3.2'
   gem 'strong_parameters'
   "~> #{version}.0"

data/README.md

@@ -3,11 +3,9 @@
 Merit adds reputation behavior to Rails apps in the form of Badges, Points,
 and Rankings.
 
-[![Build Status](https://travis-ci.org/tute/merit.png?branch=master)](http://travis-ci.org/tute/merit)
-[![Coverage
-Status](https://coveralls.io/repos/tute/merit/badge.png?branch=master)](https://coveralls.io/r/tute/merit?branch=master)
-[![Code Climate](https://codeclimate.com/github/tute/merit.png)](https://codeclimate.com/github/tute/merit)
-
+[![Build Status](https://travis-ci.org/tute/merit.svg?branch=master)](http://travis-ci.org/tute/merit)
+[![Coverage Status](https://img.shields.io/coveralls/tute/merit.svg)](https://coveralls.io/r/tute/merit?branch=master)
+[![Code Climate](https://codeclimate.com/github/tute/merit/badges/gpa.svg)](https://codeclimate.com/github/tute/merit)
 
 # Table of Contents
 
@@ -77,8 +75,8 @@ are no longer met).
 Badge rules / conditions are defined in `app/models/merit/badge_rules.rb`
 `initialize` block by calling `grant_on` with the following parameters:
 
-* `'controller#action'` a string similar to Rails routes
-* `:badge` corresponds to the `:name` of the badge
+* `'controller#action'` a string similar to Rails routes (required)
+* `:badge_id` or `:badge` these correspond to the `:id` or `:name` of the badge respectively
 * `:level` corresponds to the `:level` of the badge
 * `:to` the object's field to give the badge to. It needs a variable named
   `@model` in the associated controller action, like `@post` for
@@ -105,7 +103,7 @@ Badge rules / conditions are defined in `app/models/merit/badge_rules.rb`
 
 ```ruby
 # app/models/merit/badge_rules.rb
-grant_on 'comments#vote', badge: 'relevant-commenter', to: :user do |comment|
+grant_on 'comments#vote', badge_id: 5, to: :user do |comment|
   comment.votes.count == 5
 end
 

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

@@ -1,12 +1,6 @@
 class AddFieldsTo<%= table_name.camelize %> < ActiveRecord::Migration
-  def self.up
+  def change
     add_column :<%= table_name %>, :sash_id, :integer
-    add_column :<%= table_name %>, :level, :integer, :default => 0
-    <%- resource = table_name.singularize -%>
-  end
-
-  def self.down
-    remove_column :<%= table_name %>, :sash_id
-    remove_column :<%= table_name %>, :level
+    add_column :<%= table_name %>, :level,   :integer, :default => 0
   end
 end

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

@@ -1,5 +1,5 @@
 class CreateMeritActions < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :merit_actions do |t|
       t.integer :user_id
       t.string  :action_method
@@ -12,8 +12,4 @@ class CreateMeritActions < ActiveRecord::Migration
       t.timestamps
     end
   end
-
-  def self.down
-    drop_table :merit_actions
-  end
 end

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

@@ -1,5 +1,5 @@
 class CreateMeritActivityLogs < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :merit_activity_logs do |t|
       t.integer  :action_id
       t.string   :related_change_type
@@ -8,8 +8,4 @@ class CreateMeritActivityLogs < ActiveRecord::Migration
       t.datetime :created_at
     end
   end
-
-  def self.down
-    drop_table :merit_activity_logs
-  end
 end

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

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

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

@@ -1,5 +1,5 @@
 class CreateScoresAndPoints < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :merit_scores do |t|
       t.references :sash
       t.string :category, default: 'default'
@@ -12,9 +12,4 @@ class CreateScoresAndPoints < ActiveRecord::Migration
       t.datetime :created_at
     end
   end
-
-  def self.down
-    drop_table :merit_scores
-    drop_table :merit_score_points
-  end
 end

data/lib/generators/merit/templates/merit_badge_rules.rb

@@ -23,7 +23,8 @@ module Merit
     def initialize
       # If it creates user, grant badge
       # Should be "current_user" after registration for badge to be granted.
-      # grant_on 'users#create', badge: 'just-registered', to: :itself
+      # Find badge by badge_id, badge_id takes presidence over badge
+      # grant_on 'users#create', badge_id: 7, badge: 'just-registered', to: :itself
 
       # If it has 10 comments, grant commenter-10 badge
       # grant_on 'comments#create', badge: 'commenter', level: 10 do |comment|

data/lib/merit/controller_extensions.rb

@@ -30,7 +30,7 @@ module Merit
     end
 
     def target_data_hash
-      if Merit::Action.new.respond_to? :target_data
+      if Merit::Action.new.respond_to?(:target_data)
         { target_data: target_object.to_yaml }
       else
         Merit.upgrade_target_data_warning

data/lib/merit/rule.rb

@@ -3,7 +3,7 @@ module Merit
   # and a temporary option.
   # Could split this class between badges and rankings functionality
   class Rule
-    attr_accessor :badge_name, :level, :to, :model_name, :level_name,
+    attr_accessor :badge_id, :badge_name, :level, :to, :model_name, :level_name,
                   :multiple, :temporary, :score, :block, :category
 
     # Does this rule's condition block apply?
@@ -25,7 +25,11 @@ module Merit
 
     # Get rule's related Badge.
     def badge
-      @badge ||= Merit::Badge.find_by_name_and_level(badge_name, level)
+      if badge_id
+        Merit::Badge.find(badge_id)
+      else
+        Merit::Badge.find_by_name_and_level(badge_name, level)
+      end
     end
   end
 end

data/lib/merit/rules_badge_methods.rb

@@ -7,6 +7,7 @@ module Merit
       actions = Array.wrap(actions)
 
       rule = Rule.new
+      rule.badge_id   = options[:badge_id]
       rule.badge_name = options[:badge]
       rule.level      = options[:level]
       rule.to         = options[:to] || :action_user

data/merit.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.homepage    = "http://github.com/tute/merit"
   s.files       = `git ls-files`.split("\n").reject{|f| f =~ /^\./ }
   s.license     = 'MIT'
-  s.version     = '2.2.0'
+  s.version     = '2.3.0'
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
 

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

@@ -42,8 +42,8 @@ module Merit
       # Example rule for testing badge granting in differently namespaced controllers.
       grant_on '.*users#index', badge: 'wildcard_badge', multiple: true
 
-      # If it has 10 comments, grant commenter-10 badge
-      grant_on 'comments#create', badge: 'commenter', level: 10 do |comment|
+      # If it has 10 comments, grant commenter-10 badge, find badge by badge_id
+      grant_on 'comments#create', badge_id: 1, level: 10 do |comment|
         comment.user.comments.count >= 10
       end
       # Testing badge granting in more than one rule per action with different targets

data/test/dummy/config/environments/test.rb

@@ -27,6 +27,8 @@ Dummy::Application.configure do
   # like if you have constraints or database-specific column types
   # config.active_record.schema_format = :sql
 
+  config.active_support.test_order = :random
+
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
 

data/test/test_helper.rb

@@ -21,6 +21,7 @@ end
 require File.expand_path('../dummy/config/environment.rb', __FILE__)
 require 'rails/test_help'
 require 'minitest/rails'
+require 'mocha/mini_test'
 require "orm/#{Merit.orm}"
 
 Rails.backtrace_cleaner.remove_silencers!

data/test/unit/rule_unit_test.rb

@@ -35,9 +35,15 @@ describe Merit::Rule do
       -> { @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
+    it 'finds related badge by name' do
+      Merit::Badge.create(id: 98, name: 'test-badge-98')
+      @rule.badge_name = "test-badge-98"
+      @rule.badge.must_be :==, Merit::Badge.find(98)
+    end
+
+    it 'finds related badge by name' do
+      Merit::Badge.create(id: 98, name: 'test-badge-98')
+      @rule.badge_id = 98
       @rule.badge.must_be :==, Merit::Badge.find(98)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Tute Costa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-14 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
@@ -280,8 +280,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: General reputation Rails engine.
 test_files: []
+has_rdoc: