mortar-api-ruby 0.3.1 → 0.4.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mortar-api-ruby (0.3.1)
+    mortar-api-ruby (0.3.0)
       excon (~> 0.15.4)
 
 GEM

data/lib/mortar/api/errors.rb

@@ -32,6 +32,7 @@ module Mortar
         end
       end
 
+      class Redirect < ErrorWithResponse; end
       class BadRequest < ErrorWithResponse; end
       class Unauthorized < ErrorWithResponse; end
       class VerificationRequired < ErrorWithResponse; end

data/lib/mortar/api/version.rb

@@ -18,7 +18,7 @@ module Mortar
   class API
     # client version
     # see http://semver.org/
-    VERSION = "0.3.1"
+    VERSION = "0.4.0"
     
     SERVER_API_VERSION = "2"
   end

data/lib/mortar/api.rb

@@ -109,6 +109,12 @@ module Mortar
         end
       end
 
+      #Check if we got a redirect and treat it as an error.
+      if response.body.include? "redirect"
+        redirect_error = Mortar::API::Errors::Redirect.new(response.body["error"], response.body)
+        raise(redirect_error)
+      end
+
       # reset (non-persistent) connection
       @connection.reset
 

data/spec/mortar/api/errors_spec.rb

@@ -0,0 +1,54 @@
+#
+# Copyright 2012 Mortar Data Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "spec_helper"
+require "mortar/api"
+
+
+describe Mortar::API do
+  
+  before(:each) do
+    @api = Mortar::API.new
+  end
+  
+  after(:each) do
+    Excon.stubs.clear
+  end
+  
+  context "redirect" do
+    it "posts an illustrate and gets a redirect" do
+      illustrate_id = "7b93e4d3ab034188a0c2be418d3d24ed"
+      project_name = "my_project"
+      pigscript_name = "my_pigscript"
+      pigscript_alias = "my_alias"
+      skip_pruning = false
+      git_ref = "e20395b8b06fbf52e86665b0660209673f311d1a"
+      parameters = {"key" => "value"}
+      body = Mortar::API::OkJson.encode({"project_name" => project_name,
+                                         "pigscript_name" => pigscript_name,
+                                         "alias" => pigscript_alias,
+                                         "skip_pruning" => skip_pruning,
+                                         "git_ref" => git_ref,
+                                         "parameters" => parameters})
+      redirect_url = "some_redirect_url"
+      redirect_message = "some_redirect_message"
+      Excon.stub({:method => :post, :path => "/v2/illustrates", :body => body}) do |params|
+        {:body => Mortar::API::OkJson.encode({'redirect' => redirect_url, 'error' => redirect_message}), :status => 200}
+      end
+       expect {@api.post_illustrate(project_name, pigscript_name, pigscript_alias, skip_pruning, git_ref, :parameters => parameters)}.to raise_error(Mortar::API::Errors::Redirect)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mortar-api-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-25 00:00:00.000000000 Z
+date: 2012-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -125,6 +125,7 @@ files:
 - spec/mortar/api/basicauth_spec.rb
 - spec/mortar/api/clusters_spec.rb
 - spec/mortar/api/describe_spec.rb
+- spec/mortar/api/errors_spec.rb
 - spec/mortar/api/fixtures_spec.rb
 - spec/mortar/api/illustrate_spec.rb
 - spec/mortar/api/jobs_spec.rb
@@ -164,6 +165,7 @@ test_files:
 - spec/mortar/api/basicauth_spec.rb
 - spec/mortar/api/clusters_spec.rb
 - spec/mortar/api/describe_spec.rb
+- spec/mortar/api/errors_spec.rb
 - spec/mortar/api/fixtures_spec.rb
 - spec/mortar/api/illustrate_spec.rb
 - spec/mortar/api/jobs_spec.rb