legion-cache 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dab39061de216282a220ec038a80444f3a77238100dc1d6b6ac9ecdf97d0903f
-  data.tar.gz: 5a2ec7633c66a15c34251051c31d12c38ad5a38b7853b1ba51d099a4b88c39a7
+  metadata.gz: 8af525a0967b0fd5cb1ac712c7e34a61d33328928713a89a1dbe2126e3100884
+  data.tar.gz: e08cdd2f12067cb126d5060d1d9230b8460650c5e69825067c51bf2d16fe6588
 SHA512:
-  metadata.gz: 033b9f8f9dcc1d14b505161207d690481490dbb329a64b9d80078371fafe17d2955479bf3d2e592369803268448f7200f6cd5e9f4151a34b8afc230ca5c8da4b
-  data.tar.gz: '0958bf77c95cd1d7857d384fc3e567dd191b04b294bb8a40865ab7dd7afe752697e6afe8b5fcb93140e168b677300ac5092cdb4529d938a22c5954b9c5768be2'
+  metadata.gz: 9a91fd392e2d2eb6b02ae7e38d2dedc05841dc86f64cd829222c84b8c4a3d547e2db544fb57f93bbdd3fc2b121667e8fe27d5431b5bdd21182c82d190b9892da
+  data.tar.gz: a35558df6bec660463bafa24093cd383b522d4436d4cd69f5b0d1b4287949df08c8ccefd4783535a98bfb086b91358498b936e23ef682459ac540ac830abc706

data/.idea/.rakeTasks

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Settings><!--This file was automatically generated by Ruby plugin.
+You are allowed to: 
+1. Remove rake task
+2. Add existing rake tasks
+To add existing rake tasks automatically delete this file and reload the project.
+--><RakeGroup description="" fullCmd="" taksId="rake"><RakeTask description="Build legion-cache-0.2.0.gem into the pkg directory" fullCmd="build" taksId="build" /><RakeTask description="Remove any temporary products" fullCmd="clean" taksId="clean" /><RakeTask description="Remove any generated files" fullCmd="clobber" taksId="clobber" /><RakeTask description="Build and install legion-cache-0.2.0.gem into system gems" fullCmd="install" taksId="install" /><RakeGroup description="" fullCmd="" taksId="install"><RakeTask description="Build and install legion-cache-0.2.0.gem into system gems without network access" fullCmd="install:local" taksId="local" /></RakeGroup><RakeTask description="Create tag v0.2.0 and build and push legion-cache-0.2.0.gem to rubygems.org" fullCmd="release[remote]" taksId="release[remote]" /><RakeTask description="Run RSpec code examples" fullCmd="spec" taksId="spec" /><RakeTask description="" fullCmd="default" taksId="default" /><RakeTask description="" fullCmd="release" taksId="release" /><RakeGroup description="" fullCmd="" taksId="release"><RakeTask description="" fullCmd="release:guard_clean" taksId="guard_clean" /><RakeTask description="" fullCmd="release:rubygem_push" taksId="rubygem_push" /><RakeTask description="" fullCmd="release:source_control_push" taksId="source_control_push" /></RakeGroup></RakeGroup></Settings>

data/.idea/legion-cache.iml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="RUBY_MODULE" version="4">
+  <component name="ModuleRunConfigurationManager">
+    <shared />
+  </component>
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="ast (v2.4.0, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v2.1.4, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="connection_pool (v2.2.2, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="dalli (v2.7.10, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.3, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="docile (v1.3.2, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="jaro_winkler (v1.5.4, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="legion-logging (v0.2.0, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="parallel (v1.19.1, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="parser (v2.7.0.4, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rainbow (v3.0.0, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rake (v13.0.1, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="redis (v4.1.3, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rexml (v3.2.4, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec (v3.9.0, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.9.1, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.9.0, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.9.1, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.9.2, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec_junit_formatter (v0.4.1, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rubocop (v0.80.1, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.10.1, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="simplecov (v0.18.5, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="simplecov-html (v0.12.2, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="unicode-display_width (v1.6.1, RVM: ruby-2.6.3) [gem]" level="application" />
+  </component>
+</module>

data/.idea/misc.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+  <component name="ProjectRootManager" version="2" project-jdk-name="RVM: ruby-2.6.3" project-jdk-type="RUBY_SDK" />
+</project>

data/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/legion-cache.iml" filepath="$PROJECT_DIR$/.idea/legion-cache.iml" />
+    </modules>
+  </component>
+</project>

data/.idea/vagrant.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VagrantProjectSettings">
+    <option name="instanceFolder" value="" />
+    <option name="provider" value="" />
+  </component>
+</project>

data/.idea/workspace.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CoverageOptionsProvider">
+    <option name="myAddOrReplace" value="0" />
+  </component>
+  <component name="Git.Settings">
+    <option name="PUSH_AUTO_UPDATE" value="true" />
+    <option name="ROOT_SYNC" value="DONT_SYNC" />
+  </component>
+  <component name="ProjectId" id="1Yl3LLXb9c4jt3mof9hHMP78fdY" />
+  <component name="PropertiesComponent">
+    <property name="settings.editor.selected.configurable" value="reference.settingsdialog.project.vagrant" />
+  </component>
+</project>

data/Gemfile

@@ -4,5 +4,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in legion-cache.gemspec
 gemspec
-
-gem 'legion-settings', path: '~/legion-io/legion-settings'

data/lib/legion/cache/memcached.rb

@@ -5,12 +5,9 @@ module Legion
     module Memcached
       def connect
         Legion::Logging.debug 'Using Memcached module for Legion::Cache'
-        options = { compress:  true,
-                    serializer: Legion::JSON,
-                    failover:  Legion::Settings[:cache][:failover],
-                    namespace: Legion::Settings[:cache][:namespace], foo: 'test' }
+
         Dalli.logger = Legion::Logging
-        @client = Dalli::Client.new(Legion::Settings[:cache][:servers], options)
+        @client = Dalli::Client.new(Legion::Settings[:cache][:servers], Legion::Settings[:cache])
         Legion::Logging.debug "Legion::Cache successfully connected to #{Legion::Settings[:cache][:servers]}"
         Legion::Settings[:cache][:connected] = true
       end
@@ -33,15 +30,15 @@ module Legion
       end
 
       def set(key, value, ttl = 180)
-        @client.set(key, value, ttl)
+        @client.set(key, value, ttl).positive?
       end
 
       def delete(key)
-        @client.delete(key)
+        @client.delete(key) == true
       end
 
       def flush(delay = 0)
-        @client.flush(delay)
+        @client.flush(delay).first
       end
     end
   end

data/lib/legion/cache/redis.rb

@@ -4,7 +4,7 @@ module Legion
   module Cache
     module Redis
       def connect
-        @client = Redis.new
+        @client = ::Redis.new
       end
 
       def close
@@ -17,19 +17,22 @@ module Legion
       end
 
       def get(key)
-        @client[key]
+        @client.get(key)
       end
+      alias fetch get
 
-      def set(key, value)
-        @client[key] = value
+      def set(key, value, ttl: nil)
+        args = {}
+        args[:ex] = ttl unless ttl.nil?
+        @client.set(key, value, **args) == 'OK'
       end
 
       def delete(key)
-        @client.del key
+        @client.del(key) == 1
       end
 
       def flush
-        @client.flushdb
+        @client.flushdb == 'OK'
       end
     end
   end

data/lib/legion/cache/settings.rb

@@ -1,9 +1,10 @@
 module Legion
   module Cache
     module Settings
+      Legion::Settings.merge_settings(:cache, default) if Legion::Settings.method_defined? :merge_settings
       def self.default
         {
-          driver:     'dalli',
+          driver:     driver,
           servers:    ['127.0.0.1:11211'],
           connected:  false,
           enabled:    true,
@@ -13,16 +14,17 @@ module Legion
           threadsafe: true,
           expires_in: 0,
           cache_nils: false,
-          pool_size:  1,
+          pool_size:  5,
           serializer: Legion::JSON
         }
       end
 
-      def self.driver
-        if Gem::Specification.find_by_name('dalli')
-          'dalli'
-        elsif Gem::Specification.find_by_name('redis')
-          'redis'
+      def self.driver(prefer = 'dalli')
+        secondary = prefer == 'dalli' ? 'redis' : 'dalli'
+        if Gem::Specification.find_all_by_name(prefer).count.positive?
+          prefer
+        elsif Gem::Specification.find_all_by_name(secondary).count.positive?
+          secondary
         else
           raise NameError('Legion::Cache.driver is nil')
         end

data/lib/legion/cache/version.rb

@@ -2,6 +2,6 @@
 
 module Legion
   module Cache
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: legion-cache
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Esity
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-27 00:00:00.000000000 Z
+date: 2020-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -173,6 +173,12 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".gitignore"
+- ".idea/.rakeTasks"
+- ".idea/legion-cache.iml"
+- ".idea/misc.xml"
+- ".idea/modules.xml"
+- ".idea/vagrant.xml"
+- ".idea/workspace.xml"
 - ".rspec"
 - ".rubocop.yml"
 - Gemfile
@@ -211,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Legion::Cache integration