tq 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c715d2a759e261f57e2f4f3a745e8c641187e8e
-  data.tar.gz: a996d693740eb9a6846bc510e178e6c935639b41
+  metadata.gz: a8f311dc681edb3e301cf550ef596796c666d98c
+  data.tar.gz: e0cb1f8fe6b90e45a7652e1624bb24488d563818
 SHA512:
-  metadata.gz: 7c350e6cd8cf00d23926f4bb980af5f8221a6346ba2d3047480dd80ec0052fd81f3441fd0df7b83c26d12bdd6391bfaf8ce39e04a77094acb9c3e689856440c7
-  data.tar.gz: 44cbccddca8ed63e62e06e629b70c81598e43078df946f507e796821246d547f34fd92d414c8135db76c840ffcf59550ab82a6e043f0d5e7b1e906027f4b0aa6
+  metadata.gz: 4015eee818de8172a13d5d5e2e120c59e84b8be0277571a7d99c8865a2b1ffb473b2c78f4a890e64157cc6777cb78128ecdc375ee9704fdfb8e2ee276787ebcd
+  data.tar.gz: ddc64156e773e339f31650d1607f3853cad70264bd1a926a0b077c9d43baafabd645966971770071fada8534a08b666896ce0dd55c2c46056a1ea57d3b530b3b

data/lib/tq.rb

@@ -13,14 +13,6 @@ module TQ
 
   API_SCOPES = ['https://www.googleapis.com/auth/cloud-tasks' ]  
   
-  module Utils
-
-    def options_including(keys, options)
-      options.select { |k,_| keys.include?(k) }
-    end
-
-  end
-
   class App
 
     attr_reader :worker, :queue_in, :queue_out, :queue_err, :logger, :concurrency, :env
@@ -92,14 +84,16 @@ module TQ
   end
 
   class QueueSpec
-    extend TQ::Utils
 
     def self.from_hash(data)
       return new( 
         data['project'], 
         data['location'], 
         data['name'],
-        **options_including(['lease_duration','max_tasks'], data)
+        **( { lease_duration: data['lease_duration'],
+              max_tasks: data['max_tasks']
+            }.reject {|k,v| v.nil?}
+          )
        )
     end
 

data/lib/version.rb

@@ -1,4 +1,4 @@
 
 module TQ
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/test/suite.rb

@@ -1,4 +1,4 @@
 
-%w[ test_auth test_run test_logger ].each do |rb|
+%w[ test_queue_spec test_auth test_run test_logger ].each do |rb|
   require_relative rb
 end

data/test/test_queue_spec.rb

@@ -0,0 +1,31 @@
+require_relative './helper'
+require_relative '../lib/tq'
+
+def setup_test_logger!
+  TestUtils.setup_logger( File.basename(__FILE__,'.rb') )
+end
+
+class QueueSpecTests < Minitest::Spec
+
+  describe "QueueSpec.from_hash" do
+    
+    it "QueueSpec.from_hash with string keys should work" do
+
+      q = TQ::QueueSpec.from_hash( {
+        'project' =>  'PROJECT',
+        'location' =>  'us-central1',
+        'name' =>  'QUEUE',
+        'lease_duration' =>  '200s',
+        'max_tasks' =>  1
+      })
+
+      assert_equal '200s', q.lease_duration
+      assert_equal 1, q.max_tasks
+
+    end
+
+  end
+
+end
+
+

data/test/test_run.rb

@@ -204,7 +204,7 @@ class AppRunTests < Minitest::Spec
           ttl2 = task.lease_remaining
           $stderr.puts "ExtendWorker - ttl before extend: #{ttl}"
           $stderr.puts "ExtendWorker - ttl after extend: #{ttl2}"
-          assert_in_delta( 2.5, ttl2, 0.07, 
+          assert_in_delta( 2.5, ttl2, 0.1, 
               "Expected to be approximately 2.5s"
           )
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tq
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Eric Gjertsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-21 00:00:00.000000000 Z
+date: 2018-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
@@ -66,6 +66,7 @@ files:
 - test/suite.rb
 - test/test_auth.rb
 - test/test_logger.rb
+- test/test_queue_spec.rb
 - test/test_run.rb
 homepage: https://github.com/ericgj/tq
 licenses:
@@ -87,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby client for Google Cloud Tasks (REST API v2beta2)