draftsman 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd9e61138b818bff3ff18a8f3039e2e890cd6f90
-  data.tar.gz: c84a08a47b0e0d19995a4c00c6a3a5de0ae48d61
+  metadata.gz: f18e08326633f6b3b20b26217a23d1d81042d158
+  data.tar.gz: 4d0ab78461094ab35bc1d4b77322a88237eed9a1
 SHA512:
-  metadata.gz: 200f68df8dbc6ab78eef9fad8dbfbdfcf33f5a57be1c4f5d3fdc8f8cb199254b20800f7170f37a99bb2d05aca071bd21704fafd8a78e42e653938fff7fd689d9
-  data.tar.gz: 613df4b0ad438fa2fb73fe3930d8201df1941e68640df7e42fb17c3f616b1a739519f16879bcf9b648aa3c3f92425cff1daf8404f96d44ea2edfe553ef7c7445
+  metadata.gz: c8a87e165dcaf68c72f65a97471c418e4bde43de5c07da002ab47b13ec9067e52744bf25b6909ba74199765d61a8619b779692e8f88ece0a910af182cae2bcd9
+  data.tar.gz: d28d6bf39bc7c4e7ef5ea2891445529687eddb54142dc79bc9c5f676273923c3b85f8865c9429698e62b6d23f540bdc1d429567c7365b381adaa269203eea43f

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## 0.5.0 - August 20, 2016
+
+- [@npezza93](https://github.com/npezza93)
+  [Implemented](https://github.com/liveeditor/draftsman/pull/45)
+  [#44](https://github.com/liveeditor/draftsman/issues/44)
+  Rails 5 compatibility
+
 ## 0.4.0 - April 5, 2016
 
 - [@npafundi](https://github.com/npafundi)

data/README.md

@@ -1,4 +1,4 @@
-# Draftsman v0.4.0 (alpha)
+# Draftsman v0.5.0 (beta)
 
 Draftsman is a Ruby gem that lets you create draft versions of your database records. If you're developing a system in
 need of simple drafts or a publishing approval queue, then Draftsman just might be what you need.
@@ -41,18 +41,18 @@ source: it's a nice clean example of a gem that hooks into Rails and Sinatra.
 
 ## Compatibility
 
-Compatible with ActiveRecord 3 and 4.
+Compatible with ActiveRecord 3, 4, and 5.
 
 Works well with Rails, Sinatra, or any other application that depends on ActiveRecord.
 
 ## Installation
 
-### Rails 3 & 4
+### Rails 3, 4, and 5
 
 Add Draftsman to your `Gemfile`.
 
 ```ruby
-gem 'draftsman', '~> 0.4.0'
+gem 'draftsman', '~> 0.5.0'
 ```
 
 Or if you want to grab the latest from `master`:
@@ -323,8 +323,8 @@ this. It also presents all data in its drafted form, if a draft exists.
 
 ```ruby
 class Admin::WidgetsController < Admin::BaseController
-  before_filter :find_widget,  :only => [:show, :edit, :update, :destroy]
-  before_filter :reify_widget, :only => [:show, :edit]
+  before_action :find_widget,  :only => [:show, :edit, :update, :destroy]
+  before_action :reify_widget, :only => [:show, :edit]
 
   def index
     # The `live` scope gives us widgets that aren't in the trash.
@@ -423,7 +423,7 @@ other workflow action that you would like for your application to provide for dr
 
 ```ruby
 class Admin::DraftsController < Admin::BaseController
-  before_filter :find_draft, :only => [:show, :update, :destroy]
+  before_action :find_draft, :only => [:show, :update, :destroy]
 
   def index
     @drafts = Draftsman::Draft.includes(:item).order('updated_at DESC')

data/draftsman.gemspec

@@ -16,12 +16,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_dependency 'activerecord', ['>= 3.0', '< 5.0']
+  s.add_dependency 'activerecord', ['>= 3.0', '< 5.1']
 
-  s.add_development_dependency 'rake', '~> 10.5'
-  s.add_development_dependency 'railties', ['>= 3.0', '< 5.0']
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'railties', ['>= 3.0', '< 5.1']
   s.add_development_dependency 'sinatra', '~> 1.0'
-  s.add_development_dependency 'rspec-rails', '3.2.1'
+  s.add_development_dependency 'rspec-rails', '~> 3.5'
 
   # JRuby support for the test ENV
   if defined?(JRUBY_VERSION)

data/lib/draftsman.rb

@@ -7,6 +7,29 @@ Dir[File.join(File.dirname(__FILE__), 'draftsman', 'serializers', '*.rb')].each
 
 # Draftsman's module methods can be called in both models and controllers.
 module Draftsman
+  # Switches Draftsman on or off.
+  def self.enabled=(value)
+    Draftsman.config.enabled = value
+  end
+
+  # Returns `true` if Draftsman is on, `false` otherwise.
+  # Draftsman is enabled by default.
+  def self.enabled?
+    !!Draftsman.config.enabled
+  end
+
+  # Sets whether Draftsman is enabled or disabled for the current request.
+  def self.enabled_for_controller=(value)
+    draftsman_store[:request_enabled_for_controller] = value
+  end
+
+  # Returns `true` if Draftsman is enabled for the request, `false` otherwise.
+  #
+  # See `Draftsman::Rails::Controller#draftsman_enabled_for_controller`.
+  def self.enabled_for_controller?
+    !!draftsman_store[:request_enabled_for_controller]
+  end
+
   # Returns whether or not ActiveRecord is configured to require mass assignment whitelisting via `attr_accessible`.
   def self.active_record_protected_attributes?
     @active_record_protected_attributes ||= ActiveRecord::VERSION::STRING.to_f < 4.0 || defined?(ProtectedAttributes)

data/lib/draftsman/attributes_serialization.rb

@@ -0,0 +1,89 @@
+module Draftsman
+  module AttributesSerialization
+    class NoOpAttribute
+      def type_cast_for_database(value)
+        value
+      end
+
+      def type_cast_from_database(data)
+        data
+      end
+    end
+    NO_OP_ATTRIBUTE = NoOpAttribute.new
+
+    class SerializedAttribute
+      def initialize(coder)
+        @coder = coder.respond_to?(:dump) ? coder : Draftsman.serializer
+      end
+
+      def type_cast_for_database(value)
+        @coder.dump(value)
+      end
+
+      def type_cast_from_database(data)
+        @coder.load(data)
+      end
+    end
+
+    SERIALIZE, DESERIALIZE =
+      if ::ActiveRecord::VERSION::MAJOR >= 5
+        [:serialize, :deserialize]
+      else
+        [:type_cast_for_database, :type_cast_from_database]
+      end
+
+    if ::ActiveRecord::VERSION::STRING < '4.2'
+      # Backport Rails 4.2 and later's `type_for_attribute` to build
+      # on a common interface.
+      def type_for_attribute(attr_name)
+        serialized_attribute_types[attr_name.to_s] || NO_OP_ATTRIBUTE
+      end
+
+      def serialized_attribute_types
+        @attribute_types ||= Hash[serialized_attributes.map do |attr_name, coder|
+          [attr_name, SerializedAttribute.new(coder)]
+        end]
+      end
+      private :serialized_attribute_types
+    end
+
+    # Used for `Version#object` attribute.
+    def serialize_attributes_for_draftsman(attributes)
+      alter_attributes_for_draftsman(SERIALIZE, attributes)
+    end
+
+    def unserialize_attributes_for_draftsman(attributes)
+      alter_attributes_for_draftsman(DESERIALIZE, attributes)
+    end
+
+    def alter_attributes_for_draftsman(serializer, attributes)
+      # Don't serialize before values before inserting into columns of type
+      # `JSON` on `PostgreSQL` databases.
+      return attributes if self.draft_class.object_col_is_json?
+
+      attributes.each do |key, value|
+        attributes[key] = type_for_attribute(key).send(serializer, value)
+      end
+    end
+
+    # Used for Version#object_changes attribute.
+    def serialize_draft_attribute_changes(changes)
+      alter_draft_attribute_changes(SERIALIZE, changes)
+    end
+
+    def unserialize_draft_attribute_changes(changes)
+      alter_draft_attribute_changes(DESERIALIZE, changes)
+    end
+
+    def alter_draft_attribute_changes(serializer, changes)
+      # Don't serialize before values before inserting into columns of type
+      # `JSON` on `PostgreSQL` databases.
+      return changes if self.draft_class.object_changes_col_is_json?
+
+      changes.clone.each do |key, change|
+        type = type_for_attribute(key)
+        changes[key] = Array(change).map { |value| type.send(serializer, value) }
+      end
+    end
+  end
+end

data/lib/draftsman/config.rb

@@ -7,7 +7,17 @@ module Draftsman
 
     def initialize
       @timestamp_field = :created_at
+      @mutex = Mutex.new
       @serializer      = Draftsman::Serializers::Yaml
     end
+
+    # Indicates whether Draftsman is on or off. Default: true.
+    def enabled
+      @mutex.synchronize { !!@enabled }
+    end
+
+    def enabled=(enable)
+      @mutex.synchronize { @enabled = enable }
+    end
   end
 end

data/lib/draftsman/draft.rb

@@ -46,13 +46,7 @@ class Draftsman::Draft < ActiveRecord::Base
   def changeset
     return nil unless self.class.column_names.include? 'object_changes'
 
-    _changes = self.class.object_changes_col_is_json? ? self.object_changes : Draftsman.serializer.load(self.object_changes)
-
-    @changeset ||= HashWithIndifferentAccess.new(_changes).tap do |changes|
-      item_type.constantize.unserialize_draft_attribute_changes(changes)
-    end
-  rescue
-    {}
+    @changeset ||= load_changeset
   end
 
   # Returns whether or not this is a `create` event.
@@ -303,4 +297,20 @@ private
       block.call
     end
   end
+
+  def load_changeset
+    changes = HashWithIndifferentAccess.new(object_changes_deserialized)
+    item_type.constantize.unserialize_draft_attribute_changes(changes)
+    changes
+  rescue
+    {}
+  end
+
+  def object_changes_deserialized
+    if self.class.object_changes_col_is_json?
+      object_changes
+    else
+      Draftsman.serializer.load(object_changes)
+    end
+  end
 end

data/lib/draftsman/frameworks/rails.rb

@@ -1,9 +1,23 @@
 module Draftsman
   module Rails
     module Controller
-
       def self.included(base)
-        base.before_filter :set_draftsman_whodunnit, :set_draftsman_controller_info
+        before = [
+          :set_draftsman_enabled_for_controller,
+          :set_draftsman_controller_info
+        ]
+        after = [
+          :warn_about_not_setting_whodunnit
+        ]
+        if base.respond_to? :before_action
+          # Rails 4+
+          before.map { |sym| base.before_action sym }
+          after.map  { |sym| base.after_action  sym }
+        else
+          # Rails 3.
+          before.map { |sym| base.before_filter sym }
+          after.map  { |sym| base.after_filter  sym }
+        end
       end
 
     protected
@@ -14,7 +28,10 @@ module Draftsman
       # Override this method in your controller to call a different
       # method, e.g. `current_person`, or anything you like.
       def user_for_draftsman
-        current_user if defined?(current_user)
+        return unless defined?(current_user)
+        ActiveSupport::VERSION::MAJOR >= 4 ? current_user.try!(:id) : current_user.try(:id)
+      rescue NoMethodError
+        current_user
       end
 
       # Returns any information about the controller or request that you
@@ -38,23 +55,54 @@ module Draftsman
         {}
       end
 
+      # Returns `true` (default) or `false` depending on whether Draftsman
+      # should be active for the current request.
+      #
+      # Override this method in your controller to specify when Draftsman
+      # should be off.
+      def draftsman_enabled_for_controller
+        ::Draftsman.enabled?
+      end
+
     private
 
+      # Tells Draftsman whether drafts should be saved in the current request.
+      def set_draftsman_enabled_for_controller
+        ::Draftsman.enabled_for_controller = draftsman_enabled_for_controller
+      end
+
       # Tells Draftsman who is responsible for any changes that occur.
       def set_draftsman_whodunnit
-        ::Draftsman.whodunnit = user_for_draftsman
+        @set_draftsman_whodunnit_called = true
+        ::Draftsman.whodunnit = user_for_draftsman if ::Draftsman.enabled_for_controller?
       end
 
-      # Tells Draftsman any information from the controller you want
-      # to store alongside any changes that occur.
+      # Tells Draftsman any information from the controller you want to store
+      # alongside any changes that occur.
       def set_draftsman_controller_info
         ::Draftsman.controller_info = info_for_draftsman
       end
 
+      def warn_about_not_setting_whodunnit
+        enabled = ::Draftsman.enabled_for_controller?
+        user_present = user_for_draftsman.present?
+        whodunnit_blank = ::Draftsman.whodunnit.blank?
+        if enabled && user_present && whodunnit_blank && !@set_draftsman_whodunnit_called
+          ::Kernel.warn <<-EOS.strip_heredoc
+            user_for_draftsman is present, but whodunnit has not been set.
+            Draftsman no longer adds the set_draftsman_whodunnit callback for
+            you. To continue recording whodunnit, please add this before_action
+            callback to your ApplicationController . For more information,
+            please see https://git.io/vrTsk
+          EOS
+        end
+      end
     end
   end
 
   if defined?(::ActionController)
-    ::ActiveSupport.on_load(:action_controller) { include Draftsman::Rails::Controller }
+    ::ActiveSupport.on_load(:action_controller) do
+      include ::Draftsman::Rails::Controller
+    end
   end
 end

data/lib/draftsman/model.rb

@@ -1,3 +1,5 @@
+require 'draftsman/attributes_serialization'
+
 module Draftsman
   module Model
 
@@ -44,6 +46,7 @@ module Draftsman
         # Lazily include the instance methods so we don't clutter up
         # any more ActiveRecord models than we need to.
         send :include, InstanceMethods
+        send :extend, AttributesSerialization
 
         # Define before/around/after callbacks on each drafted model
         send :extend, ActiveModel::Callbacks
@@ -124,65 +127,11 @@ module Draftsman
         method_defined?(:draftsman_options)
       end
 
-      # Serializes attribute changes for `Draft#object_changes` attribute.
-      def serialize_draft_attribute_changes(changes)
-        # Don't serialize values before inserting into columns of type `JSON` on PostgreSQL databases.
-        return changes if self.draft_class.object_changes_col_is_json?
-
-        serialized_attributes.each do |key, coder|
-          if changes.key?(key)
-            coder = Draftsman::Serializers::Yaml unless coder.respond_to?(:dump) # Fall back to YAML if `coder` has no `dump` method
-            old_value, new_value = changes[key]
-            changes[key] = [coder.dump(old_value), coder.dump(new_value)]
-          end
-        end
-      end
-
-      # Used for `Draft#object` attribute
-      def serialize_attributes_for_draftsman(attributes)
-        # Don't serialize values before inserting into columns of type `JSON` on PostgreSQL databases.
-        return attributes if self.draft_class.object_col_is_json?
-
-        serialized_attributes.each do |key, coder|
-          if attributes.key?(key)
-            coder = Draftsman::Serializers::Yaml unless coder.respond_to?(:dump) # Fall back to YAML if `coder` has no `dump` method
-            attributes[key] = coder.dump(attributes[key])
-          end
-        end
-      end
-
       # Returns whether or not a `trashed_at` timestamp is set up on this model.
       def trashable?
         draftable? && method_defined?(self.trashed_at_attribute_name)
       end
 
-      # Unserializes attribute changes for `Draft#object_changes` attribute.
-      def unserialize_draft_attribute_changes(changes)
-        # Don't serialize values before inserting into columns of type `JSON` on PostgreSQL databases.
-        return changes if self.draft_class.object_changes_col_is_json?
-
-        serialized_attributes.each do |key, coder|
-          if changes.key?(key)
-            coder = Draftsman::Serializers::Yaml unless coder.respond_to?(:dump)
-            old_value, new_value = changes[key]
-            changes[key] = [coder.load(old_value), coder.load(new_value)]
-          end
-        end
-      end
-
-      # Used for `Draft#object` attribute
-      def unserialize_attributes_for_draftsman(attributes)
-        # Don't serialize values before inserting into columns of type `JSON` on PostgreSQL databases.
-        return attributes if self.draft_class.object_col_is_json?
-
-        serialized_attributes.each do |key, coder|
-          if attributes.key?(key)
-            coder = Draftsman::Serializers::Yaml unless coder.respond_to?(:dump)
-            attributes[key] = coder.load(attributes[key])
-          end
-        end
-      end
-
       # Returns whether or not the included ActiveRecord can do `where.not(...)` style queries.
       def where_not?
         ActiveRecord::VERSION::STRING.to_f >= 4.0

data/lib/draftsman/version.rb

@@ -1,3 +1,3 @@
 module Draftsman
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/spec/controllers/informants_controller_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 # Tests controller `info_for_draftsman` method
-describe InformantsController, :type => :controller do
-  let(:trashable) { Trashable.create!(:name => 'Bob') }
+describe InformantsController, type: :controller do
+  let(:trashable) { Trashable.create!(name: 'Bob') }
 
   describe 'create' do
     before { post :create }
@@ -18,7 +18,7 @@ describe InformantsController, :type => :controller do
   end
 
   describe 'update' do
-    before { put :update, :id => trashable.id }
+    before { put :update, id: trashable.id }
     subject { Draftsman::Draft.last }
 
     it 'records `ip` from custom `info_for_draftsman`' do
@@ -31,7 +31,7 @@ describe InformantsController, :type => :controller do
   end
 
   describe 'destroy' do
-    before { delete :destroy, :id => trashable.id }
+    before { delete :destroy, id: trashable.id }
     subject { Draftsman::Draft.last }
 
     it 'records `ip` from custom `info_for_draftsman`' do

data/spec/controllers/users_controller_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe UsersController, :type => :controller do
-  let(:trashable) { Trashable.create!(:name => 'Bob') }
+describe UsersController, type: :controller do
+  let(:trashable) { Trashable.create!(name: 'Bob') }
 
   describe 'create' do
     before { post :create }
@@ -13,7 +13,7 @@ describe UsersController, :type => :controller do
   end
 
   describe 'update' do
-    before { put :update, :id => trashable.id }
+    before { put :update, id: trashable.id }
     subject { return Draftsman::Draft.last }
 
     it 'records user name via `user_for_draftsman`' do
@@ -22,7 +22,7 @@ describe UsersController, :type => :controller do
   end
 
   describe 'destroy' do
-    before { delete :destroy, :id => trashable.id }
+    before { delete :destroy, id: trashable.id }
     subject { return Draftsman::Draft.last }
 
     it 'records user name via `user_for_draftsman`' do

data/spec/controllers/whodunnits_controller_spec.rb

@@ -1,33 +1,33 @@
 require 'spec_helper'
 
 # Tests the automatic usage of `current_user` as the `whodunnit` attribute on the draft object
-describe WhodunnitsController, :type => :controller do
-  let(:trashable) { Trashable.create!(:name => 'Bob') }
+describe WhodunnitsController, type: :controller do
+  let(:trashable) { Trashable.create!(name: 'Bob') }
 
   describe 'create' do
     before { post :create }
     subject { Draftsman::Draft.last }
 
     it 'records `current_user` via `user_for_draftsman' do
-      expect(subject.whodunnit).to eql "153"
+      expect(subject.whodunnit).to eql '153'
     end
   end
 
   describe 'update' do
-    before { put :update, :id => trashable.id }
+    before { put :update, id: trashable.id }
     subject { Draftsman::Draft.last }
 
     it 'records `current_user` via `user_for_draftsman' do
-      expect(subject.whodunnit).to eql "153"
+      expect(subject.whodunnit).to eql '153'
     end
   end
 
   describe 'destroy' do
-    before { delete :destroy, :id => trashable.id }
+    before { delete :destroy, id: trashable.id }
     subject { Draftsman::Draft.last }
 
     it 'records `current_user` via `user_for_draftsman' do
-      expect(subject.whodunnit).to eql "153"
+      expect(subject.whodunnit).to eql '153'
     end
   end
 end

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,20 +1,27 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
+  before_action :set_draftsman_whodunnit
 
   def create
-    Trashable.new(:name => 'Bob').draft_creation
-    render nothing: true
+    Trashable.new(name: 'Bob').draft_creation
+    head :no_content
   end
 
   def update
     trashable = Trashable.last
     trashable.name = 'Sam'
     trashable.draft_update
-    render nothing: true
+    head :no_content
   end
 
   def destroy
     Trashable.last.draft_destruction
-    render nothing: true
+    head :no_content
+  end
+
+  private
+
+  def draftsman_enabled_for_controller
+    request.user_agent != 'Disable User-Agent'
   end
 end

data/spec/dummy/config/application.rb

@@ -32,6 +32,6 @@ module Dummy
     config.active_record.whitelist_attributes = false if ::Draftsman.active_record_protected_attributes?
 
     # Do not access the DB or load models when precompiling assets
-    config.assets.initialize_on_precompile = false
+    config.assets.enabled = false if config.respond_to?(:assets)
   end
 end

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

@@ -12,15 +12,21 @@ Dummy::Application.configure do
   # preloads Rails for running tests, you may have to set it to true.
   config.eager_load = false
 
-  # Configure static asset server for tests with Cache-Control for performance
-  if ::ActiveRecord::VERSION::STRING < '4.2'
-    config.serve_static_assets  = true
-  # Rails 4.2 deprecates this in favor of `serve_static_files`.
+  if config.respond_to?(:public_file_server)
+    config.public_file_server.enabled = true
+  elsif config.respond_to?(:serve_static_files=)
+    config.serve_static_files = true
   else
-    config.serve_static_files  = true
+    config.serve_static_assets = true
   end
 
-  config.static_cache_control = "public, max-age=3600"
+  if config.respond_to?(:public_file_server)
+    config.public_file_server.headers = {
+      "Cache-Control" => "public, max-age=3600"
+    }
+  else
+    config.static_cache_control = "public, max-age=3600"
+  end
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true

data/spec/models/trashable_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 # A Trashable has a simple call to `has_drafts` without any options specified. The model also contains a `deleted_at`
 # attribute, which allows deletes to be drafts too.
 describe Trashable do
-  let(:trashable) { Trashable.new :name => 'Bob' }
+  let(:trashable) { Trashable.new name: 'Bob' }
 
   describe '.draftable?' do
     it 'is draftable' do

data/spec/models/vanilla_spec.rb

@@ -287,7 +287,7 @@ describe Vanilla do
       subject { Vanilla.live }
 
       it 'raises an exception' do
-        expect { subject.load }.to raise_exception
+        expect { subject.load }.to raise_exception(ActiveRecord::StatementInvalid)
       end
     end
 
@@ -311,7 +311,7 @@ describe Vanilla do
       subject { Vanilla.trashed }
 
       it 'raises an exception' do
-        expect { subject.load }.to raise_exception
+        expect { subject.load }.to raise_exception(ActiveRecord::StatementInvalid)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: draftsman
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Chris Peters
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,21 +29,21 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +53,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,7 +63,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -82,16 +82,16 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,7 @@ files:
 - Rakefile
 - draftsman.gemspec
 - lib/draftsman.rb
+- lib/draftsman/attributes_serialization.rb
 - lib/draftsman/config.rb
 - lib/draftsman/draft.rb
 - lib/draftsman/frameworks/cucumber.rb
@@ -204,7 +205,6 @@ files:
 - spec/models/vanilla_spec.rb
 - spec/models/whitelister_spec.rb
 - spec/spec_helper.rb
-- spec/support/silence_serialized_attributes_deprecation.rb
 homepage: https://github.com/liveeditor/draftsman
 licenses:
 - MIT
@@ -225,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Create draft versions of your database records.
@@ -296,4 +296,3 @@ test_files:
 - spec/models/vanilla_spec.rb
 - spec/models/whitelister_spec.rb
 - spec/spec_helper.rb
-- spec/support/silence_serialized_attributes_deprecation.rb

data/spec/support/silence_serialized_attributes_deprecation.rb

@@ -1,16 +0,0 @@
-# SerializedAttributes is deprecated in Rails 4.2.x, and will be removed in
-#   Rails 5. Draftsman spews a ton of deprecation warnings about this issue.
-#
-#   More info: https://github.com/airblade/paper_trail/issues/416
-#
-# TODO: when migrating to Rails 5, remove this initializer
-
-if Draftsman::VERSION.to_f < 1.0
-  current_behavior = ActiveSupport::Deprecation.behavior
-  ActiveSupport::Deprecation.behavior = lambda do |message, callstack|
-    return if message =~ /`serialized_attributes` is deprecated without replacement/ && callstack.any? { |m| m =~ /draftsman/ }
-    Array.wrap(current_behavior).each { |behavior| behavior.call(message, callstack) }
-  end
-else
-  warn 'FIXME: Draftsman initializer to suppress deprecation warnings can be safely removed.'
-end