diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 444eb46..fa97738 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,14 +8,11 @@ jobs: strategy: matrix: entry: - - name: 'Minimum supported' - ruby: '2.6' - gemfile: "Gemfile.min" - - name: 'Latest released' - ruby: '3.0' + - name: "Latest released" + ruby: "3.4.0" gemfile: "Gemfile" - - name: 'Rails edge' - ruby: '3.1' + - name: "Rails edge" + ruby: "3.4.0" gemfile: "Gemfile.edge" name: ${{ matrix.entry.name }} @@ -30,11 +27,11 @@ jobs: - 11211:11211 steps: - - run: sudo apt-get -y install libsasl2-dev - - uses: actions/checkout@v2 - - uses: ruby/setup-ruby@v1 - with: - ruby-version: ${{ matrix.entry.ruby }} - rubygems: '3.3.13' - bundler-cache: true - - run: bundle exec rake + - run: sudo apt-get -y install libsasl2-dev + - uses: actions/checkout@v2 + - uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.entry.ruby }} + rubygems: "3.3.13" + bundler-cache: true + - run: bundle exec rake diff --git a/Gemfile b/Gemfile index 1466767..4f3c08e 100644 --- a/Gemfile +++ b/Gemfile @@ -3,3 +3,4 @@ source 'https://rubygems.org' gemspec gem "snappy" +gem "memcached", github: "Shopify/memcached", branch: "1-0-stable-shopify" diff --git a/Gemfile.edge b/Gemfile.edge index 0e032a4..7e09c10 100644 --- a/Gemfile.edge +++ b/Gemfile.edge @@ -4,3 +4,4 @@ gemspec gem "rails", github: "rails/rails", branch: "main" gem "snappy" +gem "memcached", github: "Shopify/memcached", branch: "1-0-stable-shopify" diff --git a/Gemfile.lock b/Gemfile.lock index c763fe3..210a04c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,10 @@ +GIT + remote: https://github.com/Shopify/memcached.git + revision: 30f5735d5db2dfd50dd885ceeb51672320b356d3 + branch: 1-0-stable-shopify + specs: + memcached (1.9.0) + PATH remote: . specs: @@ -8,39 +15,45 @@ PATH GEM remote: https://rubygems.org/ specs: - activesupport (7.1.3.2) + activesupport (8.0.2) base64 + benchmark (>= 0.3) bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + uri (>= 0.13.1) base64 (0.2.0) - bigdecimal (3.1.7) - concurrent-ruby (1.2.3) - connection_pool (2.4.1) + benchmark (0.4.0) + bigdecimal (3.1.9) + concurrent-ruby (1.3.5) + connection_pool (2.5.0) drb (2.2.1) - i18n (1.14.4) + i18n (1.14.7) concurrent-ruby (~> 1.0) - memcached (1.8.0) - minitest (5.22.3) - mocha (2.2.0) + logger (1.7.0) + minitest (5.25.5) + mocha (2.7.1) ruby2_keywords (>= 0.0.5) - mutex_m (0.2.0) rake (13.2.1) ruby2_keywords (0.0.5) + securerandom (0.4.1) snappy (0.4.0) - timecop (0.9.8) + timecop (0.9.10) tzinfo (2.0.6) concurrent-ruby (~> 1.0) + uri (1.0.3) PLATFORMS ruby DEPENDENCIES + memcached! memcached_store! mocha rake diff --git a/Gemfile.min b/Gemfile.min deleted file mode 100644 index 7c76a42..0000000 --- a/Gemfile.min +++ /dev/null @@ -1,7 +0,0 @@ -source 'https://rubygems.org' - -gemspec - -gem "snappy", "~> 0.2.0" -gem "memcached", "~> 1.8.0" -gem "activesupport", "~> 6.0.0" diff --git a/lib/active_support/cache/memcached_store.rb b/lib/active_support/cache/memcached_store.rb index 92fde8b..4585a1e 100644 --- a/lib/active_support/cache/memcached_store.rb +++ b/lib/active_support/cache/memcached_store.rb @@ -327,7 +327,7 @@ def write_entry(key, entry, options) # :nodoc: def delete_entry(key, _options = nil) # :nodoc: return true if read_only - handle_exceptions(return_value_on_error: false, on_miss: true) do + handle_exceptions(return_value_on_error: false, on_miss: false) do @connection.delete(key) true end diff --git a/memcached_store.gemspec b/memcached_store.gemspec index d2d1524..e388893 100644 --- a/memcached_store.gemspec +++ b/memcached_store.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |spec| spec.files = Dir["lib/**/*.rb", "README.md", "LICENSE"] spec.require_paths = ["lib"] - spec.required_ruby_version = ">= 2.6.0" + spec.required_ruby_version = ">= 3.2.0" spec.add_runtime_dependency "activesupport", ">= 6" spec.add_runtime_dependency "memcached", "~> 1.8" diff --git a/test/test_memcached_store.rb b/test/test_memcached_store.rb index 0d11c96..dc005ed 100644 --- a/test/test_memcached_store.rb +++ b/test/test_memcached_store.rb @@ -299,7 +299,7 @@ def test_delete assert @cache.delete('foo') assert !@cache.exist?('foo') - assert @cache.delete('foo') + assert_equal false, @cache.delete('foo') end def test_original_store_objects_should_not_be_immutable