faktory_worker_ruby 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 672affacf993528eedff478961a96bbc222e62bc
-  data.tar.gz: 8b58b6e46e4d6965690bc4a17f3067548671edd0
+  metadata.gz: 5d427c1c0dc267c3debcf7fd725fab9a628f7d0d
+  data.tar.gz: 92c6b2099292bc46e2eaf22ba3be5c9f3dadf6b0
 SHA512:
-  metadata.gz: 7210a8933baf0a671a608d41b5bb183fec3ea93b5c233c937c3882e921634d1baedb5985be1ecd6142ee1ca9257d3483012a7511f40c4f58fc4c13d0f34a4f4f
-  data.tar.gz: 1a2e769ad7b96d539842e29c7056e36523d878cb81ccda8610247b99e8f239877dfbe7caee93be6d194213801c2a31fbfb876c69f5a5850bad6b15461661c4e4
+  metadata.gz: e856cbcb98527d2b38c000d87cfbced657f42b7956a7090014946c9131b4771f239683df586c084ad17b4e2f07f2e7f9560c62f7f438db99c523e276136540a6
+  data.tar.gz: 44ce04a5b7346b1e8965b917ac9ecaad179936b62fb7dc4107e1cd9fe2155da0ff549c2ef91551c5f18b75daeec5f87a5aa8b38b4b628c3ab9ef4ba0147eb776

data/Changes.md

@@ -1,5 +1,11 @@
 # Changes
 
+## 0.7.1
+
+- Add an ActiveJob adapter for Faktory.
+
+  [#17, jagthedrummer]
+
 ## 0.7.0
 
 - Add testing API, almost identical to Sidekiq's `sidekiq/testing` API.

data/Gemfile.lock

@@ -1,21 +1,38 @@
 PATH
   remote: .
   specs:
-    faktory_worker_ruby (0.7.0)
+    faktory_worker_ruby (0.7.1)
       connection_pool (~> 2.2, >= 2.2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activejob (5.1.5)
+      activesupport (= 5.1.5)
+      globalid (>= 0.3.6)
+    activesupport (5.1.5)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
     minitest (5.10.3)
     minitest-hooks (1.4.2)
     rake (12.1.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activejob (>= 5.1.5)
   faktory_worker_ruby!
   minitest (~> 5)
   minitest-hooks

data/faktory_worker_ruby.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = ">= 2.2.2"
 
   gem.add_dependency                  'connection_pool', '~> 2.2', ">= 2.2.1"
+  gem.add_development_dependency      'activejob', '>= 5.1.5'
   gem.add_development_dependency      'minitest', '~> 5'
   gem.add_development_dependency      'minitest-hooks'
   gem.add_development_dependency      'rake', '~> 12'

data/lib/active_job/queue_adapters/faktory_adapter.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'active_job'
+
+module ActiveJob
+  module QueueAdapters
+    # == Faktory adapter for Active Job
+    #
+    # To use Faktory set the queue_adapter config to +:faktory+.
+    #
+    #   Rails.application.config.active_job.queue_adapter = :faktory
+    class FaktoryAdapter
+      def enqueue(job) #:nodoc:
+        jid = SecureRandom.hex(12)
+        job.provider_job_id = jid
+        # Faktory::Client does not support symbols as keys
+        Faktory::Client.new.push \
+          "jid"     => jid,
+          "jobtype" => JobWrapper,
+          "custom"  => {
+            "wrapped" => job.class.to_s,
+          },
+          "priority" => job.priority,
+          "queue"   => job.queue_name,
+          "args"    => [ job.serialize ]
+      end
+
+      def enqueue_at(job, timestamp) #:nodoc:
+        jid = SecureRandom.hex(12)
+        job.provider_job_id = jid
+        # Faktory::Client does not support symbols as keys
+        Faktory::Client.new.push \
+          "jid"     => jid,
+          "jobtype" => JobWrapper,
+          "custom"  => {
+            "wrapped" => job.class.to_s
+          },
+          "priority" => job.priority,
+          "queue"   => job.queue_name,
+          "args"    => [ job.serialize ],
+          "at"      => Time.at(timestamp).utc.to_datetime.rfc3339(9)
+      end
+
+      class JobWrapper #:nodoc:
+        include Faktory::Job
+
+        def perform(job_data)
+          Base.execute job_data
+        end
+      end
+    end
+  end
+end

data/lib/faktory/rails.rb

@@ -1,6 +1,16 @@
 # frozen_string_literal: true
 module Faktory
   class Rails < ::Rails::Engine
+    # This hook happens after `Rails::Application` is inherited within
+    # config/application.rb and before config is touched, usually within the
+    # class block. Definitely before config/environments/*.rb and
+    # config/initializers/*.rb.
+    config.before_configuration do
+      if defined?(::ActiveJob)
+        require 'active_job/queue_adapters/faktory_adapter'
+      end
+    end
+
     config.after_initialize do
       # This hook happens after all initializers are run, just before returning
       # from config/environment.rb back to faktory/cli.rb.

data/lib/faktory/testing.rb

@@ -31,7 +31,7 @@ module Faktory
     end
 
     def self.inline!(&block)
-      # Only allow blockless inline via `blockless_inline_is_a_bad_idea_but_I_wanna_do_it_anyway!`
+      # Only allow inline testing inside of a block
       # https://github.com/mperham/sidekiq/issues/3495
       unless block_given?
         raise 'Must provide a block to Faktory::Testing.inline!'
@@ -40,10 +40,6 @@ module Faktory
       __set_test_mode(:inline, &block)
     end
 
-    def self.blockless_inline_is_a_bad_idea_but_I_wanna_do_it_anyway!
-      __set_test_mode(:inline)
-    end
-
     def self.enabled?
       self.__test_mode != :disable
     end

data/lib/faktory/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Faktory
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faktory_worker_ruby
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-17 00:00:00.000000000 Z
+date: 2018-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
@@ -30,6 +30,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.1
+- !ruby/object:Gem::Dependency
+  name: activejob
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.1.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.1.5
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -89,6 +103,7 @@ files:
 - Rakefile
 - bin/faktory-worker
 - faktory_worker_ruby.gemspec
+- lib/active_job/queue_adapters/faktory_adapter.rb
 - lib/faktory.rb
 - lib/faktory/cli.rb
 - lib/faktory/client.rb
@@ -128,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby worker for Faktory