td-querier 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 478227b02106d0610c2662f2507c894bf32bd393
-  data.tar.gz: ead6a5f69c35e4c6d0e167ea7a93c90889e12aca
+  metadata.gz: 6906902fe3b7a95a8dca37812c5161f61378b4db
+  data.tar.gz: 6a19001f042c206bbfc27e7f2a29ba54a4fc551d
 SHA512:
-  metadata.gz: 013197d771d0710df0c51823d2975b4b2e262ff039e926120c0e6cb40d559b0818060f862b5837914143e13738189f44ae83e1c57448f3c7430deddfaca5bf45
-  data.tar.gz: 735e9f9635ec2cb22651d4effe909cdbd5ce40e817a4ad4bbe6da34781012d761fef867cf0a8703b2faccf9cee12615ba923180b64604af4e5554650e059553b
+  metadata.gz: 362797d97acc68b83bb9d07194a108920f98fe5926cb3e62f1023ca56bdfb5d43a389357a363e3a0527b7b774d4c815f5d82536031bdf4314e87ba009f360087
+  data.tar.gz: 2ea3bcebecb8c958857f49862a3fcf122580fcf1fb828bf2d808f1b8835aeea95e80aab236c1ba259d028eedc8eead90c470aa3de7c1056b9a8d3015dda844ee

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    td-querier (0.0.5)
+    td-querier (0.0.7)
       sidekiq (~> 2.7.2)
       td (~> 0.10.73)
 

data/README.md

@@ -17,14 +17,15 @@ If not it will reschedule itself until the job is done.
 querier = Querier.new("TREASURE_DATA_API_KEY")
 database_name = 'my_td_database_name'
 query_text = 'select count(*) from my_table'
-options = {:klass=>"MyClass", :method=>"my_method", :results => "true"} #See Options section for this one
-
-#Optional
-on_demand_path = 'mysql://user:password@host/database/table' #will insert the result of your query into another table
-priority = 1 #default 1
-reschedule_time #Time interval for checking if the job is finished
-
-querier.query(database_name, query_text, on_demand_path, options, priority, reschedule_time)
+options = {:klass => 'MyClass',
+           :method => 'my_method',
+           :results => 'true',
+           :on_demand_path => 'mysql://user:password@host/database/table',
+           :priority => 1,
+           :reschedule_time => 300
+         } #See Options section for this one
+
+querier.query(database_name, query_text, options)
 ```
 
 ###Options
@@ -32,7 +33,11 @@ Once the job has finished sidekiq will stop retriying and will send a callback t
 
 * klass: The name of the class you want to use, i.e. "MyClass"
 * method: The name of the class method you want to use, i.e. "my_method"
-* results: if is "true" will fetch the results from treasure data and it will pass those results to your method as a parameter. Be aware that exceptionally large results might impact your performance.
+* results: if is "true" will fetch the results from treasure data and it will pass those results to your method as a 
+parameter. Be aware that exceptionally large results might impact your performance.
+* on_demand_path: will insert the result of your query into another table, i.e: 'mysql://user:password@host/database/table'
+* priority: Treasure data desired priority. By default 1
+* reschedule_time: Time interval for checking if the job is finished and rescheudle sidekiq job. By default 300 seconds
 
 ###Internals
 Querier objects are designed to query treasure data api asynchronously. 

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/td/querier.rb

@@ -10,23 +10,31 @@ class Querier
     @api_key = api_key
   end
 
-  def query(database, query, opts, on_demand_path='', priority=1, reschedule_time=300)
+  def query(database, query, opts)
+    on_demand_path = (opts && opts['on_demand_path'] != nil && opts['on_demand_path'] != '') ? opts['on_demand_path'] : ''
+    priority = (opts && opts['priority'] != nil && opts['priority'] != '') ? opts['priority'] : 1
+    reschedule_time = (opts && opts['reschedule_time'] != nil && opts['reschedule_time'] != '') ? opts['reschedule_time'] : 300
+
     client = TreasureData::Client.new(@api_key)
     job = client.query(database, query, on_demand_path, priority)
-    Querier.perform_async(@api_key, job.job_id, opts, reschedule_time)
+    Querier.perform_async(@api_key, job.job_id, opts)
   end
 
-  def perform(api_key, job_id, opts, reschedule_time=300)
+  def perform(api_key, job_id, opts)
     client = TreasureData::Client.new(api_key)
     job = client.job(job_id)
     #reschedule if the job is not finished
-    return Querier.perform_in(reschedule_time, api_key, job_id, opts, reschedule_time) unless job.finished?
+    unless job.finished?
+      reschedule_time = (opts && opts['reschedule_time'] != nil && opts['reschedule_time'] != '') ? opts['reschedule_time'].to_i : 300
+      return Querier.perform_in(reschedule_time, api_key, job_id, opts)
+    end
 
     if opts
-      klass = opts[:klass]
-      meth = opts[:method]
-      send_results = opts[:results]
-      results = (send_results.to_s == "true" ? job.results : nil)
+      stringified_opts = Hash[opts.map{ |k, v| [k.to_s, v] }]
+      klass = stringified_opts['klass']
+      meth = stringified_opts['method']
+      send_results = stringified_opts['results']
+      results = (send_results.to_s == "true" ? job.result : nil)
       eval(klass).send(meth.to_s, results)
     end
   end

data/spec/querier_spec.rb

@@ -46,7 +46,7 @@ describe Querier do
   describe "Sidekiq processing" do
     context "Standar processing" do
       before(:each) do
-        @opts = {:klass => "Object", :method => "fake_method", :results => "false"}
+        @opts = {'klass' => "Object", 'method' => "fake_method", 'results' => "false"}
         @fake_job = Object.new
         @fake_client = Object.new
         @fake_client.should_receive(:job).and_return(@fake_job)
@@ -55,7 +55,7 @@ describe Querier do
 
       it "will reschedule the sidekiq job if the treasure data job is not yet finished" do
         @fake_job.should_receive(:finished?).and_return(false)
-        Querier.should_receive(:perform_in).with(300, "apikey", 1, @opts, 300).and_return(true)
+        Querier.should_receive(:perform_in).with(300, "apikey", 1, @opts).and_return(true)
         Querier.new.perform("apikey", 1, @opts)
       end
 
@@ -69,7 +69,7 @@ describe Querier do
         new_opts = {:klass => "Object", :method => "fake_method", :results => "true"}
         results = [[1]]
         @fake_job.should_receive(:finished?).and_return(true)
-        @fake_job.should_receive(:results).and_return(results)
+        @fake_job.should_receive(:result).and_return(results)
         Object.should_receive(:fake_method).and_return(true)
         Querier.new.perform("apikey", 1, new_opts)
       end
@@ -77,14 +77,14 @@ describe Querier do
 
     context "Error case" do
       it "will raise an exception if something explodes within sidekiq" do
-        @opts = {:klass => "Object", :method => "fake_method", :results => "false"}
+        opts = {:klass => "Object", :method => "fake_method", :results => "false"}
         @fake_job = Object.new
         @fake_client = Object.new
         @fake_client.should_receive(:job).and_return(@fake_job)
         TreasureData::Client.should_receive(:new).and_return(@fake_client)
 
         @fake_job.should_receive(:finished?).and_raise(RuntimeError.new("unexpected error"))
-        lambda{Querier.new.perform("apikey", 1, @opts)}.should raise_error(RuntimeError)
+        lambda{Querier.new.perform("apikey", 1, opts)}.should raise_error(RuntimeError)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td-querier
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Carlos Donderis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-22 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq