zencoder-flix_cloud-gem 0.1.1 → 0.2.0

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
-:minor: 1
-:patch: 1
+:minor: 2
+:patch: 0

data/lib/flix_cloud/exceptions.rb

@@ -1,3 +1,5 @@
-class FlixCloud::SaveError < Exception; end
-
-class FlixCloud::CreateError < Exception; end
+class FlixCloud::Error < StandardError; end
+class FlixCloud::SaveError < FlixCloud::Error; end
+class FlixCloud::CreateError < FlixCloud::Error; end
+class FlixCloud::Unauthorized < FlixCloud::Error; end
+class FlixCloud::RequestFailed < FlixCloud::Error; end

data/lib/flix_cloud/job.rb

@@ -1,6 +1,6 @@
 class FlixCloud::Job < FlixCloud::Record
 
-  attr_accessor :id, :initialized_at, :api_key, :recipe_id, :response
+  attr_accessor :id, :initialized_at, :api_key, :recipe_id, :recipe_name, :response
 
   record_column :file_locations, 'FileLocations'
 
@@ -20,8 +20,12 @@ class FlixCloud::Job < FlixCloud::Record
       self.errors << "file_locations is required"
     end
 
-    unless recipe_id
-      self.errors << "recipe_id is required"
+    if recipe_id || recipe_name
+      if recipe_id && recipe_name
+        self.errors << "recipe_id and recipe_name cannot both be used"
+      end
+    else
+      self.errors << "recipe_id or recipe_name is required"
     end
 
     unless api_key
@@ -34,7 +38,7 @@ class FlixCloud::Job < FlixCloud::Record
   def save
     return false unless valid?
 
-    self.response = FlixCloud::Response.new(post('jobs', to_xml))
+    self.response = post('jobs', to_xml)
 
     if response.success?
       self.id = response.body_as_hash['job']['id']
@@ -70,7 +74,12 @@ class FlixCloud::Job < FlixCloud::Record
 
     xml.tag!("api-request") do
       xml.tag!("api-key", api_key)
-      xml.tag!("recipe-id", recipe_id)
+
+      if recipe_name
+        xml.tag!("recipe-name", recipe_name)
+      else
+        xml.tag!("recipe-id", recipe_id)
+      end
 
       if file_locations
         xml.tag!("file-locations") do

data/lib/flix_cloud/record.rb

@@ -30,9 +30,14 @@ class FlixCloud::Record
 protected
 
   def post(path, body)
-    RestClient::Resource.new(
-      "https://flixcloud.com/#{path}",
-      :verify_ssl => OpenSSL::SSL::VERIFY_PEER).post(body, :content_type => 'application/xml', :accept => 'application/xml')
+    begin
+      FlixCloud::Response.new(RestClient::Resource.new("https://flixcloud.com/#{path}",
+                                                       :verify_ssl => OpenSSL::SSL::VERIFY_PEER).post(body, :content_type => 'application/xml', :accept => 'application/xml'))
+    rescue RestClient::Unauthorized
+      raise FlixCloud::Unauthorized
+    rescue RestClient::RequestFailed
+      raise FlixCloud::RequestFailed
+    end
   end
 
 end

data/test/flix_cloud/job_test.rb

@@ -16,8 +16,20 @@ class FlixCloud::JobTest < Test::Unit::TestCase
       assert_match /file_locations is required/, @job.errors.to_s
     end
 
-    should "require recipe_id" do
-      assert_match /recipe_id is required/, @job.errors.to_s
+    should "require recipe_id or recipe_name" do
+      assert_match /recipe_id or recipe_name is required/, @job.errors.to_s
+    end
+  end
+
+
+  context "When validating a job object with both recipe_id and recipe_name are set" do
+    setup do
+      @job = FlixCloud::Job.new(:recipe_name => 'recipe-name', :recipe_id => 1)
+      @job.valid?
+    end
+
+    should "require that both recipe_id and recipe_name cannot be used" do
+      assert_match /recipe_id and recipe_name cannot both be used/, @job.errors.to_s
     end
   end
 
@@ -97,6 +109,28 @@ class FlixCloud::JobTest < Test::Unit::TestCase
   end
 
 
+  context "A job with recipe_id set" do
+    setup do
+      @job = FlixCloud::Job.new(:recipe_id => 1)
+    end
+
+    should "serialize to xml and include the recipe_id, not the recipe_name" do
+      assert_equal %{<?xml version="1.0" encoding="UTF-8"?><api-request><api-key></api-key><recipe-id>1</recipe-id></api-request>}, @job.to_xml
+    end
+  end
+
+
+  context "A job with a recipe_name set" do
+    setup do
+      @job = FlixCloud::Job.new(:recipe_name => 'recipe-name')
+    end
+
+    should "serialize to xml and include the recipe_name, not the recipe_id" do
+      assert_equal %{<?xml version="1.0" encoding="UTF-8"?><api-request><api-key></api-key><recipe-name>recipe-name</recipe-name></api-request>}, @job.to_xml
+    end
+  end
+
+
   context "A job with all attributes set" do
     setup do
       @job = FlixCloud::Job.new(:recipe_id => 1,
@@ -157,12 +191,11 @@ class FlixCloud::JobTest < Test::Unit::TestCase
 
     context "when saving with malformed xml (should really never happen, but what if?)" do
       setup do
-        FakeWeb.register_uri(:post, 'https://flixcloud.com/jobs', :string => %{<?xml version="1.0" encoding="UTF-8"?><errors><error>Malformed XML received, please check the syntax of your XML</error></errors>},
-                                                                  :status => ['400', 'Bad Request'])
+        FakeWeb.register_uri(:post, 'https://flixcloud.com/jobs', :status => ['400', 'Bad Request'])
       end
 
       should "raise a RequestFailed error" do
-        assert_raises RestClient::RequestFailed do
+        assert_raises FlixCloud::RequestFailed do
           @job.save
         end
       end
@@ -171,12 +204,24 @@ class FlixCloud::JobTest < Test::Unit::TestCase
 
     context "when saving and the schema doesn't validate (should really never happen, but what if?)" do
       setup do
-        FakeWeb.register_uri(:post, 'https://flixcloud.com/jobs', :string => %{<?xml version="1.0" encoding="UTF-8"?><errors><error>You are missing this thing and that thing</error></errors>},
-                                                                  :status => ['400', 'Bad Request'])
+        FakeWeb.register_uri(:post, 'https://flixcloud.com/jobs', :status => ['400', 'Bad Request'])
       end
 
       should "raise a RequestFailed error" do
-        assert_raises RestClient::RequestFailed do
+        assert_raises FlixCloud::RequestFailed do
+          @job.save
+        end
+      end
+    end
+
+
+    context "when saving and the api-key is not valid" do
+      setup do
+        FakeWeb.register_uri(:post, 'https://flixcloud.com/jobs', :status => ['401', 'Unauthorized'])
+      end
+
+      should "raise an Unauthorized error" do
+        assert_raises FlixCloud::Unauthorized do
           @job.save
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zencoder-flix_cloud-gem
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Nathan Sutton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-08 00:00:00 -07:00
+date: 2009-04-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency