blitline 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7bfcc452de6885cad8b160ad5e54dbd16da71e2
-  data.tar.gz: 6d97c5a427fb194b611d6d3de8790d151d94babc
+  metadata.gz: 7cc50d6d9f1eedd7d3d10fadc87a7c047d5238f9
+  data.tar.gz: 8b48a1f1406ce0935d6a3b68ff383058dcb41468
 SHA512:
-  metadata.gz: e0ad45e759a6daa7fdc635d798204ae0ddf50d9ea137affbbd811f25d2280619b1f92c8023638e478b03a571a23beeff38e9f77ad20df9685259deb866d18c54
-  data.tar.gz: 6c30a4e39a28cc1f81d43f983f09c7f0a1bbc0153ca8fbab707b556e23501cbc810f40c45a733482676c0eb10b8aa6d7cd3fa136a9b895c3202716de86df3c45
+  metadata.gz: 841f7c1b23f7cd95d4620302b5798fc471bfc50941755abfbf4f7789c7ddc577f539f556afbf4848785c410b6ee34e06bde6ec86f3017b463049a87017f1eccf
+  data.tar.gz: 6cd70d1d7654108ac3eaa12d40b92842e7c7caf7136f233dd229198badb65ec704ed6acab66cc1085cc8982a8030878ce604582a6e753182d4a3ba06a66fca24

data/VERSION

@@ -1 +1 @@
-2.5.0
+2.5.1

data/blitline.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: blitline 2.5.0 ruby lib
+# stub: blitline 2.5.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "blitline"
-  s.version = "2.5.0"
+  s.version = "2.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Blitline LLC"]
-  s.date = "2015-03-12"
+  s.date = "2015-06-17"
   s.description = "The blitline gems provides a simple easy wrapper to the Blitline.com web api"
   s.email = "support@blitline.com"
   s.extra_rdoc_files = [

data/lib/blitline.rb

@@ -7,7 +7,7 @@ class Blitline
   require 'blitline/s3_destination'
   require 'blitline/http_poster'
   require 'net/http'
-  
+
   include AttributeJsonizer
   attr_accessor :jobs
 
@@ -55,12 +55,12 @@ class Blitline
        json_result = result
      else
        json_result = MultiJson.load(result)
-     end 
+     end
     @jobs = [] # clear jobs
     return json_result
   end
 
-  def post_job_and_wait_for_poll
+  def post_job_and_wait_for_poll(timeout_secs = 60)
      validate
      raise "'post_job_with_poll' requires that there is only 1 job to submit" unless @jobs.length==1
      result = Blitline::HttpPoster.post("http://#{@domain}.blitline.com/job", { :json => MultiJson.dump(@jobs)})
@@ -72,21 +72,37 @@ class Blitline
 
      raise "Error posting job: #{result.to_s}" if result["error"]
      job_id = json_result["results"][0]["job_id"]
-     return poll_job(job_id)
+     return poll_job(job_id, timeout_secs)
   end
 
-  def poll_job(job_id)
+  def poll_job(job_id, timeout_secs = 60)
      raise "Invalid 'job_id'" unless job_id && job_id.length > 0
      url = "/listen/#{job_id}"
-     response = Net::HTTP.get('cache.blitline.com', url)
+     response = fetch(url, timeout_secs)
+
      if response.is_a?(Hash)
        json_result = response
      else
        json_result = MultiJson.load(response)
      end
-     return_results = json_result["results"]
+
+     # Change 2.5.0 -> 2.5.1 (Return JSON instead of string)
+     if json_result["results"].is_a?(Hash)
+       return_results = json_result["results"]
+     else
+       return_results = MultiJson.load(json_result["results"])
+     end
 
      return return_results
   end
 
+  def fetch(uri_str, timeout_secs, limit = 10)
+    raise "Too Many Redirects" if limit == 0
+
+    http = Net::HTTP.new("cache.blitline.com")
+    http.read_timeout = timeout_secs
+    request = Net::HTTP::Get.new(uri_str)
+    response = http.request(request, uri_str)
+    MultiJson.load(response.body)
+  end
 end

data/lib/blitline/http_poster.rb

@@ -21,4 +21,4 @@ class Blitline
       end
     end
   end
-end
+end

data/test/test_blitline.rb

@@ -36,29 +36,16 @@ class TestBlitline < Test::Unit::TestCase
       job.application_id = "foo"
       job.add_function("blur", nil, "my_image")
       blitline.jobs << job
-      blitline.post_jobs
+      results = blitline.post_jobs
     end
   end
 
-  should "raise exception if job missing image identifier" do
-    blitline = Blitline.new
-    job =  Blitline::Job.new("http://ww.foo.com")
-    job.add_function("blue", nil, "my_image")
-    job.application_id = "foo"
-    blitline.jobs << job
-
-    results = blitline.post_jobs
-    assert_not_nil results['results']
-    assert_not_nil results['results'][0]
-    assert_not_nil results['results'][0]['error']
-  end
-
   should "properly jsonize the jsonizable_attributes" do
     job =  Blitline::Job.new("http://ww.foo.com")
     job.add_function("blue", nil, "my_image")
     job.application_id = "foo"
     job.add_jsonizable_attribute("pre_process", { "move_original" => { "s3_destination" => Blitline::S3Destination.new("my_key","my_bucket")}})
-  
+
     results = MultiJson.dump(job)
     assert_not_nil results["pre_process"]
     assert results == '{"src":"http://ww.foo.com","functions":[{"name":"blue","save":{"image_identifier":"my_image"}}],"application_id":"foo","pre_process":{"move_original":{"s3_destination":{"key":"my_key","bucket":"my_bucket","headers":{}}}}}'

data/test/test_service.rb

@@ -75,6 +75,37 @@ class TestService < Test::Unit::TestCase
       assert(returned_values['images'].length > 0, "No images returned")
     end
 
+    should "be able to set timoeut for polling" do
+      assert_raises Net::ReadTimeout do
+        blitline = Blitline.new
+        blitline.add_job_via_hash({
+              "application_id"=> "#{ENV['BLITLINE_APPLICATION_ID']}",
+              "src"=> SAMPLE_IMAGE_SRC,
+              "src_data" => { "colorspace" => "srgb"},
+              "get_exif" => true,
+              "v" => 1.20,
+              "functions"=> [
+                  {
+                      "name"=> "resize_to_fit",
+                      "params"=> {
+                          "width"=> 100,
+                          "autosharpen"=> true
+                      },
+                      "save"=> {
+                          "image_identifier"=> "MY_CLIENT_ID"
+                      }
+                  }
+              ]
+        })
+
+
+        returned_values = blitline.post_job_and_wait_for_poll(0)
+        assert(returned_values.length > 0, "No results returned")
+        assert(returned_values['images'].length > 0, "No images returned")
+      end
+    end
+
+
     should "be able to handle incorrect JSON" do
       blitline = Blitline.new
       blitline.add_job_via_hash({

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blitline
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Blitline LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json