activejob-google_cloud_pubsub 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da9fc1a9899e01a539b7915f3048fe431b2318ec
-  data.tar.gz: 33fc32d0c44ebe6268f5cc4ce758197e90270b62
+  metadata.gz: db8cb5dcd87c4c044f590ff7159aeae92b9005fe
+  data.tar.gz: af83887bfe5e38ee312dd88290615a81448c0a0c
 SHA512:
-  metadata.gz: 3cea59188f9bc8c735b8d78091fa604eb37812e063c5974b6f41fa67484ef9b684fe1e3a7a2e5e856c051d98e979901a80c2f9c7a0f4c1f9afa1a401af2e6425
-  data.tar.gz: 6d7695efa2eacc5c7b32ec3327fb1ea3d7879cc5ea2155367add6e26ce0b0af08ea2c4453a607d1bf802e819a5b306c14ede4145e341847d3a5ab556f783b473
+  metadata.gz: a6ec0ba0e29951b8ee8678e07b67589612ae97568c553ed2d107273ff51902c071afd5671038a948c637cf0d97b24b4694901c8b65a4fb2b965f65a0a3316ee9
+  data.tar.gz: 1c7adfbc95a95a3b46528ca3b9aefe26ab536213b195a4b8ebea8b588c8fe165fac5c09527e13cd21cf263f3a857328c224c12579813bf07eb329fafefef6e89

data/README.md

@@ -66,8 +66,8 @@ Rails.application.config.active_job.queue_adapter = ActiveJob::GoogleCloudPubsub
   logger: Rails.logger,
 
   pubsub: Google::Cloud::Pubsub.new(
-    project: 'MY-PROJECT-ID',
-    keyfile: 'path/to/keyfile.json'
+    project_id:  'MY-PROJECT-ID',
+    credentials: 'path/to/keyfile.json'
   )
 )
 ```
@@ -120,7 +120,7 @@ Maximum number of worker threads.
 
 Default: number of logical cores
 
-#### `--project=PROJECT_ID`, `--keyfile=PATH`
+#### `--project_id=PROJECT_ID`, `--credentials=KEYFILE_PATH`
 
 Credentials of Google Cloud Platform. Please see [the document](https://github.com/GoogleCloudPlatform/google-cloud-ruby/blob/master/AUTHENTICATION.md) for details.
 

data/activejob-google_cloud_pubsub.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'activejob'
   spec.add_runtime_dependency 'activesupport'
   spec.add_runtime_dependency 'concurrent-ruby'
-  spec.add_runtime_dependency 'google-cloud-pubsub', '~> 0.26.0'
+  spec.add_runtime_dependency 'google-cloud-pubsub', '>= 0.27.0'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/lib/activejob-google_cloud_pubsub/pubsub_extension.rb

@@ -16,6 +16,22 @@ module ActiveJob
           subscription(name) || topic_for(queue_name).subscribe(name)
         end
       end
+
+      refine Google::Cloud::Pubsub::ReceivedMessage do
+        def scheduled_at
+          return nil unless timestamp = attributes['timestamp']
+
+          Time.at(timestamp.to_f)
+        end
+
+        def remaining_time_to_schedule
+          scheduled_at ? [(scheduled_at - Time.now).to_f.ceil, 0].max : 0
+        end
+
+        def time_to_process?
+          remaining_time_to_schedule.zero?
+        end
+      end
     end
   end
 end

data/lib/activejob-google_cloud_pubsub/version.rb

@@ -1,5 +1,5 @@
 module ActiveJob
   module GoogleCloudPubsub
-    VERSION = '0.6.0'
+    VERSION = '0.7.0'
   end
 end

data/lib/activejob-google_cloud_pubsub/worker.rb

@@ -24,12 +24,12 @@ module ActiveJob
       def run
         pool = Concurrent::ThreadPoolExecutor.new(min_threads: @min_threads, max_threads: @max_threads, max_queue: -1)
 
-        @pubsub.subscription_for(@queue_name).listen do |message|
+        @pubsub.subscription_for(@queue_name).listen {|message|
           @logger&.info "Message(#{message.message_id}) was received."
 
           begin
             Concurrent::Promise.execute(args: message, executor: pool) {|msg|
-              process msg
+              process_or_delay msg
             }.rescue {|e|
               @logger&.error e
             }
@@ -42,7 +42,7 @@ module ActiveJob
               @logger&.error e
             }
           end
-        end
+        }.start
       end
 
       def ensure_subscription
@@ -53,26 +53,19 @@ module ActiveJob
 
       private
 
-      def process(message)
-        if timestamp = message.attributes['timestamp']
-          ts  = Time.at(timestamp.to_f)
-          now = Time.now
-
-          if ts <= now
-            _process message
-          else
-            deadline = [(ts - now).to_f.ceil, MAX_DEADLINE.to_i].min
+      def process_or_delay(message)
+        if message.time_to_process?
+          process message
+        else
+          deadline = [message.remaining_time_to_schedule, MAX_DEADLINE.to_i].min
 
-            message.delay! deadline
+          message.delay! deadline
 
-            @logger&.info "Message(#{message.message_id}) was rescheduled after #{deadline} seconds because the timestamp is #{ts}."
-          end
-        else
-          _process message
+          @logger&.info "Message(#{message.message_id}) was scheduled at #{message.scheduled_at} so it was rescheduled after #{deadline} seconds."
         end
       end
 
-      def _process(message)
+      def process(message)
         timer_opts = {
           execution_interval: MAX_DEADLINE - 10.seconds,
           timeout_interval:   5.seconds,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activejob-google_cloud_pubsub
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Keita Urashima
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-19 00:00:00.000000000 Z
+date: 2017-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -56,16 +56,16 @@ dependencies:
   name: google-cloud-pubsub
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement