draftsman 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b81db1f80bb1d8742793931418a05f425f4574d
-  data.tar.gz: 40e32fd2383a15cc1e8e96552e63220faf0c4784
+  metadata.gz: 0354f5b470dbf046ad2a67b53ee7c5cb38b2f56f
+  data.tar.gz: '02991570b7c9f925f6ccf3dd753b55111ef883bd'
 SHA512:
-  metadata.gz: 6b3e3e7a21e4078e32d66726366674d1bc0af4eb68fdb7aeec02d82dcb8d0c96f09be4366d3239dbee20b3363758507fbb608b5e5b2c3b04da510a0a003c4a2c
-  data.tar.gz: c97dd6e0a81c69d5c5d83ba034b8fceb6db7fee0fa54da1c8b62bc73ee5550c9812e74754910796172d338bdc0549e1cd1afa8708d696c74900136dfe0278bf9
+  metadata.gz: cb447f51ca4d0f28041119d789c3b2100590da7db8f2f54dfe305c30bc446ed02b7c75af32cacd9e23769f9f40dcb0bdd278f592493df223de935232900519f3
+  data.tar.gz: 2668c0c599f3c9439931b06e82ed00edb385abfbb3d5f09052af6afdcec7107009cc2c22cee5a1788798e8ffe972f1616950a993bff37cf43dfe087ab982730d

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## 0.7.1 - December 24, 2017
+
+### Bug Fixes
+
+- [@jmfederico](https://github.com/jmfederico)
+  [fixed](https://github.com/jmfederico/draftsman/commit/ff46e510c7d82331fcad7ea1eb2d2d2728ed1bd5)
+  [#73](https://github.com/jmfederico/draftsman/issues/73)
+  Rails 5 migration error
+
+
 ## 0.7.0 - June 12, 2017
 
 ### Enhancements

data/README.md

@@ -1,6 +1,6 @@
-# Draftsman v0.7.0
+# Draftsman v0.7.1
 
-[![Build Status](https://secure.travis-ci.org/liveeditor/draftsman.svg?branch=master)](http://travis-ci.org/liveeditor/draftsman)
+[![Build Status](https://travis-ci.org/jmfederico/draftsman.svg?branch=0.7-stable)](https://travis-ci.org/jmfederico/draftsman)
 
 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
@@ -64,13 +64,13 @@ ActiveRecord.
 Add Draftsman to your `Gemfile`.
 
 ```ruby
-gem 'draftsman', '~> 0.7.0'
+gem 'draftsman', '~> 0.7.1'
 ```
 
 Or if you want to grab the latest from `master`:
 
 ```ruby
-gem 'draftsman', github: 'liveeditor/draftsman'
+gem 'draftsman', github: 'jmfederico/draftsman'
 ```
 
 Generate a migration which will add a `drafts` table to your database.
@@ -120,7 +120,7 @@ your app with Draftsman will look something like this:
 Add Draftsman to your `Gemfile`.
 
 ```ruby
-gem 'draftsman', github: 'liveeditor/draftsman'
+gem 'draftsman', github: 'jmfederico/draftsman'
 ```
 
 Generate a migration to add a `drafts` table to your database.
@@ -144,7 +144,7 @@ Draftsman provides a helper extension that acts similarly to the controller
 mixin it provides for Rails applications.
 
 It will set `Draftsman::Draft#whodunnit` to whatever is returned by a method
-named `user_for_paper_trail`, which you can define inside your Sinatra
+named `user_for_draftsman`, which you can define inside your Sinatra
 application. (By default, it attempts to invoke a method named `current_user`.)
 
 If you're using the modular [`Sinatra::Base`][8] style of application, you will
@@ -611,8 +611,8 @@ included, please do the following:
 
 2.  Run `bundle install`.
 
-3.  Run `RAILS_ENV=test bundle exec rake -f spec/dummy/
-    Rakefile db:schema:load` to load test database schema.
+3.  Run `RAILS_ENV=test bundle exec rake -f spec/dummy/Rakefile db:schema:load`
+    to load test database schema.
 
 4.  Add at least one test for your change. Only refactoring and documentation
     changes require no new tests. If you are adding functionality or fixing a
@@ -648,7 +648,7 @@ Draftsman is released under the [MIT License][9].
 [4]: http://railscasts.com/episodes/416-form-objects
 [5]: http://www.sinatrarb.com/
 [6]: https://github.com/janko-m/sinatra-activerecord
-[7]: https://raw.github.com/liveeditor/draftsman/master/lib/generators/draftsman/templates/create_drafts.rb
+[7]: https://raw.github.com/jmfederico/draftsman/master/lib/generators/draftsman/templates/create_drafts.rb
 [8]: http://www.sinatrarb.com/intro.html#Modular%20vs.%20Classic%20Style
 [9]: http://www.opensource.org/licenses/MIT
 [10]: http://semver.org/

data/draftsman.gemspec

@@ -6,9 +6,9 @@ Gem::Specification.new do |s|
   s.version       = Draftsman::VERSION
   s.summary       = 'Create draft versions of your database records.'
   s.description   = "Stores draft versions of your ActiveRecord models' data in a single table or split up into separate tables. Works with Ruby on Rails and Sinatra."
-  s.homepage      = 'https://github.com/liveeditor/draftsman'
-  s.authors       = ['Chris Peters']
-  s.email         = 'chris@minimalorange.com'
+  s.homepage      = 'https://github.com/jmfederico/draftsman'
+  s.authors       = ['Chris Peters', 'Federico Jaramillo']
+  s.email         = ['chris@minimalorange.com', 'federicojaramillom@gmail.com']
   s.license       = 'MIT'
 
   s.files         = `git ls-files`.split("\n")

data/lib/draftsman/version.rb

@@ -1,3 +1,3 @@
 module Draftsman
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

data/lib/generators/draftsman/install_generator.rb

@@ -2,6 +2,8 @@ require 'rails/generators'
 require 'rails/generators/migration'
 require 'rails/generators/active_record'
 
+require 'support/feature_detection'
+
 module Draftsman
   class InstallGenerator < ::Rails::Generators::Base
     include ::Rails::Generators::Migration
@@ -13,19 +15,26 @@ module Draftsman
     class_option :with_pg_json, :type => :boolean, :default => false, :desc => 'Use PostgreSQL JSON data type for serialized data.'
 
     def create_migration_file
+
+      config = {
+        api_version: activerecord_migrations_versioned? ? '[4.2]' : ''
+      }
+
       if options.with_pg_json?
-        migration_template 'create_drafts_json.rb', 'db/migrate/create_drafts.rb'
+        migration_template 'create_drafts_json.rb', 'db/migrate/create_drafts.rb', config
 
         if options.with_changes?
           migration_template 'add_object_changes_column_to_drafts_json.rb',
-                             'db/migrate/add_object_changes_column_to_drafts.rb'
+                             'db/migrate/add_object_changes_column_to_drafts.rb',
+                             config
         end
       else
-        migration_template 'create_drafts.rb', 'db/migrate/create_drafts.rb'
+        migration_template 'create_drafts.rb', 'db/migrate/create_drafts.rb', config
 
         if options.with_changes?
           migration_template 'add_object_changes_column_to_drafts.rb',
-                             'db/migrate/add_object_changes_column_to_drafts.rb'
+                             'db/migrate/add_object_changes_column_to_drafts.rb',
+                             config
         end
       end
     end

data/lib/generators/draftsman/templates/add_object_changes_column_to_drafts.rb

@@ -1,4 +1,4 @@
-class AddObjectChangesColumnToDrafts < ActiveRecord::Migration
+class AddObjectChangesColumnToDrafts < ActiveRecord::Migration<%= config[:api_version] %>
   def self.up
     add_column :drafts, :object_changes, :text
   end

data/lib/generators/draftsman/templates/add_object_changes_column_to_drafts_json.rb

@@ -1,4 +1,4 @@
-class AddObjectChangesColumnToDrafts < ActiveRecord::Migration
+class AddObjectChangesColumnToDrafts < ActiveRecord::Migration<%= config[:api_version] %>
   def self.up
     add_column :drafts, :object_changes, :json
   end

data/lib/generators/draftsman/templates/create_drafts.rb

@@ -1,4 +1,4 @@
-class CreateDrafts < ActiveRecord::Migration
+class CreateDrafts < ActiveRecord::Migration<%= config[:api_version] %>
   def change
     create_table :drafts do |t|
       t.string  :item_type, :null => false

data/lib/generators/draftsman/templates/create_drafts_json.rb

@@ -1,4 +1,4 @@
-class CreateDrafts < ActiveRecord::Migration
+class CreateDrafts < ActiveRecord::Migration<%= config[:api_version] %>
   def change
     create_table :drafts do |t|
       t.string  :item_type, :null => false

data/lib/support/feature_detection.rb

@@ -0,0 +1,4 @@
+# Returns whether migrations need to be versioned.
+def activerecord_migrations_versioned?
+  ActiveRecord::VERSION::MAJOR >= 5
+end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: draftsman
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Chris Peters
+- Federico Jaramillo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-12 00:00:00.000000000 Z
+date: 2017-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -108,7 +109,9 @@ dependencies:
         version: '1.2'
 description: Stores draft versions of your ActiveRecord models' data in a single table
   or split up into separate tables. Works with Ruby on Rails and Sinatra.
-email: chris@minimalorange.com
+email:
+- chris@minimalorange.com
+- federicojaramillom@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -143,6 +146,7 @@ files:
 - lib/generators/draftsman/templates/config/initializers/draftsman.rb
 - lib/generators/draftsman/templates/create_drafts.rb
 - lib/generators/draftsman/templates/create_drafts_json.rb
+- lib/support/feature_detection.rb
 - spec/controllers/informants_controller_spec.rb
 - spec/controllers/users_controller_spec.rb
 - spec/controllers/whodunnits_controller_spec.rb
@@ -208,7 +212,7 @@ files:
 - spec/models/whitelister_spec.rb
 - spec/spec_helper.rb
 - spec/support/feature_detection.rb
-homepage: https://github.com/liveeditor/draftsman
+homepage: https://github.com/jmfederico/draftsman
 licenses:
 - MIT
 metadata: {}
@@ -228,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Create draft versions of your database records.