draftsman 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 960fc9d2b1792d584f3e47c2b403ba36283b94e8
-  data.tar.gz: c8db52c8059ee96b62a7a83c32fae54b9e0ed8b6
+  metadata.gz: 194254f680cbf4f16b35d8752db70015373258af
+  data.tar.gz: e098a3b022b8f4524b0475f13019402ff8e4b567
 SHA512:
-  metadata.gz: 6608027eaeb64125d62070c83bd4b210075c05d12571e5e306eb4fb67569ff88247b63988f3d9595435df00c0cbe8af09aeeeb0ec0da88fd29bc641a45b7720d
-  data.tar.gz: 9d888f02c11178a3c2717fc3b40a141d8d8e66e7b96100ac76e8bb1f8c7c30f70d1f4c37d4880d863d7bdaa2393dca85990c262c7e494e2c065baf423cebcc46
+  metadata.gz: d91dd1b999f3e32d1fd53e2eed6426bedd09b9cf4e009dbdf14bec090d4b1860023e605d8911f0452fe36cdd906c8a7e65a5ee9c403be5b3ad90a871a46d8ffa
+  data.tar.gz: cfad2c03e91eaaabac18e36cc98d83cf570beba41d8ca7aa55d076bce6e12965f08473dc24147cf15d0f9fc0b9c0b1deaf28980229e64fad1cada389a07ae6c7

data/.gitignore

@@ -1,5 +1,7 @@
 *.gem
 .bundle
+.ruby-gemset
+.ruby-version
 pkg/*
 .DS_Store
 ._*

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # CHANGELOG
 
+## 0.3.7 - November 4, 2015
+
+- [@bdunham](https://github.com/bdunham)
+  [Fixed](https://github.com/liveeditor/draftsman/commit/3610087a319fd203684146bb1d37bf0e41276743) -
+  Prevented double require of model definition
+- [@chrisdpeters](https://github.com/chrisdpeters)
+  [Fixed](https://github.com/liveeditor/draftsman/commit/ec2edf45700a3bea8cfac6f9facbc8ef6c7f9f54)
+  [#36](https://github.com/liveeditor/draftsman/issues/36) -
+  Fails miserably with foreign keys
+- [@dpaluy](https://github.com/dpaluy)
+  [Fixed](https://github.com/dpaluy/draftsman/blob/afce35b3985c79760176f31710c11a77b1201f0e/config/initializers/draftsman.rb)
+  [#33](https://github.com/liveeditor/draftsman/issues/33) -
+  SerializedAttributes is deprecated in Rails 4.2.x, and will be removed in Rails 5
+- [@chrisdpeters](https://github.com/chrisdpeters)
+  [Fixed](https://github.com/liveeditor/draftsman/commit/adc2843105e8fcf34d714557e82cf3f24942dbcb) -
+  Fix `serve_static_assets` deprecation warning
+
 ## 0.3.6 - August 16, 2015
 
 - [@chrisdpeters](https://github.com/chrisdpeters)

data/README.md

@@ -1,4 +1,4 @@
-# Draftsman v0.3.6 (alpha)
+# Draftsman v0.3.7 (alpha)
 
 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.
@@ -50,7 +50,7 @@ Works well with Rails, Sinatra, or any other application that depends on ActiveR
 Add Draftsman to your `Gemfile`.
 
 ```ruby
-gem 'draftsman', '0.3.6'
+gem 'draftsman', '0.3.7'
 ```
 
 Or if you want to grab the latest from `master`:

data/lib/draftsman/draft.rb

@@ -211,7 +211,9 @@ class Draftsman::Draft < ActiveRecord::Base
         reify_previous_draft.reify
       elsif !self.object.nil?
         # This appears to be necessary if for some reason the draft's model hasn't been loaded (such as when done in the console).
-        require self.item_type.underscore
+        unless defined? self.item_type
+          require self.item_type.underscore
+        end
 
         model = item.reload
 

data/lib/draftsman/model.rb

@@ -297,9 +297,10 @@ module Draftsman
             self.save
           # Destroy the draft if this record has changed back to the original record
           elsif changed_to_original_for_draft?
-            send(self.class.draft_association_name).destroy
+            nilified_draft = send(self.class.draft_association_name)
             send "#{self.class.draft_association_name}_id=", nil
             self.save
+            nilified_draft.destroy
           # Save a draft if record is changed notably
           elsif changed_notably_for_draft?
             data = {

data/lib/draftsman/version.rb

@@ -1,3 +1,3 @@
 module Draftsman
-  VERSION = '0.3.6'
+  VERSION = '0.3.7'
 end

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

@@ -13,7 +13,13 @@ Dummy::Application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets  = true
+  if ::ActiveRecord::VERSION::STRING < '4.2'
+    config.serve_static_assets  = true
+  # Rails 4.2 deprecates this in favor of `serve_static_files`.
+  else
+    config.serve_static_files  = true
+  end
+
   config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching

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

@@ -20,7 +20,7 @@ class SetUpTestTables < ActiveRecord::Migration
 
     create_table :vanillas, :force => true do |t|
       t.string     :name
-      t.references :draft
+      t.references :draft, :foreign_key => true
       t.datetime   :published_at
       t.timestamps
     end
@@ -28,7 +28,7 @@ class SetUpTestTables < ActiveRecord::Migration
     create_table :trashables, :force => true do |t|
       t.string     :name
       t.string     :title, :null => true
-      t.references :draft
+      t.references :draft, :foreign_key => true
       t.datetime   :published_at
       t.datetime   :trashed_at
       t.timestamps
@@ -44,14 +44,14 @@ class SetUpTestTables < ActiveRecord::Migration
     create_table :whitelisters, :force => true do |t|
       t.string     :name
       t.string     :ignored
-      t.references :draft
+      t.references :draft, :foreign_key => true
       t.datetime   :published_at
       t.timestamps
     end
 
     create_table :parents, :force => true do |t|
       t.string     :name
-      t.references :draft
+      t.references :draft, :foreign_key => true
       t.datetime   :trashed_at
       t.datetime   :published_at
       t.timestamps
@@ -60,7 +60,7 @@ class SetUpTestTables < ActiveRecord::Migration
     create_table :children, :force => true do |t|
       t.string     :name
       t.references :parent
-      t.references :draft
+      t.references :draft, :foreign_key => true
       t.datetime   :trashed_at
       t.datetime   :published_at
       t.timestamps
@@ -75,7 +75,7 @@ class SetUpTestTables < ActiveRecord::Migration
     create_table :skippers, :force => true do |t|
       t.string     :name
       t.string     :skip_me
-      t.references :draft
+      t.references :draft, :foreign_key => true
       t.datetime   :trashed_at
       t.datetime   :published_at
       t.timestamps

data/spec/dummy/db/migrate/20150408234937_add_only_children.rb

@@ -3,7 +3,7 @@ class AddOnlyChildren < ActiveRecord::Migration
     create_table :only_children, :force => true do |t|
       t.string     :name
       t.references :parent
-      t.references :draft
+      t.references :draft, :foreign_key => true
       t.datetime   :trashed_at
       t.datetime   :published_at
       t.timestamps

data/spec/dummy/db/schema.rb

@@ -13,6 +13,9 @@
 
 ActiveRecord::Schema.define(version: 20150408234937) do
 
+  # These are extensions that must be enabled in order to support this database
+  enable_extension "plpgsql"
+
   create_table "bastards", force: :cascade do |t|
     t.string   "name"
     t.integer  "parent_id"
@@ -109,4 +112,11 @@ ActiveRecord::Schema.define(version: 20150408234937) do
     t.datetime "updated_at"
   end
 
+  add_foreign_key "children", "drafts"
+  add_foreign_key "only_children", "drafts"
+  add_foreign_key "parents", "drafts"
+  add_foreign_key "skippers", "drafts"
+  add_foreign_key "trashables", "drafts"
+  add_foreign_key "vanillas", "drafts"
+  add_foreign_key "whitelisters", "drafts"
 end

data/spec/support/silence_serialized_attributes_deprecation.rb

@@ -0,0 +1,16 @@
+# 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: draftsman
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Chris Peters
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-16 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -115,8 +115,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".ruby-gemset"
-- ".ruby-version"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -200,6 +198,7 @@ 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
@@ -220,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Create draft versions of your ActiveRecord models' data. Works with Ruby
@@ -286,3 +285,4 @@ test_files:
 - spec/models/vanilla_spec.rb
 - spec/models/whitelister_spec.rb
 - spec/spec_helper.rb
+- spec/support/silence_serialized_attributes_deprecation.rb

data/.ruby-gemset

@@ -1 +0,0 @@
-draftsman

data/.ruby-version

@@ -1 +0,0 @@
-ruby-2.2.1