iron_response 0.1.5 → 0.2.0

data/lib/iron_response.rb

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

data/lib/iron_response/batch.rb

@@ -6,9 +6,10 @@ require "json"
 module IronResponse
   class Batch
     attr_accessor :config
-    attr_accessor :worker
+    attr_accessor :name
     attr_accessor :params_array
     attr_accessor :results
+    attr_accessor :code
 
     def initialize(config)
       @config = config
@@ -16,11 +17,7 @@ module IronResponse
     end
 
     def worker_name
-      @worker.split("/").last.split(".rb").first
-    end
-
-    def worker_language
-      is_ruby 
+      @code.name
     end
 
     def run!
@@ -68,44 +65,13 @@ module IronResponse
       IronResponse::Common.handle_response(response, task_id, @client)
     end
 
-    def runtime
-      return "ruby" if @worker.end_with?(".rb")
-      return "node" if @worker.end_with?(".js")
-    end
-
-    def prepare_ruby_code(code)
-      code.runtime = "ruby"
-    end
-
-    def prepare_node_code(code)
-      code.runtime = "node"
-      code.dir     = "node_modules"
-      code.file    = "package.json"
-    end
-
-    def code
-      if @code.nil?
-        @code = IronWorkerNG::Code::Ruby.new(exec: @worker)
-        @code.name = worker_name
-        @code.merge_gem("iron_response", IronResponse::VERSION) # bootstraps the current version with the worker
-
-        case runtime
-        when "ruby"
-          prepare_ruby_code(@code)
-        when "node"
-          prepare_node_code(@code)
-        end
-      end
-
-      @code
-    end
-
-    def patch_code!
-      @client.codes.patch(code)
+    def patch_code!(options={})
+      @client.codes.patch(@code, options)
     end
 
     def create_code!(options={})
-      @client.codes.create(code, options)
+      @code.merge_gem("iron_response", IronResponse::VERSION) if @code.runtime == "ruby" # bootstraps the current version with the worker
+      @client.codes.create(@code, options)
     end
   end
 end

data/lib/iron_response/common.rb

@@ -27,8 +27,9 @@ module IronResponse
 
     def Common.handle_response(response, task_id, client)
       if response.nil?
+        p "getting error for Task ID: #{task_id}"
         msg = client.tasks_log(task_id)
-        IronResponse::Error.new("IronWorker error: #{msg}")
+        IronResponse::Log.new("IronWorker logs for task #{task_id}: #{msg}")
       else 
         JSON.parse(response.value)
       end

data/lib/iron_response/{error.rb → log.rb}

@@ -1,5 +1,5 @@
 module IronResponse
-  class Error
+  class Log
     def initialize(text)
       @text = text
     end

data/lib/iron_response/version.rb

@@ -1,3 +1,3 @@
 module IronResponse
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

data/test/gem_dependency_test.rb

@@ -6,32 +6,31 @@ class GemDependencyTest < MiniTest::Unit::TestCase
     config = Configuration.keys
     batch = IronResponse::Batch.new(iron_io: config[:iron_io])
     
-    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")
-    batch.code.full_remote_build(true)
-
-    batch.params_array       = [
-                                "12-375", "12-268",
-                                "12-238", "12-353", 
-                                "13-150", "13-5", 
-                                "10-71"
-                                ].map { |i| {docket_number: i} } 
+    code = IronWorkerNG::Code::Ruby.new
+    code.exec "test/workers/fcc_filings_counter.rb"
+    code.runtime = "ruby"
+    code.merge_gem("nokogiri", "< 1.6.0") # keeps the build times low
+    code.merge_gem("ecfs")
+    code.full_remote_build(true)
+
+    batch.code = code
+    params = [
+              "12-375", "12-268",
+              "12-238", "12-353", 
+              "13-150", "13-5", 
+              "10-71"
+              ].map { |i| {docket_number: i} } 
+    batch.params_array = params
     batch.create_code!
 
-    results                  = batch.run!
+    results = batch.run!
 
     #binding.pry
 
     assert_equal batch.params_array.length, results.length
-
-    results.select! {|r| !r.is_a?(IronResponse::Error)}
-
+    results.select! {|r| !r.is_a?(IronResponse::Log)}
     total = results.map {|r| r["length"]}.inject(:+)
-
     p "There are #{total} total filings in these dockets."
-
     assert_equal Array, results.class
   end
 
@@ -40,32 +39,30 @@ class GemDependencyTest < MiniTest::Unit::TestCase
     config = Configuration.keys
     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")
-    batch.code.full_remote_build(true)
-
-    batch.params_array       = [
-                                "12-375", "12-268",
-                                "12-238", "12-353", 
-                                "13-150", "13-5", 
-                                "10-71"
-                                ].map { |i| {docket_number: i} } 
+    code = IronWorkerNG::Code::Ruby.new
+    code.exec "test/workers/fcc_filings_counter.rb"
+    code.runtime = "ruby"
+    code.merge_gem("nokogiri", "< 1.6.0") # keeps the build times low
+    code.merge_gem("ecfs")
+    code.full_remote_build(true)
+
+    batch.code = code
+
+    params = [
+              "12-375", "12-268",
+              "12-238", "12-353", 
+              "13-150", "13-5", 
+              "10-71"
+              ].map { |i| {docket_number: i} } 
+    batch.params_array = params      
     
     batch.create_code!
     results = batch.run!
-
     assert_equal batch.params_array.length, results.length
-
     #binding.pry
-
-    results.select! {|r| !r.is_a?(IronResponse::Error)}
-
+    results.select! {|r| !r.is_a?(IronResponse::Log)}
     total = results.map {|r| r["length"]}.inject(:+)
-
     p "There are #{total} total filings in these dockets."
-
     assert_equal Array, results.class
   end
 

data/test/synopsis_test.rb

@@ -4,39 +4,32 @@ class SynopsisTest < MiniTest::Unit::TestCase
   def test_synopsis_with_s3
     config = Configuration.keys
     batch  = IronResponse::Batch.new(config)
-    
-    batch.worker             = "test/workers/hello.rb"
-    batch.params_array       = Array(1..4).map {|i| {number: i}}
+    code = IronWorkerNG::Code::Ruby.new
+    code.runtime = "ruby"
+    code.exec "test/workers/hello.rb"
+    batch.code = code
+    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.select! {|r| !r.is_a?(IronResponse::Log)}
     #binding.pry
-
     assert_equal Array, results.class
   end
 
   def test_synopsis_with_iron_cache
     config = Configuration.keys
     batch  = IronResponse::Batch.new(iron_io: config[:iron_io])
-    
-    batch.worker             = "test/workers/hello.rb"
-    batch.params_array       = Array(1..4).map {|i| {number: i}}
-    
+    code = IronWorkerNG::Code::Ruby.new
+    code.runtime = "ruby"
+    code.exec "test/workers/hello.rb"
+    batch.code = code
+    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.select! {|r| !r.is_a?(IronResponse::Log)}
     #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.5
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-20 00:00:00.000000000 Z
+date: 2013-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_worker_ng
@@ -123,7 +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/log.rb
 - lib/iron_response/version.rb
 - lib/iron_response/worker.rb
 - test/configuration.rb.example