strum-cache 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 134526e82a9302929bf973421134deee663814a7744e38caa0053bcffab4a3ed
-  data.tar.gz: 74ee547b25c31f5f4efc0a7daf75670799cae63e62cd47afa22322ba6781ebe6
+  metadata.gz: 429d0ccabdab8e28ec3066321eafcf0bbc26ecfbb4d22c21dfc01af7e0eba64b
+  data.tar.gz: c53417e84ea5c1a96ff22c13e9d33d8ddb3cc499eac3f7e655d5cf6523696c57
 SHA512:
-  metadata.gz: 6e2e1406c50c00abda2a0ac80f2ed83cfede406ca62e19e6350448d02b2d674fd6111a3b4ddad5d95c0d93846a2cb32df0ef97fa0f73c9ddc442a72e460b51be
-  data.tar.gz: e7c3fbd291b3011a1cf07036fff3666f64983758713145b970683e74726151799fd775f8f7eff45cf7eabf022f2b2a20f37b515679aab5a7c5a5951859aa464d
+  metadata.gz: 89dfcc215197a83d4ec352691d3d1daeb1eaf3a7f9035c17791228bd3dad3e96a508d58c7f6ffc884727339aaedf733978c2373fd359a73860b00049b8003e92
+  data.tar.gz: 69e51b5ae67c37ce8052665af3f1e63cfb756b2a29e714b92809c15b8962c5224bb8f25a0cdab87d6d6f54198660717abceecd760d39c5e7f246aaa1b4b5d74d

data/.gitlab-ci.yml

@@ -0,0 +1,3 @@
+include:
+  - project: 'strum-rb/ci-cd'
+    file: '/strum-rb/.gitlab-ci.yml'

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
   NewCops: enable
 
 # Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }.
@@ -12,15 +12,10 @@ Layout/IndentationConsistency:
   Enabled: true
   EnforcedStyle: indented_internal_methods
 
-# Two spaces, no tabs (for indentation).
-Layout/IndentationWidth:
-  Enabled: true
-
 # Check quotes usage according to lint rule below.
 Style/StringLiterals:
   Enabled: true
   EnforcedStyle: double_quotes
 
 Layout/LineLength:
-  Max: 120
   IgnoredPatterns: ['\A#']

data/Gemfile.lock

@@ -1,70 +1,61 @@
 PATH
   remote: .
   specs:
-    strum-cache (0.0.4)
+    strum-cache (0.1.0)
       dry-configurable (~> 0.11.6)
       dry-inflector (~> 0.2)
       faraday (~> 1.1)
       json (~> 2.3)
       redis (~> 4.2)
-      strum
+      strum-json (~> 0.0.2)
+      strum-pipe (~> 0.0.3)
+      strum-service (~> 0.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.1)
-    concurrent-ruby (1.1.7)
+    ast (2.4.2)
+    concurrent-ruby (1.1.9)
     debase (0.2.4.1)
       debase-ruby_core_source (>= 0.10.2)
-    debase-ruby_core_source (0.10.11)
+    debase-ruby_core_source (0.10.12)
     diff-lcs (1.4.4)
     dry-configurable (0.11.6)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.4, >= 0.4.7)
       dry-equalizer (~> 0.2)
-    dry-container (0.7.2)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.5.0)
+    dry-core (0.6.0)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.3.0)
     dry-inflector (0.2.0)
-    dry-logic (1.1.0)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5)
-    dry-struct (1.3.0)
-      dry-core (~> 0.4, >= 0.4.4)
-      dry-equalizer (~> 0.3)
-      dry-types (~> 1.3)
-      ice_nine (~> 0.11)
-    dry-types (1.4.0)
-      concurrent-ruby (~> 1.0)
-      dry-container (~> 0.3)
-      dry-core (~> 0.4, >= 0.4.4)
-      dry-equalizer (~> 0.3)
-      dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 1.0, >= 1.0.2)
-    faraday (1.3.0)
+    faraday (1.4.2)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
       faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
       multipart-post (>= 1.2, < 3)
-      ruby2_keywords
-    faraday-net_http (1.0.0)
-    ice_nine (0.11.2)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.1.0)
     json (2.5.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
     multipart-post (2.1.1)
     parallel (1.20.1)
-    parser (3.0.0.0)
+    parser (3.0.1.1)
       ast (~> 2.4.1)
     public_suffix (4.0.6)
     rainbow (3.0.0)
     rake (13.0.3)
     redis (4.2.5)
-    regexp_parser (2.0.3)
-    rexml (3.2.4)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -74,10 +65,10 @@ GEM
     rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.1)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.1)
+    rspec-support (3.10.2)
     rubocop (0.90.0)
       parallel (~> 1.10)
       parser (>= 2.7.1.1)
@@ -92,15 +83,15 @@ GEM
     ruby-debug-ide (0.7.2)
       rake (>= 0.8.1)
     ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.2)
-    sequel (5.40.0)
-    strum (0.1.3)
+    ruby2_keywords (0.0.4)
+    strum-json (0.0.2)
       dry-inflector (~> 0.2.0)
-      dry-struct (~> 1.2)
+      json (~> 2.3)
       json-schema (~> 2.8.1)
-      sequel (~> 5.29)
-      thor (~> 0.20)
-    thor (0.20.3)
+      strum-service (~> 0.1.0)
+    strum-pipe (0.0.3)
+      strum-service (~> 0.1)
+    strum-service (0.1.2)
     unicode-display_width (1.7.0)
 
 PLATFORMS

data/lib/strum/cache.rb

@@ -10,6 +10,7 @@ require "strum/cache_utils/find"
 require "strum/cache_utils/search"
 
 module Strum
+  # rubocop: disable Style/Documentation
   module Cache
     extend Dry::Configurable
 
@@ -18,6 +19,7 @@ module Strum
 
     class Error < StandardError; end
 
+    # rubocop: disable Metrics/AbcSize,Metrics/MethodLength
     def self.const_missing(resource_name)
       # Strum::Cache::Entity::Find.(id)
       # Strum::Cache::Entity::Search.(params)
@@ -55,7 +57,7 @@ module Strum
           include Strum::Service
 
           define_method :call do
-            if entity = from_cache_by_id(input) || find_by_id(input)
+            if (entity = from_cache_by_id(input) || find_by_id(input))
               output(entity)
             else
               not_found
@@ -90,7 +92,7 @@ module Strum
           include Strum::Service
 
           define_method :call do
-            if entity = from_cache_by_params || search_by_params
+            if (entity = from_cache_by_params || search_by_params)
               output(entity)
             else
               not_found
@@ -121,5 +123,7 @@ module Strum
         end)
       end
     end
+    # rubocop: enable Metrics/AbcSize,Metrics/MethodLength
   end
+  # rubocop: enable Style/Documentation
 end

data/lib/strum/cache/version.rb

@@ -2,6 +2,6 @@
 
 module Strum
   module Cache
-    VERSION = "0.0.4"
+    VERSION = "0.1.0"
   end
 end

data/lib/strum/cache_utils/build_resource_url.rb

@@ -4,15 +4,11 @@ require "strum/cache_utils/build_resources_url"
 
 module Strum
   module CacheUtils
+    # Resource url builder
     class BuildResourceUrl
       include Strum::Service
 
       def call
-        underscore_resource_code = inflector.underscore(resource_code)
-        base_url = ENV.fetch("#{underscore_resource_code.upcase}_RESOURCE_URL") do
-          host = ENV.fetch("BASE_RESOURCE_URL")
-          File.join(host, inflector.pluralize(underscore_resource_code.gsub(/_/, "-")))
-        end
         output(url: File.join(base_url, resource_id.to_s))
       rescue KeyError
         Strum::CacheUtils::BuildResourcesUrl.call(resource_code: resource_code, params: { id: resource_id }) do |m|
@@ -30,6 +26,17 @@ module Strum
         def inflector
           @inflector ||= Dry::Inflector.new
         end
+
+        def underscore_resource_code
+          inflector.underscore(resource_code)
+        end
+
+        def base_url
+          ENV.fetch("#{underscore_resource_code.upcase}_RESOURCE_URL") do
+            host = ENV.fetch("BASE_RESOURCE_URL")
+            File.join(host, inflector.pluralize(underscore_resource_code.gsub(/_/, "-")))
+          end
+        end
     end
   end
 end

data/lib/strum/cache_utils/build_resources_url.rb

@@ -4,6 +4,7 @@ require "uri"
 
 module Strum
   module CacheUtils
+    # Build url to resource
     class BuildResourcesUrl
       include Strum::Service
 

data/lib/strum/cache_utils/find.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require "strum/json_deserializer"
 require "strum/cache_utils/build_resource_url"
 
 module Strum
   module CacheUtils
+    # Find service
     class Find
       include Strum::Service
 

data/lib/strum/cache_utils/redis.rb

@@ -6,6 +6,7 @@ require "strum/cache_utils/redis_storage"
 
 module Strum
   module CacheUtils
+    # Redis storage
     class Redis
       include Strum::Service
 

data/lib/strum/cache_utils/redis_storage.rb

@@ -5,7 +5,9 @@ require "redis"
 
 module Strum
   module CacheUtils
+    # Redis storage
     module RedisStorage
+      # rubocop: disable Metrics/MethodLength, Metrics/AbcSize
       def self.const_missing(resource_name)
         const_set(resource_name.to_s.strip.capitalize, Class.new do
           include Singleton
@@ -13,10 +15,15 @@ module Strum
 
           define_method :initialize do
             redis_url = ENV.fetch("#{resource_name.upcase}_CACHE_REDIS_URL", ENV.fetch("CACHE_REDIS_URL", nil))
-            @redis = redis_url ? Strum::Cache.config.redis_class.new(url: redis_url) : Strum::Cache.config.redis_class.new
+            @redis = if redis_url
+                       Strum::Cache.config.redis_class.new(url: redis_url)
+                     else
+                       Strum::Cache.config.redis_class.new
+                     end
           end
         end)
       end
+      # rubocop: enable Metrics/MethodLength, Metrics/AbcSize
     end
   end
 end

data/lib/strum/cache_utils/search.rb

@@ -3,10 +3,10 @@
 require "strum/pipe"
 require "strum/cache_utils/build_resources_url"
 require "strum/cache_utils/send_request"
-require "strum/json_deserializer"
 
 module Strum
   module CacheUtils
+    # Search entity
     class Search
       include Strum::Service
 

data/lib/strum/cache_utils/send_request.rb

@@ -5,19 +5,12 @@ require "json"
 
 module Strum
   module CacheUtils
+    # Send request to entity source
     class SendRequest
       include Strum::Service
 
       def call
-        cache_headers = (Strum::Cache.config.cache_headers).is_a?(Hash) ? Strum::Cache.config.cache_headers : {}
-        conn = Faraday.new(url: url)
-        resp = conn.get do |req|
-          req.params = params if input[:params]
-          req.headers["Content-Type"] = "application/json"
-          req.headers["Accept"] = "application/json"
-          cache_headers.each { |k, v| req.headers[k] = v }
-        end
-        resp.success? && output(JSON.parse(resp.body))
+        (resp = send_request).success? && output(JSON.parse(resp.body))
       rescue Faraday::Error => e
         add_error(:connection, e)
       rescue JSON::JSONError => e
@@ -27,6 +20,25 @@ module Strum
       def audit
         required :url
       end
+
+      private
+
+        def cache_headers
+          Strum::Cache.config.cache_headers.is_a?(Hash) ? Strum::Cache.config.cache_headers : {}
+        end
+
+        def conn
+          Faraday.new(url: url)
+        end
+
+        def send_request
+          conn.get do |req|
+            req.params = params if input[:params]
+            req.headers["Content-Type"] = "application/json"
+            req.headers["Accept"] = "application/json"
+            cache_headers.each { |k, v| req.headers[k] = v }
+          end
+        end
     end
   end
 end

data/strum-cache.gemspec

@@ -9,14 +9,14 @@ Gem::Specification.new do |spec|
   spec.email         = ["sn@nazarov.com.ua"]
 
   spec.summary       = "Cache resources"
-  spec.homepage      = "https://code.qpard.com/strum/strum-cache"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.homepage      = "https://gitlab.com/strum-rb/strum-cache"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
   spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://code.qpard.com/strum/strum-cache"
-  spec.metadata["changelog_uri"] = "https://code.qpard.com/strum/strum-cacheCHANGELOG.md"
+  spec.metadata["source_code_uri"] = "https://gitlab.com/strum-rb/strum-cache"
+  spec.metadata["changelog_uri"] = "https://gitlab.com/strum-rb/strum-cache/CHANGELOG.md"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -32,5 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "faraday", "~> 1.1"
   spec.add_dependency "json", "~> 2.3"
   spec.add_dependency "redis", "~> 4.2"
-  spec.add_dependency "strum"
+  spec.add_dependency "strum-json", "~> 0.0.2"
+  spec.add_dependency "strum-pipe", "~> 0.0.3"
+  spec.add_dependency "strum-service", "~> 0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strum-cache
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Serhiy Nazarov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-14 00:00:00.000000000 Z
+date: 2021-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -81,19 +81,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: strum
+  name: strum-json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: strum-pipe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+- !ruby/object:Gem::Dependency
+  name: strum-service
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 description: 
 email:
 - sn@nazarov.com.ua
@@ -102,6 +130,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
@@ -123,13 +152,13 @@ files:
 - lib/strum/cache_utils/search.rb
 - lib/strum/cache_utils/send_request.rb
 - strum-cache.gemspec
-homepage: https://code.qpard.com/strum/strum-cache
+homepage: https://gitlab.com/strum-rb/strum-cache
 licenses: []
 metadata:
   allowed_push_host: https://rubygems.org
-  homepage_uri: https://code.qpard.com/strum/strum-cache
-  source_code_uri: https://code.qpard.com/strum/strum-cache
-  changelog_uri: https://code.qpard.com/strum/strum-cacheCHANGELOG.md
+  homepage_uri: https://gitlab.com/strum-rb/strum-cache
+  source_code_uri: https://gitlab.com/strum-rb/strum-cache
+  changelog_uri: https://gitlab.com/strum-rb/strum-cache/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -138,14 +167,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Cache resources