legion-cache 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a0e98b3a109f9afe974174f40b6e881b1bc0fc44d8425170414cea1bd035f80
-  data.tar.gz: 533023b2a19842e481108e8954e4085cb7a38c6773fd4d87482257791bce90bb
+  metadata.gz: c084b2a826a462326ca3f8e76caadf7a7e37a78760cf5dbeb67b5ec99fe8a0ae
+  data.tar.gz: c841a6cb5586e091fedbad0d16b414127596943009a2dccb90fdf45f4a15e0c4
 SHA512:
-  metadata.gz: 202568edde877bd7a9e2c0e5b245e4283f818dfbb8118a316e9fbf145ca853910c2e1da44145cc6c71698846d7d62d391495fa965708d30063bce304d4519263
-  data.tar.gz: fbf7bfaa69f0d5f79e11d56b877481220a267d94775aeb2bcb8d243ab0baa49ecc18c6d6715ac18f5933ff3d7553ef232492c42528af548ffc264ef2d64c0c46
+  metadata.gz: 2ff55af73c6deb78556832331872bac6e89342d4fc0c40efd711ebc66731cb3d2b99316c1a9e0d043afcced6bf222c9d9e43a24379735fea7872839be256b88e
+  data.tar.gz: 77d8df72f0c1dcd555b491b037674fc090c1bd8e390e22a49b66c1ab9663b975505c0bc637557b7550603cc62f5e0bb25000c8fbe3de02b377e636294181ac97

data/.rubocop.yml

@@ -6,6 +6,10 @@ Metrics/ClassLength:
   Max: 1500
 Metrics/BlockLength:
   Max: 50
+  Exclude:
+    - 'spec/*/**.rb'
+Metrics/AbcSize:
+  Max: 20
 Layout/SpaceAroundEqualsInParameterDefault:
   EnforcedStyle: space
 Style/SymbolArray:

data/Gemfile.lock

@@ -1,64 +1,67 @@
 PATH
   remote: .
   specs:
-    legion-cache (1.0.0)
-      connection_pool
-      dalli
-      redis
+    legion-cache (1.1.0)
+      connection_pool (>= 2.2.3)
+      dalli (>= 2.7)
+      redis (>= 4.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.1)
     connection_pool (2.2.3)
-    dalli (2.7.10)
+    dalli (2.7.11)
     diff-lcs (1.4.4)
     docile (1.3.2)
     json (2.3.1)
-    legion-json (1.1.0)
+    json_pure (2.3.1)
+    legion-json (1.1.2)
+      json_pure
       multi_json
-    legion-logging (1.1.0)
+    legion-logging (1.1.3)
       rainbow (~> 3)
-    legion-settings (1.1.0)
+    legion-settings (1.1.2)
       legion-json
       legion-logging
     multi_json (1.15.0)
     parallel (1.19.2)
-    parser (2.7.1.4)
+    parser (2.7.2.0)
       ast (~> 2.4.1)
     rainbow (3.0.0)
     rake (13.0.1)
-    redis (4.2.1)
-    regexp_parser (1.7.1)
+    redis (4.2.2)
+    regexp_parser (1.8.2)
     rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.88.0)
+    rubocop (1.2.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8)
       rexml
-      rubocop-ast (>= 0.1.0, < 1.0)
+      rubocop-ast (>= 1.0.1)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.2.0)
-      parser (>= 2.7.0.1)
-    rubocop-performance (1.7.1)
-      rubocop (>= 0.82.0)
+    rubocop-ast (1.1.1)
+      parser (>= 2.7.1.5)
+    rubocop-performance (1.8.1)
+      rubocop (>= 0.87.0)
+      rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.10.1)
     simplecov (0.17.1)
       docile (~> 1.1)
@@ -71,7 +74,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler
+  bundler (>= 2)
   legion-cache!
   legion-logging
   legion-settings

data/bitbucket-pipelines.yml

@@ -0,0 +1,18 @@
+image: ruby:2.7
+
+pipelines:
+  tags:
+    "v*":
+      - step:
+          name: Push to RubyGems
+          deployment: RubyGems
+          script:
+            - gem install bundler gem-release rspec
+            - bundle install
+            - (umask  077 ; echo $gem_creds | base64 --decode > ~/.gem/credentials)
+            - gem release
+          artifacts:
+            - pkg/**
+definitions:
+  caches:
+    bundler: /usr/local/bundle

data/legion-cache.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'bundler', '>= 2'
   spec.add_development_dependency 'legion-logging'
   spec.add_development_dependency 'legion-settings'
   spec.add_development_dependency 'rake'
@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop-performance'
   spec.add_development_dependency 'simplecov', '< 0.18.0'
 
-  spec.add_dependency 'connection_pool'
-  spec.add_dependency 'dalli'
-  spec.add_dependency 'redis'
+  spec.add_dependency 'connection_pool', '>= 2.2.3'
+  spec.add_dependency 'dalli', '>= 2.7'
+  spec.add_dependency 'redis', '>= 4.2'
 end

data/lib/legion/cache.rb

@@ -10,6 +10,15 @@ module Legion
       include Legion::Cache::Memcached if Legion::Settings[:cache][:driver] == 'dalli'
       include Legion::Cache::Redis if Legion::Settings[:cache][:driver] == 'redis'
 
+      def setup(**opts)
+        return Legion::Settings[:cache][:connected] = true if connected?
+
+        return unless client(**Legion::Settings[:cache], **opts)
+
+        @connected = true
+        Legion::Settings[:cache][:connected] = true
+      end
+
       def shutdown
         Legion::Logging.info 'Shutting down Legion::Cache'
         close

data/lib/legion/cache/memcached.rb

@@ -1,51 +1,45 @@
 require 'dalli'
+require 'legion/cache/pool'
 
 module Legion
   module Cache
     module Memcached
+      include Legion::Cache::Pool
       extend self
 
       def client(servers: Legion::Settings[:cache][:servers], **opts)
         return @client unless @client.nil?
 
+        @pool_size = opts.key?(:pool_size) ? opts[:pool_size] : Legion::Settings[:cache][:pool_size] || 10
+        @timeout = opts.key?(:timeout) ? opts[:timeout] : Legion::Settings[:cache][:timeout] || 5
+
         Dalli.logger = Legion::Logging
-        @client = Dalli::Client.new(servers, Legion::Settings[:cache].merge(opts))
+        @client = ConnectionPool.new(size: pool_size, timeout: timeout) do
+          Dalli::Client.new(servers, Legion::Settings[:cache].merge(opts))
+        end
+
         @connected = true
         @client
       end
 
-      def connected?
-        @connected ||= false
-      end
-
-      def close
-        client.close
-      end
-
-      def restart
-        close
-        @client = nil
-        client
-      end
-
       def get(key)
-        client.get(key)
+        client.with { |conn| conn.get(key) }
       end
 
       def fetch(key, ttl = nil)
-        client.fetch(key, ttl)
+        client.with { |conn| conn.fetch(key, ttl) }
       end
 
       def set(key, value, ttl = 180)
-        client.set(key, value, ttl).positive?
+        client.with { |conn| conn.set(key, value, ttl).positive? }
       end
 
       def delete(key)
-        client.delete(key) == true
+        client.with { |conn| conn.delete(key) == true }
       end
 
       def flush(delay = 0)
-        client.flush(delay).first
+        client.with { |conn| conn.flush(delay).first }
       end
     end
   end

data/lib/legion/cache/pool.rb

@@ -0,0 +1,43 @@
+require 'connection_pool'
+
+module Legion
+  module Cache
+    module Pool
+      def connected?
+        @connected ||= false
+      end
+
+      def size
+        client.size
+      end
+
+      def timeout
+        @timeout ||= Legion::Settings[:cache][:timeout] || 5
+      end
+
+      def pool_size
+        @pool_size ||= Legion::Settings[:cache][:pool_size] || 10
+      end
+
+      def available
+        client.available
+      end
+
+      def close
+        client.shutdown(&:close)
+        @client = nil
+        @connected = false
+      end
+
+      def restart(**opts)
+        close
+        @client = nil
+        client_hash = opts
+        client_hash[:pool_size] = opts[:pool_size] if opts.key? :pool_size
+        client_hash[:timeout] = opts[:timeout] if opts.key? :timeout
+        client(**client_hash)
+        @connected = true
+      end
+    end
+  end
+end

data/lib/legion/cache/redis.rb

@@ -1,49 +1,42 @@
 require 'redis'
+require 'legion/cache/pool'
 
 module Legion
   module Cache
     module Redis
+      include Legion::Cache::Pool
       extend self
 
-      def client
+      def client(pool_size: 20, timeout: 5, **)
         return @client unless @client.nil?
 
-        @client = ::Redis.new
+        @pool_size = pool_size
+        @timeout = timeout
+
+        @client = ConnectionPool.new(size: pool_size, timeout: timeout) do
+          ::Redis.new
+        end
         @connected = true
         @client
       end
 
-      def connected?
-        @connected ||= false
-      end
-
-      def close
-        client.close
-      end
-
-      def restart
-        close
-        @client = nil
-        client
-      end
-
       def get(key)
-        client.get(key)
+        client.with { |conn| conn.get(key) }
       end
       alias fetch get
 
       def set(key, value, ttl: nil)
         args = {}
         args[:ex] = ttl unless ttl.nil?
-        client.set(key, value, **args) == 'OK'
+        client.with { |conn| conn.set(key, value, **args) == 'OK' }
       end
 
       def delete(key)
-        client.del(key) == 1
+        client.with { |conn| conn.del(key) == 1 }
       end
 
       def flush
-        client.flushdb == 'OK'
+        client.with { |conn| conn.flushdb == 'OK' }
       end
     end
   end

data/lib/legion/cache/settings.rb

@@ -14,7 +14,8 @@ module Legion
           threadsafe: true,
           expires_in: 0,
           cache_nils: false,
-          pool_size:  5,
+          pool_size:  10,
+          timeout:    5,
           serializer: Legion::JSON
         }
       end

data/lib/legion/cache/version.rb

@@ -2,6 +2,6 @@
 
 module Legion
   module Cache
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: legion-cache
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Esity
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-21 00:00:00.000000000 Z
+date: 2020-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: legion-logging
   requirement: !ruby/object:Gem::Requirement
@@ -142,42 +142,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.3
 - !ruby/object:Gem::Dependency
   name: dalli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
 description: Used to connect Legion with a cache service like memcached
 email:
 - matthewdiverson@gmail.com
@@ -194,9 +194,11 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bitbucket-pipelines.yml
 - legion-cache.gemspec
 - lib/legion/cache.rb
 - lib/legion/cache/memcached.rb
+- lib/legion/cache/pool.rb
 - lib/legion/cache/redis.rb
 - lib/legion/cache/settings.rb
 - lib/legion/cache/version.rb
@@ -210,7 +212,7 @@ metadata:
   changelog_uri: https://bitbucket.org/legion-io/legion-cache/src/master/CHANGELOG.md
   wiki_uri: https://bitbucket.org/legion-io/legion-cache/wiki
   bug_tracker_uri: https://bitbucket.org/legion-io/legion-cache/issues
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -225,8 +227,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: Legion::Cache integration
 test_files: []