encoding-dot-com 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/encoding-dot-com.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{encoding-dot-com}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roland Swingler", "Alan Kennedy", "Levent Ali"]
-  s.date = %q{2009-12-07}
+  s.date = %q{2009-12-08}
   s.description = %q{A ruby wrapper for the encoding.com API}
   s.email = %q{roland.swingler@gmail.com}
   s.extra_rdoc_files = [
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
      "lib/encoding_dot_com/format.rb",
      "lib/encoding_dot_com/http_adapters/curb_adapter.rb",
      "lib/encoding_dot_com/http_adapters/net_http_adapter.rb",
+     "lib/encoding_dot_com/image_format.rb",
      "lib/encoding_dot_com/media_info.rb",
      "lib/encoding_dot_com/media_list_item.rb",
      "lib/encoding_dot_com/queue.rb",
@@ -41,6 +42,7 @@ Gem::Specification.new do |s|
      "spec/encoding_dot_com/http_adapters/net_http_adapter_spec.rb",
      "spec/flv_vp6_format_spec.rb",
      "spec/format_spec.rb",
+     "spec/image_format_spec.rb",
      "spec/media_list_item_spec.rb",
      "spec/queue_spec.rb",
      "spec/spec_helper.rb",
@@ -54,6 +56,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/flv_vp6_format_spec.rb",
      "spec/spec_helper.rb",
+     "spec/image_format_spec.rb",
      "spec/encoding_dot_com/http_adapters/net_http_adapter_spec.rb",
      "spec/encoding_dot_com/http_adapters/curb_adapter_spec.rb",
      "spec/format_spec.rb",

data/lib/encoding-dot-com.rb

@@ -4,6 +4,7 @@ require 'encoding_dot_com/attribute_restrictions'
 require 'encoding_dot_com/format'
 require 'encoding_dot_com/video_format'
 require 'encoding_dot_com/thumbnail_format'
+require 'encoding_dot_com/image_format'
 require 'encoding_dot_com/flv_vp6_format'
 require 'encoding_dot_com/media_list_item'
 require 'encoding_dot_com/media_info'

data/lib/encoding_dot_com/format.rb

@@ -12,6 +12,8 @@ module EncodingDotCom
           ThumbnailFormat.new(attributes)
         elsif attributes["output"] == "flv" && attributes["video_codec"] == "vp6"
           FLVVP6Format.new(attributes)
+        elsif attributes["output"] == "image"
+          ImageFormat.new(attributes)
         else
           VideoFormat.new(attributes)
         end

data/lib/encoding_dot_com/image_format.rb

@@ -0,0 +1,37 @@
+module EncodingDotCom
+  class ImageFormat < Format
+    allowed_attributes :output, :image_format, :size, :resize_method, :quality
+    boolean_attributes :keep_aspect_ratio
+
+    def initialize(attributes={})
+      @attributes = attributes.merge("output" => "image")
+      validate_attributes      
+    end
+
+    private
+
+    def validate_attributes
+      validate_image_format
+      validate_resize_method
+      validate_quality
+    end
+
+    def validate_image_format
+      unless image_format.nil? || %w{jpg png gif}.include?(image_format)
+        raise IllegalFormatAttribute.new("image_format should be one of jpg, png or gif.")
+      end
+    end
+    
+    def validate_resize_method
+      unless resize_method.nil? || %w{resize crop combine}.include?(resize_method)
+        raise IllegalFormatAttribute.new("resize_method should be one of resize, crop or combine.")
+      end
+    end
+
+    def validate_quality
+      unless quality.nil? || (quality.to_i >= 1 && quality.to_i <= 100)
+        raise IllegalFormatAttribute.new("quality should be between 1 and 100.")
+      end
+    end
+  end
+end

data/spec/flv_vp6_format_spec.rb

@@ -5,16 +5,7 @@ describe "Encoding.com FLV VP6 Format" do
   it "should have an output attribute of 'thumbnail'" do
     EncodingDotCom::FLVVP6Format.new.output.should == "flv"
   end
-  
-  it "should return a ThumbnailFormat if the output is 'thumbnail'" do
-    EncodingDotCom::Format.create("output" => "flv", "video_codec" => "vp6").should be_instance_of(EncodingDotCom::FLVVP6Format)
-  end
-  
-  def format_xml(attributes={})
-    format = EncodingDotCom::FLVVP6Format.new(attributes)
-    Nokogiri::XML::Builder.new {|b| format.build_xml(b, "http://example.com") }.to_xml
-  end
-  
+      
   it "should produce a format node in the xml output" do
     format_xml.should have_xpath("/format")
   end
@@ -41,4 +32,9 @@ describe "Encoding.com FLV VP6 Format" do
       lambda { EncodingDotCom::FLVVP6Format.new("size" => "33x33") }.should raise_error(EncodingDotCom::IllegalFormatAttribute)
     end
   end
+
+  def format_xml(attributes={})
+    format = EncodingDotCom::FLVVP6Format.new(attributes)
+    Nokogiri::XML::Builder.new {|b| format.build_xml(b, "http://example.com") }.to_xml
+  end
 end

data/spec/format_spec.rb

@@ -3,9 +3,17 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "Encoding.com video format" do
 
   describe "#create" do
-    it "should return a video format" do
+    it "should return a VideoFormat when the output type is a video output" do
       EncodingDotCom::Format.create("output" => "mp4").should be_instance_of(EncodingDotCom::VideoFormat)
     end
+
+    it "should return a FLVVP6Format if the output is flv and the video codec is vp6" do
+      EncodingDotCom::Format.create("output" => "flv", "video_codec" => "vp6").should be_instance_of(EncodingDotCom::FLVVP6Format)
+    end
+
+    it "should return a ImageFormat when the output type is image" do
+      EncodingDotCom::Format.create("output" => "image").should be_instance_of(EncodingDotCom::ImageFormat)
+    end
   end
   
   describe "#output" do

data/spec/image_format_spec.rb

@@ -0,0 +1,71 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Encoding.com Image Format" do
+
+  it "should have an output attribute of 'thumbnail'" do
+    EncodingDotCom::ImageFormat.new.output.should == "image"
+  end
+
+  it "should produce an output node in the xml output" do
+    format_xml.should have_xpath("/format/output[text()='image']")
+  end
+
+  it "should produce an image format node in the xml output" do
+    format_xml("image_format" => "jpg").should have_xpath("/format/image_format[text()='jpg']")
+  end
+
+  it "should produce a size node in the xml output" do
+    format_xml("size" => "10x10").should have_xpath("/format/size[text()='10x10']")
+  end
+
+  it "should produce a resize method node in the xml output" do
+    format_xml("resize_method" => "crop").should have_xpath("/format/resize_method[text()='crop']")
+  end
+
+  it "should produce a resize method node in the xml output" do
+    format_xml("quality" => "90").should have_xpath("/format/quality[text()='90']")
+  end
+
+  it "should produce a keep aspect ratio node in the xml output" do
+    format_xml("keep_aspect_ratio" => true).should have_xpath("/format/keep_aspect_ratio[text()='yes']")
+  end
+
+  describe "valid resize method" do
+    %w{resize crop combine}.each do |method|
+      it "should allow '#{method}'" do
+        lambda { format_xml("resize_method" => method) }.should_not raise_error(EncodingDotCom::IllegalFormatAttribute)
+      end
+    end
+
+    it "should not allow anything else" do
+      lambda { format_xml("resize_method" => "foo") }.should raise_error(EncodingDotCom::IllegalFormatAttribute)
+    end
+  end
+
+  describe "valid image format" do
+    %w{jpg png gif}.each do |format|
+      it "should allow '#{format}'" do
+        lambda { format_xml("image_format" => format) }.should_not raise_error(EncodingDotCom::IllegalFormatAttribute)
+      end
+    end
+
+    it "should not allow anything else" do
+      lambda { format_xml("image_format" => "foo") }.should raise_error(EncodingDotCom::IllegalFormatAttribute)
+    end
+  end
+
+  describe "valid quality" do
+    it "should be between 1 and 100" do
+      lambda { format_xml("quality" => 0) }.should raise_error(EncodingDotCom::IllegalFormatAttribute)
+      lambda { format_xml("quality" => 101) }.should raise_error(EncodingDotCom::IllegalFormatAttribute)
+      lambda { format_xml("quality" => 1) }.should_not raise_error(EncodingDotCom::IllegalFormatAttribute)      
+      lambda { format_xml("quality" => 100) }.should_not raise_error(EncodingDotCom::IllegalFormatAttribute)      
+    end
+  end
+  
+  def format_xml(attributes={})
+    format = EncodingDotCom::ImageFormat.new(attributes)
+    Nokogiri::XML::Builder.new {|b| format.build_xml(b, "http://example.com") }.to_xml
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: encoding-dot-com
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Roland Swingler
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-07 00:00:00 +00:00
+date: 2009-12-08 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,6 +59,7 @@ files:
 - lib/encoding_dot_com/format.rb
 - lib/encoding_dot_com/http_adapters/curb_adapter.rb
 - lib/encoding_dot_com/http_adapters/net_http_adapter.rb
+- lib/encoding_dot_com/image_format.rb
 - lib/encoding_dot_com/media_info.rb
 - lib/encoding_dot_com/media_list_item.rb
 - lib/encoding_dot_com/queue.rb
@@ -68,6 +69,7 @@ files:
 - spec/encoding_dot_com/http_adapters/net_http_adapter_spec.rb
 - spec/flv_vp6_format_spec.rb
 - spec/format_spec.rb
+- spec/image_format_spec.rb
 - spec/media_list_item_spec.rb
 - spec/queue_spec.rb
 - spec/spec_helper.rb
@@ -103,6 +105,7 @@ summary: A ruby wrapper for the encoding.com API
 test_files: 
 - spec/flv_vp6_format_spec.rb
 - spec/spec_helper.rb
+- spec/image_format_spec.rb
 - spec/encoding_dot_com/http_adapters/net_http_adapter_spec.rb
 - spec/encoding_dot_com/http_adapters/curb_adapter_spec.rb
 - spec/format_spec.rb