iron_response 0.1.3 → 0.1.4

data/lib/iron_response/batch.rb

@@ -8,12 +8,11 @@ module IronResponse
     attr_accessor :config
     attr_accessor :worker
     attr_accessor :params_array
-    attr_accessor :auto_update_worker
     attr_accessor :results
 
-    def initialize
-      @results = []
-      @config  = {}
+    def initialize(config)
+      @config = config
+      @client = IronWorkerNG::Client.new(@config[:iron_io])
     end
 
     def worker_name
@@ -21,22 +20,14 @@ module IronResponse
     end
 
     def run!
-      @client = IronWorkerNG::Client.new(@config[:iron_io])
-
-      if @auto_update_worker
-        create_code!
-      end
-
       task_ids = params_array.map do |params|
         params[:config] = @config
         @client.tasks.create(worker_name, params)._id
       end
 
-      task_ids.each do |task_id|
-        @results << get_response_from_task_id(@client.tasks.wait_for(task_id)._id)
+      task_ids.map do |task_id|
+        get_response_from_task_id(@client.tasks.wait_for(task_id)._id)
       end
-
-      @results
     end
 
     def get_response_from_task_id(task_id)
@@ -56,20 +47,20 @@ module IronResponse
       bucket_name = IronResponse::Common.s3_bucket_name(@config)
       bucket      = AWS::S3::Bucket.find(bucket_name)
       path        = IronResponse::Common.s3_path(task_id)
-      response    = bucket[path].value
+      response    = bucket[path]
 
-      JSON.parse(response)
+      IronResponse::Common.handle_response(response, task_id, @client)
     end
 
     def get_iron_cache_response(task_id)
       cache_client = IronCache::Client.new(@config[:iron_io])
       cache_name   = IronResponse::Common.iron_cache_cache_name(@config)
       cache        = cache_client.cache(cache_name)
+      
+      key          = IronResponse::Common.iron_cache_key(task_id)
+      response     = cache.get(key)
 
-      key   = IronResponse::Common.iron_cache_key(task_id)
-      value = cache.get(key).value
-
-      JSON.parse(value)
+      IronResponse::Common.handle_response(response, task_id, @client)
     end
 
     def code
@@ -87,9 +78,8 @@ module IronResponse
       @client.codes.patch(code)
     end
 
-    def create_code!
-      @client.codes.create(code)
+    def create_code!(options={})
+      @client.codes.create(code, options)
     end
   end
-
 end

data/lib/iron_response/common.rb

@@ -24,5 +24,14 @@ module IronResponse
     def Common.response_provider(config)
       config[:aws_s3].nil? ? :iron_cache : :aws_s3
     end
+
+    def Common.handle_response(response, task_id, client)
+      if response.nil?
+        msg = client.tasks_log(task_id)
+        IronResponse::Error.new("IronWorker error: #{msg}")
+      else 
+        JSON.parse(response.value)
+      end
+    end
   end
 end

data/lib/iron_response/error.rb

@@ -0,0 +1,11 @@
+module IronResponse
+  class Error
+    def initialize(text)
+      @text = text
+    end
+
+    def to_s
+      @text
+    end
+  end
+end

data/lib/iron_response/version.rb

@@ -1,3 +1,3 @@
 module IronResponse
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/iron_response.rb

@@ -2,6 +2,7 @@ require "iron_response/version"
 require "iron_response/common"
 require "iron_response/batch"
 require "iron_response/worker"
+require "iron_response/error"
 
 module IronResponse
 end

data/test/gem_dependency_test.rb

@@ -4,15 +4,9 @@ class GemDependencyTest < MiniTest::Unit::TestCase
   def test_synopsis_with_iron_cache
 
     config = Configuration.keys
-    batch = IronResponse::Batch.new
+    batch = IronResponse::Batch.new(iron_io: config[:iron_io])
     
-    #batch.auto_update_worker = true
-    
-    batch.config[:iron_io] = config[:iron_io]
-
-    #batch.config[:iron_io]   = config[:iron_io]
-    #batch.config[:aws_s3]    = config[:aws_s3]
-    batch.worker             = "test/workers/fcc_filings_counter.rb"
+    batch.worker = "test/workers/fcc_filings_counter.rb"
 
     batch.code.merge_gem("nokogiri", "< 1.6.0") # keeps the build times low
     batch.code.merge_gem("ecfs")
@@ -24,26 +18,29 @@ class GemDependencyTest < MiniTest::Unit::TestCase
                                 "13-150", "13-5", 
                                 "10-71"
                                 ].map { |i| {docket_number: i} } 
-    
+    batch.create_code!
+
     results                  = batch.run!
 
+    binding.pry
+
+    assert_equal batch.params_array.length, results.length
+
+    results.select! {|r| !r.is_a?(IronResponse::Error)}
+
     total = results.map {|r| r["length"]}.inject(:+)
 
     p "There are #{total} total filings in these dockets."
 
     assert_equal Array, results.class
-    assert_equal batch.params_array.length, results.length
   end
 
   def test_synopsis_with_aws_s3
 
     config = Configuration.keys
-    batch = IronResponse::Batch.new
-    
-    #batch.auto_update_worker = true
-    
-    batch.config = config
-    batch.worker             = "test/workers/fcc_filings_counter.rb"
+    batch = IronResponse::Batch.new(config)
+
+    batch.worker = "test/workers/fcc_filings_counter.rb"
 
     batch.code.merge_gem("nokogiri", "< 1.6.0") # keeps the build times low
     batch.code.merge_gem("ecfs")
@@ -56,14 +53,20 @@ class GemDependencyTest < MiniTest::Unit::TestCase
                                 "10-71"
                                 ].map { |i| {docket_number: i} } 
     
-    results                  = batch.run!
+    batch.create_code!
+    results = batch.run!
+
+    assert_equal batch.params_array.length, results.length
+
+    binding.pry
+
+    results.select! {|r| !r.is_a?(IronResponse::Error)}
 
     total = results.map {|r| r["length"]}.inject(:+)
 
     p "There are #{total} total filings in these dockets."
 
     assert_equal Array, results.class
-    assert_equal batch.params_array.length, results.length
   end
 
 end

data/test/synopsis_test.rb

@@ -3,34 +3,40 @@ require "test_helper"
 class SynopsisTest < MiniTest::Unit::TestCase
   def test_synopsis_with_s3
     config = Configuration.keys
-    batch  = IronResponse::Batch.new
+    batch  = IronResponse::Batch.new(config)
     
-    batch.auto_update_worker = true
-    batch.config[:iron_io]   = config[:iron_io]
-    batch.config[:aws_s3]    = config[:aws_s3]
     batch.worker             = "test/workers/hello.rb"
     batch.params_array       = Array(1..4).map {|i| {number: i}}
+    batch.create_code!
+
+    results = batch.run!
+
+    assert_equal batch.params_array.length, results.length
+
+    results.select! {|r| !r.is_a?(IronResponse::Error)}
     
-    results                  = batch.run!
+    binding.pry
 
     assert_equal Array, results.class
-    assert_equal batch.params_array.length, results.length
-    assert_equal true, results.select {|r| r.nil?}.length == 0
   end
 
   def test_synopsis_with_iron_cache
     config = Configuration.keys
-    batch  = IronResponse::Batch.new
+    batch  = IronResponse::Batch.new(iron_io: config[:iron_io])
     
-    batch.auto_update_worker = true
-    batch.config[:iron_io]   = config[:iron_io]
     batch.worker             = "test/workers/hello.rb"
     batch.params_array       = Array(1..4).map {|i| {number: i}}
     
-    results                  = batch.run!
+    batch.create_code!
+
+    results = batch.run!
 
-    assert_equal Array, results.class
     assert_equal batch.params_array.length, results.length
-    assert_equal true, results.select {|r| r.nil?}.length == 0
+
+    results.select! {|r| !r.is_a?(IronResponse::Error)}
+
+    binding.pry
+
+    assert_equal Array, results.class
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_response
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -123,6 +123,7 @@ files:
 - lib/iron_response.rb
 - lib/iron_response/batch.rb
 - lib/iron_response/common.rb
+- lib/iron_response/error.rb
 - lib/iron_response/version.rb
 - lib/iron_response/worker.rb
 - test/configuration.rb.example