cached_resource 6.0.0 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1db920707ba1bb3a1ba5c619c316ea9a1a0c932b9852231f312178a15952ac43
-  data.tar.gz: 7bb62db4f9df25eb585ab2d1a7605ed5b4ca0811df2e83cb19be9adefd039be0
+  metadata.gz: 945dbe812b6e4fea58b155907076ea3821bf87a7b37312a7301f16f420ed9158
+  data.tar.gz: f07ca05471ba063bbe38d8ae7a29d6b16c4cd5132066f9c8d9f71d2d06a22c45
 SHA512:
-  metadata.gz: c7f06dba0aaf189395a70fc6c5d8e7d97a5e48e327f2d73fdc192b9bb3b911b85e01bff9cdda67aad53c91d471df59bb5b3db808f3eac5c92f9a881c41a7347b
-  data.tar.gz: 307f61951d5ac54b1c28677253b862a8857b79358afe7abb8504849b8da902bfba1ae05bda6231aa34044d1f0eaa0228fd4794ccf25e6acf5406df7747840fcc
+  metadata.gz: ab3c75b4c0384b7ea516159ce7526e7dcd62443951331302986483403887d7e498528fef972c1268fc9a2dce3fb2d0df56434617ea21db03a3adc3457534527d
+  data.tar.gz: 21a1220f34e5bb07b5da51648dcbdb521970c801d7aabdcc53a142b4ad5347c0e779c3bd7186891f5bb9e4b9b79bb74df5790b9524cd14f72358d875b293c9db

data/.github/workflows/ruby.yml

@@ -0,0 +1,109 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Test
+
+on: [push]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version: ['1.9', '2.2', '2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2']
+        rails-version: ['4.2', '5.0', '5.1', '6.0', '6.1', '7.0']
+        exclude:
+          # Segmentation faults during tests, but should work?
+          - ruby-version: '2.2'
+            rails-version: '5.0'
+          - ruby-version: '2.2'
+            rails-version: '5.1'
+          # Too old
+          - ruby-version: '1.9'
+            rails-version: '5.0'
+          - ruby-version: '1.9'
+            rails-version: '5.1'
+          - ruby-version: '1.9'
+            rails-version: '6.0'
+          - ruby-version: '1.9'
+            rails-version: '6.1'
+          - ruby-version: '1.9'
+            rails-version: '7.0'
+          # activesupport (~> 6.0.0) was resolved to 6.0.6.1, which depends on ruby (>= 2.5.0)
+          # activesupport (~> 6.1.0) was resolved to 6.1.7.2, which depends on ruby (>= 2.5.0)
+          - ruby-version: '2.2'
+            rails-version: '6.0'
+          - ruby-version: '2.2'
+            rails-version: '6.1'
+          - ruby-version: '2.3'
+            rails-version: '6.0'
+          - ruby-version: '2.3'
+            rails-version: '6.1'
+          - ruby-version: '2.4'
+            rails-version: '6.0'
+          - ruby-version: '2.4'
+            rails-version: '6.1'
+          # activesupport (~> 7.0.0) was resolved to 7.0.4.2, which depends on Ruby (>= 2.7.0)
+          - ruby-version: '2.2'
+            rails-version: '7.0'
+          - ruby-version: '2.3'
+            rails-version: '7.0'
+          - ruby-version: '2.4'
+            rails-version: '7.0'
+          - ruby-version: '2.5'
+            rails-version: '7.0'
+          - ruby-version: '2.6'
+            rails-version: '7.0'
+          # incompatbility with BigDecimal.new
+          - ruby-version: '2.7'
+            rails-version: '4.2'
+          - ruby-version: '3.0'
+            rails-version: '4.2'
+          - ruby-version: '3.1'
+            rails-version: '4.2'
+          - ruby-version: '3.2'
+            rails-version: '4.2'
+          # ArgumentError: expected attributes to be able to convert to Hash, got "#<Thing:0x000055d208b2e258>"
+          # probably keyword argument delegation different in Ruby 3
+          # https://www.ruby-lang.org/en/news/2019/12/12/separation-of-positional-and-keyword-arguments-in-ruby-3-0/
+          - ruby-version: '3.0'
+            rails-version: '5.0'
+          - ruby-version: '3.0'
+            rails-version: '5.1'
+          - ruby-version: '3.1'
+            rails-version: '5.0'
+          - ruby-version: '3.1'
+            rails-version: '5.1'
+          - ruby-version: '3.2'
+            rails-version: '5.0'
+          - ruby-version: '3.2'
+            rails-version: '5.1'
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+        # change this to (see https://github.com/ruby/setup-ruby#versioning):
+        # uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+      - name: Install bundler 1.x.x
+        if: matrix.rails-version == '4.2'
+        run: gem uninstall -aIx bundler && gem install bundler -v 1.17.3
+      - name: Install dependencies
+        run: bundle install
+        env:
+          TEST_RAILS_VERSION: ${{ matrix.rails-version }}
+          DEBUG: true
+      - name: Run tests
+        run: bundle exec rake

data/.gitignore

@@ -4,3 +4,4 @@ Gemfile.lock
 pkg/*
 *DS_Store
 .ruby-version
+.tool-versions

data/Gemfile

@@ -1,3 +1,29 @@
 source "http://rubygems.org"
 
 gemspec
+
+def eval_gemfile(path)
+  gemfile_local = File.expand_path(path, __FILE__)
+  if File.readable?(gemfile_local)
+    puts "Loading #{gemfile_local}..." if ENV['DEBUG']
+    instance_eval(File.read(gemfile_local))
+  end
+end
+
+puts "\e[93mUsing TEST_RAILS_VERSION #{ENV['TEST_RAILS_VERSION']}\e[0m" if ENV['DEBUG']
+case ENV['TEST_RAILS_VERSION']
+when "4.2"
+  eval_gemfile('../gemfiles/4.2.gemfile')
+when "5.0"
+  eval_gemfile('../gemfiles/5.0.gemfile')
+when "5.1"
+  eval_gemfile('../gemfiles/5.1.gemfile')
+when "6.0"
+  eval_gemfile('../gemfiles/6.0.gemfile')
+when "6.1"
+  eval_gemfile('../gemfiles/6.1.gemfile')
+when "7.0"
+  eval_gemfile('../gemfiles/7.0.gemfile')
+else
+  puts "\e[93mNo TEST_RAILS_VERSION present, letting dependency manager decide what's best.\e[0m" if ENV['DEBUG']
+end

data/README.md

@@ -1,4 +1,5 @@
-# CachedResource [![Build Status](https://app.travis-ci.com/mhgbrown/cached_resource.svg?branch=master)](https://app.travis-ci.com/github/mhgbrown/cached_resource)
+# CachedResource ![Tests](https://github.com/mhgbrown/cached_resource/actions/workflows/ruby.yml/badge.svg)
+
 CachedResource is a Ruby gem whose goal is to increase the performance of interacting with web services via ActiveResource by caching responses based on request parameters.  It can help reduce the lag created by making repeated requests across a network.
 
 ## Installation
@@ -8,28 +9,25 @@ gem install cached_resource
 ```
 
 ## Compatibility
-CachedResource supports the following Ruby versions:
-
-* 2.2.x
-* 2.3.x
-* 2.4.x
-* 2.5.x
-* 2.7.x
-
-...and likely other modern Ruby versions. If you require 1.8.7 support, please use version 2.3.4.
 
-CachedResource is designed to be framework agnostic, but will hook into Rails for caching and logging if available. The latest CachedResource officially supports the following Rails versions:
+CachedResource is designed to be framework agnostic, but will hook into Rails for caching and logging if available. CachedResource supports the following ActiveSupport/Rails (right) and Ruby (down) version combinations:
 
-* 4.2.x
-* 5.0.x
-* 5.1.x
-* 6.0.x
-* 6.1.x
-* 7.0.x
+| | 🛤️ 4.2 | 🛤️ 5.0 | 🛤️ 5.1 | 🛤️ 6.0 | 🛤️ 6.1 | 🛤️ 7.0 |
+|-------|-----|-----|-----|-----|-----|-----|
+| 💎 1.9   | ✅   |     |     |     |     |     |
+| 💎 2.2   | ✅   |     |     |     |     |     |
+| 💎 2.3   | ✅   | ✅   | ✅   |     |     |     |
+| 💎 2.4   | ✅   | ✅   | ✅   |     |     |     |
+| 💎 2.5   | ✅   | ✅   | ✅   | ✅   | ✅   |     |
+| 💎 2.6   |   ✅   |   ✅  |  ✅   |  ✅   |  ✅   |     |
+| 💎 2.7   |     | ✅   | ✅   | ✅   | ✅   | ✅   |
+| 💎 3.0   |     |     |     | ✅   | ✅   | ✅   |
+| 💎 3.1   |     |     |     | ✅   | ✅   | ✅   |
+| 💎 3.2   |     |     |     | ✅   | ✅   | ✅   |
 
-For previously supported versions, use 4.2.0 or below.
 
 ## Configuration
+
 **Set up CachedResource across all ActiveResources:**
 
 ```ruby
@@ -154,25 +152,46 @@ Since resources are cached with an argument based key, you may pass in extra dat
 ```ruby
 MyActiveResource.find(:one, from: "/admin/shop.json", uid: "unique value")
 ```
+
 ## Testing
 
-```ruby
-rake
+To test the Ruby + Rails combination configured by default:
+
+```bash
+$ rake
 ```
 
-or to test all supported environments, make sure appraisal is setup
+or to test all supported environments...you have to do a little more work...
 
-```ruby
-bundle exec appraisal install
+Switch your Ruby version to the desired version. This project's maintainer uses `asdf`, so switching to Ruby 3 looks like this:
+
+```bash
+$ asdf local ruby 3.0.5
 ```
 
-and then run
+If you have a `Gemfile.lock`, delete it:
 
-```ruby
-bundle exec appraisal rake
+```bash
+$ rm Gemfile.lock
 ```
 
-For more details, head over to the [appraisal](https://github.com/thoughtbot/appraisal) documentation.
+Then reinstall your dependencies:
+
+```bash
+$ bundle install
+```
+
+and finally, run the tests:
+
+```bash
+$ rake
+```
+
+If you want to test with a specific Rails version, start over and install dependencies with `TEST_RAILS_VERSION` set:
+
+```bash
+$ TEST_RAILS_VERSION=6.1 bundle install
+```
 
 ## Credit/Inspiration
 * quamen and [this gist](http://gist.github.com/947734)

data/cached_resource.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.name        = "cached_resource"
   s.version     = CachedResource::VERSION
   s.authors     = "Morgan Brown"
-  s.email       = "brown.mhg@gmail.com"
+  s.email       = "cached_resource@email.mhgbrown.is"
   s.homepage    = "https://github.com/mhgbrown/cached_resource"
   s.summary     = %q{Caching for ActiveResource}
   s.description = %q{Enables request-based caching for ActiveResource}
@@ -17,11 +17,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.required_ruby_version = '>= 1.9.0'
+
   s.add_runtime_dependency "activeresource", ">= 4.0"
   s.add_runtime_dependency "activesupport", ">= 4.0"
   s.add_runtime_dependency "nilio", ">= 1.0"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
-  s.add_development_dependency "appraisal"
 end

data/gemfiles/4.2.gemfile

@@ -1,9 +1,6 @@
-# This file was generated by Appraisal
-
 source "http://rubygems.org"
 
 gem "rails", "~> 4.2.0"
-# https://stackoverflow.com/questions/60226893/rails-nomethoderror-undefined-method-new-for-bigdecimalclass
-gem "bigdecimal", "1.3.5"
 
-gemspec path: "../"
+# https://stackoverflow.com/questions/60226893/rails-nomethoderror-undefined-method-new-for-bigdecimalclass
+# gem "bigdecimal", "1.3.5"

data/gemfiles/5.0.gemfile

@@ -1,7 +1,3 @@
-# This file was generated by Appraisal
-
 source "http://rubygems.org"
 
 gem "rails", "~> 5.0.0"
-
-gemspec path: "../"

data/gemfiles/5.1.gemfile

@@ -1,7 +1,3 @@
-# This file was generated by Appraisal
-
 source "http://rubygems.org"
 
 gem "rails", "~> 5.1.0"
-
-gemspec path: "../"

data/gemfiles/6.0.gemfile

@@ -1,7 +1,3 @@
-# This file was generated by Appraisal
-
 source "http://rubygems.org"
 
 gem "rails", "~> 6.0.0"
-
-gemspec path: "../"

data/gemfiles/6.1.gemfile

@@ -1,7 +1,3 @@
-# This file was generated by Appraisal
-
 source "http://rubygems.org"
 
 gem "rails", "~> 6.1.0"
-
-gemspec path: "../"

data/gemfiles/7.0.gemfile

@@ -1,7 +1,3 @@
-# This file was generated by Appraisal
-
 source "http://rubygems.org"
 
 gem "rails", "~> 7.0.0"
-
-gemspec path: "../"

data/lib/cached_resource/version.rb

@@ -1,3 +1,3 @@
 module CachedResource
-  VERSION = "6.0.0"
+  VERSION = "7.0.0"
 end

data/spec/spec_helper.rb

@@ -9,3 +9,4 @@ require 'cached_resource'
 RSpec.configure do |config|
   # nada
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cached_resource
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Morgan Brown
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-18 00:00:00.000000000 Z
+date: 2023-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -80,47 +80,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  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'
 description: Enables request-based caching for ActiveResource
-email: brown.mhg@gmail.com
+email: cached_resource@email.mhgbrown.is
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
-- Appraisals
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - cached_resource.gemspec
 - gemfiles/4.2.gemfile
-- gemfiles/4.2.gemfile.lock
 - gemfiles/5.0.gemfile
-- gemfiles/5.0.gemfile.lock
 - gemfiles/5.1.gemfile
-- gemfiles/5.1.gemfile.lock
 - gemfiles/6.0.gemfile
-- gemfiles/6.0.gemfile.lock
 - gemfiles/6.1.gemfile
-- gemfiles/6.1.gemfile.lock
 - gemfiles/7.0.gemfile
-- gemfiles/7.0.gemfile.lock
 - lib/cached_resource.rb
 - lib/cached_resource/cached_resource.rb
 - lib/cached_resource/caching.rb
@@ -142,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.travis.yml

@@ -1,43 +0,0 @@
-language: ruby
-sudo: false
-before_install:
-  - gem install bundler:1.17.3
-cache: bundler
-
-rvm:
-  - 2.2.4
-  - 2.3.4
-  - 2.4.1
-  - 2.5.8
-  - 2.7.2
-
-gemfile:
-  - gemfiles/4.2.gemfile
-  - gemfiles/5.0.gemfile
-  - gemfiles/5.1.gemfile
-  - gemfiles/6.0.gemfile
-  - gemfiles/6.1.gemfile
-  - gemfiles/7.0.gemfile
-
-jobs:
-  exclude:
-    - rvm: 2.2.4
-      gemfile: gemfiles/6.0.gemfile
-    - rvm: 2.3.4
-      gemfile: gemfiles/6.0.gemfile
-    - rvm: 2.4.1
-      gemfile: gemfiles/6.0.gemfile
-    - rvm: 2.2.4
-      gemfile: gemfiles/6.1.gemfile
-    - rvm: 2.3.4
-      gemfile: gemfiles/6.1.gemfile
-    - rvm: 2.4.1
-      gemfile: gemfiles/6.1.gemfile
-    - rvm: 2.2.4
-      gemfile: gemfiles/7.0.gemfile
-    - rvm: 2.3.4
-      gemfile: gemfiles/7.0.gemfile
-    - rvm: 2.4.1
-      gemfile: gemfiles/7.0.gemfile
-    - rvm: 2.5.8
-      gemfile: gemfiles/7.0.gemfile

data/Appraisals

@@ -1,28 +0,0 @@
-appraise "4.2" do
-  gem "rails", "~> 4.2.0"
-  # https://stackoverflow.com/questions/60226893/rails-nomethoderror-undefined-method-new-for-bigdecimalclass
-  gem "bigdecimal", "1.3.5"
-end
-
-appraise "5.0" do
-  gem "rails", "~> 5.0.0"
-end
-
-appraise "5.1" do
-  gem "rails", "~> 5.1.0"
-end
-
-# requires ruby >= 2.5.0
-appraise "6.0" do
-  gem "rails", "~> 6.0.0"
-end
-
-# requires ruby >= 2.5.0
-appraise "6.1" do
-  gem "rails", "~> 6.1.0"
-end
-
-# requires ruby >= 2.7.0
-appraise "7.0" do
-  gem "rails", "~> 7.0.0"
-end

data/gemfiles/4.2.gemfile.lock

@@ -1,142 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    cached_resource (5.3.0)
-      activeresource (>= 4.0)
-      activesupport (>= 4.0)
-      nilio (>= 1.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (4.2.9)
-      actionpack (= 4.2.9)
-      actionview (= 4.2.9)
-      activejob (= 4.2.9)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.9)
-      actionview (= 4.2.9)
-      activesupport (= 4.2.9)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.9)
-      activesupport (= 4.2.9)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.9)
-      activesupport (= 4.2.9)
-      globalid (>= 0.3.0)
-    activemodel (4.2.9)
-      activesupport (= 4.2.9)
-      builder (~> 3.1)
-    activerecord (4.2.9)
-      activemodel (= 4.2.9)
-      activesupport (= 4.2.9)
-      arel (~> 6.0)
-    activeresource (4.1.0)
-      activemodel (~> 4.0)
-      activesupport (~> 4.0)
-      rails-observers (~> 0.1.2)
-    activesupport (4.2.9)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    appraisal (2.2.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (6.0.4)
-    bigdecimal (1.3.5)
-    builder (3.2.3)
-    concurrent-ruby (1.0.5)
-    diff-lcs (1.3)
-    erubis (2.7.0)
-    globalid (0.4.0)
-      activesupport (>= 4.2.0)
-    i18n (0.8.4)
-    loofah (2.0.3)
-      nokogiri (>= 1.5.9)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.2.0)
-    minitest (5.10.2)
-    nilio (1.0.0)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
-    rack (1.6.8)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.2.9)
-      actionmailer (= 4.2.9)
-      actionpack (= 4.2.9)
-      actionview (= 4.2.9)
-      activejob (= 4.2.9)
-      activemodel (= 4.2.9)
-      activerecord (= 4.2.9)
-      activesupport (= 4.2.9)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.9)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.8)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    rails-observers (0.1.5)
-      activemodel (>= 4.0)
-    railties (4.2.9)
-      actionpack (= 4.2.9)
-      activesupport (= 4.2.9)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
-    sprockets (3.7.1)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.0)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    thor (0.19.4)
-    thread_safe (0.3.6)
-    tzinfo (1.2.3)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal
-  bigdecimal (= 1.3.5)
-  cached_resource!
-  rails (~> 4.2.0)
-  rake
-  rspec
-
-BUNDLED WITH
-   1.17.3