funktor 0.3.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dad52e1f8c07a2cf42ec9029920e80cc4152870a0fc863c35ad8015dfe5eac1
-  data.tar.gz: a22bbf4322188071bb1290f4d189f2fb3c6f80fe2ec6a8fe8c8e150887808007
+  metadata.gz: 57488e1ec71535021b02e646cce074552b08bab597ccf0394df4eaee7b9b8480
+  data.tar.gz: 2d38386a8da34bc2737da98dad4336b90820b03d85c18b52ca0d09d0d2d85a63
 SHA512:
-  metadata.gz: 669ee84b2d8e0261886484e365631eaea64ea7a8bb3c3528fce1edebdfa2bb4da61be55e64346a3a4f3b4f7eb5c4dbaebc0ce622a81ae887dc056effa983caa4
-  data.tar.gz: d5ef08ff4ca811a24131fc16fb38dffb8f0ddb9ff777d96408bd0ab9c4c6d498a9d430cee8af2feba6cad38090a26f952480ead4e16a7336095fe21e28fedc31
+  metadata.gz: 2ea9cc75cc179ff340d35fa48d5dbbaba7604b30b1361efb0a3ed8783de6b929279c39cd237ca1b78863e0622a9eb2a5c8f23f2b707d40159f09bdf788f97b4c
+  data.tar.gz: 8b018ebd3e15892fcf4b13feedb77873f41a59d75a62b6ee498808e9848f0e717785e4347d9f294b737025519f527a792b6b64c8c70334b8023e8733205c5aee

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    funktor (0.2.19)
+    funktor (0.4.1)
       activesupport
       aws-sdk-sqs (~> 1.37)
       thor
@@ -9,6 +9,9 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    activejob (6.1.4)
+      activesupport (= 6.1.4)
+      globalid (>= 0.3.6)
     activesupport (6.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
@@ -18,27 +21,38 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     aws-eventstream (1.1.1)
-    aws-partitions (1.473.0)
-    aws-sdk-core (3.115.0)
+    aws-partitions (1.482.0)
+    aws-sdk-core (3.119.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-sqs (1.40.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-sqs (1.42.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.3)
+    aws-sigv4 (1.2.4)
       aws-eventstream (~> 1, >= 1.0.2)
+    byebug (11.1.3)
+    coderay (1.1.3)
     concurrent-ruby (1.1.9)
     crack (0.4.5)
       rexml
     diff-lcs (1.4.4)
     docile (1.3.5)
+    globalid (0.5.1)
+      activesupport (>= 5.0)
     hashdiff (1.0.1)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     jmespath (1.4.0)
+    method_source (1.0.0)
     minitest (5.14.4)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
     public_suffix (4.0.6)
     rake (12.3.3)
     rexml (3.2.5)
@@ -74,11 +88,13 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activejob (>= 5.1.5)
   funktor!
+  pry-byebug
   rake (~> 12.0)
   rspec (~> 3.0)
   simplecov
   webmock
 
 BUNDLED WITH
-   2.1.4
+   2.2.24

data/funktor.gemspec

@@ -33,6 +33,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport" # TODO - Can we build our own verison of cattr_accessor to avoid this?
   spec.add_dependency "thor" # Thor drives the CLI
 
+  spec.add_development_dependency 'activejob', '>= 5.1.5'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'webmock'
+  spec.add_development_dependency 'pry-byebug'
 end

data/lib/active_job/queue_adapters/funktor_adapter.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'active_job'
+require "funktor/worker/funktor_options"
+
+module ActiveJob
+  module QueueAdapters
+    # == Funktor adapter for Active Job
+    #
+    # To use Funktor set the queue_adapter config to +:funktor+.
+    #
+    #   Rails.application.config.active_job.queue_adapter = :funktor
+    class FunktorAdapter
+      def enqueue(job) # :nodoc:
+        job.provider_job_id = Funktor.job_pusher.push({
+          "worker"  => JobWrapper.to_s,
+          "wrapped" => job.class,
+          "queue"   => job.class.work_queue,
+          "delay"   => 0,
+          "worker_params"    => [ job.serialize ]
+        })
+      end
+
+      def enqueue_at(job, timestamp) # :nodoc:
+        delay = (timestamp.utc - Time.now.utc).round
+        if delay < 0
+          delay = 0
+        end
+        job.provider_job_id = Funktor.job_pusher.push({
+          "worker"  => JobWrapper.to_s,
+          "wrapped" => job.class,
+          "queue"   => job.class.work_queue,
+          "delay"   => delay,
+          "worker_params"    => [ job.serialize ]
+        })
+      end
+
+      class JobWrapper #:nodoc:
+        include Funktor::Worker
+
+        def perform(job_data)
+          Base.execute job_data.first
+        end
+      end
+    end
+  end
+
+  class Base
+    include Funktor::Worker::FunktorOptions
+  end
+end

data/lib/funktor.rb

@@ -3,6 +3,7 @@ require 'funktor/aws/sqs/event'
 require 'funktor/aws/sqs/record'
 require 'funktor/counter'
 require 'funktor/job'
+require 'funktor/job_pusher'
 require 'funktor/logger'
 require 'funktor/worker'
 require 'funktor/middleware_chain'
@@ -22,6 +23,10 @@ module Funktor
     yield self
   end
 
+  def self.job_pusher
+    @job_pusher ||= JobPusher.new
+  end
+
   def self.job_pusher_middleware
     @job_pusher_chain ||= MiddlewareChain.new
     yield @job_pusher_chain if block_given?
@@ -98,3 +103,5 @@ end
 require 'funktor/middleware/metrics'
 require 'funktor/error_handler'
 require 'funktor/active_job_handler'
+
+require 'funktor/rails' if defined?(::Rails::Engine)

data/lib/funktor/cli/init.rb

@@ -112,15 +112,15 @@ module Funktor
       end
 
       def all_iam_permissions
-        Dir.glob(File.join('config', 'iam_permissions', '**.yml'))
+        Dir.glob(File.join('funktor_config', 'iam_permissions', '**.yml'))
       end
 
       def all_function_definitions
-        Dir.glob(File.join('config', 'function_definitions', '**.yml'))
+        Dir.glob(File.join('funktor_config', 'function_definitions', '**.yml'))
       end
 
       def all_resources
-        Dir.glob(File.join('config', 'resources', '**.yml'))
+        Dir.glob(File.join('funktor_config', 'resources', '**.yml'))
       end
 
       def funktor_config

data/lib/funktor/cli/templates/funktor_config/environment.yml

@@ -1,3 +1,7 @@
+BUNDLE_WITHOUT: development:test:assets
+BUNDLE_PLUGINS: false
+BUNDLE_FROZEN: true
+SERVERLESS_STAGE: ${self:custom.stage}
 FUNKTOR_APP_NAME: <%= app_name %>
 FUNKTOR_INCOMING_JOB_QUEUE:
   Ref: IncomingJobQueue

data/lib/funktor/fake_job_queue.rb

@@ -1,7 +1,10 @@
+require "active_support/core_ext/hash/indifferent_access"
+
 module Funktor
   module FakeJobQueue
-    def self.push(worker, payload)
-      jobs[worker.name].push({worker: worker, payload: payload})
+    def self.push(payload)
+      payload = payload.with_indifferent_access
+      jobs[payload["worker"].to_s].push(payload)
     end
 
     def self.jobs

data/lib/funktor/job.rb

@@ -38,7 +38,7 @@ module Funktor
       # TODO - In Funktor Pro we need to override this method (or do something else) so that
       # we can schedule jobs farther in the future than 15 minutes. We do this here in case a
       # retry sequence goes too long.
-      jdelay = job_data["delay"]
+      jdelay = job_data["delay"] || 0
       return jdelay < 900 ? jdelay : 900
     end
 

data/lib/funktor/job_pusher.rb

@@ -0,0 +1,31 @@
+require 'aws-sdk-sqs'
+
+module Funktor
+  class JobPusher
+
+    def push(payload)
+      puts "payload ============"
+      pp payload
+      job_id = SecureRandom.uuid
+      payload[:job_id] = job_id
+
+      Funktor.job_pusher_middleware.invoke(payload) do
+        client.send_message({
+          queue_url: queue_url(payload),
+          message_body: Funktor.dump_json(payload)
+        })
+        return job_id
+      end
+    end
+
+    private
+
+    def client
+      @client ||= ::Aws::SQS::Client.new
+    end
+
+    def queue_url(payload)
+      payload[:incoming_job_queue_url] || ENV['FUNKTOR_INCOMING_JOB_QUEUE']
+    end
+  end
+end

data/lib/funktor/rails.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+module Funktor
+  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/funktor_adapter'
+      end
+    end
+  end if defined?(::Rails)
+
+  if defined?(::Rails) && ::Rails::VERSION::MAJOR < 5
+    raise "🚫 ERROR: Funktor does not support Rails versions under 5.x"
+  end
+end

data/lib/funktor/testing.rb

@@ -17,9 +17,9 @@ module Funktor
 
       def work_all_jobs
         while jobs.any?
-          job_data = jobs.shift
-          worker = job_data[:worker]
-          worker_params = job_data[:payload][:worker_params]
+          job_data = jobs.shift.with_indifferent_access
+          worker = Object.const_get job_data[:worker]
+          worker_params = job_data[:worker_params]
           worker.new.perform(worker_params)
         end
       end
@@ -56,14 +56,16 @@ module Funktor
   end
 
   class InlineJobPusherMiddleware
-    def call(worker, payload)
-      worker.new.perform(*payload[:worker_params])
+    def call(payload)
+      payload = payload.with_indifferent_access
+      worker = Object.const_get payload["worker"]
+      worker.new.perform(*payload["worker_params"])
     end
   end
 
   class FakeJobPusherMiddleware
-    def call(worker, payload)
-      Funktor::FakeJobQueue.push(worker, payload)
+    def call(payload)
+      Funktor::FakeJobQueue.push(payload)
     end
   end
 end

data/lib/funktor/version.rb

@@ -1,3 +1,3 @@
 module Funktor
-  VERSION = "0.3.0"
+  VERSION = "0.4.2"
 end

data/lib/funktor/worker.rb

@@ -1,6 +1,6 @@
 require 'securerandom'
-require 'aws-sdk-sqs'
 require "active_support"
+require 'funktor/worker/funktor_options'
 
 module Funktor
   class DelayTooLongError < StandardError; end
@@ -9,34 +9,10 @@ end
 module Funktor::Worker
   def self.included(base)
     base.extend ClassMethods
-    base.class_eval do
-      cattr_accessor :funktor_options_hash
-      #alias_method :perform_later, :perform_async
-    end
+    base.include(Funktor::Worker::FunktorOptions)
   end
 
   module ClassMethods
-    def funktor_options(options = {})
-      self.funktor_options_hash = options
-    end
-
-    def get_funktor_options
-      self.funktor_options_hash || {}
-    end
-
-    def custom_queue_url
-      get_funktor_options[:queue_url]
-    end
-
-    def custom_queue
-      get_funktor_options[:queue]
-    end
-
-    def queue_url
-      # TODO : Should this default to FUNKTOR_ACTIVE_JOB_QUEUE?
-      # Depends how e handle this in pro...?
-      custom_queue_url || ENV['FUNKTOR_INCOMING_JOB_QUEUE']
-    end
 
     def perform_async(*worker_params)
       self.perform_in(0, *worker_params)
@@ -54,39 +30,24 @@ module Funktor::Worker
       if delay > max_delay
         raise Funktor::DelayTooLongError.new("The delay can't be longer than #{max_delay} seconds. This is a limitation of SQS. Funktor Pro has mechanisms to work around this limitation.")
       end
-      self.push_to_incoming_job_queue(delay, *worker_params)
+      self.push(delay, *worker_params)
     end
 
-    def push_to_incoming_job_queue(delay, *worker_params)
-      job_id = SecureRandom.uuid
-      payload = build_job_payload(job_id, delay, *worker_params)
-
-      Funktor.job_pusher_middleware.invoke(self, payload) do
-        client.send_message({
-          queue_url: queue_url,
-          message_body: Funktor.dump_json(payload)
-        })
-      end
+    def push(delay, *worker_params)
+      payload = build_job_payload(delay, *worker_params)
+      Funktor.job_pusher.push(payload)
     end
 
     def max_delay
       900
     end
 
-    def client
-      @client ||= Aws::SQS::Client.new
-    end
-
-    def work_queue
-      (self.custom_queue || 'default').to_s
-    end
-
-    def build_job_payload(job_id, delay, *worker_params)
+    def build_job_payload(delay, *worker_params)
       {
         worker: self.name,
         worker_params: worker_params,
         queue: self.work_queue,
-        job_id: job_id,
+        incoming_job_queue_url: self.queue_url,
         delay: delay,
         funktor_options: get_funktor_options
       }

data/lib/funktor/worker/funktor_options.rb

@@ -0,0 +1,37 @@
+module Funktor
+  module Worker
+    module FunktorOptions
+      def self.included(base)
+        base.extend ClassMethods
+        base.class_eval do
+          cattr_accessor :funktor_options_hash
+        end
+      end
+      module ClassMethods
+        def funktor_options(options = {})
+          self.funktor_options_hash = options
+        end
+
+        def get_funktor_options
+          self.funktor_options_hash || {}
+        end
+
+        def custom_queue_url
+          get_funktor_options[:queue_url]
+        end
+
+        def custom_queue
+          get_funktor_options[:queue]
+        end
+
+        def queue_url
+          custom_queue_url
+        end
+
+        def work_queue
+          (self.custom_queue || 'default').to_s
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: funktor
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Jeremy Green
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-28 00:00:00.000000000 Z
+date: 2021-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sqs
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !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: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Background processing in AWS Lambda.
 email:
 - jeremy@octolabs.com
@@ -104,6 +132,7 @@ files:
 - exe/funktor
 - exe/funktor-deploy
 - funktor.gemspec
+- lib/active_job/queue_adapters/funktor_adapter.rb
 - lib/funktor.rb
 - lib/funktor/active_job_handler.rb
 - lib/funktor/aws/sqs/event.rb
@@ -141,12 +170,15 @@ files:
 - lib/funktor/fake_job_queue.rb
 - lib/funktor/incoming_job_handler.rb
 - lib/funktor/job.rb
+- lib/funktor/job_pusher.rb
 - lib/funktor/logger.rb
 - lib/funktor/middleware/metrics.rb
 - lib/funktor/middleware_chain.rb
+- lib/funktor/rails.rb
 - lib/funktor/testing.rb
 - lib/funktor/version.rb
 - lib/funktor/worker.rb
+- lib/funktor/worker/funktor_options.rb
 homepage: https://github.com/Octo-Labs/funktor
 licenses:
 - MIT
@@ -168,8 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Background processing in AWS Lambda.