paper_trail 5.1.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83f408e34bbaf733c5fdab5ad37fc8c3718ab7ad
-  data.tar.gz: b1e73feb664e29d18946f3c526b1bb6b1ccec024
+  metadata.gz: e471a732adc2f061cb578d20237b672b93297b8a
+  data.tar.gz: 5e05efb3575d7f29cd256a68de86e381e0b6f12c
 SHA512:
-  metadata.gz: b61edd25675bb0ea5254640920f04ff23aab1fc9dc729bc2bb27c5f4bd6774fb6e86df50d213d173a2892e7b2ef2e15240745e541d9f4fb0238c4b07574f6e56
-  data.tar.gz: 8b701f3921a8945fd3e7e55dbda82c7b716711e457f72caf7054dd502fd77a927ef5c5ebcf7d634f9c8465ba0bc8c44cc057220bea24cbaac1f5dbad7f2c9a96
+  metadata.gz: 8fa9c2ed5b166efa37dff6b479816ebd9d2c00aed2a4ec2c857626d42ad5be6525bd6d88b80367e0829bcb17f80ed470ff41dc3d7cfeabadc08b0cc8676753ca
+  data.tar.gz: 6e56713f695d7eef4dd8b86da138c37f6ab8767d8188e88f4679b8c5efddc0fdbe2caf4e1f2ca9398104d360dc9f08b29c4e7cd3880e58f1aac99bc2e226e2c9

data/CHANGELOG.md

@@ -12,6 +12,23 @@
 
 - None
 
+## 5.1.1 (2016-05-31)
+
+### Breaking Changes
+
+- None
+
+### Added
+
+- None
+
+### Fixed
+
+- [#813](https://github.com/airblade/paper_trail/pull/813) -
+  Warning for paper_trail_on_destroy(:after) for pre-releases of AR 5
+- [#651](https://github.com/airblade/paper_trail/issues/651) -
+  Bug with installing PT on MySQL <= 5.6
+
 ## 5.1.0 (2016-05-20)
 
 ### Breaking Changes

data/lib/generators/paper_trail/templates/create_versions.rb

@@ -17,7 +17,7 @@ class CreateVersions < ActiveRecord::Migration
 
   def change
     create_table :versions, versions_table_options do |t|
-      t.string   :item_type, null: false
+      t.string   :item_type, item_type_options
       t.integer  :item_id,   null: false
       t.string   :event,     null: false
       t.string   :whodunnit
@@ -43,6 +43,18 @@ class CreateVersions < ActiveRecord::Migration
 
   private
 
+  # MySQL 5.6 utf8mb4 limit is 191 chars for keys used in indexes.
+  # See https://github.com/airblade/paper_trail/issues/651
+  def item_type_options
+    opt = { null: false }
+    opt[:limit] = 191 if mysql?
+    opt
+  end
+
+  def mysql?
+    MYSQL_ADAPTERS.include?(connection.class.name)
+  end
+
   # Even modern versions of MySQL still use `latin1` as the default character
   # encoding. Many users are not aware of this, and run into trouble when they
   # try to use PaperTrail in apps that otherwise tend to use UTF-8. Postgres, by
@@ -59,7 +71,7 @@ class CreateVersions < ActiveRecord::Migration
   # - https://dev.mysql.com/doc/refman/5.5/en/charset-unicode-utf8mb4.html
   #
   def versions_table_options
-    if MYSQL_ADAPTERS.include?(connection.class.name)
+    if mysql?
       { options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci" }
     else
       {}

data/lib/paper_trail/has_paper_trail.rb

@@ -179,8 +179,8 @@ module PaperTrail
           raise ArgumentError, 'recording order can only be "after" or "before"'
         end
 
-        if recording_order == "after" &&
-            Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new("5")
+        if recording_order.to_s == "after" &&
+            Gem::Version.new(ActiveRecord::VERSION::STRING).release >= Gem::Version.new("5")
           if ::ActiveRecord::Base.belongs_to_required_by_default
             ::ActiveSupport::Deprecation.warn(
               "paper_trail_on_destroy(:after) is incompatible with ActiveRecord " +

data/lib/paper_trail/version_number.rb

@@ -3,7 +3,7 @@ module PaperTrail
   module VERSION
     MAJOR = 5
     MINOR = 1
-    TINY = 0
+    TINY = 1
     PRE = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".").freeze

data/test/dummy/db/migrate/20110208155312_set_up_test_tables.rb

@@ -38,7 +38,7 @@ class SetUpTestTables < ActiveRecord::Migration
     end
 
     create_table :versions, versions_table_options do |t|
-      t.string   :item_type, null: false
+      t.string   :item_type, item_type_options
       t.integer  :item_id,   null: false
       t.string   :event,     null: false
       t.string   :whodunnit
@@ -323,11 +323,21 @@ class SetUpTestTables < ActiveRecord::Migration
 
   private
 
+  def item_type_options
+    opt = { null: false }
+    opt[:limit] = 191 if mysql?
+    opt
+  end
+
+  def mysql?
+    MYSQL_ADAPTERS.include?(connection.class.name)
+  end
+
   def versions_table_options
-    opts = { force: true }
-    if MYSQL_ADAPTERS.include?(connection.class.name)
-      opts[:options] = "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci"
+    if mysql?
+      { options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci" }
+    else
+      {}
     end
-    opts
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paper_trail
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.1.1
 platform: ruby
 authors:
 - Andy Stewart
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-20 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord