activejob-google_cloud_pubsub 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c7fb77dfcc2712ebff760e45cb9fcfb605230f1
-  data.tar.gz: '086f22928fb681f54ede2c7c114433362b699bc7'
+  metadata.gz: c7e0c78787b37b8180943e0f4a6c4ea393a00bae
+  data.tar.gz: 651b28c7e58141252a34b9be2d550dbdd26fc1bc
 SHA512:
-  metadata.gz: 0d15086d08144818ae5ca082c0e9f0457455b2d02bd5471cfaf5dad6d90096eaabf0f38317448d2886f7a8a84af9e9d48b8e0601863a1a4187433e6b0afaffd5
-  data.tar.gz: 9a73c4e6a1f361a2346e467f48aa62820f766ed1ac518947166a935c9d169582506a832997e212b915889fe46b02370b87ee743821da1be5504d107e435b36ec
+  metadata.gz: cf2214ee8c25208dbfb4e2f03dea18550a010571bd321ae14421c4e3f5314dbc9aa5cc6c54fead51ce9febd371234a8e060cea07eb913596edc060f4969c3ff2
+  data.tar.gz: 7dbd633493e0f635bb29b07da2c8a35f941d80301194cb109e61189dd49ca05b9d68ce51f880497f22b1ae0ed3b709aa45508832691fa9a01a1c7b0a279212ed

data/Gemfile

@@ -3,3 +3,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'concurrent-ruby-ext'
+gem 'faraday', '< 0.12.0' # https://github.com/lostisland/faraday/issues/679

data/README.md

@@ -1,5 +1,8 @@
 # ActiveJob::GoogleCloudPubsub
 
+[![Build Status](https://travis-ci.org/ursm/activejob-google_cloud_pubsub.svg?branch=master)](https://travis-ci.org/ursm/activejob-google_cloud_pubsub)
+[![Gem Version](https://badge.fury.io/rb/activejob-google_cloud_pubsub.svg)](https://badge.fury.io/rb/activejob-google_cloud_pubsub)
+
 Google Cloud Pub/Sub adapter and worker for ActiveJob
 
 ## Installation
@@ -58,10 +61,15 @@ If you hit the previous action, the job will be executed.
 When passing options to the adapter, you need to create the object instead of a symbol.
 
 ``` ruby
-Rails.application.config.active_job.queue_adapter = ActiveJob::QueueAdapters::GoogleCloudPubsubAdapter.new(options)
+Rails.application.config.active_job.queue_adapter = ActiveJob::QueueAdapters::GoogleCloudPubsubAdapter.new(
+  pubsub: Google::Cloud::Pubsub.new(
+    project: 'MY-PROJECT-ID',
+    keyfile: 'path/to/keyfile.json'
+  )
+)
 ```
 
-All options are passed to [`Google::Cloud::Pubsub.new`](http://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud-pubsub/v0.23.2/google/cloud/pubsub?method=new-class).
+Please see [`Google::Cloud::Pubsub.new`](http://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud-pubsub/v0.23.2/google/cloud/pubsub?method=new-class) for details.
 
 ### Worker
 
@@ -95,7 +103,9 @@ Default: number of logical cores
 
 #### `--project=PROJECT_ID`, `--keyfile=PATH`
 
-Credentials of Google Cloud Platform. Please refer to [the document](https://github.com/GoogleCloudPlatform/google-cloud-ruby/blob/master/AUTHENTICATION.md) for details.
+Credentials of Google Cloud Platform. Please see [the document](https://github.com/GoogleCloudPlatform/google-cloud-ruby/blob/master/AUTHENTICATION.md) for details.
+
+## Development
 
 ``` sh
 $ bundle exec rake spec

data/exe/activejob-google_cloud_pubsub-worker

@@ -6,17 +6,17 @@ require 'optparse/kwargs'
 
 Version = ActiveJob::GoogleCloudPubsub::VERSION
 
-args = {
+opts = {
   require: './config/environment'
 }
 
-opt = OptionParser.new
+parser = OptionParser.new
 
-opt.on '--[no-]require=PATH' do |v|
-  args[:require] = v
+parser.on '--[no-]require=PATH' do |v|
+  opts[:require] = v
 end
 
-worker_args = opt.define_by_keywords(
+worker_args = parser.define_by_keywords(
   {},
   ActiveJob::GoogleCloudPubsub::Worker.instance_method(:initialize),
   {
@@ -25,7 +25,7 @@ worker_args = opt.define_by_keywords(
   }
 )
 
-pubsub_args = opt.define_by_keywords(
+pubsub_args = parser.define_by_keywords(
   {},
   Google::Cloud::Pubsub.method(:new),
   {
@@ -34,8 +34,10 @@ pubsub_args = opt.define_by_keywords(
   }
 )
 
-opt.parse ARGV
+parser.parse ARGV
 
-require args[:require] if args[:require]
+require opts[:require] if opts[:require]
 
-ActiveJob::GoogleCloudPubsub::Worker.new(**worker_args, **pubsub_args).run
+pubsub = Google::Cloud::Pubsub.new(pubsub_args)
+
+ActiveJob::GoogleCloudPubsub::Worker.new(pubsub: pubsub, **worker_args).run

data/lib/active_job/google_cloud_pubsub/adapter.rb

@@ -1,20 +1,18 @@
-require 'active_job/google_cloud_pubsub/naming'
+require 'active_job/google_cloud_pubsub/pubsub_extension'
 require 'google/cloud/pubsub'
 require 'json'
 
 module ActiveJob
   module GoogleCloudPubsub
     class Adapter
-      include Naming
+      using PubsubExtension
 
-      def initialize(**pubsub_args)
-        @pubsub = Google::Cloud::Pubsub.new(pubsub_args)
+      def initialize(pubsub: Google::Cloud::Pubsub.new)
+        @pubsub = pubsub
       end
 
       def enqueue(job, attributes = {})
-        topic = @pubsub.topic(topic_name(job.queue_name), autocreate: true)
-
-        topic.publish JSON.dump(job.serialize), attributes
+        @pubsub.topic_for(job.queue_name).publish JSON.dump(job.serialize), attributes
       end
 
       def enqueue_at(job, timestamp)

data/lib/active_job/google_cloud_pubsub/pubsub_extension.rb

@@ -0,0 +1,21 @@
+require 'google/cloud/pubsub'
+
+module ActiveJob
+  module GoogleCloudPubsub
+    module PubsubExtension
+      refine Google::Cloud::Pubsub::Project do
+        def topic_for(queue_name)
+          name = "activejob-queue-#{queue_name}"
+
+          topic(name, autocreate: true)
+        end
+
+        def subscription_for(queue_name)
+          name = "activejob-worker-#{queue_name}"
+
+          subscription(name) || topic_for(queue_name).subscribe(name)
+        end
+      end
+    end
+  end
+end

data/lib/active_job/google_cloud_pubsub/version.rb

@@ -1,5 +1,5 @@
 module ActiveJob
   module GoogleCloudPubsub
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/lib/active_job/google_cloud_pubsub/worker.rb

@@ -1,5 +1,5 @@
 require 'active_job/base'
-require 'active_job/google_cloud_pubsub/naming'
+require 'active_job/google_cloud_pubsub/pubsub_extension'
 require 'active_support/core_ext/numeric/time'
 require 'concurrent'
 require 'google/cloud/pubsub'
@@ -9,29 +9,20 @@ require 'logger'
 module ActiveJob
   module GoogleCloudPubsub
     class Worker
-      include Naming
-
       MAX_DEADLINE = 10.minutes
 
-      cattr_accessor(:logger) { Logger.new($stdout) }
-
-      def initialize(queue: 'default', min_threads: 0, max_threads: Concurrent.processor_count, **pubsub_args)
-        @queue_name, @min_threads, @max_threads = queue, min_threads, max_threads
-
-        @pubsub = Google::Cloud::Pubsub.new(**pubsub_args)
-      end
+      using PubsubExtension
 
-      def subscription
-        topic = @pubsub.topic(topic_name(@queue_name), autocreate: true)
+      cattr_accessor(:logger) { Logger.new($stdout) }
 
-        topic.subscription(subscription_name(@queue_name)) || topic.subscribe(subscription_name(@queue_name))
+      def initialize(queue: 'default', min_threads: 0, max_threads: Concurrent.processor_count, pubsub: Google::Cloud::Pubsub.new)
+        @queue_name, @min_threads, @max_threads, @pubsub = queue, min_threads, max_threads, pubsub
       end
-      alias ensure_subscription subscription
 
       def run
         pool = Concurrent::ThreadPoolExecutor.new(min_threads: @min_threads, max_threads: @max_threads, max_queue: -1)
 
-        subscription.listen do |message|
+        @pubsub.subscription_for(@queue_name).listen do |message|
           begin
             Concurrent::Promise.execute(args: message, executor: pool) {|msg|
               process msg
@@ -44,6 +35,12 @@ module ActiveJob
         end
       end
 
+      def ensure_subscription
+        @pubsub.subscription_for @queue_name
+
+        nil
+      end
+
       private
 
       def process(message)
@@ -53,7 +50,7 @@ module ActiveJob
           if ts >= Time.now
             _process message
           else
-            message.delay! [ts - Time.now, MAX_DEADLINE.to_i].min
+            message.delay! [(ts - Time.now).ceil, MAX_DEADLINE.to_i].min
           end
         else
           _process message

data/lib/activejob-google_cloud_pubsub.rb

@@ -1,4 +1,5 @@
 require 'active_job'
+require 'google/cloud/pubsub'
 
 module ActiveJob
   module GoogleCloudPubsub

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activejob-google_cloud_pubsub
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Keita Urashima
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-01 00:00:00.000000000 Z
+date: 2017-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -128,7 +128,7 @@ files:
 - bin/setup
 - exe/activejob-google_cloud_pubsub-worker
 - lib/active_job/google_cloud_pubsub/adapter.rb
-- lib/active_job/google_cloud_pubsub/naming.rb
+- lib/active_job/google_cloud_pubsub/pubsub_extension.rb
 - lib/active_job/google_cloud_pubsub/version.rb
 - lib/active_job/google_cloud_pubsub/worker.rb
 - lib/activejob-google_cloud_pubsub.rb

data/lib/active_job/google_cloud_pubsub/naming.rb

@@ -1,13 +0,0 @@
-module ActiveJob
-  module GoogleCloudPubsub
-    module Naming
-      def topic_name(queue_name)
-        "activejob-queue-#{queue_name}"
-      end
-
-      def subscription_name(queue_name)
-        "activejob-worker-#{queue_name}"
-      end
-    end
-  end
-end