draftsman 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7c171351b9d3dbd76bc30ae5385e99a771c9e52
-  data.tar.gz: b59f30aeed82d65392097f6e2d9cd2cb275420f1
+  metadata.gz: b38f2627f56beadc10e01b0a07b9484ba4fd9d92
+  data.tar.gz: 98cefed36490f43ce3416ede00b2bfb1ef11b28d
 SHA512:
-  metadata.gz: f1cefc9d992c9de7e485a29b1c5affd5f0bd4580a901346f7234bdce2cdc87143fde506b72b23da237daa6913c28f04c6787435e45b5afbbd3b2b51ec619ae8a
-  data.tar.gz: a43b06c0e6d444559e988efe34368c2e86aa642992193b7b72a970cbfc978719fc39701a5eb20d11bdb73d12867098f2aa5239b9edc8fb441d51fbd0e2d4edb8
+  metadata.gz: 60d3bbe5dfb13262fc1075dc987726aaa671affda4c467360353d609722206ed86fadf0fff7c4a3351b4d4593a3cebf39f45e1fb4c9920ce30661d1e2d7d5dd5
+  data.tar.gz: 3f8c96b231067ad01510a80a4c973ed594e7fc5f5d4069b2fa511774cae571d368becbf730e54c4a4f771166fef2513498febc64db05135340bfdaa2c831e61c

data/.gitignore

@@ -5,6 +5,7 @@ pkg/*
 ._*
 .idea/
 .redcar/
+bin/
 spec/dummy/tmp/
 spec/dummy/db/*.sqlite3
 spec/dummy/log/*.log

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # CHANGELOG
 
+## 0.3.4 - May 21, 2015
+
+- [@npafundi](https://github.com/npafundi)
+  [Fixed](https://github.com/liveeditor/draftsman/pull/21)
+  [#13](https://github.com/liveeditor/draftsman/issues/13) -
+  LoadError when trying to run migrations
+- [@npafundi](https://github.com/npafundi)
+  [Fixed](https://github.com/liveeditor/draftsman/pull/23)
+  [#22](https://github.com/liveeditor/draftsman/issues/22) -
+  Exception on draft_destroy when has_one association is nil
+- [@chrisdpeters](https://github.com/chrisdpeters)
+  [Fixed](https://github.com/liveeditor/draftsman/commit/32b13375f4e50bafc3b4516d731d2fcf51a5fb2b)
+  [#24](https://github.com/liveeditor/draftsman/issues/24) -
+  Stack too deep: Error when running `bundle exec rails c` in app including draftsman
+
 ## 0.3.3 - April 8, 2015
 
 -  Fixed regression [#18](https://github.com/liveeditor/draftsman/pull/19) - Exception when destroying drafts

data/README.md

@@ -1,4 +1,4 @@
-# Draftsman v0.3.3 (alpha)
+# Draftsman v0.3.4 (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.

data/lib/draftsman/model.rb

@@ -259,11 +259,12 @@ module Draftsman
           dependent_associations.each do |association|
 
             if association.klass.draftable? && association.options.has_key?(:dependent) && association.options[:dependent] == :destroy
-              dependents = association.macro == :has_one ? [self.send(association.name)] : self.send(association.name)
+              dependents = self.send(association.name)
+              dependents = [dependents] if (dependents && association.macro == :has_one)
 
               dependents.each do |dependent|
                 dependent.draft_destroy unless dependent.draft? && dependent.send(dependent.class.draft_association_name).destroy?
-              end
+              end if dependents
             end
           end
         end

data/lib/draftsman/version.rb

@@ -1,3 +1,3 @@
 module Draftsman
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

data/spec/dummy/app/models/only_child.rb

@@ -0,0 +1,4 @@
+class OnlyChild < ActiveRecord::Base
+  has_drafts
+  belongs_to :parent
+end

data/spec/dummy/app/models/parent.rb

@@ -2,4 +2,5 @@ class Parent < ActiveRecord::Base
   has_drafts
   has_many :children, :dependent => :destroy
   has_many :bastards, :dependent => :destroy
+  has_one :only_child, :dependent => :destroy
 end

data/spec/dummy/config/boot.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 
 # Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
 
 require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

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

@@ -0,0 +1,16 @@
+class AddOnlyChildren < ActiveRecord::Migration
+  def up
+    create_table :only_children, :force => true do |t|
+      t.string     :name
+      t.references :parent
+      t.references :draft
+      t.datetime   :trashed_at
+      t.datetime   :published_at
+      t.timestamps
+    end
+  end
+
+  def down
+    drop_table :only_children
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,20 +11,16 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20110208155312) do
+ActiveRecord::Schema.define(version: 20150408234937) do
 
-  create_table "bastards", force: true do |t|
+  create_table "bastards", force: :cascade do |t|
     t.string   "name"
     t.integer  "parent_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "change_hoarders", force: true do |t|
-    t.integer "draft_id"
-  end
-
-  create_table "children", force: true do |t|
+  create_table "children", force: :cascade do |t|
     t.string   "name"
     t.integer  "parent_id"
     t.integer  "draft_id"
@@ -34,16 +30,7 @@ ActiveRecord::Schema.define(version: 20110208155312) do
     t.datetime "updated_at"
   end
 
-  create_table "clingy_parents", force: true do |t|
-    t.string   "name"
-    t.integer  "draft_id"
-    t.datetime "trashed_at"
-    t.datetime "published_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "draft_as_sketches", force: true do |t|
+  create_table "draft_as_sketches", force: :cascade do |t|
     t.string   "name"
     t.integer  "sketch_id"
     t.datetime "published_at"
@@ -51,17 +38,7 @@ ActiveRecord::Schema.define(version: 20110208155312) do
     t.datetime "updated_at"
   end
 
-  create_table "draft_dependencies", force: true do |t|
-    t.integer "draft_id",      null: false
-    t.integer "dependency_id", null: false
-  end
-
-  create_table "draft_dependents", force: true do |t|
-    t.integer "draft_id",     null: false
-    t.integer "dependent_id", null: false
-  end
-
-  create_table "drafts", force: true do |t|
+  create_table "drafts", force: :cascade do |t|
     t.string   "item_type"
     t.integer  "item_id"
     t.string   "event",          null: false
@@ -76,18 +53,8 @@ ActiveRecord::Schema.define(version: 20110208155312) do
     t.string   "user_agent"
   end
 
-  create_table "hopeless_children", force: true do |t|
+  create_table "only_children", force: :cascade do |t|
     t.string   "name"
-    t.integer  "clingy_parent_id"
-    t.integer  "draft_id"
-    t.datetime "trashed_at"
-    t.datetime "published_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "mortgages", force: true do |t|
-    t.float    "amount"
     t.integer  "parent_id"
     t.integer  "draft_id"
     t.datetime "trashed_at"
@@ -96,7 +63,7 @@ ActiveRecord::Schema.define(version: 20110208155312) do
     t.datetime "updated_at"
   end
 
-  create_table "parents", force: true do |t|
+  create_table "parents", force: :cascade do |t|
     t.string   "name"
     t.integer  "draft_id"
     t.datetime "trashed_at"
@@ -105,7 +72,7 @@ ActiveRecord::Schema.define(version: 20110208155312) do
     t.datetime "updated_at"
   end
 
-  create_table "skippers", force: true do |t|
+  create_table "skippers", force: :cascade do |t|
     t.string   "name"
     t.string   "skip_me"
     t.integer  "draft_id"
@@ -115,7 +82,7 @@ ActiveRecord::Schema.define(version: 20110208155312) do
     t.datetime "updated_at"
   end
 
-  create_table "trashables", force: true do |t|
+  create_table "trashables", force: :cascade do |t|
     t.string   "name"
     t.string   "title"
     t.integer  "draft_id"
@@ -125,7 +92,7 @@ ActiveRecord::Schema.define(version: 20110208155312) do
     t.datetime "updated_at"
   end
 
-  create_table "vanillas", force: true do |t|
+  create_table "vanillas", force: :cascade do |t|
     t.string   "name"
     t.integer  "draft_id"
     t.datetime "published_at"
@@ -133,7 +100,7 @@ ActiveRecord::Schema.define(version: 20110208155312) do
     t.datetime "updated_at"
   end
 
-  create_table "whitelisters", force: true do |t|
+  create_table "whitelisters", force: :cascade do |t|
     t.string   "name"
     t.string   "ignored"
     t.integer  "draft_id"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: draftsman
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Chris Peters
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -109,18 +109,7 @@ dependencies:
 description: Create draft versions of your ActiveRecord models' data. Works with Ruby
   on Rails and Sinatra.
 email: chris@minimalorange.com
-executables:
-- bundler
-- erubis
-- htmldiff
-- ldiff
-- nokogiri
-- rackup
-- rails
-- rake
-- rspec
-- thor
-- tilt
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -133,17 +122,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/bundler
-- bin/erubis
-- bin/htmldiff
-- bin/ldiff
-- bin/nokogiri
-- bin/rackup
-- bin/rails
-- bin/rake
-- bin/rspec
-- bin/thor
-- bin/tilt
 - draftsman.gemspec
 - lib/draftsman.rb
 - lib/draftsman/config.rb
@@ -179,6 +157,7 @@ files:
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/bastard.rb
 - spec/dummy/app/models/child.rb
+- spec/dummy/app/models/only_child.rb
 - spec/dummy/app/models/parent.rb
 - spec/dummy/app/models/skipper.rb
 - spec/dummy/app/models/trashable.rb
@@ -202,6 +181,7 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20110208155312_set_up_test_tables.rb
+- spec/dummy/db/migrate/20150408234937_add_only_children.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/lib/assets/.gitkeep
@@ -263,6 +243,7 @@ test_files:
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/bastard.rb
 - spec/dummy/app/models/child.rb
+- spec/dummy/app/models/only_child.rb
 - spec/dummy/app/models/parent.rb
 - spec/dummy/app/models/skipper.rb
 - spec/dummy/app/models/trashable.rb
@@ -286,6 +267,7 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20110208155312_set_up_test_tables.rb
+- spec/dummy/db/migrate/20150408234937_add_only_children.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/lib/assets/.gitkeep

data/bin/bundler

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'bundler' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('bundler', 'bundler')

data/bin/erubis

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'erubis' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('draftsman', 'erubis')

data/bin/htmldiff

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'htmldiff' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('draftsman', 'htmldiff')

data/bin/ldiff

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'ldiff' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('draftsman', 'ldiff')

data/bin/nokogiri

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'nokogiri' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('draftsman', 'nokogiri')

data/bin/rackup

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rackup' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('draftsman', 'rackup')

data/bin/rails

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rails' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('railties', 'rails')

data/bin/rake

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rake' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('draftsman', 'rake')

data/bin/rspec

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rspec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rspec-core', 'rspec')

data/bin/thor

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'thor' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('thor', 'thor')

data/bin/tilt

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'tilt' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('tilt', 'tilt')