strum-cache 0.0.3 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68bcc14c5132c6498fbe47188eeee25c7a47bad93357e0c00e999e456a923258
-  data.tar.gz: ae93681fa8f28c73e35a235e122b869b19dd4b51301de1377c03e502113f296e
+  metadata.gz: f1057277181a99a80a1ca12f32fcf1349c2c23170f22ac2912239cd3432321d3
+  data.tar.gz: 2b5f3e05091e217d8d205cda0718be2f3646c874993c35299123f5a3f484a7e7
 SHA512:
-  metadata.gz: bba45287395f656357cc035564131b17304c0649d313c032bff97e565cc17401bc1fa949fbef99c09cff12d517b6d71b5d22996ba66bca48be9a96deacd97a83
-  data.tar.gz: aae3bc53cc5c46f9ab7835e12e9027db21cdb519ea0a960b549f94009e68ee09143cf8fd07f17795dca2910e9264d1c02d84bfedad739e537a284c2387747fdf
+  metadata.gz: 588edc1bf46b4f51690d88388690eb28a58a1adebdcb8266c37d64a018e6ae1b5e0aca6d31098c747433693741024fa0d53adde477c3b2af5ed3c713ff5b1339
+  data.tar.gz: a25937df792f2c5e583f9b59a98c204429f3a4e5bf52b7d874f9ca241bb9afed30398b5e2e1da96f53273e1a93acc6f9cd64e136b2167c0492ff6aba60d1ec81

data/.gitignore

@@ -9,6 +9,7 @@
 
 # rspec failure tracking
 .rspec_status
+/.rbenv-gemsets
 
 # Editor directories and files
 .idea

data/lib/strum/cache.rb

@@ -1,22 +1,26 @@
 # frozen_string_literal: true
 
+require "dry/inflector"
+require "dry/configurable"
 require "strum/cache/version"
 require "strum/service"
 require "strum/pipe"
-require "dry/inflector"
-require "dry/configurable"
+require "strum/json"
 require "strum/cache_utils/redis"
 require "strum/cache_utils/find"
 require "strum/cache_utils/search"
 
 module Strum
+  # rubocop: disable Style/Documentation
   module Cache
     extend Dry::Configurable
 
     setting :cache_headers
+    setting :redis_class, Redis
 
     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)
@@ -54,7 +58,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
@@ -89,7 +93,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
@@ -120,5 +124,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.3"
+    VERSION = "0.1.1"
   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,17 +1,17 @@
 # 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
 
       def call
         Strum::Pipe.call(Strum::CacheUtils::BuildResourceUrl,
                          Strum::CacheUtils::SendRequest,
-                         Strum::JsonDeserializer,
+                         Strum::Json::Deserializer,
                          input: input) do |m|
           m.success { |responce| output(responce) }
           m.failure { |errors| add_errors(errors) }

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 ? ::Redis.new(url: redis_url) : ::Redis.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,17 +3,17 @@
 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
 
       def call
         Strum::Pipe.call(Strum::CacheUtils::BuildResourcesUrl,
                          Strum::CacheUtils::SendRequest,
-                         Strum::JsonDeserializer,
+                         Strum::Json::Deserializer,
                          input: input) do |m|
           m.success { |responce| output(responce) }
           m.failure { |errors| add_errors(errors) }

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,28 +9,34 @@ 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.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject do |f|
+      f.match(
+        /^(test|spec|features|\.rubocop.yml|\.ruby-version|Gemfile.lock|Gemfile|\.gitlab-ci.yml|README|\.travis.yml|CHANGELOG|\.rspec)/ # rubocop:disable Layout/LineLength
+      )
+    end
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "dry-configurable", "~> 0.11.6"
-  spec.add_dependency "dry-inflector", "~> 0.2"
-  spec.add_dependency "faraday", "~> 1.1"
-  spec.add_dependency "json", "~> 2.3"
-  spec.add_dependency "redis", "~> 4.2"
-  spec.add_dependency "strum", "~> 0"
+  spec.add_runtime_dependency "dry-configurable", "~> 0.11.6"
+  spec.add_runtime_dependency "dry-inflector", "~> 0.2"
+  spec.add_runtime_dependency "faraday", "~> 1.1"
+  spec.add_runtime_dependency "json", "~> 2.3"
+  spec.add_runtime_dependency "redis", "~> 4.2"
+  spec.add_runtime_dependency "strum-json", "~> 0.0.3"
+  spec.add_runtime_dependency "strum-pipe", "~> 0.0.3"
+  spec.add_runtime_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.3
+  version: 0.1.1
 platform: ruby
 authors:
 - Serhiy Nazarov
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-18 00:00:00.000000000 Z
+date: 2021-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -81,20 +81,48 @@ 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'
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description:
+        version: 0.0.3
+- !ruby/object:Gem::Dependency
+  name: strum-pipe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        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.1'
+description: 
 email:
 - sn@nazarov.com.ua
 executables: []
@@ -102,14 +130,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
-- Gemfile
-- Gemfile.lock
 - LICENSE.txt
-- README.md
 - Rakefile
 - bin/console
 - bin/setup
@@ -123,14 +145,14 @@ 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
-post_install_message:
+  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:
 - lib
@@ -138,15 +160,15 @@ 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.0.3
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Cache resources
 test_files: []

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---color
---require spec_helper

data/.rubocop.yml

@@ -1,26 +0,0 @@
-AllCops:
-  TargetRubyVersion: 2.6
-  NewCops: enable
-
-# Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }.
-Style/HashSyntax:
-  Enabled: true
-
-# Method definitions after `private` or `protected` isolated calls need one
-# extra level of indentation.
-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/.travis.yml

@@ -1,6 +0,0 @@
----
-language: ruby
-cache: bundler
-rvm:
-  - 2.6.5
-before_install: gem install bundler -v 2.1.4

data/Gemfile

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in strum-cache.gemspec
-gemspec
-
-gem "bundler", "~> 2.1.4"
-gem "rspec", "~> 3"
-gem "rubocop", "~> 0.90.0"
-
-gem "debase", "~> 0.2.4"
-gem "ruby-debug-ide", "~> 0.7.0"

data/Gemfile.lock

@@ -1,117 +0,0 @@
-PATH
-  remote: .
-  specs:
-    strum-cache (0.0.3)
-      dry-configurable (~> 0.11.6)
-      dry-inflector (~> 0.2)
-      faraday (~> 1.1)
-      json (~> 2.3)
-      redis (~> 4.2)
-      strum (~> 0)
-
-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)
-    debase (0.2.4.1)
-      debase-ruby_core_source (>= 0.10.2)
-    debase-ruby_core_source (0.10.11)
-    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.4.9)
-      concurrent-ruby (~> 1.0)
-    dry-equalizer (0.3.0)
-    dry-inflector (0.2.0)
-    dry-logic (1.0.8)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.2)
-      dry-equalizer (~> 0.2)
-    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.1.0)
-      multipart-post (>= 1.2, < 3)
-      ruby2_keywords
-    ice_nine (0.11.2)
-    json (2.3.1)
-    json-schema (2.8.1)
-      addressable (>= 2.4)
-    multipart-post (2.1.1)
-    parallel (1.20.0)
-    parser (2.7.2.0)
-      ast (~> 2.4.1)
-    public_suffix (4.0.6)
-    rainbow (3.0.0)
-    rake (13.0.1)
-    redis (4.2.3)
-    regexp_parser (1.8.2)
-    rexml (3.2.4)
-    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.10.0)
-    rspec-mocks (3.10.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.0)
-    rubocop (0.90.0)
-      parallel (~> 1.10)
-      parser (>= 2.7.1.1)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
-      rexml
-      rubocop-ast (>= 0.3.0, < 1.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.8.0)
-      parser (>= 2.7.1.5)
-    ruby-debug-ide (0.7.2)
-      rake (>= 0.8.1)
-    ruby-progressbar (1.10.1)
-    ruby2_keywords (0.0.2)
-    sequel (5.38.0)
-    strum (0.1.3)
-      dry-inflector (~> 0.2.0)
-      dry-struct (~> 1.2)
-      json-schema (~> 2.8.1)
-      sequel (~> 5.29)
-      thor (~> 0.20)
-    thor (0.20.3)
-    unicode-display_width (1.7.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 2.1.4)
-  debase (~> 0.2.4)
-  rspec (~> 3)
-  rubocop (~> 0.90.0)
-  ruby-debug-ide (~> 0.7.0)
-  strum-cache!
-
-BUNDLED WITH
-   2.1.4

data/README.md

@@ -1,68 +0,0 @@
-# Strum::Cache
-
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/strum/cache`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'strum-cache'
-```
-
-And then execute:
-
-    $ bundle install
-
-Or install it yourself as:
-
-    $ gem install strum-cache
-
-## Usage
-
-###ENV variables:
-
-`CACHE_REDIS_URL` - connection string to Redis
-
-`{RESOURCE}_CACHE_REDIS_URL` - separated Redis connection string for resource 
-
-`BASE_RESOURCE_URL` - full url to resource find endpoint. example: "http://example.com/entities"
-
-`{RESOURCE}_RESOURCE_URL` - separated full url to resource find endpoint. example: "http://example.com/entities"
-
-`BASE_RESOURCE_SEARCH_URL` - full url to resource search endpoint. example: "http://example.com/entities/search"
-
-`{RESOURCE}_RESOURCE_SEARCH_URL` - separated full url to resource search endpoint. example: "http://example.com/entities/search"
-
-###Configurable
-
-`Strum::Cache.config.cache_headers` - hash with headers that should be sent on http request
-
-###How to use
-
-`Strum::Cache::Entity::Find.(id)` - find Entity by id
-
-`Strum::Cache::Entity::Search.(params)` - search Entity by params
-
-`Strum::Cache::Entity::Push.(params)` - push Entity to cache
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/strum-cache. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/strum-cache/blob/master/CODE_OF_CONDUCT.md).
-
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
-
-## Code of Conduct
-
-Everyone interacting in the Strum::Cache project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/strum-cache/blob/master/CODE_OF_CONDUCT.md).