Merge c01c838 into f8f5fae

.gitignore

@@ -6,3 +6,6 @@
 spec/database.yml
 ./tags
 tags
+lor
+coverage
+gemfiles/*.lock

.rubocop.yml

@@ -0,0 +1,19 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  TargetRubyVersion: 2.7
+  Exclude:
+    - 'lib/generators/acts_as_messageable/migration/templates/*'
+    - 'vendor/**/*'
+    - 'gemfiles/vendor/**/*'
+  NewCops: enable
+
+Layout/LineLength:
+  Max: 120
+
+Metrics/BlockLength:
+  ExcludedMethods: ['describe', 'context']
+
+Naming/FileName:
+  Exclude:
+    - 'lib/acts-as-messageable.rb'

.rubocop_todo.yml

@@ -0,0 +1,32 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2020-04-19 08:04:49 +0200 using RuboCop version 0.82.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 2
+# Configuration parameters: IgnoredMethods.
+Metrics/AbcSize:
+  Max: 44
+
+# Offense count: 1
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/MethodLength:
+  Max: 28
+
+# Offense count: 12
+Style/Documentation:
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'lib/acts_as_messageable.rb'
+    - 'lib/acts_as_messageable/message.rb'
+    - 'lib/acts_as_messageable/model.rb'
+    - 'lib/acts_as_messageable/rails3.rb'
+    - 'lib/acts_as_messageable/rails4.rb'
+    - 'lib/acts_as_messageable/railtie.rb'
+    - 'lib/acts_as_messageable/relation.rb'
+    - 'lib/acts_as_messageable/scopes.rb'
+    - 'lib/generators/acts_as_messageable/migration/migration_generator.rb'

.travis.yml

@@ -18,6 +18,11 @@ matrix:
       gemfile: gemfiles/rails_master.gemfile
     - rvm: ruby-head
       gemfile: gemfiles/rails_master.gemfile
+    - rvm: 2.7
+      stage: "Static analysis"
+      gemfile: gemfiles/rails_6.0.gemfile
+      name: "Rubocop"
+      script: rake rubocop
 before_install:
   - gem update --system
   - gem install bundler

Appraisals

@@ -1,18 +1,20 @@
-appraise "rails-3.2" do
-  gem "activerecord", "~> 3.2.22"
-  gem "activesupport", "~> 3.2.22"
-  gem "railties", "~> 3.2.22"
+# frozen_string_literal: true
+
+appraise 'rails-3.2' do
+  gem 'activerecord', '~> 3.2.22'
+  gem 'activesupport', '~> 3.2.22'
+  gem 'railties', '~> 3.2.22'
 
   group :development do
     gem 'sqlite3', '~> 1.3.6'
   end
 end
 
-appraise "rails-4.2.11" do
-  gem "activerecord", "~> 4.2.11"
-  gem "activesupport", "~> 4.2.11"
-  gem "railties", "~> 4.2.11"
-  gem "rdoc", "6.2.0"
+appraise 'rails-4.2.11' do
+  gem 'activerecord', '~> 4.2.11'
+  gem 'activesupport', '~> 4.2.11'
+  gem 'railties', '~> 4.2.11'
+  gem 'rdoc', '6.2.0'
 
   group :development do
     gem 'sqlite3', '~> 1.3.6'
@@ -40,11 +42,9 @@ appraise 'rails-6.0' do
 end
 
 appraise 'rails-master' do
-  git 'https://github.com/rails/rails.git', branch: :master do
-    gem 'activerecord'
-    gem 'activesupport'
-    gem 'railties'
-  end
+  gem 'activerecord', git: 'https://github.com/rails/rails.git'
+  gem 'activesupport', git: 'https://github.com/rails/rails.git'
+  gem 'railties', git: 'https://github.com/rails/rails.git'
 
   group :development do
     gem 'sqlite3'

Gemfile

@@ -1,11 +1,17 @@
+# frozen_string_literal: true
+
 source 'http://rubygems.org'
 
-gem "ancestry"
+gem 'activerecord'
+gem 'activesupport'
+gem 'ancestry'
+gem 'railties'
 
 group :development do
-  gem "appraisal"
-  gem "coveralls", require: false
-  gem "jeweler"
-  gem "rspec"
-  gem "sqlite3"
+  gem 'appraisal'
+  gem 'coveralls', require: false
+  gem 'jeweler'
+  gem 'rspec'
+  gem 'rubocop', require: false
+  gem 'sqlite3'
 end

Gemfile.lock

@@ -1,6 +1,19 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    actionpack (6.0.2.2)
+      actionview (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (6.0.2.2)
+      activesupport (= 6.0.2.2)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
     activemodel (6.0.2.2)
       activesupport (= 6.0.2.2)
     activerecord (6.0.2.2)
@@ -19,6 +32,7 @@ GEM
       bundler
       rake
       thor (>= 0.14.0)
+    ast (2.4.0)
     builder (3.2.4)
     concurrent-ruby (1.1.6)
     coveralls (0.8.23)
@@ -27,10 +41,12 @@ GEM
       term-ansicolor (~> 1.3)
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
+    crass (1.0.6)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
     docile (1.3.2)
+    erubi (1.9.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     git (1.6.0)
@@ -46,6 +62,7 @@ GEM
     highline (2.0.3)
     i18n (1.8.2)
       concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.4)
     jeweler (2.3.9)
       builder
       bundler
@@ -59,6 +76,10 @@ GEM
       semver2
     json (2.3.0)
     jwt (2.2.1)
+    loofah (2.5.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    method_source (1.0.0)
     mime-types (2.99.3)
     mini_portile2 (2.4.0)
     minitest (5.14.0)
@@ -73,11 +94,29 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
+    parallel (1.19.1)
+    parser (2.7.1.1)
+      ast (~> 2.4.0)
     psych (3.1.0)
     rack (2.2.2)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.2.2)
+      actionpack (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
+    rainbow (3.0.0)
     rake (13.0.1)
     rchardet (1.8.0)
     rdoc (6.2.1)
+    rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -91,6 +130,15 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
+    rubocop (0.82.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      rexml
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    ruby-progressbar (1.10.1)
     semver2 (3.4.2)
     simplecov (0.16.1)
       docile (~> 1.1)
@@ -107,18 +155,23 @@ GEM
       sync
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
+    unicode-display_width (1.7.0)
     zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord
+  activesupport
   ancestry
   appraisal
   coveralls
   jeweler
+  railties
   rspec
+  rubocop
   sqlite3
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'bundler'
 begin
@@ -8,6 +10,7 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 require 'rake'
+require 'rubocop/rake_task'
 
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
@@ -19,6 +22,7 @@ Jeweler::Tasks.new do |gem|
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new
+RuboCop::RakeTask.new
 
 require 'rspec/core'
 require 'rspec/core/rake_task'