blitline 1.2.0 → 1.2.2

data/Rakefile

@@ -41,8 +41,7 @@ Rcov::RcovTask.new do |test|
 end
 
 task :default => :test
-
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.2

data/blitline.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "blitline"
-  s.version = "1.2.0"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Blitline LLC"]
-  s.date = "2011-12-18"
+  s.date = "2012-01-23"
   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 = [
@@ -33,7 +33,8 @@ Gem::Specification.new do |s|
     "lib/blitline/s3_destination.rb",
     "lib/blitline/save.rb",
     "test/helper.rb",
-    "test/test_blitline.rb"
+    "test/test_blitline.rb",
+    "test/test_service.rb"
   ]
   s.homepage = "http://github.com/blitline-dev/blitline"
   s.licenses = ["MIT"]

data/lib/blitline.rb

@@ -40,8 +40,9 @@ class Blitline
 
   def post_jobs
     validate
+    puts "@jobs = #{Yajl::Encoder.encode(@jobs)}"
     result = Blitline::HttpPoster.post("http://api.blitline.com/job", { :json => Yajl::Encoder.encode(@jobs)})
     return Yajl::Parser.parse(result)
   end
 
-end
+end

data/lib/blitline/attribute_jsonizer.rb

@@ -6,8 +6,8 @@ module AttributeJsonizer
     self.instance_variables.each do |iv|
       key = iv
       value = self.instance_variable_get(iv)
-      json_hash[key.to_s.gsub("@","")] = value
+      json_hash[key.to_s.gsub("@","")] = value unless value.kind_of?(Array) && value.length == 0 #Bail on empty arrays
     end
     Yajl::Encoder.encode(json_hash)
   end
-end
+end

data/lib/blitline/function.rb

@@ -17,10 +17,10 @@ class Blitline
       @save = save
     end
 
-    def add_function(function_name, function_params, image_identifier = nil)
+    def add_function(function_name, function_params)
       function = Blitline::Function.new(function_name, function_params)
       @functions << function
-      function.add_save(image_identifier) if image_identifier
+      return function
     end
 
     def validate

data/test/test_service.rb

@@ -0,0 +1,59 @@
+require 'helper'
+
+class TestService < Test::Unit::TestCase
+  if ENV['BLITLINE_APPLICATION_ID']
+    require 'yajl'
+    SAMPLE_IMAGE_SRC = "http://www.google.com/intl/en_com/images/srpr/logo3w.png"
+
+    should "be able to commit a simple job to service" do
+      blitline = Blitline.new
+      job =  Blitline::Job.new(SAMPLE_IMAGE_SRC)
+      job.application_id = ENV['BLITLINE_APPLICATION_ID']
+      job.add_function("blur", nil, "my_image")
+      blitline.jobs << job
+      returned_values = blitline.post_jobs
+      assert(returned_values.length > 0, "No results returned")
+      assert(returned_values['results'][0]['images'].length > 0, "No images returned")
+    end
+
+    should "be able to commit a job with multiple embedded functions" do
+      blitline = Blitline.new
+      job =  Blitline::Job.new(SAMPLE_IMAGE_SRC)
+      job.application_id = ENV['BLITLINE_APPLICATION_ID']
+      watermark_function = job.add_function("watermark", {text:"Jason"})
+      watermark_function.add_save("watermarked")#, @key, @s3_config['bucket_name'])
+
+      # begin sub-functions
+      original_function = watermark_function.add_function("resize_to_fit", {width:2000, height:2000})
+      original_function.add_save("original")#, key('original'), @s3_config['bucket_name'])
+
+      sm_gallery_function = watermark_function.add_function("resize_to_fill", {width:200, height:200})
+      sm_gallery_function.add_save("smgallery")#, key('sm_gallery'), @s3_config['bucket_name'])
+
+      # if I add a third subfunction, the job appears to fail. If I remove these two lines below, the job works.
+      thumb_function = watermark_function.add_function("resize_to_fit", {width:100, height:100})
+      thumb_function.add_save("thumb")#, key('thumb'), @s3_config['bucket_name'])
+
+      blitline.jobs << job
+      returned_values = blitline.post_jobs
+      assert(returned_values.length > 0, "No results returned")
+      assert(returned_values['results'][0]['images'].length > 0, "No images returned")
+    end
+
+    should "be able to commit a multi-function job to service" do
+      blitline = Blitline.new
+      job =  Blitline::Job.new(SAMPLE_IMAGE_SRC)
+      job.application_id = ENV['BLITLINE_APPLICATION_ID']
+      blur_function = job.add_function("blur", nil)
+      blitline.jobs << job
+      # Add a rotate function inside the blur function (so it will blur first, then rotate)
+      rotate_function = blur_function.add_function("rotate", { "amount" => -90 })
+      rotate_function.add_save("rotate_only_result")
+      returned_values = blitline.post_jobs
+      assert(returned_values.length > 0, "No results returned")
+      assert(returned_values['results'][0]['images'].length > 0, "No images returned")
+    end
+  else
+    puts "Cannot test service with ENV['BLITLINE_APPLICATION_ID']"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blitline
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-18 00:00:00.000000000 Z
+date: 2012-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &8518100 !ruby/object:Gem::Requirement
+  requirement: &18256580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8518100
+  version_requirements: *18256580
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &8517540 !ruby/object:Gem::Requirement
+  requirement: &18254180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8517540
+  version_requirements: *18254180
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &8516620 !ruby/object:Gem::Requirement
+  requirement: &18253420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *8516620
+  version_requirements: *18253420
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &8515600 !ruby/object:Gem::Requirement
+  requirement: &18252180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *8515600
+  version_requirements: *18252180
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &8513440 !ruby/object:Gem::Requirement
+  requirement: &18249740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8513440
+  version_requirements: *18249740
 description: The blitline gems provides a simple easy wrapper to the Blitline.com
   web api
 email: support@blitline.com
@@ -92,6 +92,7 @@ files:
 - lib/blitline/save.rb
 - test/helper.rb
 - test/test_blitline.rb
+- test/test_service.rb
 homepage: http://github.com/blitline-dev/blitline
 licenses:
 - MIT
@@ -107,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1300062068295652826
+      hash: 2063341646104889258
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: