userlist 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee5f47b48e2bcc0babdbb7bcc85e84e5b197dacefb777eb19764d6f23e78e682
-  data.tar.gz: 53caac6db3e462e9fe280541a7249da39e821a6a8bed7c70373131bebe9a6e19
+  metadata.gz: ee98b5cd1e17b91ed12fce427d0c87ec4593da547349015ca4ed9272dba73100
+  data.tar.gz: 3ec9d567b7c8c1894841483cd136c76db4e1a667eac7101541fcd3d232b20a8f
 SHA512:
-  metadata.gz: 687b4ff1d89c5c98814fc89fe7cb8097577bd0cea63138f40e194eb47d6d6a2807b624c9dd15f2b64868f0473f1baaf268b6f7cb3945b713c20d00150b71739c
-  data.tar.gz: 0b72bc8a28a6cba596c5afaff369e62b26cc8a84347f0059f68859c02df270562663c9e7faa8ddbb89a7053cf6d811d7dfcafa75f2f9233c27a36aebd72e4b4a
+  metadata.gz: 68340e08984d801834f1f853102119df452da6455bdca3b1eedf0d743d829c750fc81e234ef661f964402e44173b9951a891f15cb9ed0665929d525fbd0b03df
+  data.tar.gz: 1d6e7976d2e5486506306b2623135b4addf4cb7c6b6f3c3d81e30fde6d4fb733eb9d289027812ae6390d82b0b7cf4a5742104b0496d88372b0e720a8ed89402d

data/.github/workflows/test.yml

@@ -5,14 +5,12 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - 2.4
-          - 2.5
-          - 2.6
-          - 2.7
           - 3.0
+          - 3.1
+          - 3.2
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

data/.rubocop.yml

@@ -51,6 +51,9 @@ Style/ClassAndModuleChildren:
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 
+Layout/SpaceAroundOperators:
+  EnforcedStyleForExponentOperator: space
+
 Style/SymbolArray:
   Enabled: false
 

data/Gemfile

@@ -6,6 +6,8 @@ gemspec
 
 gem 'guard-rspec', '~> 4.7'
 gem 'guard-rubocop', '~> 1.3'
-gem 'rubocop', '~> 0.68'
+gem 'rubocop', '~> 1.45'
 
 gem 'sidekiq'
+gem 'activejob'
+gem 'uri'

data/README.md

@@ -44,15 +44,15 @@ end
 
 The possible configuration values are listed in the table below.
 
-| Name                    | Default value                | Description                                                                                                                 |
-| ----------------------- | ---------------------------- | --------------------------------------------------------------------------------------------------------------------------- |
-| `push_key`              | `nil`                        | The push key for your account. See [Push API settings](https://app.userlist.com/settings/push).                             |
-| `push_id`               | `nil`                        | The push id for your account. See [Push API settings](https://app.userlist.com/settings/push).                              |
-| `push_endpoint`         | `https://push.userlist.com/` | The HTTP endpoint that the library will send data to.                                                                       |
-| `push_strategy`         | `:threaded`                  | The strategy to use to send data to the HTTP endpoint. Possible values are `:threaded`, `:sidekiq`, `:direct`, and `:null`. |
-| `push_strategy_options` | `{}`                         | Any additional options for the push strategy.                                                                               |
-| `log_level`             | `:warn`                      | The log level for Userlist related log messages. Possible values are `:debug`, `:error`, `:fatal`, `:info`, and `:warn`     |
-| `token_lifetime`        | `3600`                       | The lifetime of generated in-app messages tokens in seconds                                                                 |
+| Name                    | Default value                | Description                                                                                                                                |
+| ----------------------- | ---------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------ |
+| `push_key`              | `nil`                        | The push key for your account. See [Push API settings](https://app.userlist.com/settings/push).                                            |
+| `push_id`               | `nil`                        | The push id for your account. See [Push API settings](https://app.userlist.com/settings/push).                                             |
+| `push_endpoint`         | `https://push.userlist.com/` | The HTTP endpoint that the library will send data to.                                                                                      |
+| `push_strategy`         | `:threaded`                  | The strategy to use to send data to the HTTP endpoint. Possible values are `:threaded`, `:sidekiq`, `:active_job`, `:direct`, and `:null`. |
+| `push_strategy_options` | `{}`                         | Any additional options for the push strategy.                                                                                              |
+| `log_level`             | `:warn`                      | The log level for Userlist related log messages. Possible values are `:debug`, `:error`, `:fatal`, `:info`, and `:warn`                    |
+| `token_lifetime`        | `3600`                       | The lifetime of generated in-app messages tokens in seconds                                                                                |
 
 ### Disabling in development and test environments
 

data/lib/userlist/config.rb

@@ -53,7 +53,7 @@ module Userlist
 
     def config_from_environment
       default_config.keys.each_with_object({}) do |key, config|
-        value = ENV["USERLIST_#{key.to_s.upcase}"]
+        value = ENV.fetch("USERLIST_#{key.to_s.upcase}", nil)
         config[key] = value if value
       end
     end

data/lib/userlist/push/client.rb

@@ -27,8 +27,8 @@ module Userlist
         request(Net::HTTP::Put, endpoint, payload)
       end
 
-      def delete(endpoint)
-        request(Net::HTTP::Delete, endpoint)
+      def delete(endpoint, payload = nil)
+        request(Net::HTTP::Delete, endpoint, payload)
       end
 
     private
@@ -58,7 +58,11 @@ module Userlist
         logger.debug "Sending #{request.method} to #{URI.join(endpoint, request.path)} with body #{request.body}"
 
         http.start unless http.started?
-        http.request(request)
+        response = http.request(request)
+
+        logger.debug "Recieved #{response.code} #{response.message} with body #{response.body}"
+
+        response
       end
 
       def endpoint

data/lib/userlist/push/resource.rb

@@ -33,9 +33,9 @@ module Userlist
           relationships[name.to_sym] = { type: type }
 
           generated_methods.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def #{name}
-              #{type}.from_payload(payload[:#{name}], config)
-            end
+            def #{name}                                        # def company
+              #{type}.from_payload(payload[:#{name}], config)  #   Company.from_payload(payload[:company], config)
+            end                                                # end
           RUBY
         end
 
@@ -43,11 +43,11 @@ module Userlist
           relationships[name.to_sym] = options
 
           generated_methods.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def #{name}
-              relationship = self.class.relationships[:#{name}]
-
-              ResourceCollection.new(payload[:#{name}], relationship, self, config)
-            end
+            def #{name}                                                             # def companies
+              relationship = self.class.relationships[:#{name}]                     #   relationship = self.class.relationships[:companies]
+                                                                                    #
+              ResourceCollection.new(payload[:#{name}], relationship, self, config) # ResourceCollection.new(payload[:companies], relationship, self, config)
+            end                                                                     #
           RUBY
         end
 

data/lib/userlist/push/strategies/active_job/worker.rb

@@ -0,0 +1,16 @@
+require 'active_job'
+
+module Userlist
+  class Push
+    module Strategies
+      class ActiveJob
+        class Worker < ::ActiveJob::Base
+          def perform(method, *args)
+            client = Userlist::Push::Client.new
+            client.public_send(method, *args)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/userlist/push/strategies/active_job.rb

@@ -0,0 +1,47 @@
+require 'active_job'
+
+require 'userlist/push/strategies/active_job/worker'
+
+module Userlist
+  class Push
+    module Strategies
+      class ActiveJob
+        def initialize(config = {})
+          @config = Userlist.config.merge(config)
+        end
+
+        def call(*args)
+          options = default_options.merge(self.options)
+
+          worker_name = options.delete(:class)
+          worker_class = Object.const_get(worker_name)
+          worker_class
+            .set(options)
+            .perform_later(*normalize(args))
+        end
+
+      private
+
+        attr_reader :config
+
+        def options
+          @options ||= begin
+            options = config.push_strategy_options || {}
+            options.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+          end
+        end
+
+        def default_options
+          {
+            class: 'Userlist::Push::Strategies::ActiveJob::Worker',
+            queue: 'default'
+          }
+        end
+
+        def normalize(args)
+          JSON.parse(JSON.generate(args))
+        end
+      end
+    end
+  end
+end

data/lib/userlist/push/strategies/direct.rb

@@ -7,7 +7,7 @@ module Userlist
         end
 
         def call(*args)
-          client.public_send(*args)
+          retryable.attempt { client.public_send(*args) }
         end
 
       private
@@ -17,6 +17,14 @@ module Userlist
         def client
           @client ||= Userlist::Push::Client.new(config)
         end
+
+        def retryable
+          @retryable ||= Userlist::Retryable.new do |response|
+            status = response.code.to_i
+
+            status >= 500 || status == 429
+          end
+        end
       end
     end
   end

data/lib/userlist/push/strategies/threaded/worker.rb

@@ -22,7 +22,7 @@ module Userlist
                 method, *args = *queue.pop
                 break if method == :stop
 
-                client.public_send(method, *args)
+                retryable.attempt { client.public_send(method, *args) }
               rescue StandardError => e
                 logger.error "Failed to deliver payload: [#{e.class.name}] #{e.message}"
               end
@@ -44,6 +44,14 @@ module Userlist
           def client
             @client ||= Userlist::Push::Client.new(config)
           end
+
+          def retryable
+            @retryable ||= Userlist::Retryable.new do |response|
+              status = response.code.to_i
+
+              status >= 500 || status == 429
+            end
+          end
         end
       end
     end

data/lib/userlist/push/strategies.rb

@@ -12,13 +12,16 @@ module Userlist
         return strategy unless strategy.is_a?(Symbol) || strategy.is_a?(String)
 
         require_strategy(strategy)
-        const_get(strategy.to_s.capitalize, false)
+
+        class_name = classify_strategy(strategy)
+        const_get(class_name, false)
       end
 
       def self.strategy_defined?(strategy)
         return true unless strategy.is_a?(Symbol) || strategy.is_a?(String)
 
-        const_defined?(strategy.to_s.capitalize, false)
+        class_name = classify_strategy(strategy)
+        const_defined?(class_name, false)
       end
 
       def self.require_strategy(strategy)
@@ -26,6 +29,11 @@ module Userlist
 
         require("userlist/push/strategies/#{strategy}") unless strategy_defined?(strategy)
       end
+
+      def self.classify_strategy(strategy)
+        strategy.to_s.split('_').map(&:capitalize).join
+      end
+      private_class_method :classify_strategy
     end
   end
 end

data/lib/userlist/retryable.rb

@@ -0,0 +1,49 @@
+module Userlist
+  class Retryable
+    include Userlist::Logging
+
+    RETRIES = 10
+    DELAY = 100
+    MULTIPLIER = 2
+    MAX_DELAY = 10_000
+
+    def initialize(retries: RETRIES, delay: DELAY, max_delay: MAX_DELAY, multiplier: MULTIPLIER, &retry_check)
+      @retries = retries
+      @delay = delay
+      @max_delay = max_delay
+      @multiplier = multiplier
+      @retry_check = retry_check
+    end
+
+    def retry?(value)
+      @retry_check.call(value)
+    end
+
+    def attempt
+      (0..@retries).each do |attempt|
+        if attempt.positive?
+          milliseconds = delay(attempt)
+          logger.debug "Retrying in #{milliseconds}ms, #{@retries - attempt} retries left"
+          sleep(milliseconds / 1000.0)
+        end
+
+        result = yield
+
+        return result unless retry?(result)
+      end
+
+      logger.debug 'Retries exhausted, giving up'
+
+      nil
+    end
+
+  private
+
+    def delay(attempt)
+      [
+        @delay * (@multiplier ** attempt),
+        @max_delay
+      ].min
+    end
+  end
+end

data/lib/userlist/version.rb

@@ -1,3 +1,3 @@
 module Userlist
-  VERSION = '0.7.2'.freeze
+  VERSION = '0.8.0'.freeze
 end

data/lib/userlist.rb

@@ -3,6 +3,7 @@ require 'logger'
 require 'userlist/version'
 require 'userlist/config'
 require 'userlist/logging'
+require 'userlist/retryable'
 require 'userlist/push'
 require 'userlist/token'
 

data/userlist.gemspec

@@ -23,7 +23,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '>= 1.15'
   spec.add_development_dependency 'jwt', '~> 2.2'
-  spec.add_development_dependency 'rake', '~> 12.3', '>= 12.3.3'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'webmock', '~> 1.22'
+  spec.add_development_dependency 'webmock', '~> 3.18'
+
+  spec.metadata = { 'rubygems_mfa_required' => 'true' }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: userlist
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Benedikt Deicke
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-20 00:00:00.000000000 Z
+date: 2023-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,20 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: '3.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: '3.18'
 description:
 email:
 - benedikt@userlist.com
@@ -120,6 +114,8 @@ files:
 - lib/userlist/push/resource_collection.rb
 - lib/userlist/push/serializer.rb
 - lib/userlist/push/strategies.rb
+- lib/userlist/push/strategies/active_job.rb
+- lib/userlist/push/strategies/active_job/worker.rb
 - lib/userlist/push/strategies/direct.rb
 - lib/userlist/push/strategies/null.rb
 - lib/userlist/push/strategies/sidekiq.rb
@@ -127,13 +123,15 @@ files:
 - lib/userlist/push/strategies/threaded.rb
 - lib/userlist/push/strategies/threaded/worker.rb
 - lib/userlist/push/user.rb
+- lib/userlist/retryable.rb
 - lib/userlist/token.rb
 - lib/userlist/version.rb
 - userlist.gemspec
 homepage: http://github.com/userlistio/userlist-ruby
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -149,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Ruby wrapper for the Userlist API