discard 1.2.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27523357b203abf0f0928633448c778ec25ca89f36a9ec2e8178149b9a37ab67
-  data.tar.gz: 0650603e1aa80be6727824df9b74486fa8ad7af81f44074bf4c6db7b5b7c88cd
+  metadata.gz: 0626ecc4ddd0c4d8e9fb8c9c0edbd42aa664576cbea51403d904c58cb4857c2b
+  data.tar.gz: 8ec497ce993f3fe49c5ea802021e45b8c04c43b97b5ebd5bc19deb5e91da8843
 SHA512:
-  metadata.gz: e77b001ed871ddee9dcc0de5379b15c13370d5976b050cc1690dfd03d99898c6cde6993660bf379fc9d0c01e489655ec1b7d5d2f12bfd8176b9e68fbacc59841
-  data.tar.gz: d1e59a758e632ff4bfb96ae854e6b79eeb9a6eba76a6d6935f2f6fcad3c7f23fb4ee74e6562dc5055d89ddbc361dcab76440e5d5fa7f3ca6615513c3f763f9c9
+  metadata.gz: 10c74db9ce658b50d0b2112e34c901a06e69db789d74842400e4b9a9c32ae92b390a67ed6fc189b262d82de8eddeea3e71d85048ce43fbb7a223d758af768b40
+  data.tar.gz: bb82e531e3098c835bfcbbf1aabf8d06b1356346b1eeee361f01080b4c0d5c3d682f0987c1959588c84fea44769f32f4da6db4916430f656516d4872951b1a53

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,41 @@ 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:
+      fail-fast: false
       matrix:
-        rails_version:
-          - ~> 5.1.0
-          - ~> 5.2.0
-          - ~> 6.0.0
-          - ~> 6.1.0
-          - ~> 7.0.0
-    container: docker://ruby
+        include:
+          - rails_version: 8.0.0.rc1
+            ruby_version: '3.3'
+            sqlite_version: ~> 2.0
+          - rails_version: ~> 7.2.0
+            ruby_version: '3.3'
+            sqlite_version: ~> 2.0
+          - rails_version: ~> 7.2.0
+            ruby_version: '3.2'
+            sqlite_version: ~> 2.0
+          - rails_version: ~> 7.2.0
+            ruby_version: '3.1'
+            sqlite_version: ~> 2.0
+          - rails_version: ~> 7.1.0
+            ruby_version: '3.3'
+            sqlite_version: ~> 1.0
+          - rails_version: ~> 7.0.0
+            ruby_version: '3.2'
+            sqlite_version: ~> 1.0
+          - rails_version: ~> 6.1.0
+            ruby_version: '3.0'
+            sqlite_version: ~> 1.0
+    env:
+      RAILS_VERSION: ${{ matrix.rails_version }}
+      SQLITE_VERSION: ${{ matrix.sqlite_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@v4
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby_version }}
+    - name: Bundle install
+      run: bundle install
+    - name: Test
+      run: bundle exec rake 

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 ### Unreleased
 
+### Version 1.4.0
+Release date: 2024-11-05
+
+* Support Rails 8.0 and 8.1 (#110, #111)
+
+* More descriptive error messages (#108)
+
+### 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.
 
@@ -13,7 +13,7 @@ A simple ActiveRecord mixin to add conventions for flagging records as discarded
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'discard', '~> 1.2'
+gem 'discard', '~> 1.4'
 ```
 
 And then execute:
@@ -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

@@ -22,9 +22,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", ">= 4.2", "< 8"
+  spec.add_dependency "activerecord", ">= 4.2", "< 9.0"
   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,13 +138,13 @@ 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
     end
 
-    # Discard the record in the database
+    # Undiscard the record in the database
     #
     # There's a series of callbacks associated with #undiscard!. If the
     # <tt>before_undiscard</tt> callback throws +:abort+ the action is cancelled
@@ -159,11 +159,23 @@ module Discard
     private
 
     def _raise_record_not_discarded
-      raise ::Discard::RecordNotDiscarded.new("Failed to discard the record", self)
+      raise ::Discard::RecordNotDiscarded.new(discarded_fail_message, self)
     end
 
     def _raise_record_not_undiscarded
-      raise ::Discard::RecordNotUndiscarded.new("Failed to undiscard the record", self)
+      raise ::Discard::RecordNotUndiscarded.new(undiscarded_fail_message, self)
+    end
+
+    def discarded_fail_message
+      return "A discarded record cannot be discarded" if discarded?
+
+      "Failed to discard the record"
+    end
+
+    def undiscarded_fail_message
+      return "An undiscarded record cannot be undiscarded" if undiscarded?
+
+      "Failed to undiscard the record"
     end
   end
 end

data/lib/discard/version.rb

@@ -2,5 +2,5 @@
 
 module Discard
   # Discard version
-  VERSION = "1.2.1".freeze
+  VERSION = "1.4.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.4.0
 platform: ruby
 authors:
 - John Hawthorn
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-16 00:00:00.000000000 Z
+date: 2024-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -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,10 +124,10 @@ 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"
-- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: ActiveRecord soft-deletes done right

data/.travis.yml

@@ -1,28 +0,0 @@
-language: ruby
-cache: bundler
-rvm:
-  - 2.2
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-env:
-  matrix:
-    - RAILS_VERSION='~> 4.2.0' SQLITE_VERSION='~> 1.3.6'
-    - RAILS_VERSION='~> 5.0.0' SQLITE_VERSION='~> 1.3.6'
-    - RAILS_VERSION='~> 5.1.0'
-    - RAILS_VERSION='~> 5.2.0'
-    - RAILS_VERSION='~> 6.0.0'
-
-matrix:
-  exclude:
-    - rvm: 2.2
-      env: RAILS_VERSION='~> 6.0.0'
-    - rvm: 2.3
-      env: RAILS_VERSION='~> 6.0.0'
-    - rvm: 2.4
-      env: RAILS_VERSION='~> 6.0.0'
-    # Rails 4.2 uses BigDecimal.new, which Ruby 2.7 removed
-    - rvm: 2.7
-      env: RAILS_VERSION='~> 4.2.0' SQLITE_VERSION='~> 1.3.6'