drafting 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 043b4e70db7b252237396cdce71a46a27f698cc189d462010df9c2a96897f543
-  data.tar.gz: b94a9218a79961ae09a39adc554ba600692dcf52cef2c472f525e1adef05106a
+  metadata.gz: 22e6c8a3b50e9c18bbbf2270046d351d7434a5b7b89540617b0f0977cc0f32d3
+  data.tar.gz: 754eb2e34972631fc17ba811ae5ef4744214ac44afa7a32fc5a0388c071a9aae
 SHA512:
-  metadata.gz: 34f7c7a88a14af1ab7072c108abaa4c1ab6d40f576c5cd70cd3afa1ec398f2b9a81fa4ce1e812281806298223b174942075dbe1f869f2b3f5c8c319706217d94
-  data.tar.gz: ee42af4f46cd8d7a75c37cdf474147255f5c16c3683e5ea206e379efa753cd78b682ebd6cff0d0d262b1c6814a0f01ba2d9c873ec3d7a958327268df1b081651
+  metadata.gz: 63b27faffef9e09e06b740a0fab74dcfab7e020b9b61497554d2ccb29a7bfeae3d43086a9d40c4178aaf47745e3ca7efbde07daadbced62941f32ad497b2a373
+  data.tar.gz: f066d6c4df5da61da95cc4c85f797fd9465c5df9b7a7e1f99d299f59cd50737cff07c6e91c8c36dc4351de8aaa1a721a475a1181345cb978325348801f0b071f

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 rvm:
   - 2.3.8
-  - 2.4.6
-  - 2.5.5
-  - 2.6.3
+  - 2.4.9
+  - 2.5.7
+  - 2.6.5
 gemfile:
   - gemfiles/rails_6_0.gemfile
   - gemfiles/rails_5_2.gemfile
@@ -15,13 +15,13 @@ matrix:
   exclude:
     - rvm: 2.3.8
       gemfile: gemfiles/rails_6_0.gemfile
-    - rvm: 2.4.6
+    - rvm: 2.4.9
       gemfile: gemfiles/rails_4_1.gemfile
-    - rvm: 2.4.6
+    - rvm: 2.4.9
       gemfile: gemfiles/rails_6_0.gemfile
-    - rvm: 2.5.5
+    - rvm: 2.5.7
       gemfile: gemfiles/rails_4_1.gemfile
-    - rvm: 2.6.3
+    - rvm: 2.6.5
       gemfile: gemfiles/rails_4_1.gemfile
 before_install: gem update bundler
 sudo: false

data/Appraisals

@@ -1,5 +1,5 @@
 appraise "rails-6-0" do
-  gem "activerecord", "~> 6.0.0"
+  gem "activerecord", "~> 6.0.1"
   gem "sqlite3", "~> 1.4"
 end
 

data/README.md

@@ -66,6 +66,17 @@ drafts = Message.drafts(current_user)
 messages = drafts.restore_all
 ```
 
+### Migration
+
+#### 0.5.x
+
+Starting from 0.5.x, you will be able to save drafts under a non `User` model as such:
+```
+message.save_draft(author)
+```
+
+If you are upgrading from previous versions, simply run `rails g drafting:migration` again to generate the mising migration files.
+
 ### Linking to parent instance
 
 ```ruby
@@ -100,7 +111,6 @@ message.save!
 * The `user` argument can be nil if you don't want to distinguish between multiple users
 * Saving draft stores the data via `Marshal.dump` and `Marshal.load`. If you don't like this or need some customization, you can override the instance methods `dump_to_draft` and `load_from_draft` (see source)
 
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/drafting.gemspec

@@ -30,4 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "appraisal"
+  spec.add_development_dependency "generator_spec"
 end

data/gemfiles/rails_6_0.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 6.0.0"
+gem "activerecord", "~> 6.0.1"
 gem "sqlite3", "~> 1.4"
 
 gemspec path: "../"

data/lib/drafting/base_class_methods.rb

@@ -15,11 +15,19 @@ module Drafting
         unless parent_class.method_defined? :drafts
           parent_class.class_eval do
             def drafts(user)
-              Draft.where(user: user, parent: self)
+              Draft.where(
+                user: user,
+                user_type: user.try(:class).try(:name),
+                parent: self
+              )
             end
 
             def self.child_drafts(user)
-              Draft.where(user: user, parent_type: self.base_class.name)
+              Draft.where(
+                user: user,
+                user_type: user.try(:class).try(:name),
+                parent_type: self.base_class.name
+              )
             end
           end
         end

data/lib/drafting/draft.rb

@@ -1,5 +1,5 @@
 class Draft < ActiveRecord::Base
-  belongs_to :user
+  belongs_to :user, polymorphic: true
   belongs_to :parent, polymorphic: true
 
   validates_presence_of :data, :target_type

data/lib/drafting/instance_methods.rb

@@ -7,7 +7,8 @@ module Drafting
 
       draft.data = dump_to_draft
       draft.target_type = self.class.name
-      draft.user = user
+      draft.user_id = user.try(:id)
+      draft.user_type = user.try(:class).try(:name)
       draft.parent = self.send(self.class.draft_parent) if self.class.draft_parent
 
       result = draft.save

data/lib/drafting/version.rb

@@ -1,3 +1,3 @@
 module Drafting
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

data/lib/generators/drafting/migration/migration_generator.rb

@@ -10,6 +10,7 @@ module Drafting
 
     def create_migration_file
       migration_template 'migration.rb', 'db/migrate/drafting_migration.rb'
+      migration_template 'non_user_migration.rb', 'db/migrate/non_user_drafting_migration.rb'
     end
 
     def self.next_migration_number(dirname)

data/lib/generators/drafting/migration/templates/non_user_migration.rb

@@ -0,0 +1,13 @@
+class NonUserDraftingMigration < Drafting::MIGRATION_BASE_CLASS
+  def self.up
+    add_column :drafts, :user_type, :string, index: true
+
+    # add in user_type for existing drafts table
+    # for migration from old version
+    Draft.update_all(user_type: 'User')
+  end
+
+  def self.down
+    remove_column :drafts, :user_type
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drafting
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Georg Ledermann
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-25 00:00:00.000000000 Z
+date: 2019-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: generator_spec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email:
 - mail@georg-ledermann.de
@@ -169,6 +183,7 @@ files:
 - lib/drafting/version.rb
 - lib/generators/drafting/migration/migration_generator.rb
 - lib/generators/drafting/migration/templates/migration.rb
+- lib/generators/drafting/migration/templates/non_user_migration.rb
 homepage: https://github.com/ledermann/drafting
 licenses:
 - MIT
@@ -188,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Save draft version of any ActiveRecord object