Merge pull request #1000 from airblade/various_2017-10-17

Various: 2017-10-17

.rubocop_todo.yml

@@ -23,18 +23,11 @@ RSpec/ExpectInHook:
     - spec/paper_trail/associations_spec.rb
     - spec/models/version_spec.rb
 
-RSpec/FilePath:
-  Enabled: false
-
 RSpec/InstanceVariable:
   Exclude:
     - spec/paper_trail/associations_spec.rb
     - spec/paper_trail/model_spec.rb
 
-RSpec/MessageSpies:
-  Exclude:
-    - spec/models/version_spec.rb
-
 RSpec/NamedSubject:
   Enabled: false
 

Appraisals

@@ -8,7 +8,7 @@
 # > https://github.com/thoughtbot/appraisal
 
 appraise "ar-4.2" do
-  gem "activerecord", "~> 4.2.9"
+  gem "activerecord", "~> 4.2.10"
 end
 
 appraise "ar-5.0" do

README.md

@@ -1100,9 +1100,9 @@ Generates (but does not run) a migration to add a versions table.  Also generate
 
 As of version 6, PT no longer supports rails 3 or the [protected_attributes][17]
 gem. If you are still using them, you may use PT 5 or lower. We recommend
-upgrading to [strong_parameters][18] as soon as possible.  
+upgrading to [strong_parameters][18] as soon as possible.
 
-If you must use [protected_attributes][17] for now, and want to use PT > 5, you 
+If you must use [protected_attributes][17] for now, and want to use PT > 5, you
 can reopen `PaperTrail::Version` and add the following `attr_accessible` fields:
 
 ```ruby
@@ -1535,6 +1535,7 @@ require 'paper_trail/frameworks/rspec'
 
 - [ActiveAdmin][42]
 - Sinatra - [paper_trail-sinatra][41]
+- [globalize][45] - [globalize-versioning][44]
 
 ## Articles
 
@@ -1613,3 +1614,5 @@ Released under the MIT licence.
 [41]: https://github.com/jaredbeck/paper_trail-sinatra
 [42]: https://github.com/activeadmin/activeadmin/wiki/Auditing-via-paper_trail-%28change-history%29
 [43]: https://github.com/airblade/paper_trail/blob/master/.github/CONTRIBUTING.md
+[44]: https://github.com/globalize/globalize-versioning
+[45]: https://github.com/globalize/globalize

gemfiles/ar_4.2.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 4.2.9"
+gem "activerecord", "~> 4.2.10"
 
 gemspec path: "../"

paper_trail.gemspec

@@ -17,7 +17,7 @@ has been destroyed.
   s.license = "MIT"
 
   s.files = `git ls-files -z`.split("\x0").select { |f|
-    f.match(%r{^(Gemfile|MIT-LICENSE|lib|paper_trail.gemspec)/})
+    f.match(%r{^(Gemfile|LICENSE|lib|paper_trail.gemspec)/})
   }
   s.executables = []
   s.require_paths = ["lib"]
@@ -29,22 +29,19 @@ has been destroyed.
   s.add_dependency "activerecord", [">= 4.2", "< 5.2"]
   s.add_dependency "request_store", "~> 1.1"
 
-  s.add_development_dependency "appraisal", "~> 2.1"
-  s.add_development_dependency "rake", "~> 12.0"
-  s.add_development_dependency "ffaker", "~> 2.5"
-
-  # Why `railties`? Possibly used by `spec/dummy_app` boot up?
-  s.add_development_dependency "railties", [">= 4.2", "< 5.2"]
-
+  s.add_development_dependency "appraisal", "~> 2.2"
+  s.add_development_dependency "database_cleaner", "~> 1.6"
+  s.add_development_dependency "ffaker", "~> 2.7"
+  s.add_development_dependency "generator_spec", "~> 0.9.4"
+  s.add_development_dependency "mysql2", "~> 0.4.9"
+  s.add_development_dependency "pg", "~> 0.21.0"
+  s.add_development_dependency "pry-byebug", "~> 3.5"
   s.add_development_dependency "rack-test", "~> 0.6.3"
-  s.add_development_dependency "rspec-rails", "~> 3.5"
-  s.add_development_dependency "generator_spec", "~> 0.9.3"
-  s.add_development_dependency "database_cleaner", "~> 1.2"
-  s.add_development_dependency "pry-byebug", "~> 3.4"
+  s.add_development_dependency "rake", "~> 12.1"
+  # rspec-rails 3.7.0 has a bug: https://github.com/rspec/rspec-rails/issues/1882
+  s.add_development_dependency "rspec-rails", "~> 3.6.1"
   s.add_development_dependency "rubocop", "0.50.0"
   s.add_development_dependency "rubocop-rspec", "~> 1.18.0"
-  s.add_development_dependency "timecop", "~> 0.8.0"
-  s.add_development_dependency "sqlite3", "~> 1.2"
-  s.add_development_dependency "pg", "~> 0.21.0"
-  s.add_development_dependency "mysql2", "~> 0.4.2"
+  s.add_development_dependency "sqlite3", "~> 1.3"
+  s.add_development_dependency "timecop", "~> 0.9.1"
 end

spec/dummy_app/db/schema.rb

@@ -91,7 +91,7 @@ ActiveRecord::Schema.define(version: 20110208155312) do
     t.string "name"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.index ["uuid"], name: "sqlite_autoindex_custom_primary_key_records_1", unique: true
+    t.index ["uuid"], unique: true
   end
 
   create_table "customers", force: :cascade do |t|

spec/generators/paper_trail/install_generator_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 require "generator_spec/test_case"
-require File.expand_path("../../../lib/generators/paper_trail/install_generator", __FILE__)
+require File.expand_path("../../../../lib/generators/paper_trail/install_generator", __FILE__)
 
 RSpec.describe PaperTrail::InstallGenerator, type: :generator do
   include GeneratorSpec::TestCase

spec/modules/paper_trail_spec.rb

@@ -1,27 +0,0 @@
-require "spec_helper"
-
-RSpec.describe PaperTrail, type: :module, versioning: true do
-  describe "#config" do
-    it { is_expected.to respond_to(:config) }
-
-    it "allows for config values to be set" do
-      expect(subject.config.enabled).to eq(true)
-      subject.config.enabled = false
-      expect(subject.config.enabled).to eq(false)
-    end
-
-    it "accepts blocks and yield the config instance" do
-      expect(subject.config.enabled).to eq(true)
-      subject.config { |c| c.enabled = false }
-      expect(subject.config.enabled).to eq(false)
-    end
-  end
-
-  describe "#configure" do
-    it { is_expected.to respond_to(:configure) }
-
-    it "is an alias for the `config` method" do
-      expect(subject.method(:configure)).to eq(subject.method(:config))
-    end
-  end
-end

spec/paper_trail_spec.rb

@@ -1,6 +1,30 @@
 require "spec_helper"
 
 RSpec.describe PaperTrail do
+  describe "#config", versioning: true do
+    it { is_expected.to respond_to(:config) }
+
+    it "allows for config values to be set" do
+      expect(subject.config.enabled).to eq(true)
+      subject.config.enabled = false
+      expect(subject.config.enabled).to eq(false)
+    end
+
+    it "accepts blocks and yield the config instance" do
+      expect(subject.config.enabled).to eq(true)
+      subject.config { |c| c.enabled = false }
+      expect(subject.config.enabled).to eq(false)
+    end
+  end
+
+  describe "#configure" do
+    it { is_expected.to respond_to(:configure) }
+
+    it "is an alias for the `config` method" do
+      expect(subject.method(:configure)).to eq(subject.method(:config))
+    end
+  end
+
   describe ".gem_version" do
     it "returns a Gem::Version" do
       v = described_class.gem_version