jobba 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8b6fbe4f79c7707c269facfeb60eddd1af3f6983
-  data.tar.gz: 0d2910f8859ea8d05a1745a3cc58bbaf0ff34a2b
+SHA256:
+  metadata.gz: 937d8738afd80bda5878ea1dad5d82310d5d4090c5de83788c0f427816328180
+  data.tar.gz: 1a23bbcc448af7634b683fe743fd8cc59a4b3cecd06575a7e076eb473caa5a0a
 SHA512:
-  metadata.gz: 6091608aa497bc8027fa30c23dbecf31c6d9d2e987177da8fed93cda20629ca35a26b3b806664a5e7983a45d4612ff5020857ab5752de11d66f059be81eadbb5
-  data.tar.gz: c81bb3aebf41dab11f2c94b37f6915d2ad4ead35586e78df8bea825427406ac128d531ea8c15a863258c2fefd70f24dbd5d00ae0d546a5e92b55a4f85ba34f6d
+  metadata.gz: df3b9f488b84af546a31e5931abc4e67b9641324687c6c6272ce90cb0b3b2aaa3a2480ceb448aac485cda2e656d090d3a607b776891f65ba9f2c68fb87f3e196
+  data.tar.gz: 0cad4eb0d5c6016fba344849815ff0ec09236ce6cee8e8e52522db946442c4067553a867f301f1b6d92f2ca3fc575fb146cdf831e0b7d2f602062d3b69f0a72a

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.5.3

data/.travis.yml

@@ -2,6 +2,10 @@ sudo: false
 language: ruby
 rvm:
   - 2.2.3
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
+  - 2.6.0
 cache: bundler
 bundler_args: --retry=6
 script:
@@ -13,3 +17,5 @@ notifications:
 env:
   - USE_REAL_REDIS=false
   - USE_REAL_REDIS=true
+before_install:
+   - gem install bundler -v '< 2'

data/jobba.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "redis", "~> 3.2"
+  spec.add_runtime_dependency "oj", '~> 3.7.6'
   spec.add_runtime_dependency "redis-namespace"
 
   spec.add_development_dependency "bundler", "~> 1.10"

data/lib/jobba/state.rb

@@ -59,11 +59,6 @@ class Jobba::State
   ALL_TIMESTAMP_SYMBOLS = ALL.collect{|state| state.timestamp_name_key}.freeze
 
   def to_json
-    name.to_json
+    "\"#{name}\""
   end
 end
-
-
-
-
-

data/lib/jobba/status.rb

@@ -1,5 +1,5 @@
-require 'json'
 require 'ostruct'
+require 'oj'
 
 module Jobba
   class Status
@@ -163,7 +163,11 @@ module Jobba
     end
 
     def normalize_for_json(input)
-      JSON.parse(input.to_json, quirks_mode: true)
+      Oj.load(convert_to_json(input))
+    end
+
+    def convert_to_json(value)
+      Oj.dump(value, mode: :custom, use_to_json: true)
     end
 
     def delete
@@ -219,7 +223,7 @@ module Jobba
     def archive_attempt!
       archived_job_key = job_key(attempt)
       redis.rename(job_key, archived_job_key)
-      redis.hset(archived_job_key, :id, "#{id}:#{attempt}".to_json)
+      redis.hset(archived_job_key, :id, convert_to_json("#{id}:#{attempt}"))
       delete_locally!
     end
 
@@ -260,7 +264,7 @@ module Jobba
 
     def load_from_json_encoded_attrs(attribute_name)
       json = (@json_encoded_attrs || {})[attribute_name]
-      attribute = json.nil? ? nil : JSON.parse(json, quirks_mode: true)
+      attribute = json.nil? ? nil : Oj.load(json)
 
       case attribute_name
       when 'state'
@@ -298,8 +302,7 @@ module Jobba
           key = kv_array[0]
           value = kv_array[1]
           value = Jobba::Utils.time_to_usec_int(value) if value.is_a?(::Time)
-
-          [key, value.to_json]
+          [key, convert_to_json(value)]
         end
 
       Jobba.redis.hmset(job_key, *redis_key_value_array)

data/lib/jobba/version.rb

@@ -1,3 +1,3 @@
 module Jobba
-  VERSION = "1.7.0"
+  VERSION = "1.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jobba
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-10 00:00:00.000000000 Z
+date: 2019-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.7.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.7.6
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
@@ -161,8 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Redis-based background job status tracking.