draft_punk 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d4a6420f3e781377149fe2a5501e9f98a0919a7
-  data.tar.gz: 3bff87d484861606d197f4ffd20b531bb3b474f3
+  metadata.gz: 736d197cd13d789cca1213de1254c89a1082fddc
+  data.tar.gz: faa8ed97c0233efc97494180dfdfa4c26cfec3ee
 SHA512:
-  metadata.gz: 008e3ddeb9db92ef6c7ec4ddfddf457ca854831d294b100b42f921aa495bc67a62e0e9371e73f2af012ff562a92dd314682788bd9e1d0fa7dbf6deebb4e6c3da
-  data.tar.gz: fbb7819e33a842c8802408bd766e83fda9a22e2b941abc037cf276406772fac686b9658ff506d3e8f53dd013d407c9c27e8fee118a96e93775e7345b659636f7
+  metadata.gz: 1b1f61d8ad5f526b41f406c5aeb6e410f5eda164fa1d55efc356695b7af42314c6d43984ff877b6693429e9562587c47dc2b9e75de975bd0308b0bd2a052c902
+  data.tar.gz: c21fb1a305501bb941e8ba2cdce4da2dbb4efea82e32fe82f959746c16340c0b90d874e137f2a0deffd1fa14e544bcc26eda3928910e6fdaf55bf588a8e542a6

data/draft_punk.gemspec

@@ -31,10 +31,9 @@ EOF
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency     "amoeba",    "~> 3.0"
-  spec.add_runtime_dependency     "unscoped_associations", "< 1.0"
+  spec.add_runtime_dependency     "amoeba",    "~> 3.1"
   spec.add_runtime_dependency     "differ",    "< 0.2"
-  spec.add_runtime_dependency     'rails',     "> 3.0", "< 5.1"
+  spec.add_runtime_dependency     'rails',     "> 5.0", "< 5.3"
 
   spec.add_development_dependency "bundler",   "~> 1.9"
   spec.add_development_dependency "rake",      "~> 10.0"

data/lib/activerecord_class_methods.rb

@@ -125,8 +125,8 @@ module DraftPunk
         associations = target_class.draft_target_associations
         associations = target_class.set_valid_associations(associations)
         target_class.amoeba do
-          enable
-          include_association target_class.const_get(:DRAFT_VALID_ASSOCIATIONS)
+          enable 
+          include_associations target_class.const_get(:DRAFT_VALID_ASSOCIATIONS) unless target_class.const_get(:DRAFT_VALID_ASSOCIATIONS).empty?
           customize target_class.set_approved_version_id_callback
         end
         target_class.const_set :DRAFT_PUNK_IS_SETUP, true
@@ -165,14 +165,12 @@ module DraftPunk
         return if target_class.reflect_on_association(:approved_version) || !target_class.column_names.include?('approved_version_id')
         target_class.send       :include, ActiveRecordInstanceMethods
         target_class.send       :include, DraftDiffInstanceMethods
-        target_class.belongs_to :approved_version, class_name: target_class.name
-        target_class.has_one    :draft, class_name: target_class.name, foreign_key: :approved_version_id, unscoped: true
+        target_class.belongs_to :approved_version, class_name: target_class.name, optional: true
         target_class.scope      :approved, -> { where("#{target_class.quoted_table_name}.approved_version_id IS NULL") }
+        target_class.has_one    :draft, -> { unscope(where: :approved) }, class_name: target_class.name, foreign_key: :approved_version_id
+        target_class.scope      :draft, -> { unscoped.where("#{target_class.quoted_table_name}.approved_version_id IS NOT NULL") }
         if set_default_scope
           target_class.default_scope -> { approved }
-        else
-          # TODO: fix - the unscoped isn't working with default scope, so not defining this draft scope if set_default_scope
-          target_class.scope      :draft,    -> { unscoped.where("#{target_class.quoted_table_name}.approved_version_id IS NOT NULL") }
         end
       end
 

data/lib/activerecord_instance_methods.rb

@@ -105,6 +105,7 @@ module DraftPunk
         rescue => message
           raise DraftCreationError, message
         end
+        reload
         draft
       end
 

data/lib/draft_punk.rb

@@ -1,6 +1,5 @@
 require 'draft_punk/version'
 require 'amoeba'
-require 'unscoped_associations'
 require 'activerecord_class_methods'
 require 'helper_methods'
 

data/lib/draft_punk/version.rb

@@ -1,3 +1,3 @@
 module DraftPunk
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: draft_punk
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Steve Hodges
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-31 00:00:00.000000000 Z
+date: 2018-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amoeba
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: unscoped_associations
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: differ
   requirement: !ruby/object:Gem::Requirement
@@ -58,20 +44,20 @@ dependencies:
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -196,10 +182,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Easy editing of a draft version of an ActiveRecord model and its associations,
   and publishing said draft's changes back to the original models.
 test_files: []
-has_rdoc: yard