mortar-api-ruby 0.8.3 → 0.8.4

data/lib/mortar/api.rb

@@ -35,7 +35,6 @@ require "mortar/api/basicauth"
 require "mortar/api/errors"
 require "mortar/api/version"
 require "mortar/api/clusters"
-require "mortar/api/fixtures"
 require "mortar/api/illustrate"
 require "mortar/api/describe"
 require "mortar/api/validate"

data/lib/mortar/api/version.rb

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

data/mortar-api-ruby.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'gem-release'  
   gem.add_development_dependency 'rake'
   gem.add_development_dependency "rr"
-  gem.add_development_dependency "rspec"
+  # Use latest 2.x for rspec.  3.x breaks test configuration and various assertions
+  gem.add_development_dependency "rspec", '~>2.0'
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mortar-api-ruby
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -80,17 +80,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 description: Client for Mortar API.
 email: support@mortardata.com
 executables: []
@@ -112,7 +112,6 @@ files:
 - lib/mortar/api/config.rb
 - lib/mortar/api/describe.rb
 - lib/mortar/api/errors.rb
-- lib/mortar/api/fixtures.rb
 - lib/mortar/api/illustrate.rb
 - lib/mortar/api/jobs.rb
 - lib/mortar/api/login.rb
@@ -128,7 +127,6 @@ files:
 - spec/mortar/api/config_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
 - spec/mortar/api/login_spec.rb
@@ -163,20 +161,4 @@ rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Client for Mortar API
-test_files:
-- spec/mortar/api/basicauth_spec.rb
-- spec/mortar/api/clusters_spec.rb
-- spec/mortar/api/config_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
-- spec/mortar/api/login_spec.rb
-- spec/mortar/api/projects_spec.rb
-- spec/mortar/api/tasks_spec.rb
-- spec/mortar/api/user_spec.rb
-- spec/mortar/api/validate_spec.rb
-- spec/mortar/api_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
+test_files: []

data/lib/mortar/api/fixtures.rb

@@ -1,56 +0,0 @@
-#
-# 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 'set'
-
-module Mortar
-  class API
-    module Fixtures
-      STATUS_GATEWAY_STARTING = 'GATEWAY_STARTING'
-      STATUS_PENDING = 'PENDING'
-      STATUS_CREATING = 'CREATING'
-      STATUS_SAVING = 'SAVING'
-      STATUS_CREATED = 'CREATED'
-      STATUS_FAILED = 'FAILED'
-      
-      STATUSES_COMPLETE = Set.new([STATUS_CREATED, 
-                                   STATUS_FAILED])
-    end
-    
-    # GET /vX/fixtures/:fixture
-    def get_fixture(fixture_id)
-      request(
-        :expects  => 200,
-        :idempotent => true,
-        :method   => :get,
-        :path     => versioned_path("/fixtures/#{fixture_id}")
-      )
-    end
-
-    # POST /vX/fixtures 
-    def post_fixture_limit(project_name, fixture_name, input_url, num_rows)
-      request(
-        :expects  => 200,
-        :method   => :post,
-        :path     => versioned_path("/fixtures"),
-        :body     => json_encode({"fixture_name" => fixture_name,
-                                  "project_name" => project_name,
-                                  "s3_url"       => input_url,
-                                  "num_rows"     => num_rows})
-      )
-    end
-  end
-end

data/spec/mortar/api/fixtures_spec.rb

@@ -1,79 +0,0 @@
-#
-# 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 "base64"
-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 "fixtures" do
-        
-    it "gets a fixture" do
-      account_id = "123456780aaaaaa123456780aaaaaabb"
-      project_name = "MyProject"
-      project_id = "aaaaasssss"
-      fixture_id = "12345123412abcd12345123412abcdef"
-      fixture = {'name' => "Some fixture",
-                 'fixture_id' => fixture_id,
-                 'account_id' => account_id,
-                 'project_id' => project_id,
-                 'status_code' => Mortar::API::Fixtures::STATUS_CREATED,
-                 'status_description' => "Some Status Description",
-                 'sample_s3_urls' => [ {'url' => "https://some_url_1", 
-                                        'name' => "url1"}, 
-                                       {'url' => "https://some_url_2",
-                                        'name' => "url2"}]
-                }
-      Excon.stub({:method => :get, :path => "/v2/fixtures/#{fixture_id}"}) do |params|
-        {:body => Mortar::API::OkJson.encode(fixture),
-         :status => 200}
-      end
-      response = @api.get_fixture(fixture_id)
-      response.body['name'].should == fixture['name']
-      response.body['status'].should == fixture['status']
-      response.body['sample_s3_urls'].count.should == 2
-    end
-    
-    it "posts a limit fixture" do
-      fixture_name = "some_fixture"
-      s3_url = "some_s3_url"
-      num_rows = 100
-      project_name = "ProjectName"
-      fixture_id = "12345123412abcd12345123412abcdef"
-
-      body = Mortar::API::OkJson.encode({"fixture_name" => fixture_name,
-                                         "project_name" => project_name,
-                                         "s3_url" => s3_url,
-                                         "num_rows" => num_rows})
-      Excon.stub({:method => :post, :path => "/v2/fixtures", :body => body}) do |params|
-        {:body => Mortar::API::OkJson.encode({"fixture_id" => fixture_id}), :status => 200}
-      end
-      response = @api.post_fixture_limit(project_name, fixture_name, s3_url, num_rows)
-      response.body['fixture_id'].should == fixture_id
-    end
-
-  end
-end