Merge pull request #14 from splitwise/ar/mondernize

Update code and conventions

Author: agrberg

.rubocop.yml

@@ -1,14 +1,15 @@
 require: 'rubocop-rspec'
 
 AllCops:
-  TargetRubyVersion: 2.3
+  NewCops: enable
+  TargetRubyVersion: 2.6
 
+Layout/LineLength:
+  Max: 120
+  IgnoredPatterns: ['#.*']
 Layout/SpaceInsideHashLiteralBraces:
   EnforcedStyle: no_space
 
-Metrics/LineLength:
-  Max: 120
-  IgnoredPatterns: ['#.*']
 Metrics/MethodLength:
   Max: 25
 

Gemfile

@@ -1,13 +1,13 @@
 source 'https://rubygems.org'
 
 group :development, :test do
-  gem 'guard', '~> 2.15'
-  gem 'guard-rspec', '~> 4.7'
-  gem 'guard-rubocop', '~> 1.3'
-  gem 'pry-byebug', '~> 3.6'
-  gem 'rspec', '~> 3.8'
-  gem 'rubocop', '~> 0.63'
-  gem 'rubocop-rspec', '~> 1.31'
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'guard-rubocop'
+  gem 'pry-byebug'
+  gem 'rspec'
+  gem 'rubocop'
+  gem 'rubocop-rspec'
 end
 
 gemspec

Gemfile.lock

@@ -1,100 +1,102 @@
 PATH
   remote: .
   specs:
-    cacheable (1.0.4)
+    cacheable (2.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
-    byebug (10.0.2)
-    coderay (1.1.2)
-    diff-lcs (1.3)
-    ffi (1.10.0)
-    formatador (0.2.5)
-    guard (2.15.0)
+    ast (2.4.2)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    diff-lcs (1.5.0)
+    ffi (1.15.5)
+    formatador (1.1.0)
+    guard (2.18.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
-      pry (>= 0.9.12)
+      pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
     guard-rspec (4.7.3)
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    guard-rubocop (1.3.0)
+    guard-rubocop (1.5.0)
       guard (~> 2.0)
-      rubocop (~> 0.20)
-    jaro_winkler (1.5.2)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    lumberjack (1.0.13)
-    method_source (0.9.2)
+      rubocop (< 2.0)
+    listen (3.7.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.2.8)
+    method_source (1.0.0)
     nenv (0.3.0)
-    notiffany (0.1.1)
+    notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.13.0)
-    parser (2.6.0.0)
-      ast (~> 2.4.0)
-    powerpack (0.1.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
-      pry (~> 0.10)
-    rainbow (3.0.0)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    parallel (1.21.0)
+    parser (3.1.0.0)
+      ast (~> 2.4.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
+    rainbow (3.1.1)
+    rb-fsevent (0.11.1)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    regexp_parser (2.2.0)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.2)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.63.1)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    rubocop (1.25.1)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
-    rubocop-rspec (1.31.0)
-      rubocop (>= 0.60.0)
-    ruby-progressbar (1.10.0)
-    ruby_dep (1.5.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.15.1)
+      parser (>= 3.0.1.1)
+    rubocop-rspec (2.8.0)
+      rubocop (~> 1.19)
+    ruby-progressbar (1.11.0)
     shellany (0.0.1)
-    thor (0.20.3)
-    unicode-display_width (1.4.1)
+    thor (1.2.1)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-20
+  x86_64-darwin-21
 
 DEPENDENCIES
   cacheable!
-  guard (~> 2.15)
-  guard-rspec (~> 4.7)
-  guard-rubocop (~> 1.3)
-  pry-byebug (~> 3.6)
-  rspec (~> 3.8)
-  rubocop (~> 0.63)
-  rubocop-rspec (~> 1.31)
+  guard
+  guard-rspec
+  guard-rubocop
+  pry-byebug
+  rspec
+  rubocop
+  rubocop-rspec
 
 BUNDLED WITH
-   1.16.6
+   2.3.6

Guardfile

@@ -17,7 +17,7 @@
 #
 # and, you'll have to watch "config/Guardfile" instead of "Guardfile"
 
-# Note: The cmd option is now required due to the increasing number of ways
+# NOTE: The cmd option is now required due to the increasing number of ways
 #       rspec may be run, below are examples of the most common uses.
 #  * bundler: 'bundle exec rspec'
 #  * bundler binstubs: 'bin/rspec'
@@ -43,7 +43,7 @@ guard :rspec, cmd: 'bundle exec rspec' do
   dsl.watch_spec_files_for(ruby.lib_files)
 end
 
-guard :rubocop, cli: '-RD' do
+guard :rubocop, cli: '-D' do
   watch(/.+\.rb$/)
   watch(%r{(?:.+/)?\.rubocop(?:_todo)?\.yml$}) { |m| File.dirname(m[0]) }
 end

Rakefile

@@ -0,0 +1,7 @@
+require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+RuboCop::RakeTask.new
+
+task default: %i[rubocop spec]

cacheable.gemspec

@@ -6,7 +6,6 @@ require 'cacheable/version'
 Gem::Specification.new do |s|
   s.name        = 'cacheable'
   s.version     = Cacheable::VERSION
-  s.date        = '2018-07-31'
   s.summary     = 'Add caching to any Ruby method in a aspect orientated programming approach.'
   s.description = 'Add caching simply without modifying your existing code. '\
                   'Includes configurable options for simple cache invalidation. '\
@@ -16,5 +15,6 @@ Gem::Specification.new do |s|
   s.files       = Dir['lib/**/*', 'README.md', 'cache-adapters.md']
   s.homepage    = 'https://github.com/splitwise/cacheable'
   s.licenses    = 'MIT'
-  s.required_ruby_version = '>= 2.3.0'
+  s.required_ruby_version = '>= 2.6.0'
+  s.metadata = {'rubygems_mfa_required' => 'true'}
 end

lib/cacheable/cache_adapters.rb

@@ -14,7 +14,7 @@ def lookup(adapter_name)
       private
 
       def class_name_for(string)
-        string.split('_').map { |name_part| "#{name_part[0].upcase}#{name_part[1..-1].downcase}" }.join
+        string.split('_').map { |name_part| "#{name_part[0].upcase}#{name_part[1..].downcase}" }.join
       end
     end
   end

lib/cacheable/cache_adapters/memory_adapter.rb

@@ -20,7 +20,7 @@ def exist?(key)
       def fetch(key, _options = {})
         return read(key) if exist?(key)
 
-        write(key, Proc.new.call)
+        write(key, yield)
       end
 
       def delete(key)

lib/cacheable/method_generator.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'English'
-
 module Cacheable
   module MethodGenerator
     def cacheable(*original_method_names, **opts)
@@ -66,7 +64,7 @@ def default_key_format
 
     def create_method_names(original_method_name)
       method_name_without_punctuation = original_method_name.to_s.sub(/([?!=])$/, '')
-      punctuation = $LAST_PAREN_MATCH
+      punctuation = Regexp.last_match(-1)
 
       {
         with_cache_method_name: "#{method_name_without_punctuation}_with_cache#{punctuation}",

lib/cacheable/version.rb

@@ -2,15 +2,13 @@
 
 module Cacheable
   module VERSION
-    MAJOR = 1
+    MAJOR = 2
     MINOR = 0
-    TINY = 4
+    TINY = 0
     PRE = nil
 
-    STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.').freeze
-
     def self.to_s
-      STRING
+      [MAJOR, MINOR, TINY, PRE].compact.join('.').freeze
     end
   end
 end