merit 2.4.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1d70d0ff56841cebd7bfb79bf17a152ba0a8156
-  data.tar.gz: c602f5a16bbe014cd78ba2fc5d5eeec1ee9ac362
+  metadata.gz: 1c2cb7b1562ee27518561243969673e6bc9796f4
+  data.tar.gz: ac96051e01a3ad6223ebc0a84ffa7d0f7845dc67
 SHA512:
-  metadata.gz: 5a8a44e81bddc1a740ebfb860eabefa2314f136c19851f5011113b1e25e4f539bb86affa4c9d447c6768f77b5c0a6b107258563a7bc41bd0b16ec86b24bd7a72
-  data.tar.gz: 4e8523ab4e5c04583184da68b1aa5ff9937f053ad39c3756d10526bf9fde5f1e93c54d2d209c65b3f8c811e8d1bc21c15a475faa688eef5021ab363ee97bfe3c
+  metadata.gz: 74b144eb96c51f83aacb529ac9d87962e9fed9e48f6af0da365b00df773597c28f79a66f8ab3048df3c9042a62e46371442661123b4321f0a9d333fa8f97ed67
+  data.tar.gz: 1022b3357c719d183dfa1b2b068943fecefa009263aeed1905d051310c29e644333c087cadbd5eec433d0542a11abf5174121c38f003d6b657e937895345ca44

data/Gemfile

@@ -2,23 +2,8 @@ source 'https://rubygems.org'
 
 gemspec
 
-version = ENV['RAILS_VERSION'] || '4.2'
-rails = case version
-when 'master'
-  { github: 'rails/rails' }
-when '4.0-protected-attributes'
-  gem 'protected_attributes'
-  "~> 4.0.0"
-when /4\.0|4\.1/
-  "~> #{version}.0"
-when /4\.2/
-  "~> #{version}.0.rc3"
-when '3.2'
-  gem 'strong_parameters'
-  "~> #{version}.0"
-end
-
-gem 'rails', rails
+version = ENV['RAILS_VERSION'] || '5.0.3'
+gem 'rails', version
 
 case ENV['ORM']
 when 'active_record'
@@ -36,7 +21,7 @@ platforms :rbx do
   gem 'rubysl', '~> 2.0'
   gem 'psych'
   gem 'racc'
-  gem 'minitest'
+  gem 'minitest', '~> 5.10', '!= 5.10.2'
   gem 'rubinius-developer_tools'
 end
 

data/NEWS.md

@@ -2,6 +2,11 @@
 
 User-visible changes worth mentioning.
 
+## 3.0.0
+
+- [#276] Drops Rails <5 version support. Drops deprecated `action_filter` call.
+- Fix deprecation warnings
+
 ## 2.4.0
 
 - [#260] Works with Rails 5

data/README.md

@@ -4,7 +4,7 @@ Merit adds reputation behavior to Rails apps in the form of Badges, Points,
 and Rankings.
 
 [![Build Status](https://travis-ci.org/merit-gem/merit.svg?branch=master)](http://travis-ci.org/merit-gem/merit)
-[![Coverage Status](https://img.shields.io/coveralls/tute/merit.svg)](https://coveralls.io/r/tute/merit?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/merit-gem/merit/badge.svg?branch=master)](https://coveralls.io/github/merit-gem/merit?branch=master)
 [![Code Climate](https://codeclimate.com/github/tute/merit/badges/gpa.svg)](https://codeclimate.com/github/tute/merit)
 
 # Table of Contents

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

@@ -9,7 +9,7 @@ class CreateMeritActions < ActiveRecord::Migration
       t.integer :target_id
       t.text    :target_data
       t.boolean :processed, default: false
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end

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

@@ -1,7 +1,7 @@
 class CreateSashes < ActiveRecord::Migration
   def change
     create_table :sashes do |t|
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end

data/lib/merit/controller_extensions.rb

@@ -4,18 +4,19 @@ module Merit
   # 'controller_path#action_name'
   module ControllerExtensions
     def self.included(base)
-      base.after_filter do |controller|
-        if rules_defined?
-          log_merit_action
-          Merit::Action.check_unprocessed if Merit.checks_on_each_request
-        end
-      end
+      base.after_action :log_and_process
     end
 
     private
 
-    def log_merit_action
-      Merit::Action.create(merit_action_hash)
+    def log_and_process
+      if rules_defined?
+        Merit::Action.create(merit_action_hash)
+
+        if Merit.checks_on_each_request
+          Merit::Action.check_unprocessed
+        end
+      end
     end
 
     def merit_action_hash

data/merit.gemspec

@@ -6,14 +6,14 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split("\n").reject{|f| f =~ /^\./ }
   s.test_files  = `git ls-files -- test/*`.split("\n")
   s.license     = 'MIT'
-  s.version     = '2.4.0'
+  s.version     = '3.0.0'
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
 
-  s.required_ruby_version = '>= 1.9.2'
+  s.required_ruby_version = '>= 2.2.2'
 
-  s.add_dependency 'ambry',  '~> 1.0.0'
-  s.add_development_dependency 'rails', '>= 3.2.0'
+  s.add_dependency 'ambry', '~> 1.0.0'
+  s.add_development_dependency 'rails', '>= 5.0.0'
   s.add_development_dependency 'capybara'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'rubocop'

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

@@ -32,5 +32,5 @@ Dummy::Application.configure do
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
 
-  config.eager_load = ENV['RAILS_VERSION'] == '4.0' || ENV['RAILS_VERSION'] == '4.0-protected-attributes'
+  config.eager_load = false
 end

data/test/dummy/db/migrate/20110421191249_create_users.rb

@@ -1,8 +1,8 @@
-class CreateUsers < ActiveRecord::Migration
+class CreateUsers < ActiveRecord::Migration[5.0]
   def self.up
     create_table :users do |t|
       t.string :name
-      t.timestamps
+      t.timestamps null: false
     end
   end
 

data/test/dummy/db/migrate/20110421191250_create_comments.rb

@@ -1,4 +1,4 @@
-class CreateComments < ActiveRecord::Migration
+class CreateComments < ActiveRecord::Migration[5.0]
   def self.up
     create_table :comments do |t|
       t.string  :name
@@ -6,7 +6,7 @@ class CreateComments < ActiveRecord::Migration
       t.integer :user_id
       t.integer :votes, :default => 0
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
 

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

@@ -1,4 +1,4 @@
-class AddFieldsToUsers < ActiveRecord::Migration
+class AddFieldsToUsers < ActiveRecord::Migration[5.0]
   def self.up
     add_column :users, :sash_id, :integer
     add_column :users, :level, :integer, :default => 0

data/test/dummy/db/migrate/20130321082817_add_fields_to_comments.rb

@@ -1,4 +1,4 @@
-class AddFieldsToComments < ActiveRecord::Migration
+class AddFieldsToComments < ActiveRecord::Migration[5.0]
   def self.up
     add_column :comments, :sash_id, :integer
     add_column :comments, :level, :integer, :default => 0

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

@@ -1,4 +1,4 @@
-class CreateMeritActions < ActiveRecord::Migration
+class CreateMeritActions < ActiveRecord::Migration[5.0]
   def self.up
     create_table :merit_actions do |t|
       t.integer :user_id # source
@@ -8,7 +8,7 @@ class CreateMeritActions < ActiveRecord::Migration
       t.string  :target_model
       t.integer :target_id
       t.boolean :processed, :default => false
-      t.timestamps
+      t.timestamps null: false
     end
   end
 

data/test/dummy/db/migrate/20130329224407_create_merit_activity_logs.rb

@@ -1,4 +1,4 @@
-class CreateMeritActivityLogs < ActiveRecord::Migration
+class CreateMeritActivityLogs < ActiveRecord::Migration[5.0]
   def self.up
     create_table :merit_activity_logs do |t|
       t.integer  :action_id

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

@@ -1,7 +1,7 @@
-class CreateSashes < ActiveRecord::Migration
+class CreateSashes < ActiveRecord::Migration[5.0]
   def self.up
     create_table :sashes do |t|
-      t.timestamps
+      t.timestamps null: false
     end
   end
 

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

@@ -1,4 +1,4 @@
-class CreateBadgesSashes < ActiveRecord::Migration
+class CreateBadgesSashes < ActiveRecord::Migration[5.0]
   def self.up
     create_table :badges_sashes do |t|
       t.integer :badge_id, :sash_id

data/test/dummy/db/migrate/20130329224410_create_scores_and_points.rb

@@ -1,4 +1,4 @@
-class CreateScoresAndPoints < ActiveRecord::Migration
+class CreateScoresAndPoints < ActiveRecord::Migration[5.0]
   def self.up
     create_table :merit_scores do |t|
       t.references :sash

data/test/dummy/db/migrate/20140211144001_create_addresses.rb

@@ -1,4 +1,4 @@
-class CreateAddresses < ActiveRecord::Migration
+class CreateAddresses < ActiveRecord::Migration[5.0]
   def up
     create_table :addresses do |t|
       t.references :user

data/test/dummy/db/migrate/20140819133931_add_target_data_to_merit_actions.rb

@@ -1,4 +1,4 @@
-class AddTargetDataToMeritActions < ActiveRecord::Migration
+class AddTargetDataToMeritActions < ActiveRecord::Migration[5.0]
   def change
     add_column :merit_actions, :target_data, :text
   end

data/test/dummy/db/migrate/20140906225844_create_players.rb

@@ -1,4 +1,4 @@
-class CreatePlayers < ActiveRecord::Migration
+class CreatePlayers < ActiveRecord::Migration[5.0]
   def change
     create_table :players do |t|
       t.integer :sash_id

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Tute Costa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-22 00:00:00.000000000 Z
+date: 2017-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -273,7 +273,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -281,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Reputation engine for Rails apps