discard 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27523357b203abf0f0928633448c778ec25ca89f36a9ec2e8178149b9a37ab67
-  data.tar.gz: 0650603e1aa80be6727824df9b74486fa8ad7af81f44074bf4c6db7b5b7c88cd
+  metadata.gz: 98ef1bd12f3edc82e8e50b429d39989473cf7b917225ce25068a60e09ef7bb06
+  data.tar.gz: 7762b63af8cd7aeeb848f9778242a02a02be7069586943542916ea3ac12e6d51
 SHA512:
-  metadata.gz: e77b001ed871ddee9dcc0de5379b15c13370d5976b050cc1690dfd03d99898c6cde6993660bf379fc9d0c01e489655ec1b7d5d2f12bfd8176b9e68fbacc59841
-  data.tar.gz: d1e59a758e632ff4bfb96ae854e6b79eeb9a6eba76a6d6935f2f6fcad3c7f23fb4ee74e6562dc5055d89ddbc361dcab76440e5d5fa7f3ca6615513c3f763f9c9
+  metadata.gz: a43ba463a29c4cd1e1b8c3a79a37b8d140925ef9fe2ee1d23b1aa347c86e746faa390a3a11c60818cf327fb81c0cacd8561a9005a3ddeb9ced016b64258c32ce
+  data.tar.gz: 1a3516836d8a2f21ef1e0385d6b126bec5f5ca380071f473a80ac8d8bd5dc9cd275954fff9052b9964f5d0763cbbd0b2ba4e8da9317e042dbbdd5cb42836cf56

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

data/.github/workflows/test.yml

@@ -11,22 +11,29 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    name: Test on Rails ${{ matrix.rails_version }}
+    name: Test on Rails ${{ matrix.rails_version }} and Ruby ${{ matrix.ruby_version }}
     strategy:
       matrix:
-        rails_version:
-          - ~> 5.1.0
-          - ~> 5.2.0
-          - ~> 6.0.0
-          - ~> 6.1.0
-          - ~> 7.0.0
-    container: docker://ruby
+        include:
+          - rails_version: ~> 7.0.0
+            ruby_version: 3.2
+          - rails_version: ~> 7.0.0
+            ruby_version: 3.1
+          - rails_version: ~> 6.1.0
+            ruby_version: '3.0'
+          - rails_version: ~> 6.0.0
+            ruby_version: 2.7
+          - rails_version: ~> 5.2.0
+            ruby_version: 2.6
+          - rails_version: ~> 5.1.0
+            ruby_version: 2.5
+    env:
+      RAILS_VERSION: ${{ matrix.rails_version }}
     steps:
-    - uses: actions/checkout@v1
-    - name: Build and test
-      run: |
-        gem install bundler
-        bundle install --jobs 4 --retry 3
-        bundle exec rake
-      env:
-        RAILS_VERSION:  ${{ matrix.rails_version }}
+    - uses: actions/checkout@v3
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby_version }}
+        bundler-cache: true
+    - name: Test
+      run: bundle exec rake 

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ### Unreleased
 
+### Version 1.3.0
+Release date: 2023-08-17
+
+* Fix `undiscard` so it returns false instead of nil when the record isn't
+  discarded (#95, #96)
+
 ### Version 1.2.1
 Release date: 2021-12-16
 

data/README.md

@@ -1,4 +1,4 @@
-# Discard [![Build Status](https://travis-ci.org/jhawthorn/discard.svg?branch=master)](https://travis-ci.org/jhawthorn/discard)
+# Discard [![Test](https://github.com/jhawthorn/discard/actions/workflows/test.yml/badge.svg)](https://github.com/jhawthorn/discard/actions/workflows/test.yml)
 
 Soft deletes for ActiveRecord done right.
 
@@ -265,6 +265,8 @@ Discard takes a different approach. It doesn't override any ActiveRecord
 methods and instead simply provides convenience methods and scopes for
 discarding (hiding), restoring, and querying records.
 
+You can find more information about the history and purpose of Discard in [this blog post](https://supergood.software/introduction-to-discard/).
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/discard.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activerecord", ">= 4.2", "< 8"
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 10.0"
   spec.add_development_dependency "rspec", "~> 3.5.0"
   spec.add_development_dependency "database_cleaner", "~> 1.5"
   spec.add_development_dependency "with_model", "~> 2.0"

data/lib/discard/model.rb

@@ -138,7 +138,7 @@ module Discard
     #
     # @return [Boolean] true if successful, otherwise false
     def undiscard
-      return unless discarded?
+      return false unless discarded?
       run_callbacks(:undiscard) do
         update_attribute(self.class.discard_column, nil)
       end

data/lib/discard/version.rb

@@ -2,5 +2,5 @@
 
 module Discard
   # Discard version
-  VERSION = "1.2.1".freeze
+  VERSION = "1.3.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discard
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - John Hawthorn
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-16 00:00:00.000000000 Z
+date: 2023-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -48,14 +48,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
@@ -124,6 +124,7 @@ extra_rdoc_files: []
 files:
 - ".github/ISSUE_TEMPLATE/bug-report.md"
 - ".github/ISSUE_TEMPLATE/feature-proposal.md"
+- ".github/dependabot.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
@@ -161,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: ActiveRecord soft-deletes done right