zombie_record 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3f8292fbf152824abdd2e88b7e565f883d591a6
-  data.tar.gz: e17a37b90ca66b26cc27330847cad5a9cd5e5bd3
+  metadata.gz: eea378400a5d0ed7e8fca681c1a9c8d3930729db
+  data.tar.gz: 0de41938e4b71a6460241fa1be73d53daa5db4c1
 SHA512:
-  metadata.gz: 8b453ed7119257f5380b4b08e22228b1f27d05324c2bfeaae644f4118d40c9e91e0da5149cfa33920f748cfecc86c130cf3720e372d71075435f968d2d1d0af7
-  data.tar.gz: 6c9e58b70d2454fc1a09aa8fcd93196bf88aa48e424127d5a764ad87da0b8158e3e51f350a74656ac280aa218650b4d095cd1ff0406c03b34f9c435e9b4947ae
+  metadata.gz: 68b89647924130a7a41d14b8881dcbff500935179a4fd73d9b010cf75332c29e0e997dc558af443d13fd34e8d513a1d5251b2cede37cefecf6887bd2235a35b1
+  data.tar.gz: e8af2f78981866fbe8bbad28c2fb71ebc1cdf29ac6ff4538edb7d7cc417b705db3e2224c454f6f4a3624ff1647a6b37becaddf6e5d99f2c2764c4bd2c5e38cb0

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ###### Unreleased
 
+###### v1.3.1
+
+* Fix a `to_a` vs `records` bug for Rails 5.0.
+
 ###### v1.3.0
 
 * Test against Rails 5.0.

data/Rakefile

@@ -1,6 +1,7 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require "wwtd/tasks"
+require "bump/tasks"
 
 RSpec::Core::RakeTask.new(:spec)
 

data/gemfiles/rails4.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    zombie_record (1.3.0)
+    zombie_record (1.3.1)
       activerecord (>= 4.0, < 5.1)
       mysql2
 
@@ -23,6 +23,7 @@ GEM
       tzinfo (~> 1.1)
     arel (5.0.1.20140414130214)
     builder (3.2.2)
+    bump (0.5.3)
     byebug (8.2.1)
     diff-lcs (1.2.5)
     i18n (0.7.0)
@@ -49,6 +50,7 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (~> 4.1.8)
+  bump
   bundler (~> 1.3)
   byebug
   mysql2 (~> 0.3.0)

data/gemfiles/rails4.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    zombie_record (1.3.0)
+    zombie_record (1.3.1)
       activerecord (>= 4.0, < 5.1)
       mysql2
 
@@ -23,6 +23,7 @@ GEM
       tzinfo (~> 1.1)
     arel (6.0.3)
     builder (3.2.2)
+    bump (0.5.3)
     byebug (8.2.1)
     diff-lcs (1.2.5)
     i18n (0.7.0)
@@ -49,6 +50,7 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (~> 4.2.0)
+  bump
   bundler (~> 1.3)
   byebug
   rake

data/gemfiles/rails5.0.gemfile

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec path: "../"
 
-gem "activerecord", "~> 5.0.0.beta1"
+gem "activerecord", "~> 5.0.0.beta3"

data/gemfiles/rails5.0.gemfile.lock

@@ -1,36 +1,31 @@
 PATH
   remote: ../
   specs:
-    zombie_record (1.3.0)
+    zombie_record (1.3.1)
       activerecord (>= 4.0, < 5.1)
       mysql2
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.0.0.beta1)
-      activesupport (= 5.0.0.beta1)
-      builder (~> 3.1)
-    activerecord (5.0.0.beta1)
-      activemodel (= 5.0.0.beta1)
-      activesupport (= 5.0.0.beta1)
+    activemodel (5.0.0.beta3)
+      activesupport (= 5.0.0.beta3)
+    activerecord (5.0.0.beta3)
+      activemodel (= 5.0.0.beta3)
+      activesupport (= 5.0.0.beta3)
       arel (~> 7.0)
-    activesupport (5.0.0.beta1)
+    activesupport (5.0.0.beta3)
       concurrent-ruby (~> 1.0)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      method_source
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (7.0.0)
-    builder (3.2.2)
+    bump (0.5.3)
     byebug (8.2.1)
-    concurrent-ruby (1.0.0)
+    concurrent-ruby (1.0.1)
     diff-lcs (1.2.5)
     i18n (0.7.0)
-    json (1.8.3)
-    method_source (0.8.2)
-    minitest (5.8.3)
+    minitest (5.8.4)
     mysql2 (0.4.2)
     rake (10.4.2)
     rspec (2.14.1)
@@ -51,7 +46,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 5.0.0.beta1)
+  activerecord (~> 5.0.0.beta3)
+  bump
   bundler (~> 1.3)
   byebug
   rake

data/lib/zombie_record/restorable.rb

@@ -148,8 +148,14 @@ module ZombieRecord
     end
 
     module WithDeletedAssociationsWrapper
-      def to_a
-        super.map(&:with_deleted_associations)
+      if ActiveRecord::VERSION::MAJOR < 5
+        def to_a
+          super.map(&:with_deleted_associations)
+        end
+      else
+        def records
+          super.map(&:with_deleted_associations)
+        end
       end
     end
 

data/lib/zombie_record/version.rb

@@ -1,3 +1,3 @@
 module ZombieRecord
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/zombie_record.gemspec

@@ -1,7 +1,4 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'zombie_record/version'
+require './lib/zombie_record/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "zombie_record"
@@ -24,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "bump"
   spec.add_development_dependency "rspec", "~> 2.14.1"
   spec.add_development_dependency "timecop", "~> 0.7.0"
   spec.add_development_dependency "wwtd", ">= 0.5.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zombie_record
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Daniel Schierbeck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -86,6 +86,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bump
+  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'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -175,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Allows restoring your Active Records from the dead!