acts_as_paranoid 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '096b348280798fe5ac4770a6c57bdb0731d2c5df9e7d361551cf065fe71f0b56'
-  data.tar.gz: 3d923644ebb1ccb3e06d9c04d8a0797f1677fcec880a188dd04ec8b19c9a957a
+  metadata.gz: 73cbdef60cb81f9506a3763c13b0380f83169b8c68f0b914305d828b90202d25
+  data.tar.gz: 2023f4db3125ff3db3dd9dc7b0fb0142e92d6f8f54bc433557d5dd0dc40fb853
 SHA512:
-  metadata.gz: e677d8e734d9c6d72fd68feaad170f928fb159ea6a90e400632ce8365f8120a991eae46508bb04d641117fa2e24d3e38e9df6699c1d70b2cd994a4cf85c49379
-  data.tar.gz: b58a42cbf60696baffac255deb673476e5e339dbbe4bd1681959442ca2fc33a51f6d2e146755fc8f79539976d47c6244927969c82a86fdb70a553de44281e512
+  metadata.gz: 1c7b2ff7d8655621915c11630012ff946a196b46fd0a175facad75d90aa4f6ecae1ae6df1e627f9cf778faa46d26fb559b275e62101a4ba402007d545014f43d
+  data.tar.gz: ec47e5232127609e3e83b9bf22b142a821e955b55a77e082f21ceaeb5e62c390253fee6815cfc3a4a795257eb68c15f29eb5adbad8e511703718e4278d84e52c

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 Notable changes to this project will be documented in this file.
 
+## 0.7.2
+
+* Do not set boolean column to NULL on recovery if nulls are not allowed
+  ([#193], by [Shodai Suzuki][soartec-lab])
+* Add a CONTRIBUTING.md file ([#207], by [Matijs van Zuijlen][mvz])
+
 ## 0.7.1
 
 * Support Rails 6.1 ([#191], by [Matijs van Zuijlen][mvz])
@@ -87,6 +93,7 @@ Notable changes to this project will be documented in this file.
 [ri4a]: https://github.com/ri4a
 [pauldruziak]: https://github.com/pauldruziak
 [shadydealer]: https://github.com/shadydealer
+[soartec-lab]: https://github.com/soartec-lab
 [thebravoman]: https://github.com/thebravoman
 [valeriecodes]: https://github.com/valeriecodes
 [wtfspm]: https://github.com/wtfspm
@@ -95,6 +102,8 @@ Notable changes to this project will be documented in this file.
 
 [#209]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/209
 [#208]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/208
+[#207]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/207
+[#193]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/193
 [#191]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/191
 [#175]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/175
 [#173]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/173

data/CONTRIBUTING.md

@@ -0,0 +1,59 @@
+# Contributing to ActsAsParanoid
+
+We welcome all contributions to ActsAsParanoid. Below are some guidelines to
+help the process of handling issues and pull requests go smoothly.
+
+## Issues
+
+When creating an issue, please try to provide as much information as possible.
+Also, please follow the guidelines below to make it easier for us to figure out
+what's going on. If you miss any of these points we will probably ask you to
+improve the ticket.
+
+- Include a clear title describing the problem
+- Describe what you are trying to achieve
+- Describe what you did, preferably including relevant code
+- Describe what you expected to happen
+- Describe what happened instead, possibly including relevant output
+- Use [code blocks](https://github.github.com/gfm/#fenced-code-blocks) to
+  format any code and output in your ticket to make it readable.
+
+## Pull requests
+
+If you have an idea for a particular feature, it's probably best to create a
+GitHub issue for it before trying to implement it yourself. That way, we can
+discuss the feature and whether it makes sense to include in ActsAsParanoid itself
+before putting in the work to implement it.
+
+If you want to send pull requests or patches, try to follow the instructions
+below. **If you get stuck, please make a pull request anyway and we'll try to
+help out.**
+
+- Make sure `rake test` runs without reporting any failures.
+- Add tests for your feature. Otherwise, we can't see if it works or if we
+  break it later.
+- Make sure latest master merges cleanly with your branch. Things might
+  have moved around since you forked.
+- Try not to include changes that are irrelevant to your feature in the
+  same commit.
+- Keep an eye on the build results in GitHub Actions. If the build fails and it
+  seems due to your changes, please update your pull request with a fix.
+
+### The review process
+
+- We will try to review your pull request as soon as possible but we can make no
+  guarantees. Feel free to ping us now and again.
+- We will probably ask you to rebase your branch on current master at some point
+  during the review process.
+  If you are unsure how to do this,
+  [this in-depth guide](https://git-rebase.io/) should help out.
+- If you have any unclear commit messages, work-in-progress commits, or commits
+  that just fix a mistake in a previous commits, we will ask you to clean up
+  the history.
+  Again, [the git-rebase guide](https://git-rebase.io/) should help out.
+- At the end of the review process we may still choose not to merge your pull
+  request. For example, this could happen if we decide the proposed feature
+  should not be part of ActsAsParanoid, or if the technical implementation does not
+  match where we want to go with the architecture the project.
+- We will generally not merge any pull requests that make the build fail, unless
+  it's very clearly not related to the changes in the pull request.

data/lib/acts_as_paranoid.rb

@@ -32,8 +32,12 @@ module ActsAsParanoid
     }
     if options[:column_type] == "string"
       paranoid_configuration.merge!(deleted_value: "deleted")
+    elsif options[:column_type] == "boolean" && !options[:allow_nulls]
+      paranoid_configuration.merge!(recovery_value: false)
+    elsif options[:column_type] == "boolean"
+      paranoid_configuration.merge!(allow_nulls: true)
     end
-    paranoid_configuration.merge!(allow_nulls: true) if options[:column_type] == "boolean"
+
     paranoid_configuration.merge!(options) # user options
 
     unless %w[time boolean string].include? paranoid_configuration[:column_type]

data/lib/acts_as_paranoid/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActsAsParanoid
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

data/test/test_core.rb

@@ -533,6 +533,24 @@ class ParanoidTest < ParanoidBaseTest
     assert_equal 0, ParanoidBooleanNotNullable.with_deleted.where(id: ps).count
   end
 
+  def test_boolean_type_with_no_nil_value_after_recover
+    ps = ParanoidBooleanNotNullable.create!
+    ps.destroy
+    assert_equal 1, ParanoidBooleanNotNullable.only_deleted.where(id: ps).count
+
+    ps.recover
+    assert_equal 1, ParanoidBooleanNotNullable.where(id: ps).count
+  end
+
+  def test_boolean_type_with_no_nil_value_after_recover!
+    ps = ParanoidBooleanNotNullable.create!
+    ps.destroy
+    assert_equal 1, ParanoidBooleanNotNullable.only_deleted.where(id: ps).count
+
+    ps.recover!
+    assert_equal 1, ParanoidBooleanNotNullable.where(id: ps).count
+  end
+
   def test_no_double_tap_destroys_fully
     ps = ParanoidNoDoubleTapDestroysFully.create!
     2.times { ps.destroy }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_paranoid
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Zachary Scott
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-14 00:00:00.000000000 Z
+date: 2021-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -148,14 +148,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +184,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
+- CONTRIBUTING.md
 - LICENSE
 - README.md
 - lib/acts_as_paranoid.rb