merit 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be995bc6f76b25bcfd157f902124baba46eb05a7
-  data.tar.gz: 3905b409c862c55b11e05a892bdad1fca4371653
+  metadata.gz: 123265ab30632290e284deffe94b000aab61af82
+  data.tar.gz: 3e2dcca325352e75a7237c97f009104945af6215
 SHA512:
-  metadata.gz: 30548a8373a7db2b1a37621bc8dbd08d60e7c2d11bf164b139e5098e245179acfcaec8bde96e4b6bf3a9b0edba238e9b45a65099abed95350bf0aa8d0b9370f5
-  data.tar.gz: 1ecac2b778294d30882a0bba7ddcb165b0c328f12f74972cf0dba7dd65a207fa6fb8af151063c1ecd9769f4296bad0712583ab3f003433f8156d850d3652d9ec
+  metadata.gz: ee7cb5ebfc7acf53f13d03199f3456740d2a10c171a7d7aabb6eafad7abb919ab1c0855ec00d23a5a6a248f36502358ae02b3a6b9a5a70af69aa4bbc47c45a6d
+  data.tar.gz: 907ebc5ea903eb2977c9240fd5d2f5e9772091cff6352743520198b67b595e7187d56c974826f25bdcf2b88417cb5903229356fd5aba185d730142e472283900

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+# Changelog
+
+## 1.7.1
+
+- [#121] Adds "Uninstall Merit" rake task.
+- [#124] Thread safe configuration instance variable.
+- [#133] Fixes Rails 4 + protected_attributes bug.
+- Starts this Changelog!
+- General code, tests and README improvements.

data/Gemfile

@@ -6,6 +6,9 @@ version = ENV['RAILS_VERSION'] || '3.2'
 rails = case version
 when 'master'
   { github: 'rails/rails' }
+when '4.0-protected-attributes'
+  gem 'protected_attributes'
+  "~> #{version}.0"
 when '4.0'
   "~> #{version}.0"
 when '3.2'

data/README.md

@@ -1,12 +1,37 @@
 # Merit
-Merit is a reputation Ruby gem that supports Badges, Points, and Rankings.
 
-
-![Merit gem](http://i567.photobucket.com/albums/ss118/DeuceBigglebags/th_nspot26_300.jpg)
+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)
 [![Code Climate](https://codeclimate.com/github/tute/merit.png)](https://codeclimate.com/github/tute/merit)
 
+
+# Table of Contents
+
+- [Merit](#merit)
+- [Table of Contents](#table-of-contents)
+- [Installation](#installation)
+- [Badges](#badges)
+    - [Creating Badges](#creating-badges)
+        - [Example](#example)
+    - [Defining Rules](#defining-rules)
+        - [Examples](#examples)
+    - [Other Actions](#other-actions)
+    - [Displaying Badges](#displaying-badges)
+- [Points](#points)
+    - [Defining Rules](#defining-rules-1)
+        - [Examples](#examples-1)
+    - [Other Actions](#other-actions-1)
+    - [Displaying Points](#displaying-points)
+- [Rankings](#rankings)
+    - [Defining Rules](#defining-rules-2)
+        - [Examples](#examples-2)
+    - [Displaying Rankings](#displaying-rankings)
+- [Uninstalling Merit](#uninstalling-merit)
+- [To-do List](#to-do-list)
+
+
 # Installation
 
 1. Add `gem 'merit'` to your `Gemfile`
@@ -16,10 +41,11 @@ Merit is a reputation Ruby gem that supports Badges, Points, and Rankings.
 5. Define badges in `config/initializers/merit.rb`
 6. Configure reputation rules for your application in `app/models/merit/*`
 
----
 
 # Badges
+
 ## Creating Badges
+
 Create badges in `config/initializers/merit.rb`
 
 `Merit::Badge.create!` takes a hash describing the badge:
@@ -30,6 +56,7 @@ Create badges in `config/initializers/merit.rb`
 * `:custom_fields` hash of anything else you want associated with the badge (optional)
 
 ### Example
+
 ```ruby
 Merit::Badge.create! ({
   id: 1,
@@ -39,11 +66,15 @@ Merit::Badge.create! ({
 })
 ```
 
-## Defining Badge Rules
-Badges can be automatically given to any resource in your application based on rules and conditions you create.
-Badges can also have levels, and be permanent or temporary (A temporary badge is revoked when the conditions of the badge are no longer met).
+## Defining Rules
+
+Badges can be automatically given to any resource in your application based on
+rules and conditions you create. Badges can also have levels, and be permanent
+or temporary (A temporary badge is revoked when the conditions of the badge
+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:
+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
@@ -76,11 +107,11 @@ grant_on 'comments#vote', badge: 'relevant-commenter', to: :user do |comment|
 end
 
 grant_on ['users#create', 'users#update'], badge: 'autobiographer', temporary: true do |user|
-  user.name.present? && user.email.present?
+  user.name? && user.email?
 end
 ```
 
-## Other Badge Actions
+## Other Actions
 
 ```ruby
 # Check granted badges
@@ -102,9 +133,23 @@ Badge.last_granted(since_date: 1.week.ago, limit: 20)
 Badge.find(1).users
 ```
 
----
+## Displaying Badges
 
-# Defining point rules
+Meritable models have a `badges` method which returns an array of associated
+badges:
+
+```erb
+<ul>
+<% current_user.badges.each do |badge| %>
+  <li><%= badge.name %></li>
+<% end %>
+</ul>
+```
+
+
+# Points
+
+## Defining Rules
 
 Points are given to "meritable" resources on actions-triggered, either to the
 action user or to the method(s) defined in the `:to` option. Define rules on
@@ -114,17 +159,18 @@ action user or to the method(s) defined in the `:to` option. Define rules on
 
 * `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.
+  * `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.
-  (e.g. `model_name: 'User'` for `RegistrationsController`, or
-        `model_name: 'Comment'` for `Api::CommentsController`)
+* `:model_name` (optional) to specify the model name if it cannot be guessed
+  from the controller. (e.g. `model_name: 'User'` for `RegistrationsController`,
+  or `model_name: 'Comment'` for `Api::CommentsController`)
 * `&block`
   * empty (always scores)
   * a block which evaluates to boolean (recieves target object as parameter)
 
-## Examples
+### Examples
 
 ```ruby
 # app/models/merit/point_rules.rb
@@ -139,20 +185,23 @@ score 20, on: [
 
 score 15, on: 'reviews#create', to: [:reviewer, :reviewed]
 
-calculate = lambda { |photo| PhotoPointsCalculator.calculate_score_for(photo) }
-score calculate, on: 'photos#create'
+proc = lambda { |photo| PhotoPointsCalculator.calculate_score_for(photo) }
+score proc, on: 'photos#create'
 ```
 
-```ruby
-# Check awarded points
-current_user.points # Returns an integer
+## Other Actions
 
+```ruby
 # Score manually
 current_user.add_points(20, 'Optional log message')
 current_user.subtract_points(10)
 ```
 
 ```ruby
+# Query awarded points since a given date
+score_points = current_user.sash.scores.first.score_points
+score_points.where("created_at > '#{1.month.ago}'").sum(:num_points)
+
 # List top 10 scored users in the last month
 Merit::Score.top_scored
 
@@ -164,18 +213,27 @@ Merit::Score.top_scored(
 )
 ```
 
----
+## Displaying Points
+
+Meritable models have a `points` method which returns an integer:
+
+```erb
+<%= current_user.points %>
+```
+
 
-# Defining rank rules
+# Rankings
 
-5 stars is a common ranking use case. They are not given at specified actions
-like badges, you should define a cron job to test if ranks are to be granted.
+A common ranking use case is 5 stars. They are not given at specified actions
+like badges, a cron job should be defined to test if ranks are to be granted.
+
+## Defining Rules
 
 Define rules on `app/models/merit/rank_rules.rb`:
 
 `set_rank` accepts:
 
-* `:level` ranking level (greater is better)
+* `:level` ranking level (greater is better, Lexicographical order)
 * `:to` model or scope to check if new rankings apply
 * `:level_name` attribute name (default is empty and results in
   '`level`' attribute, if set it's appended like
@@ -190,7 +248,7 @@ end
 ```
 
 
-## Examples
+### Examples
 
 ```ruby
 set_rank level: 2, to: Committer.active do |committer|
@@ -202,8 +260,23 @@ set_rank level: 3, to: Committer.active do |committer|
 end
 ```
 
+## Displaying Rankings
+
+```erb
+<%= current_user.level %>
+```
+
+
+# Uninstalling Merit
+
+1. Run `rails d merit:install`
+2. Run `rails d merit MODEL_NAME` (e.g. `user`)
+3. Run `rails g merit:remove MODEL_NAME` (e.g. `user`)
+4. Run `rake db:migrate`
+5. Remove `merit` from your Gemfile
+
 
-# To-do list
+# To-do List
 
 * Finish Observer implementation for `Judge`.
 * Move level from meritable model into Sash

data/lib/generators/active_record/remove_generator.rb

@@ -0,0 +1,21 @@
+require 'rails/generators/active_record'
+
+module ActiveRecord
+  module Generators
+    class RemoveGenerator < ActiveRecord::Generators::Base
+      include Rails::Generators::Migration
+
+      source_root File.expand_path('../templates', __FILE__)
+      desc "Creates a migration file to remove all traces of Merit on the DB"
+
+      def self.next_migration_number(path)
+        ActiveRecord::Generators::Base.next_migration_number(path)
+      end
+
+      def copy_migrations_and_model
+        migration_template 'remove_merit_tables.rb', 'db/migrate/remove_merit_tables.rb'
+        migration_template "remove_fields_from_model.rb", "db/migrate/remove_fields_from_#{table_name}"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,6 @@
+class RemoveFieldsFrom<%= table_name.camelize %> < ActiveRecord::Migration
+  def self.up
+    remove_column :<%= table_name %>, :sash_id
+    remove_column :<%= table_name %>, :level
+  end
+end

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

@@ -0,0 +1,10 @@
+class RemoveMeritTables < ActiveRecord::Migration
+  def self.up
+    drop_table :merit_actions
+    drop_table :merit_activity_logs
+    drop_table :badges_sashes
+    drop_table :sashes
+    drop_table :merit_scores
+    drop_table :merit_score_points
+  end 
+end

data/lib/generators/merit/remove_generator.rb

@@ -0,0 +1,18 @@
+module Merit
+  module Generators
+    class RemoveGenerator < Rails::Generators::NamedBase
+      source_root File.expand_path('../templates', __FILE__)
+      hook_for :orm
+	  
+	  private
+
+      def model_exists?
+        File.exists?(File.join(destination_root, model_path))
+      end
+
+      def model_path
+        @model_path ||= File.join("app", "models", "#{file_path}.rb")
+      end
+    end
+  end
+end

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

@@ -3,7 +3,7 @@ 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 and :mongoid
+  # Define ORM. Could be :active_record (default) and :mongoid
   # config.orm = :active_record
 
   # Define :user_model_name. This model will be used to grand badge if no :to option is given. Default is "User".
@@ -14,11 +14,14 @@ Merit.setup do |config|
 end
 
 # Create application badges (uses https://github.com/norman/ambry)
-# Merit::Badge.create!({
-#   id: 1,
+# badge_id = 0
+# [{
+#   id: (badge_id = badge_id+1),
 #   name: 'just-registered'
 # }, {
-#   id: 2,
+#   id: (badge_id = badge_id+1),
 #   name: 'best-unicorn',
 #   custom_fields: { category: 'fantasy' }
-# })
+# }].each do |attrs|
+#   Merit::Badge.create! attrs
+# end

data/lib/merit.rb

@@ -11,33 +11,43 @@ require 'merit/base_target_finder'
 require 'merit/target_finder'
 
 module Merit
+  def self.setup
+    @config ||= Configuration.new
+    yield @config if block_given?
+  end
+
   # Check rules on each request
-  mattr_accessor :checks_on_each_request
-  @@checks_on_each_request = true
+  def self.checks_on_each_request
+    @config.checks_on_each_request
+  end
 
-  # Define ORM
-  mattr_accessor :orm
-  @@orm = :active_record
+  # # Define ORM
+  def self.orm
+    @config.orm
+  end
 
   # Define user_model_name
-  mattr_accessor :user_model_name
-  @@user_model_name = 'User'
   def self.user_model
-    @@user_model_name.constantize
+    @config.user_model_name.constantize
   end
 
   # Define current_user_method
-  mattr_accessor :current_user_method
   def self.current_user_method
-    @@current_user_method || "current_#{@@user_model_name.downcase}".to_sym
+    @config.current_user_method || "current_#{@config.user_model_name.downcase}".to_sym
   end
 
-
-  # Load configuration from initializer
-  def self.setup
-    yield self
+  class Configuration
+    attr_accessor :checks_on_each_request,
+      :orm, :user_model_name, :current_user_method
+    def initialize
+      @checks_on_each_request = true
+      @orm = :active_record
+      @user_model_name = 'User'
+    end
   end
 
+  setup
+
   class BadgeNotFound < Exception; end
   class RankAttributeNotDefined < Exception; end
 

data/lib/merit/model_additions.rb

@@ -24,12 +24,7 @@ module Merit
     end
 
     def _merit_orm_specific_config
-      if Merit.orm == :mongo_mapper
-        plugin Merit
-        key :sash_id, String
-        key :points, Integer, default: 0
-        key :level, Integer, default: 0
-      elsif Merit.orm == :mongoid
+      if Merit.orm == :mongoid
         field :sash_id
         field :points, type: Integer, default: 0
         field :level, type: Integer, default: 0
@@ -62,9 +57,6 @@ end
 if Object.const_defined?('ActiveRecord')
   ActiveRecord::Base.send :include, Merit
 end
-if Object.const_defined?('MongoMapper')
-  MongoMapper::Document.plugin Merit
-end
 if Object.const_defined?('Mongoid')
   Mongoid::Document.send :include, Merit
 end

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

@@ -4,7 +4,7 @@ module Merit
 
     has_many :activity_logs, class_name: Merit::ActivityLog
 
-    unless defined?(ActionController::StrongParameters)
+    if defined?(ProtectedAttributes) || !defined?(ActionController::StrongParameters)
       attr_accessible :user_id, :action_method, :action_value, :had_errors,
         :target_model, :target_id, :processed, :log
     end

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

@@ -5,7 +5,7 @@ module Merit
     belongs_to :action, class_name: Merit::Action
     belongs_to :related_change, polymorphic: true
 
-    unless defined?(ActionController::StrongParameters)
+    if defined?(ProtectedAttributes) || !defined?(ActionController::StrongParameters)
       attr_accessible :action_id, :related_change, :description, :created_at
     end
   end

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

@@ -5,7 +5,7 @@ module Merit
       class_name: Merit::ActivityLog,
       as: :related_change
 
-    unless defined?(ActionController::StrongParameters)
+    if defined?(ProtectedAttributes) || !defined?(ActionController::StrongParameters)
       attr_accessible :badge_id
     end
 

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     = '1.7.0'
+  s.version     = '1.7.1'
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
 

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

@@ -3,7 +3,7 @@ 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 and :mongoid
+  # Define ORM. Could be :active_record (default) and :mongoid
   config.orm = :mongoid
 end
 

data/test/dummy/app/models/comment.rb

@@ -3,7 +3,7 @@ class Comment < ActiveRecord::Base
 
   belongs_to :user
 
-  unless defined?(ActionController::StrongParameters)
+  if defined?(ProtectedAttributes) || !defined?(ActionController::StrongParameters)
     attr_accessible :name, :comment, :user_id, :votes
   end
 

data/test/dummy/app/models/user.rb

@@ -3,7 +3,7 @@ class User < ActiveRecord::Base
 
   has_many :comments
 
-  unless defined?(ActionController::StrongParameters)
+  if defined?(ProtectedAttributes) || !defined?(ActionController::StrongParameters)
     attr_accessible :name
   end
 

data/test/dummy/app/views/layouts/application.html.erb

@@ -20,4 +20,4 @@
     <li><%= link_to 'Comments', comments_url %></li>
   </ul>
 </body>
-</html>
+</html>

data/test/dummy/config/application.rb

@@ -16,6 +16,9 @@ module Dummy
     # config.i18n.default_locale = :de
     # config.active_record.whitelist_attributes = true
 
+    # http://stackoverflow.com/questions/20361428/rails-i18n-validation-deprecation-warning
+    config.i18n.enforce_available_locales = true
+
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
 

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

@@ -3,7 +3,7 @@ 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), :mongo_mapper and :mongoid
+  # Define ORM. Could be:active_record (default) and :mongoid
   # config.orm = :active_record
 end
 

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130329222238) do
+ActiveRecord::Schema.define(:version => 20130329224410) do
 
   create_table "badges_sashes", :force => true do |t|
     t.integer  "badge_id"

data/test/unit/target_finder_test.rb

@@ -24,7 +24,9 @@ describe Merit::TargetFinder do
 
     describe 'rule#to is :action_user' do
       it 'should return an array including user that executed the action' do
-        Merit.user_model_name = 'User'
+        Merit.setup do |config|
+          config.user_model_name = 'User'
+        end
         rule = Merit::Rule.new
         rule.to = :action_user
         action = Merit::Action.new(user_id: 22)
@@ -40,7 +42,9 @@ describe Merit::TargetFinder do
 
       describe 'when user does not exist' do
         it 'should return warn and return an empty array' do
-          Merit.user_model_name = 'User'
+          Merit.setup do |config|
+            config.user_model_name = 'User'
+          end
           rule = Merit::Rule.new
           rule.to = :action_user
           action = Merit::Action.new(user_id: 22)

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Tute Costa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         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: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -101,6 +101,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -111,14 +112,18 @@ files:
 - app/models/merit/badge.rb
 - lib/generators/active_record/install_generator.rb
 - lib/generators/active_record/merit_generator.rb
+- lib/generators/active_record/remove_generator.rb
 - lib/generators/active_record/templates/add_fields_to_model.rb
 - lib/generators/active_record/templates/create_badges_sashes.rb
 - lib/generators/active_record/templates/create_merit_actions.rb
 - lib/generators/active_record/templates/create_merit_activity_logs.rb
 - lib/generators/active_record/templates/create_sashes.rb
 - lib/generators/active_record/templates/create_scores_and_points.rb
+- lib/generators/active_record/templates/remove_fields_from_model.rb
+- lib/generators/active_record/templates/remove_merit_tables.rb
 - lib/generators/merit/install_generator.rb
 - lib/generators/merit/merit_generator.rb
+- lib/generators/merit/remove_generator.rb
 - lib/generators/merit/templates/merit.rb
 - lib/generators/merit/templates/merit_badge_rules.rb
 - lib/generators/merit/templates/merit_point_rules.rb
@@ -133,8 +138,6 @@ files:
 - lib/merit/models/active_record/merit/badges_sash.rb
 - lib/merit/models/active_record/merit/sash.rb
 - lib/merit/models/active_record/merit/score.rb
-- lib/merit/models/mongo_mapper/merit/action.rb
-- lib/merit/models/mongo_mapper/sash.rb
 - lib/merit/models/mongoid/merit/action.rb
 - lib/merit/models/mongoid/sash.rb
 - lib/merit/observer.rb
@@ -283,17 +286,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: General reputation Rails engine.

data/lib/merit/models/mongo_mapper/merit/action.rb

@@ -1,15 +0,0 @@
-module Merit
-  class Action
-    include MongoMapper::Document
-
-    key :user_id, String
-    key :action_method, String
-    key :action_value, Integer
-    key :had_errors, Boolean
-    key :target_model, String
-    key :target_id, String
-    key :processed, Boolean, default: false
-    key :log, String
-    timestamps!
-  end
-end

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

@@ -1,16 +0,0 @@
-class Sash
-  include MongoMapper::Document
-
-  key :badge_ids, Array
-  timestamps!
-
-  def add_badge(badge_id)
-    self.badge_ids << badge_id
-    self.save
-  end
-
-  def rm_badge(badge_id)
-    self.badge_ids -= [badge_id]
-    self.save
-  end
-end