waylon-core 0.1.9 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 628f00817729895a327ec3adff832ba15fdb071da3762a061eb637b0492b2953
-  data.tar.gz: 17276d8b5acbdaf2b5c90766329d53ec8fe42d0afae64f7aa062ad0a4cb1a381
+  metadata.gz: 1aebd152f6a966ba3af1d42c2538ee64aa63f23b369defa8cb14b5b76028156b
+  data.tar.gz: ed1ca477399d53439683414a943e99ba727dd07ebb7f4a7229db7bd106e74b5c
 SHA512:
-  metadata.gz: 6724d7e8ee142b43534ca17fd53d729272d83ab0f6e5f3ef0cf1b07ac63a552bc8393a167b1d6f324cf809fd27bb88f6379375929f130481a16b1ef69f24068e
-  data.tar.gz: 800fa36240abe3b85afc58951efa01c519fa6802d74d9fe92a67eb5719e3d25dfc2348f6d38dc347be7ccf9d6c7c1a6e4f4ca92d3117c04775a67ed151295a3e
+  metadata.gz: e211f819f4d54ad740f422902c98ea9086c1b02e738aa4907a7fcd79841a42ad3478f37c72d6399208be06bac0567c61c08652a50b492e9bcfc774600f056a88
+  data.tar.gz: 286a48bb42872720a371e48fc5f872456af7c1a0d655bfe677554a3eef459cbe8309bc974e0ef4f38fd8b434026f078828b99a5efb86e9b197dd9d7b68d42bad

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    waylon-core (0.1.9)
+    waylon-core (0.2.2)
       addressable (~> 2.8)
       faraday (~> 1.8)
       i18n (~> 1.8)
@@ -14,13 +14,14 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     concurrent-ruby (1.1.10)
+    connection_pool (2.2.5)
     diff-lcs (1.5.0)
     docile (1.4.0)
-    faraday (1.10.0)
+    faraday (1.10.2)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -44,34 +45,37 @@ GEM
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
     ffi (1.15.5)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     json (2.6.2)
     moneta (1.5.1)
     mono_logger (1.1.1)
     multi_json (1.15.0)
     multipart-post (2.2.3)
-    mustermann (1.1.1)
+    mustermann (2.0.2)
       ruby2_keywords (~> 0.0.1)
     nio4r (2.5.8)
     parallel (1.22.1)
-    parser (3.1.2.0)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
-    public_suffix (4.0.7)
-    puma (5.6.4)
+    public_suffix (5.0.0)
+    puma (5.6.5)
       nio4r (~> 2.0)
-    rack (2.2.3.1)
-    rack-protection (2.2.0)
+    rack (2.2.4)
+    rack-protection (2.2.2)
       rack
     rainbow (3.1.1)
     rake (13.0.6)
     rbnacl (7.1.1)
       ffi
-    redis (4.6.0)
-    redis-namespace (1.8.2)
-      redis (>= 3.0.4)
+    redis (5.0.1)
+      redis-client (~> 0.7)
+    redis-client (0.7.1)
+      connection_pool
+    redis-namespace (1.9.0)
+      redis (>= 4)
     regexp_parser (2.5.0)
-    resque (2.2.1)
+    resque (2.3.0)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.6)
@@ -90,21 +94,22 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.30.1)
+    rubocop (1.35.1)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.18.0, < 2.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.18.0)
+    rubocop-ast (1.21.0)
       parser (>= 3.1.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.11.1)
-      rubocop (~> 1.19)
+    rubocop-rspec (2.12.1)
+      rubocop (~> 1.31)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     simplecov (0.21.2)
@@ -113,13 +118,13 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    sinatra (2.2.0)
-      mustermann (~> 1.0)
+    sinatra (2.2.2)
+      mustermann (~> 2.0)
       rack (~> 2.2)
-      rack-protection (= 2.2.0)
+      rack-protection (= 2.2.2)
       tilt (~> 2.0)
-    tilt (2.0.10)
-    unicode-display_width (2.1.0)
+    tilt (2.0.11)
+    unicode-display_width (2.2.0)
     webrick (1.7.0)
     yard (0.9.28)
       webrick (~> 1.7.0)

data/lib/waylon/cache.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Waylon
+  # Used for working with the Moneta store for caching
+  module Cache
+    DefaultStorage = Moneta.new(
+      :Redis,
+      url: "redis://#{ENV.fetch("REDIS", "localhost:6379")}/1"
+    )
+
+    def self.clear
+      storage.clear
+    end
+
+    def self.delete(key)
+      storage.delete(key)
+    end
+
+    def self.key?(name)
+      storage.key?(name)
+    end
+
+    def self.load(key, expires: nil)
+      expires ? storage.load(key, expires: expires) : storage.load(key)
+    end
+
+    def self.store(key, value, expires: nil)
+      if expires
+        storage.store(key, value, expires: expires)
+      else
+        storage.store(key, value)
+      end
+    end
+
+    def self.storage
+      @storage ||= DefaultStorage
+    end
+
+    def self.storage=(storage)
+      @storage = storage
+    end
+  end
+end

data/lib/waylon/core.rb

@@ -27,6 +27,7 @@ require "sinatra"
 
 # Internal requirements
 require "waylon/version"
+require "waylon/cache"
 require "waylon/config"
 require "waylon/generic_exception"
 require "waylon/exceptions/not_implemented_error"

data/lib/waylon/rspec/test_server.rb

@@ -19,8 +19,7 @@ require "waylon/rspec/test_worker"
 config = Waylon::Config.instance
 config.load_env
 
-Waylon::Cache = Moneta.new(:Cookie)
-p Waylon::Storage
+Waylon::Cache.storage = Moneta.new(:Cookie)
 Waylon::Logger.log("Found Global Admins: #{config.admins}")
 
 Waylon::RSpec::TestUser.find_or_create(

data/lib/waylon/rspec.rb

@@ -46,5 +46,5 @@ module Waylon
   end
 end
 
-Waylon::Cache = Moneta.new(:Cookie)
-Waylon::Storage::Store = Moneta.new(:Cookie)
+Waylon::Cache.storage = Moneta.new(:Cookie)
+Waylon::Storage.storage = Moneta.new(:Cookie)

data/lib/waylon/skills/diagnostics.rb

@@ -23,10 +23,10 @@ module Waylon
         response << "*Skill plugins:*"
         loaded_routes.each { |d| response << "  - #{d}" }
         response << "*Redis:*"
-        state, read_time, write_time = test_redis
+        state, raw_read_time, raw_write_time, read_time, write_time = test_redis
         response << "  - *Test Result:* #{state ? "Success" : "Error"}"
-        response << "  - *Read time:* #{read_time}s"
-        response << "  - *Write time:* #{write_time}s"
+        response << "  - *Read time:* #{read_time}s (raw: #{raw_read_time}s)"
+        response << "  - *Write time:* #{write_time}s (raw: #{raw_write_time}s)"
         if Resque.redis.connected?
           response << "*Queue Monitoring:*"
           response << "  - Failed jobs: #{Resque::Failure.count}"
@@ -43,17 +43,27 @@ module Waylon
         SenseRegistry.instance.senses.map { |_s, c| c.name }.sort.uniq
       end
 
-      def test_redis
-        test_key = ("a".."z").to_a.sample(10).join
+      def test_redis # rubocop:disable Metrics/AbcSize
+        test_key1 = ("a".."z").to_a.sample(10).join
+        test_key2 = ("a".."z").to_a.sample(10).join
         test_value = (0..1000).to_a.sample(20).map(&:to_s).join
         test_result = nil
 
-        write_time = Benchmark.realtime { db.store(test_key, test_value) }
-        read_time = Benchmark.realtime { test_result = db.load(test_key) }
+        raw_write_time = Benchmark.realtime { cache(test_key1) { test_value } }
+        raw_read_time = Benchmark.realtime { cache(test_key1) { test_value } }
+        enc_write_time = Benchmark.realtime { db.store(test_key2, test_value) }
+        enc_read_time = Benchmark.realtime { test_result = db.load(test_key2) }
 
-        db.delete(test_key)
+        db.delete(test_key1)
+        db.delete(test_key2)
 
-        [(test_value == test_result), read_time.round(6), write_time.round(6)]
+        [
+          (test_value == test_result),
+          raw_read_time.round(6),
+          raw_write_time.round(6),
+          enc_read_time.round(6),
+          enc_write_time.round(6)
+        ]
       end
     end
   end

data/lib/waylon/storage.rb

@@ -1,14 +1,9 @@
 # frozen_string_literal: true
 
-Waylon::Cache = Moneta.new(
-  :Redis,
-  url: "redis://#{ENV.fetch("REDIS", "localhost:6379")}/1"
-)
-
 module Waylon
   # Used for working with the Moneta store
   module Storage
-    Store = Moneta.new(
+    DefaultStorage = Moneta.new(
       :Redis,
       url: "redis://#{ENV.fetch("REDIS", "localhost:6379")}/2"
     )
@@ -19,16 +14,20 @@ module Waylon
     end
 
     def self.clear
-      Store.clear
+      storage.clear
+    end
+
+    def self.delete(key)
+      storage.delete(key)
     end
 
     def self.key?(name)
-      Store.key?(name)
+      storage.key?(name)
     end
 
     def self.load(key)
       this_cipher = cipher
-      raw = Store.load(key)
+      raw = storage.load(key)
       return nil unless raw
 
       decoded = Base64.decode64(raw)
@@ -36,11 +35,19 @@ module Waylon
       JSON.parse(plain)
     end
 
+    def self.storage
+      @storage ||= DefaultStorage
+    end
+
+    def self.storage=(storage)
+      @storage = storage
+    end
+
     def self.store(key, value)
       this_cipher = cipher
       encrypted = this_cipher.encrypt(value.to_json)
       encoded = Base64.encode64(encrypted)
-      Store.store(key, encoded)
+      storage.store(key, encoded)
     end
   end
 end

data/lib/waylon/version.rb

@@ -5,8 +5,8 @@ module Waylon
     # The Waylon::Core version
     VERSION = [
       0, # Major
-      1, # Minor
-      9  # Patch
+      2, # Minor
+      2  # Patch
     ].join(".")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waylon-core
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.2
 platform: ruby
 authors:
 - Jonathan Gnagy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-19 00:00:00.000000000 Z
+date: 2022-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -261,6 +261,7 @@ files:
 - bin/console
 - bin/setup
 - lib/waylon/base_component.rb
+- lib/waylon/cache.rb
 - lib/waylon/condition.rb
 - lib/waylon/conditions/black_hole.rb
 - lib/waylon/conditions/default.rb