fruit_juice 0.5.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00615c32fa376b69617e3eafdcbf6f4f77ea211dbd4ab4c5a5818bbf0a8b0763
-  data.tar.gz: 3595801442e08409ba444cfd967fc1f1ec76fcb9956b78fb1b1d1a8a3df3fa43
+  metadata.gz: 50acb05db88081a34b6fa89b6ba701a6822c8d4ce2bb77c7584ef018c0726196
+  data.tar.gz: b19e563af2dc36317e2d790f64e34f173d3d47e6a6bcc9197d0b42cb5798576c
 SHA512:
-  metadata.gz: 7bba0dd5a5181faeae8ab44c091045b98f47d23c4bfd04a7f9886f87190a1dee140d88e2abdd520088c6f32b2f912e0cbd0580708d77f290e4a97f3f7aea8347
-  data.tar.gz: af8eecdac690482f8af029c1982d496b7b6a2294f61cd3b768fef76343ce833e8ab4941a185786da3e73db6c026d78a29c2328c6a4645c370754cace182a0507
+  metadata.gz: d76ea233f0bdd7296190c8cd2a6a75a247f5787cbe7496742736cd9a8c4981394f0171d8fbcb6e6230b9e5a526bb37436208ce90296e8a8c35462b14133a47ba
+  data.tar.gz: 373659336eaeb7dba73541c94df18a0c3f145d2c68d9f4feccea0a1b2e326926b0c59185e8f3c8ead8e7deb5c2a37626ff6d8ceb33213356d1fa81b40edb7c83

data/Appraisals

@@ -0,0 +1,7 @@
+appraise "redis-4" do
+  gem "redis", ">= 4.0.0", "< 5.0.0"
+end
+
+appraise "redis-5" do
+  gem "redis", ">= 5.0.0"
+end

data/Gemfile

@@ -5,6 +5,6 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in fruit_juice.gemspec
 gemspec
 
-gem "rake", "~> 13.0"
-gem "byebug"
-gem "rspec", "~> 3.0"
+group :test do 
+  gem "rspec", "~> 3.0"
+end

data/Gemfile.lock

@@ -1,14 +1,17 @@
 PATH
   remote: .
   specs:
-    fruit_juice (0.5.0)
-      json (>= 2.4.1)
-      redis (>= 4.0.0)
+    fruit_juice (0.6.0)
+      json (>= 2.3.0)
+      redis (>= 4.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    byebug (11.1.3)
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
     connection_pool (2.3.0)
     diff-lcs (1.5.0)
     json (2.6.3)
@@ -30,14 +33,16 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
+    thor (1.2.1)
 
 PLATFORMS
   arm64-darwin-22
+  x86_64-darwin-21
+  x86_64-linux
 
 DEPENDENCIES
-  byebug
+  appraisal (~> 2.5)
   fruit_juice!
-  rake (~> 13.0)
   rspec (~> 3.0)
 
 BUNDLED WITH

data/README.md

@@ -5,7 +5,7 @@ FruitJuice is a job enqueuing adapter for the [mosquito background job processor
 
 ## Requirements
 
-Ruby 2.7+
+Ruby 2.5.0+
 Mosquito 1.0.0.rc1+
 Crystal 1.0.0+
 Redis 4+
@@ -76,13 +76,12 @@ delayed_job = MyNewRubyJob.new(job_type: "MyNewJob")
 delayed_job.perform(this_will: "become a job option", "job option": "and be stored", "as": "json to parse in Mosquito")
 ```
 
-
 That's it! Triggering jobs from Ruby/Rails is pretty easy, but this makes it a nice pattern that's easy to follow.
   
 
 ## 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.
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rspec` 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 the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org). (Hint: only Seth can push to ruby gems for now)
 

data/gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_RETRY: "1"

data/gemfiles/redis_4.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake", "~> 13.0"
+gem "redis", ">= 4.0.0", "< 5.0.0"
+
+group :test do
+  gem "rspec", "~> 3.0"
+end
+
+gemspec path: "../"

data/gemfiles/redis_4.gemfile.lock

@@ -0,0 +1,46 @@
+PATH
+  remote: ..
+  specs:
+    fruit_juice (0.6.0)
+      redis (>= 4.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    byebug (11.1.3)
+    diff-lcs (1.5.0)
+    rake (13.0.6)
+    redis (4.6.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    thor (1.2.1)
+
+PLATFORMS
+  arm64-darwin-22
+  x86_64-darwin-21
+
+DEPENDENCIES
+  appraisal (~> 2.5)
+  byebug
+  fruit_juice!
+  rake (~> 13.0)
+  redis (>= 4.0.0, < 5.0.0)
+  rspec (~> 3.0)
+
+BUNDLED WITH
+   2.3.26

data/gemfiles/redis_5.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake", "~> 13.0"
+gem "redis", ">= 5.0.0"
+
+group :test do
+  gem "rspec", "~> 3.0"
+end
+
+gemspec path: "../"

data/gemfiles/redis_5.gemfile.lock

@@ -0,0 +1,50 @@
+PATH
+  remote: ..
+  specs:
+    fruit_juice (0.6.0)
+      redis (>= 4.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    byebug (11.1.3)
+    connection_pool (2.3.0)
+    diff-lcs (1.5.0)
+    rake (13.0.6)
+    redis (5.0.5)
+      redis-client (>= 0.9.0)
+    redis-client (0.11.2)
+      connection_pool
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    thor (1.2.1)
+
+PLATFORMS
+  arm64-darwin-22
+  x86_64-darwin-21
+
+DEPENDENCIES
+  appraisal (~> 2.5)
+  byebug
+  fruit_juice!
+  rake (~> 13.0)
+  redis (>= 5.0.0)
+  rspec (~> 3.0)
+
+BUNDLED WITH
+   2.3.26

data/lib/fruit_juice/delayed_job.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 require_relative "string"
 require_relative "hash"
-
 require "json"
 
 module FruitJuice
@@ -20,13 +19,13 @@ module FruitJuice
     end
 
     def perform(**job_options)
-      @job_options = JSON.generate(job_options.deep_stringify_keys!)
+      @job_options = job_options.deep_stringify_keys!
       enqueue_job
     end
 
     protected
 
-      def enqueue_job(**options)
+      def enqueue_job
         enqueue_time = (Time.now.utc.to_f*1000).to_i
         job_id = "#{enqueue_time}:#{rand(1000)}"
         job_run_key = "mosquito:job_run:#{job_id}"
@@ -38,9 +37,12 @@ module FruitJuice
           "retry_count": 0,
 
           # Job specific params
-          "job_options": @job_options
+          "job_options": @job_options.to_json
         }
 
+        # Required to support both Redis v4.x & v5+ due to behavior changes
+        job_run_meta_data.transform_values!(&:to_s) if Redis::VERSION.to_i > 4
+        
         @redis_adapter.hset(job_run_key, job_run_meta_data)
         @redis_adapter.lpush(@waiting_queue_key, job_id)
         job_run_key
@@ -70,4 +72,4 @@ module FruitJuice
         end
       end
   end
-end
+end

data/lib/fruit_juice/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FruitJuice
-  VERSION = "0.5.0"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: fruit_juice
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Seth Tucker
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-15 00:00:00.000000000 Z
+date: 2023-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 2.3.0
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
 description: This handy adapter will let you enqueue delayed jobs from a Ruby/Rails
   app and have the job processed by Mosquito in Crystal. The idea behind this came
   from a Ruby/Rails app needing a better way to process massive background jobs more
@@ -48,15 +62,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".byebug_history"
 - ".rspec"
+- Appraisals
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- fruit_juice.gemspec
+- gemfiles/.bundle/config
+- gemfiles/redis_4.gemfile
+- gemfiles/redis_4.gemfile.lock
+- gemfiles/redis_5.gemfile
+- gemfiles/redis_5.gemfile.lock
 - lib/fruit_juice.rb
 - lib/fruit_juice/delayed_job.rb
 - lib/fruit_juice/hash.rb
@@ -77,14 +95,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Ruby job adapter to enqueue background jobs in Mosquito for Crystal. Uniting

data/.byebug_history

@@ -1,55 +0,0 @@
-q!
-job_type.class.to_s
-job_type
-c
-delayed_job.job_type
-c
-job_type.class
-c
-delayed_job.public_methods
-delayed_job.methods
-delayed_job.job_type
-c
-delayed_job.instance_variables
-delayed_job.job_type
-c
-job_type.camelize
-job_type.class == String
-job_type
-job_type.camelize
-job_type.class
-c
-config_options[:job_type].class
-config_options[:job_type].camelize
-config_options[:job_type]
-"test".camelize
-@job_type
-c
-jobType&.camelize
-jobType.camelize
-jobType.methods.grep /camel/
-jobType.class
-jobType = config_options[:job_type]
-config_options[:job_type].camelize
-config_options[:job_type].class
-set_job_type(config_options[:job_type])
-config_options
-@job_type
-c
-c!
-c
-job_type
-config_options
-config_options[:job_type]
-@job_type
-c
-FruitJuice::DelayedJob.new
-c
-ENV["REDIS_URL"]
-redis_url
-q
-ENV["REDIS_URL"]
-ENV.delete("REDIS_URL")
-ENV["REDIS_URL"].delete
-ENV["REDIS_URL"]
-redis_adapter.class.to_s.downcase

data/fruit_juice.gemspec

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "lib/fruit_juice/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "fruit_juice"
-  spec.version = FruitJuice::VERSION
-  spec.authors = ["Seth Tucker"]
-  spec.email = ["crimsonknightstudios@gmail.com"]
-
-  spec.summary = "Ruby job adapter to enqueue background jobs in Mosquito for Crystal. Uniting Ruby/Rails & Crystal!"
-  spec.description = "This handy adapter will let you enqueue delayed jobs from a Ruby/Rails app and have the job processed by Mosquito in Crystal. The idea behind this came from a Ruby/Rails app needing a better way to process massive background jobs more effeciently, and a desire to stay curious and explore."
-  spec.homepage = "https://github.com/crimson-knight/fruit_juice"
-  spec.license = "MIT"
-  spec.required_ruby_version = ">= 2.7.0"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/crimson-knight/fruit_juice"
-
-  # 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(__dir__) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
-    end
-  end
-  spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "json", ">= 2.4.1"
-  spec.add_dependency "redis", ">= 4.0.0"
-end