paper_trail 8.1.0 → 8.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35be7a120b219b65fcc01eaad84678dcb9f3400bf91202e08965d32b08ca0f4c
-  data.tar.gz: 07924178fab1058f7ee256722ae2370dc2f424cb2821af79dd45f58449f08ce4
+  metadata.gz: 389976a20a0d3d80ff31006b9ad5f58e8c66b2678d96eb6bdf25d461d28dc182
+  data.tar.gz: 0d7a51d9715a65cd7a0f509d9db888a8b6b01514c9f6a56bd13940fced350361
 SHA512:
-  metadata.gz: e7cf8bf09991e914d93ff7a0983d9143c479fddeb57cf7a0eb9e0833aa8c6a7162576b287823aedaf9cef3376bf7a337c0780fc24e02b66562f02c38ef8b12e3
-  data.tar.gz: 0cfa94e51ea6609874cf8fd86caee523fe3231da5ef067c03d6f01fb9c848d44a5e46ca02a2cb759a6cc02e7b75749270eac3eb63221dfa9aa5efbdd893bff9a
+  metadata.gz: 26239968c3d59c0a745d66990d053f2ca9a03bce8dfd31bbd4d811abcb05e58cad0fa1cf7d4ac7882325861e07edacb295b24c34ae29f7b880d23bff9ba718bc
+  data.tar.gz: d6c8b8104f81dfd31ecb64cc4ec936fb22d3b079ac686628f36e3c770c6f768d1953a47c195f11587ffd9e2afc840616364bf89f5893ea93e6dbd1cdf6064697

data/lib/paper_trail.rb

@@ -22,7 +22,7 @@ module PaperTrail
   EOS
   E_TIMESTAMP_FIELD_CONFIG = <<-EOS.squish.freeze
     PaperTrail.timestamp_field= has been removed, without replacement. It is no
-    longer configurable. The timestamp field in the versions table must now be
+    longer configurable. The timestamp column in the versions table must now be
     named created_at.
   EOS
 

data/lib/paper_trail/attribute_serializers/attribute_serializer_factory.rb

@@ -0,0 +1,25 @@
+require "paper_trail/type_serializers/postgres_array_serializer"
+
+module PaperTrail
+  module AttributeSerializers
+    # Values returned by some Active Record serializers are
+    # not suited for writing JSON to a text column. This factory
+    # replaces certain default Active Record serializers
+    # with custom PaperTrail ones.
+    module AttributeSerializerFactory
+      AR_PG_ARRAY_CLASS = "ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Array".freeze
+
+      def self.for(klass, attr)
+        active_record_serializer = klass.type_for_attribute(attr)
+        if active_record_serializer.class.name == AR_PG_ARRAY_CLASS
+          TypeSerializers::PostgresArraySerializer.new(
+            active_record_serializer.subtype,
+            active_record_serializer.delimiter
+          )
+        else
+          active_record_serializer
+        end
+      end
+    end
+  end
+end

data/lib/paper_trail/attribute_serializers/cast_attribute_serializer.rb

@@ -1,3 +1,5 @@
+require "paper_trail/attribute_serializers/attribute_serializer_factory"
+
 module PaperTrail
   # :nodoc:
   module AttributeSerializers
@@ -32,7 +34,7 @@ module PaperTrail
       # This implementation uses AR 5's `serialize` and `deserialize`.
       class CastAttributeSerializer
         def serialize(attr, val)
-          @klass.type_for_attribute(attr).serialize(val)
+          AttributeSerializerFactory.for(@klass, attr).serialize(val)
         end
 
         def deserialize(attr, val)
@@ -40,7 +42,7 @@ module PaperTrail
             # Because PT 4 used to save the string version of enums to `object_changes`
             val
           else
-            @klass.type_for_attribute(attr).deserialize(val)
+            AttributeSerializerFactory.for(@klass, attr).deserialize(val)
           end
         end
       end

data/lib/paper_trail/frameworks/rails/controller.rb

@@ -66,14 +66,17 @@ module PaperTrail
 
       # Tells PaperTrail who is responsible for any changes that occur.
       def set_paper_trail_whodunnit
-        @set_paper_trail_whodunnit_called = true
-        ::PaperTrail.whodunnit = user_for_paper_trail if ::PaperTrail.enabled_for_controller?
+        if ::PaperTrail.enabled_for_controller?
+          ::PaperTrail.whodunnit = user_for_paper_trail
+        end
       end
 
       # Tells PaperTrail any information from the controller you want to store
       # alongside any changes that occur.
       def set_paper_trail_controller_info
-        ::PaperTrail.controller_info = info_for_paper_trail if ::PaperTrail.enabled_for_controller?
+        if ::PaperTrail.enabled_for_controller?
+          ::PaperTrail.controller_info = info_for_paper_trail
+        end
       end
 
       # We have removed this warning. We no longer add it as a callback.

data/lib/paper_trail/type_serializers/postgres_array_serializer.rb

@@ -0,0 +1,47 @@
+module PaperTrail
+  module TypeSerializers
+    # Provides an alternative method of serialization
+    # and deserialization of PostgreSQL array columns.
+    class PostgresArraySerializer
+      def initialize(subtype, delimiter)
+        @subtype = subtype
+        @delimiter = delimiter
+      end
+
+      def serialize(array)
+        return serialize_with_ar(array) if active_record_pre_502?
+        array
+      end
+
+      def deserialize(array)
+        return deserialize_with_ar(array) if active_record_pre_502?
+
+        case array
+        # Needed for legacy reasons. If serialized array is a string
+        # then it was serialized with Rails < 5.0.2.
+        when ::String then deserialize_with_ar(array)
+        else array
+        end
+      end
+
+      private
+
+      def active_record_pre_502?
+        ::ActiveRecord::VERSION::MAJOR < 5 ||
+          (::ActiveRecord::VERSION::MINOR.zero? && ::ActiveRecord::VERSION::TINY < 2)
+      end
+
+      def serialize_with_ar(array)
+        ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Array.
+          new(@subtype, @delimiter).
+          serialize(array)
+      end
+
+      def deserialize_with_ar(array)
+        ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Array.
+          new(@subtype, @delimiter).
+          deserialize(array)
+      end
+    end
+  end
+end

data/lib/paper_trail/version_number.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paper_trail
 version: !ruby/object:Gem::Version
-  version: 8.1.0
+  version: 8.1.1
 platform: ruby
 authors:
 - Andy Stewart
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-01 00:00:00.000000000 Z
+date: 2017-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -265,6 +265,7 @@ files:
 - lib/generators/paper_trail/templates/create_versions.rb.erb
 - lib/paper_trail.rb
 - lib/paper_trail/attribute_serializers/README.md
+- lib/paper_trail/attribute_serializers/attribute_serializer_factory.rb
 - lib/paper_trail/attribute_serializers/cast_attribute_serializer.rb
 - lib/paper_trail/attribute_serializers/object_attribute.rb
 - lib/paper_trail/attribute_serializers/object_changes_attribute.rb
@@ -293,6 +294,7 @@ files:
 - lib/paper_trail/reifiers/has_one.rb
 - lib/paper_trail/serializers/json.rb
 - lib/paper_trail/serializers/yaml.rb
+- lib/paper_trail/type_serializers/postgres_array_serializer.rb
 - lib/paper_trail/version_association_concern.rb
 - lib/paper_trail/version_concern.rb
 - lib/paper_trail/version_number.rb