funktor 0.4.0 → 0.4.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 25d6a36d1e21a09dda03678f7b81742dfec17ceb95c1220254a04690a3933d12
4
- data.tar.gz: e43d8a4640ca2bced4c5d6e687a1f3b878016108790afeb7b502c0680e334363
3
+ metadata.gz: 14aab17eb93983bb955499f188016259228524db65da3ac42355b16fc9dcc6fc
4
+ data.tar.gz: f144426a8f28880f50d538c1ccff935f1df06257d948106c17d10d051584934e
5
5
  SHA512:
6
- metadata.gz: c14ed21535c212873b4bddec9744467f6aa1ca25125aae1c4ea115a88e89ffc0dbc683916507400562c38c3041d15bcda9711265047bbcbc001195256dcf7543
7
- data.tar.gz: 213dd13516d536fb9e253e6b2a59bee33771e5e1a90d1702f56de5c16c3aab5384641d0361df221f5c012bd25439e3bec5a26cc865c3321637604ffb0f86dd7a
6
+ metadata.gz: 49849e8195b4724d6471035ebc914556dfee9173016532117e2e5d512196d3016eee51171aaeea55a92ec1cae35699c72d740bf3c4093be8374447eba2ef54b4
7
+ data.tar.gz: daff2109c7cbaa42075f154b375a1263d5afe5ad5d74fb20169cbe051bb53e81dcb0a4328f012642358e5c9467f4dfe0d4e74315ce2d2f5e594db4e3af2b7009
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- funktor (0.3.1)
4
+ funktor (0.4.4)
5
5
  activesupport
6
6
  aws-sdk-sqs (~> 1.37)
7
7
  thor
@@ -21,14 +21,14 @@ GEM
21
21
  addressable (2.7.0)
22
22
  public_suffix (>= 2.0.2, < 5.0)
23
23
  aws-eventstream (1.1.1)
24
- aws-partitions (1.481.0)
25
- aws-sdk-core (3.118.0)
24
+ aws-partitions (1.482.0)
25
+ aws-sdk-core (3.119.0)
26
26
  aws-eventstream (~> 1, >= 1.0.2)
27
27
  aws-partitions (~> 1, >= 1.239.0)
28
28
  aws-sigv4 (~> 1.1)
29
29
  jmespath (~> 1.0)
30
- aws-sdk-sqs (1.41.0)
31
- aws-sdk-core (~> 3, >= 3.118.0)
30
+ aws-sdk-sqs (1.42.0)
31
+ aws-sdk-core (~> 3, >= 3.119.0)
32
32
  aws-sigv4 (~> 1.1)
33
33
  aws-sigv4 (1.2.4)
34
34
  aws-eventstream (~> 1, >= 1.0.2)
@@ -1,6 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require 'active_job'
4
+ require "funktor/worker/funktor_options"
4
5
 
5
6
  module ActiveJob
6
7
  module QueueAdapters
@@ -15,17 +16,22 @@ module ActiveJob
15
16
  "worker" => JobWrapper.to_s,
16
17
  "wrapped" => job.class,
17
18
  "queue" => job.class.work_queue,
18
- "worker_params" => [ job.serialize ]
19
+ "delay" => 0,
20
+ "worker_params" => job.serialize
19
21
  })
20
22
  end
21
23
 
22
24
  def enqueue_at(job, timestamp) # :nodoc:
25
+ delay = (Time.at(timestamp).utc - Time.now.utc).round
26
+ if delay < 0
27
+ delay = 0
28
+ end
23
29
  job.provider_job_id = Funktor.job_pusher.push({
24
30
  "worker" => JobWrapper.to_s,
25
31
  "wrapped" => job.class,
26
32
  "queue" => job.class.work_queue,
27
- "worker_params" => [ job.serialize ],
28
- "at" => timestamp
33
+ "delay" => delay,
34
+ "worker_params" => job.serialize
29
35
  })
30
36
  end
31
37
 
@@ -33,7 +39,9 @@ module ActiveJob
33
39
  include Funktor::Worker
34
40
 
35
41
  def perform(job_data)
36
- Base.execute job_data.first
42
+ puts "job_data = #{job_data.class}"
43
+ puts job_data
44
+ Base.execute job_data
37
45
  end
38
46
  end
39
47
  end
@@ -1,4 +1,6 @@
1
- BUNDLE_WITHOUT: development:test
1
+ BUNDLE_WITHOUT: development:test:assets
2
+ BUNDLE_PLUGINS: false
3
+ BUNDLE_FROZEN: true
2
4
  SERVERLESS_STAGE: ${self:custom.stage}
3
5
  FUNKTOR_APP_NAME: <%= app_name %>
4
6
  FUNKTOR_INCOMING_JOB_QUEUE:
data/lib/funktor/job.rb CHANGED
@@ -38,7 +38,7 @@ module Funktor
38
38
  # TODO - In Funktor Pro we need to override this method (or do something else) so that
39
39
  # we can schedule jobs farther in the future than 15 minutes. We do this here in case a
40
40
  # retry sequence goes too long.
41
- jdelay = job_data["delay"]
41
+ jdelay = job_data["delay"] || 0
42
42
  return jdelay < 900 ? jdelay : 900
43
43
  end
44
44
 
data/lib/funktor/rails.rb CHANGED
@@ -7,7 +7,6 @@ module Funktor
7
7
  # config/initializers/*.rb.
8
8
  config.before_configuration do
9
9
  if defined?(::ActiveJob)
10
- require "sidekiq/worker"
11
10
  require 'active_job/queue_adapters/funktor_adapter'
12
11
  end
13
12
  end
@@ -1,3 +1,3 @@
1
1
  module Funktor
2
- VERSION = "0.4.0"
2
+ VERSION = "0.4.4"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: funktor
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.0
4
+ version: 0.4.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jeremy Green