upperkut 1.0.0.rc → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 497852c1c7edee902a15cb3978f2efaab5ffdd8fe5be6fa2ab3fc62e9de2b661
-  data.tar.gz: 39ed05ba320a38368c83a018216ab9db5ab26e760369f5b944e8ecacd24c1acc
+  metadata.gz: edf84d6612f4c9577cfe53e578e16983e3936863379c7d4c1041e9c92637f867
+  data.tar.gz: ce0ad624fe65306bb8fe818b8018acfe519326cbb744ef9af0519b26fd25faed
 SHA512:
-  metadata.gz: 7cccacbc6c943ca5ee5bab8bea75c67d0ba6bb039c732723f16ffb78cd98c85ee5873b04cfc485b8e3fa879a35bfe59f0aedb53ede87a620666aebbe40ef9b77
-  data.tar.gz: 3031919f600731f5fb2989ebe02055a1032bb3565ce471b74f6b29025b9f2417fc98a1302cc39ad6d0a05b1c4d641636cbff8d965bbd7194b5ae94f34a1096e4
+  metadata.gz: 3f6325ce299c9af7c50c9891acee2e771131d002c27b27fe6e245227d73ce177afd65451116daf7a5af5fc5e546b8b52b796ea82abf05bb8eae88966a16efa46
+  data.tar.gz: 482e700d0cd87b0f6de61c528ef42d7c57bbc96afce8d5d6b1593420a4fa9308f6be668cc8c183fc98b9347a6a33800be9df5bebc3da98ac7a673f2204440cc2

data/.circleci/config.yml

@@ -6,7 +6,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/ruby:2.4.4
+      - image: circleci/ruby:2.7.2
         environment:
           CC_TEST_REPORTER_ID: 03ab83a772148a577d29d4acf438d7ebdc95c632224122d0ba8dbb291eedebe6
           COVERAGE: true

data/CHANGELOG.md

@@ -1,4 +1,11 @@
 # Upperkut changes
+
+1.0.x
+-------
+-  Add docker
+- Fix to_underscore bug for ruby 2.7.2 #83 @andrehjr;
+
+
 0.8.x
 --------
 - Added exponential backoff when push_items #57

data/Dockerfile

@@ -0,0 +1,7 @@
+FROM ruby:2.7.2
+
+WORKDIR /code
+COPY . .
+
+RUN gem install bundler
+RUN bundle install

data/Gemfile

@@ -8,4 +8,4 @@ gemspec
 gem 'fivemat'
 gem 'pry'
 gem 'rspec_junit_formatter'
-gem 'simplecov', require: false
+gem 'simplecov', '< 0.18', require: false

data/Gemfile.lock

@@ -1,38 +1,38 @@
 PATH
   remote: .
   specs:
-    upperkut (1.0.0.rc)
+    upperkut (1.0.2)
       connection_pool (~> 2.2, >= 2.2.2)
       redis (>= 4.1.0, < 5.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    coderay (1.1.2)
+    coderay (1.1.3)
     connection_pool (2.2.3)
-    diff-lcs (1.3)
+    diff-lcs (1.4.4)
     docile (1.3.2)
     fivemat (1.3.7)
-    json (2.3.0)
+    json (2.3.1)
     method_source (1.0.0)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     rake (13.0.1)
-    redis (4.2.1)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    redis (4.2.5)
+    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.9.0)
-    rspec-mocks (3.9.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
     simplecov (0.17.1)
@@ -51,7 +51,7 @@ DEPENDENCIES
   rake (~> 13.0)
   rspec (~> 3.0)
   rspec_junit_formatter
-  simplecov
+  simplecov (< 0.18)
   upperkut!
 
 BUNDLED WITH

data/Makefile

@@ -0,0 +1,4 @@
+bash:
+	docker-compose run gem bash
+specs:
+	docker-compose run gem bundle exec rspec

data/docker-compose.yml

@@ -0,0 +1,18 @@
+services:
+  gem:
+    build: .
+    volumes:
+      - .:/code
+    environment:
+      - REDIS_URL=redis://redis:6379
+    depends_on:
+      - redis
+  redis:
+    image: redis:5.0.4-alpine
+    command: redis-server --save "" --appendonly yes --appendfsync everysec
+    ports:
+      - 6379:6379
+    volumes:
+      - redis-data:/data
+volumes:
+  redis-data:

data/lib/upperkut.rb

@@ -58,7 +58,7 @@ module Upperkut
 
     def self.default
       new.tap do |config|
-        config.polling_interval = Integer(ENV['UPPERKUT_POLLING_INTERVAL'] || 5)
+        config.polling_interval = Float(ENV['UPPERKUT_POLLING_INTERVAL'] || 5)
       end
     end
 

data/lib/upperkut/item.rb

@@ -4,27 +4,13 @@ module Upperkut
   class Item
     attr_reader :id, :body, :enqueued_at
 
-    def initialize(body:, id: nil, enqueued_at: nil)
-      raise ArgumentError, 'Body should be a Hash' unless body.is_a?(Hash)
-
+    def initialize(id:, body:, enqueued_at: nil)
+      @id = id
       @body = body
-      @id = id || SecureRandom.uuid
       @enqueued_at = enqueued_at || Time.now.utc.to_i
       @nacked = false
     end
 
-    def [](key)
-      @body[key]
-    end
-
-    def []=(key, value)
-      @body[key] = value
-    end
-
-    def key?(key)
-      @body.key?(key)
-    end
-
     def nack
       @nacked = true
     end
@@ -32,19 +18,5 @@ module Upperkut
     def nacked?
       @nacked
     end
-
-    def to_json
-      JSON.generate(
-        'id' => @id,
-        'body' => @body,
-        'enqueued_at' => @enqueued_at
-      )
-    end
-
-    def self.from_json(item_json)
-      hash = JSON.parse(item_json)
-      id, body, enqueued_at = hash.values_at('id', 'body', 'enqueued_at')
-      new(id: id, body: body, enqueued_at: enqueued_at)
-    end
   end
 end

data/lib/upperkut/processor.rb

@@ -11,6 +11,7 @@ module Upperkut
 
     def process
       items = @worker.fetch_items.freeze
+      return unless items.any?
 
       @worker.server_middlewares.invoke(@worker, items) do
         @worker_instance.perform(items)

data/lib/upperkut/strategies/buffered_queue.rb

@@ -83,7 +83,7 @@ module Upperkut
         return false if items.empty?
 
         redis do |conn|
-          conn.rpush(key, items.map(&:to_json))
+          conn.rpush(key, encode_json_items(items))
         end
 
         true
@@ -111,7 +111,7 @@ module Upperkut
         redis do |conn|
           conn.eval(ACK_ITEMS,
                     keys: [processing_key],
-                    argv: items.map(&:to_json))
+                    argv: encode_json_items(items))
         end
       end
 
@@ -121,7 +121,7 @@ module Upperkut
         redis do |conn|
           conn.eval(NACK_ITEMS,
                     keys: [key, processing_key],
-                    argv: items.map(&:to_json))
+                    argv: encode_json_items(items))
         end
       end
 

data/lib/upperkut/strategies/priority_queue.rb

@@ -112,7 +112,7 @@ module Upperkut
 
             conn.eval(ENQUEUE_ITEM,
                       keys: keys,
-                      argv: [item.to_json])
+                      argv: [encode_json_items(item)])
           end
         end
 

data/lib/upperkut/strategies/scheduled_queue.rb

@@ -43,8 +43,9 @@ module Upperkut
 
         redis do |conn|
           items.each do |item|
-            ensure_timestamp_attr(item)
-            conn.zadd(key, item['timestamp'], item.to_json)
+            schedule_item = ensure_timestamp_attr(item)
+            timestamp = schedule_item.body['timestamp']
+            conn.zadd(key, timestamp, encode_json_items(schedule_item))
           end
         end
 
@@ -97,7 +98,13 @@ module Upperkut
       end
 
       def ensure_timestamp_attr(item)
-        item['timestamp'] = Time.now.utc.to_i unless item.key?('timestamp')
+        return item if item.body.key?('timestamp')
+
+        Item.new(
+          id: item.id,
+          body: item.body.merge('timestamp' => Time.now.utc.to_i),
+          enqueued_at: item.enqueued_at
+        )
       end
 
       def pop_values(redis_client, args)
@@ -119,17 +126,16 @@ module Upperkut
 
       def latency
         now = Time.now.utc
-        now_timestamp = now.to_f
-        job = nil
+        timestamp = now.to_f
 
-        redis do |conn|
-          job = conn.zrangebyscore(key, '-inf'.freeze, now_timestamp.to_s, limit: [0, 1]).first
-          job = decode_json_items([job]).first
+        item = redis do |conn|
+          item = conn.zrangebyscore(key, '-inf', timestamp.to_s, limit: [0, 1]).first
+          decode_json_items([item]).first
         end
 
-        return 0 unless job
+        return timestamp - item.body['timestamp'].to_f if item
 
-        now_timestamp - job['timestamp'].to_f
+        0
       end
 
       def redis

data/lib/upperkut/util.rb

@@ -4,7 +4,7 @@ require 'upperkut/item'
 module Upperkut
   module Util
     def to_underscore(object)
-      klass_name = object
+      klass_name = object.dup
       klass_name.gsub!(/::/, '_')
       klass_name.gsub!(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2')
       klass_name.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
@@ -27,13 +27,29 @@ module Upperkut
       items.map do |item|
         next item if item.is_a?(Item)
 
-        Item.new(body: item)
+        Item.new(id: SecureRandom.uuid, body: item)
+      end
+    end
+
+    def encode_json_items(items)
+      items = [items] unless items.is_a?(Array)
+
+      items.map do |item|
+        JSON.generate(
+          'id' => item.id,
+          'body' => item.body,
+          'enqueued_at' => item.enqueued_at
+        )
       end
     end
 
     def decode_json_items(items)
-      items.each_with_object([]) do |item, memo|
-        memo << Item.from_json(item) if item
+      items.each_with_object([]) do |item_json, memo|
+        next unless item_json
+
+        hash = JSON.parse(item_json)
+        id, body, enqueued_at = hash.values_at('id', 'body', 'enqueued_at')
+        memo << Item.new(id: id, body: body, enqueued_at: enqueued_at)
       end
     end
 

data/lib/upperkut/version.rb

@@ -1,3 +1,3 @@
 module Upperkut
-  VERSION = '1.0.0.rc'.freeze
+  VERSION = '1.0.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upperkut
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc
+  version: 1.0.2
 platform: ruby
 authors:
 - Nando Sousa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-31 00:00:00.000000000 Z
+date: 2021-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
@@ -106,12 +106,15 @@ files:
 - ".rspec"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
+- Dockerfile
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
+- Makefile
 - README.md
 - Rakefile
 - bin/upperkut
+- docker-compose.yml
 - examples/basic.rb
 - examples/priority_worker.rb
 - examples/scheduled_worker.rb
@@ -152,11 +155,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Batch background processing tool