right_api_client 1.5.19 → 1.5.21

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+script: 
+  - RACK_ENV=test bundle exec rspec spec
+bundler_args: --without test

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG.md
 
+## 1.5.21
+ - \#71 Stop locking rest-client to 1.6.x and return to locking it to 1.x
+
+## 1.5.20
+ - \#67 Fix bug preventing configuration from setting nil for :timeout.
+ - \#67 Lock rest-client to 1.6.x due to requirement for Ruby 1.8.7 support.
+ - \#66 Add [TravisCI support](https://travis-ci.org/rightscale/right_api_client).
+ - \#64 Jewelerize the project to make maintenance easier.
+
 ## 1.5.19
  - \#38 Specify `:allow_nan => true` in calls to `JSON.parse` so we don't choke on NAN values.
  - \#60 Make exception [namespace change](https://github.com/rightscale/right_api_client/commit/84f477907eef0a583ee5bec0ee5336309d933c75) fully backwards compatible.

data/Gemfile

@@ -1,8 +1,24 @@
 source 'https://rubygems.org'
 
-gemspec
+# Runtime dependencies that should appear in the gemspec.
+gem 'json', '~> 1.0'
+gem 'mime-types', '~> 1.0'
+gem 'rest-client', '~> 1.6'
 
-gem 'ruby-debug',
-    :platforms => [:ruby_18]
-gem 'debugger',
-    :platforms => [:ruby_19, :ruby_20, :ruby_21]
+# Development dependencies that should appear in the gemspec.
+group :development do
+  gem 'rake', '0.8.7'
+  gem 'rspec', '2.9.0'
+  gem 'flexmock', '0.8.7'
+  gem 'simplecov', '0.4.2',
+      :platforms => [:ruby_19, :ruby_20, :ruby_21]
+end
+
+# Gems used during test and development that should be OMITTED from the gemspec
+group :test do
+  gem 'ruby-debug',
+      :platforms => [:ruby_18]
+  gem 'debugger',
+      :platforms => [:ruby_19, :ruby_20, :ruby_21]
+  gem 'jeweler', '~> 2.0'
+end

data/Gemfile.lock

@@ -1,14 +1,8 @@
-PATH
-  remote: .
-  specs:
-    right_api_client (1.5.19)
-      json (~> 1.0)
-      mime-types (~> 1.0)
-      rest-client (~> 1.6)
-
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.3.6)
+    builder (3.2.2)
     columnize (0.3.6)
     debugger (1.6.6)
       columnize (>= 0.3.1)
@@ -17,15 +11,52 @@ GEM
     debugger-linecache (1.2.0)
     debugger-ruby_core_source (1.3.2)
     diff-lcs (1.1.3)
+    faraday (0.8.9)
+      multipart-post (~> 1.2.0)
     flexmock (0.8.7)
+    git (1.2.6)
+    github_api (0.10.1)
+      addressable
+      faraday (~> 0.8.1)
+      hashie (>= 1.2)
+      multi_json (~> 1.4)
+      nokogiri (~> 1.5.2)
+      oauth2
+    hashie (3.0.0)
+    highline (1.6.21)
+    jeweler (2.0.1)
+      builder
+      bundler (>= 1.0)
+      git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
+      rake
+      rdoc
     json (1.8.1)
+    jwt (0.1.11)
+      multi_json (>= 1.5)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
     mime-types (1.25.1)
+    multi_json (1.10.1)
+    multi_xml (0.5.5)
+    multipart-post (1.2.0)
+    nokogiri (1.5.11)
+    oauth2 (0.9.3)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 0.1.8)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.5.2)
     rake (0.8.7)
     rbx-require-relative (0.0.9)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
+    rdoc (4.1.1)
+      json (~> 1.4)
+    rest-client (1.6.8)
+      mime-types (~> 1.16)
+      rdoc (>= 2.4.2)
     rspec (2.9.0)
       rspec-core (~> 2.9.0)
       rspec-expectations (~> 2.9.0)
@@ -47,11 +78,13 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0)
   debugger
   flexmock (= 0.8.7)
+  jeweler (~> 2.0)
+  json (~> 1.0)
+  mime-types (~> 1.0)
   rake (= 0.8.7)
-  right_api_client!
+  rest-client (~> 1.6)
   rspec (= 2.9.0)
   ruby-debug
   simplecov (= 0.4.2)

data/README.md

@@ -1,4 +1,5 @@
 # RightScale API Client
+[![Build Status](https://travis-ci.org/rightscale/right_api_client.svg?branch=master)](https://travis-ci.org/rightscale/right_api_client)
 
 The right\_api\_client gem simplifies the use of RightScale's MultiCloud API. It provides
 a simple object model of the API resources, and handles all of the fine details involved

data/Rakefile

@@ -1,17 +1,38 @@
-require File.expand_path('../lib/right_api_client', __FILE__)
-require 'rubygems'
-require 'rake'
+require 'jeweler'
 require 'rspec/core/rake_task'
 
-task :build do
-  system "gem build right_api_client.gemspec"
+RSpec::Core::RakeTask.new('spec') do |t|
+  t.pattern= 'spec/**/*_spec.rb'
 end
 
-task :release => :build do
-  system "gem push right_api_client-#{RightApi::Client::VERSION}.gem"
-end
+tasks = Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification; see http://docs.rubygems.org/read/chapter/20 for more options
+  gem.name = 'right_api_client'
+  gem.homepage = 'https://github.com/rightscale/right_api_client'
+  gem.license = 'MIT'
+  gem.summary = 'RightScale MultiCloud API HTTP Client'
+  gem.description = %{
+The right_api_client gem simplifies the use of RightScale's MultiCloud API.
+It provides a simple object model of the API resources, and handles all of the
+fine details involved in making HTTP calls and translating their responses.
+}
+  gem.email = 'rubygems@rightscale.com'
+  gem.authors = ['RightScale, Inc.']
 
-RSpec::Core::RakeTask.new('spec') do |t|
-  t.pattern= 'spec/**/*_spec.rb'
-  t.rspec_opts = ['--format nested','--colour']
+  # This gem is special; its own VERSION file needs to be shipped with the gem in order to
+  # initialize the VERSION constant living under RightApi::Client.
+  gem.files.include 'VERSION'
+
+  # Keep the gem nice and svelte
+  gem.files.exclude 'config'
+  gem.files.exclude 'cookies'
+  gem.files.exclude 'spec'
 end
+
+# Never auto-commit during operations that change the repository. Allows developers to decide on their own commit comment
+# and/or aggregate version bumps into other fixes.
+tasks.jeweler.commit = false
+
+Jeweler::RubygemsDotOrgTasks.new
+
+CLEAN.include('pkg')

data/VERSION

@@ -0,0 +1 @@
+1.5.21

data/lib/right_api_client/client.rb

@@ -45,7 +45,7 @@ module RightApi
 
       # Initializing all instance variables from hash
       args.each { |key,value|
-        instance_variable_set("@#{key}", value) if value && AUTH_PARAMS.include?(key.to_s)
+        instance_variable_set("@#{key}", value) if AUTH_PARAMS.include?(key.to_s)
       } if args.is_a? Hash
 
       raise 'This API client is only compatible with the RightScale API 1.5 and upwards.' if (Float(@api_version) < 1.5)

data/lib/right_api_client/version.rb

@@ -1,8 +1,8 @@
 # This gem is versioned with the usual X.Y.Z notation, where X.Y is the API version, and Z is the client version.
 module RightApi
   class Client
-    API_VERSION = '1.5'
-    CLIENT_VERSION = '19'
-    VERSION = "#{API_VERSION}.#{CLIENT_VERSION}"
+    VERSION        = File.read(File.expand_path('../../../VERSION', __FILE__)).strip
+    API_VERSION    = VERSION.split('.')[0..1].join('.')
+    CLIENT_VERSION = VERSION.split('.')[1..-1].join('.')
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_api_client
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 41
   prerelease: 
   segments: 
   - 1
   - 5
-  - 19
-  version: 1.5.19
+  - 21
+  version: 1.5.21
 platform: ruby
 authors: 
 - RightScale, Inc.
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-06-05 00:00:00 Z
+date: 2014-08-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -126,43 +126,29 @@ dependencies:
         version: 0.4.2
   prerelease: false
   requirement: *id007
-- !ruby/object:Gem::Dependency 
-  type: :development
-  name: bundler
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-  prerelease: false
-  requirement: *id008
-description: "\n\
-  The right_api_client gem simplifies the use of RightScale's MultiCloud API.\n\
-  It provides a simple object model of the API resources, and handles all of the\n\
-  fine details involved in making HTTP calls and translating their responses.\n  "
-email: 
-- rubygems@rightscale.com
+description: |
+  
+  The right_api_client gem simplifies the use of RightScale's MultiCloud API.
+  It provides a simple object model of the API resources, and handles all of the
+  fine details involved in making HTTP calls and translating their responses.
+
+email: rubygems@rightscale.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- LICENSE.txt
+- README.md
 files: 
-- .gitignore
-- .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- config/login.yml.example
+- VERSION
 - lib/right_api_client.rb
 - lib/right_api_client/client.rb
 - lib/right_api_client/errors.rb
@@ -173,17 +159,7 @@ files:
 - lib/right_api_client/resources.rb
 - lib/right_api_client/version.rb
 - login_to_client_irb.rb
-- right_api_client.gemspec
 - right_api_client.rconf
-- spec/functional/audit_entries_spec.rb
-- spec/functional/client_spec.rb
-- spec/spec_helper.rb
-- spec/support/mock_spec_helper.rb
-- spec/unit/helper_spec.rb
-- spec/unit/instance_facing_spec.rb
-- spec/unit/resource_detail_spec.rb
-- spec/unit/resource_spec.rb
-- spec/unit/resources_spec.rb
 homepage: https://github.com/rightscale/right_api_client
 licenses: 
 - MIT
@@ -217,14 +193,5 @@ rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: RightScale MultiCloud API HTTP Client
-test_files: 
-- config/login.yml.example
-- spec/functional/audit_entries_spec.rb
-- spec/functional/client_spec.rb
-- spec/spec_helper.rb
-- spec/support/mock_spec_helper.rb
-- spec/unit/helper_spec.rb
-- spec/unit/instance_facing_spec.rb
-- spec/unit/resource_detail_spec.rb
-- spec/unit/resource_spec.rb
-- spec/unit/resources_spec.rb
+test_files: []
+

data/.gitignore

@@ -1,13 +0,0 @@
-.DS_Store
-nbproject
-*login.yml
-.loadpath
-.project
-.rvmrc
-.bundle
-.idea
-.idea/*
-.ruby-version
-coverage/*
-doc/*
-*~

data/.rspec

@@ -1,4 +0,0 @@
---colour
---format=nested
---backtrace
---debugger

data/config/login.yml.example

@@ -1,35 +0,0 @@
-# The API login details can be put in a YAML file. This is an example login.yml which
-# will be needed for login_to_client_irb.rb quick login method.
-
-# Account ID is a required parameter. You can find your account number by logging into the
-# RightScale dashboard (https://my.rightscale.com), navigate to the Settings > Account Settings page.
-# The account number is at the end of the browser address bar.
-:account_id: my_account_id
-
-# There are five login mechanisms:
-
-# 0. Use the following parameters to login with your email and base64-encoded password:
-# To encode your plaintext password, use 'base64' command or similar.
-:email: my@email.com
-:password_base64: my_password_encoded_as_base64
-
-# 1. Use the following parameters to login with your email and plaintext password:
-:email: my@email.com
-:password: my_password
-
-# 2. Use the following parameter to login with an instance_token:
-# To find the instance_token, launch a server, navigate to the info page and under
-# User Data box, you will see RS_API_TOKEN = your_account_id:the_instance_token
-:instance_token: my_instance_token
-
-# 3. Use the following parameter to send a pre-authenticated cookie with every request:
-:cookies: my_cookie_string
-
-# 4. Use the following parameter to send an existing OAuth access token with every request:
-# To learn more about OAuth and how to obtain an access token, see
-# http://support.rightscale.com/12-Guides/03-Rightscale_API/OAuth
-:access_token: my_token_string
-
-# The following are optional parameters:
-:api_url: (this defaults to https://my.rightscale.com)
-:api_version: (this defaults to 1.5)

data/right_api_client.gemspec

@@ -1,32 +0,0 @@
-require File.expand_path('../lib/right_api_client/version', __FILE__)
-
-Gem::Specification.new do |s|
-  s.name             = 'right_api_client'
-  s.version          = RightApi::Client::VERSION
-  s.platform         = Gem::Platform::RUBY
-  s.date             = Time.now.utc.strftime("%Y-%m-%d")
-  s.require_path     = 'lib'
-  s.authors          = [ 'RightScale, Inc.' ]
-  s.email            = [ 'rubygems@rightscale.com' ]
-  s.homepage         = 'https://github.com/rightscale/right_api_client'
-  s.summary          = 'RightScale MultiCloud API HTTP Client'
-  s.license          = 'MIT'
-  s.description      = %{
-The right_api_client gem simplifies the use of RightScale's MultiCloud API.
-It provides a simple object model of the API resources, and handles all of the
-fine details involved in making HTTP calls and translating their responses.
-  }
-  s.files            = `git ls-files`.split(' ')
-  s.test_files       = `git ls-files spec config`.split(' ')
-  s.rubygems_version = '1.3.7'
-
-  s.add_runtime_dependency 'json',             '~> 1.0'
-  s.add_runtime_dependency 'mime-types',       '~> 1.0'
-  s.add_runtime_dependency 'rest-client',      '~> 1.6'
-
-  s.add_development_dependency 'rake',         '0.8.7'
-  s.add_development_dependency 'rspec',        '2.9.0'
-  s.add_development_dependency 'flexmock',     '0.8.7'
-  s.add_development_dependency 'simplecov',    '0.4.2'
-  s.add_development_dependency 'bundler',      '~> 1.0'
-end

data/spec/functional/audit_entries_spec.rb

@@ -1,64 +0,0 @@
-require File.expand_path('../../spec_helper', __FILE__)
-
-describe RightApi::Client do
-
-  before(:all) do
-
-    creds = File.expand_path('../../../config/login.yml', __FILE__)
-
-    begin
-      @client = RightApi::Client.new(YAML.load_file(creds))
-    rescue Exception => e
-      puts "=" * 80
-      puts "WARNING: please provide a valid config/login.yml file"
-      puts
-      puts e.message
-      puts "=" * 80
-    end
-
-    server_arrays =
-      @client.server_arrays.index
-
-    @server_array =
-      server_arrays.find { |sa| sa.name.match(/test/i) } ||
-      server_arrays.first
-
-    raise "sorry, can't test, no server arrays in your RS" unless @server_array
-  end
-
-  describe '#audit_entries' do
-
-    describe '#create' do
-
-      it 'creates audit entries' do
-
-        ae = @client.audit_entries.create(:audit_entry => {
-          'auditee_href' => @server_array.href,
-          'summary' => "right_api_client test #{$$}-#{Time.now.to_f}",
-          'detail' => 'sacrificing goats to make it work'
-        })
-
-        ae.class.should == RightApi::Resource
-        ae.show.href.should match(/^\/api\/audit_entries\/[a-z0-9]+$/)
-      end
-    end
-  end
-
-  describe 'AuditEntry resource' do
-
-    describe '#detail' do
-
-      it 'returns the detail plain text' do
-
-        ae = @client.audit_entries.create(:audit_entry => {
-          'auditee_href' => @server_array.href,
-          'summary' => "right_api_client test #{$$}-#{Time.now.to_f}",
-          'detail' => "and it's 1984"
-        })
-
-        ae.show.detail.show.text.should == "and it's 1984"
-      end
-    end
-  end
-end
-

data/spec/functional/client_spec.rb

@@ -1,175 +0,0 @@
-require File.expand_path('../../spec_helper', __FILE__)
-
-describe RightApi::Client do
-
-  context "given a valid set of credentials in the config/login.yml file" do
-
-    before(:all) do
-      @creds = '../../../config/login.yml'
-      begin
-        @client = RightApi::Client.new(YAML.load_file(File.expand_path(@creds, __FILE__)))
-      rescue => e
-        puts "WARNING: The following specs need a valid set of credentials as they are integration tests that can only be done by calling the API server"
-        puts e.message
-        puts e.backtrace
-      end
-
-      # Don't bother to run tests if the client didn't initialize
-      @client.should_not be_nil
-    end
-
-    it "logs in" do
-      @client.send(:headers)[:cookies].should_not be_nil
-      @client.session.index.message.should == 'You have successfully logged into the RightScale API.'
-    end
-
-    it "returns valid cookies" do
-      @client.cookies.class.should == Hash
-      @client.cookies['_session_id'].should_not be_nil
-      @client.cookies['domain'].should match /rightscale.com$/
-      @client.cookies.keys.sort.last.should match /^rs_gbl/ # HACK: not quite sane sanity check
-    end
-
-    it "accepts a cookie argument when creating a new client" do
-      my_hash = YAML.load_file(File.expand_path(@creds, __FILE__))
-      my_hash.delete(:email)
-      my_hash.delete(:password)
-      my_hash.delete(:cookies)
-      my_hash[:cookies] = @client.cookies
-      client1 = RightApi::Client.new(my_hash)
-      client1.cookies.should == @client.cookies
-    end
-
-    it "accepts an access_token argument when creating a new client" do
-      my_hash = YAML.load_file(File.expand_path(@creds, __FILE__))
-      my_hash.delete(:email)
-      my_hash.delete(:password)
-      my_hash.delete(:cookies)
-
-      access_token = @client.cookies.detect { |k, _| k =~ /^rs_gbl/ }.last
-      access_token.should_not be_nil
-      my_hash[:access_token] = access_token
-
-      client1 = RightApi::Client.new(my_hash)
-      client1.access_token.should == access_token
-    end
-
-    it "timestamps cookies" do
-
-      @client.cookies.timestamp.should_not == nil
-    end
-
-    it "keeps track of the cookies all the time" do
-
-      t0 = @client.cookies.timestamp
-
-      @client.deployments.index
-      t1 = @client.cookies.timestamp
-
-      t0.to_f.should < t1.to_f
-    end
-
-    it "accepts a YAML argument when creating a new client" do
-      client2 = RightApi::Client.new(YAML.load_file(File.expand_path(@creds, __FILE__)))
-      client2.cookies.should_not == @client.cookies
-    end
-
-    it "sends post/get/put/delete requests to the server correctly" do
-      deployment_name = "right_api_client functional test #{Time.now.to_s}"
-      # create a new deployment
-      new_deployment = @client.deployments.create(:deployment => {:name => deployment_name})
-      new_deployment.class.should     == RightApi::Resource
-      new_deployment.show.name.should == deployment_name
-
-      # verify new deployment
-      deployment = @client.deployments(:id => new_deployment.show.href.split('/').last)
-      deployment.class.should      == RightApi::Resource
-      deployment.show.class.should == RightApi::ResourceDetail
-      deployment.show.href.should  == new_deployment.show.href
-
-      # update deployment
-      deployment.update(:deployment => {:name => "#{deployment_name} updated"}).should be_nil
-      deployment.show.name.should == "#{deployment_name} updated"
-
-      # delete deployment
-      deployment.destroy.should be_nil
-    end
-
-    # Tags are a bit special as they use POST and return content type so they need specific tests
-    it "adds tag to deployment" do
-      deployment_name = "right_api_client functional test #{Time.now.to_s}"
-
-      # create a new deployment
-      new_deployment = @client.deployments.create(:deployment => {:name => deployment_name})
-
-      # add a tag to deployment
-      @client.tags.multi_add("resource_hrefs[]=#{new_deployment.show.href}&tags[]=tag1").should == nil
-
-      # verify tag
-      tags = @client.tags.by_resource("resource_hrefs[]=#{new_deployment.show.href}")
-      tags.class.should == Array
-      tags.first.class.should == RightApi::ResourceDetail
-      tags.first.tags.first.should == {"name" => "tag1"}
-      tags.first.resource.show.name.should == deployment_name
-
-      # delete deployment
-      new_deployment.destroy.should be_nil
-    end
-
-    it "singularizes resource_types correctly" do
-      @client.get_singular('servers').should == 'server'
-      @client.get_singular('deployments').should == 'deployment'
-      @client.get_singular('audit_entries').should == 'audit_entry'
-      @client.get_singular('processes').should == 'process'
-      @client.get_singular('ip_addresses').should == 'ip_address'
-    end
-
-    it "returns the resource when calling #resource(href)" do
-
-      d0 = @client.deployments.index.first
-
-      d1 = @client.resource(d0.href)
-
-      d1.href.should == d0.href
-    end
-
-    it "raises meaningful errors" do
-
-      err = begin
-        @client.resource('/api/nada')
-      rescue => e
-        e
-      end
-
-      err.class.should ==
-        RightApi::UnknownRouteError
-      err.message.should ==
-        "Unknown action or route. HTTP Code: 404, Response body: " +
-        "NotFound: No route matches \"/api/nada\" with {:method=>:get}"
-    end
-
-    it "wraps errors with _details" do
-
-      err = begin
-        @client.deployments(:id => 'nada').show
-      rescue => e
-        e
-      end
-
-      #p err
-      #puts err.backtrace
-
-      err._details.method.should == :get
-      err._details.path.should == '/api/deployments/nada'
-      err._details.params.should == {}
-
-      err._details.request.class.should == RestClient::Request
-
-      err._details.response.code.should == 422
-      err._details.response.class.should == String
-      err._details.response.should == "ResourceNotFound: Couldn't find Deployment with ID=nada "
-
-      err._details.code.should == 422
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,24 +0,0 @@
-
-require 'pp'
-require 'yaml'
-
-require File.expand_path('../../lib/right_api_client', __FILE__)
-
-
-RSpec.configure do |config|
-
-  #
-  # include helpers
-
-  $config = config
-
-  Dir[File.expand_path('../support/**/*.rb', __FILE__)].each do |path|
-    require(path)
-  end
-
-  #
-  # misc
-
-  config.mock_with :flexmock
-end
-

data/spec/support/mock_spec_helper.rb

@@ -1,36 +0,0 @@
-module MockSpecHelper
-
-  def mock_rest_client
-    @api_version = RightApi::Client::API_VERSION
-    @test_account_id = '1'
-    @rest_client = RestClient::Resource.new(RightApi::Client::DEFAULT_API_URL)
-    flexmock(RestClient::Resource).should_receive(:new).and_return(@rest_client)
-    @session = flexmock(:cookies => {})
-    @header = {'X-Api-Version' => @api_version, 'X-Account' => @test_account_id, :cookies => {}, :accept => :json}
-  end
-
-  def given_user_facing_client
-    mock_rest_client
-    flexmock(@rest_client).should_receive(:post).with(
-        {'email' => 'email', 'password' => 'password', 'account_href' => '/api/accounts/1'},
-        {'X-Api-Version' => @api_version}, Proc).and_return(@session)
-    flexmock(@rest_client).should_receive(:get).with(@header, Proc).and_return(['', '{}'])
-    @client = RightApi::Client.new(:email => 'email', :password => 'password', :account_id => @test_account_id)
-  end
-
-  def given_instance_facing_client
-    mock_rest_client
-    flexmock(@rest_client).should_receive(:post).with(
-        {'instance_token' => 'instance_token', 'account_href' => '/api/accounts/1'},
-        {'X-Api-Version' => @api_version}, Proc).and_return(@session)
-    flexmock(@rest_client).should_receive(:get).with(@header, Proc).and_return(['', '{"links": [
-        {
-          "href": "/api/clouds/1/instances/1",
-          "rel": "self"
-        }]}'])
-    @client = RightApi::Client.new(:instance_token => 'instance_token', :account_id => @test_account_id)
-  end
-end
-
-$config.include MockSpecHelper
-

data/spec/unit/helper_spec.rb

@@ -1,78 +0,0 @@
-require File.expand_path('../../spec_helper', __FILE__)
-include RightApi::Helper
-
-describe RightApi::Helper do
-
-  API_MEDIA_TYPES = %w{audit_entry ip_address process server}
-
-  context "#is_singular?" do
-    API_MEDIA_TYPES.each do |media_type|
-      it "should identify media type #{media_type} as singular" do
-        is_singular?(media_type).should == true
-      end
-    end
-  end
-
-  context "#fix_array_of_hashes" do
-    it "fixes all the keys that have the value as array of hashes" do
-      res = fix_array_of_hashes(
-          'a' => '1',
-          'b' => [1, 2, 3],
-          'c' => {1 => 2, 3 => 4},
-          'd' => [
-              {5 => 6, 7 => 8},
-              {9 => 10, 11 => 12}
-          ]
-      )
-
-      res.should == {
-          'a' => '1',
-          'b' => [1, 2, 3],
-          'c' => {1 => 2, 3 => 4},
-          'd[]' => [
-              {5 => 6, 7 => 8},
-              {9 => 10, 11 => 12}
-          ]
-      }
-
-    end
-
-    it "fixes key that have a top-level array of hashes as value" do
-      res = fix_array_of_hashes(
-          'a' => [
-              {1 => 2},
-              {3 => 4}
-          ]
-      )
-
-      res.should == {
-          'a[]' => [
-              {1 => 2},
-              {3 => 4}
-          ]
-      }
-    end
-
-    it "fixes key that have a nested array of hashes as value" do
-      res = fix_array_of_hashes(
-          'a' => {
-              'b' => [
-                  {1 => 2},
-                  {3 => 4}
-              ]
-          }
-      )
-
-      res.should == {
-          'a' => {
-              'b' => {
-                  '' => [
-                      {1 => 2},
-                      {3 => 4}
-                  ]
-              }
-          }
-      }
-    end
-  end
-end

data/spec/unit/instance_facing_spec.rb

@@ -1,24 +0,0 @@
-require File.expand_path('../../spec_helper', __FILE__)
-
-describe RightApi::Client do
-  context "given an instance-facing logged in RightScale user" do
-    before(:each) do
-      given_instance_facing_client
-    end
-
-    it "has the required methods for the client" do
-      @client.api_methods.sort.collect{|s| s.to_s}.should == ["backups", "get_instance", "live_tasks", "volume_attachments", "volume_snapshots", "volume_types", "volumes"]
-    end
-
-    it "returns an instance of the Resource class when user provides an id" do
-      @client.volumes(:id => 1).class.should    == RightApi::Resource
-      @client.backups(:id => 1).class.should    == RightApi::Resource
-      @client.live_tasks(:id => 1).class.should == RightApi::Resource
-    end
-
-    it "returns an instance of the Resources class when user does not provide an id" do
-      @client.volumes.class.should == RightApi::Resources
-      @client.backups.class.should == RightApi::Resources
-    end
-  end
-end

data/spec/unit/resource_detail_spec.rb

@@ -1,53 +0,0 @@
-require File.expand_path('../../spec_helper', __FILE__)
-
-describe RightApi::ResourceDetail do
-  context "given a logged in RightScale user" do
-    before(:each) do
-      given_user_facing_client
-    end
-
-    it "has the required methods for instances of the ResourceDetail class" do
-      resource = RightApi::ResourceDetail.new(@client, 'deployment', '/api/deployments/1', {})
-      resource.api_methods.sort.collect{|s| s.to_s}.should == ["destroy", "links", "show", "update"]
-    end
-
-    it "has resource-specific methods for instances of the ResourceDetail class" do
-      resource = RightApi::ResourceDetail.new(@client, 'deployment', '/api/deployments/1',
-                                              {:attribute1 => 'value1', :attribute2 => 'value2'})
-      resource.api_methods.sort.collect{|s| s.to_s}.should == ["attribute1", "attribute2", "destroy", "links", "show", "update"]
-    end
-
-    it "has the links for instances of the ResourceDetail class" do
-      resource = RightApi::ResourceDetail.new(@client, 'deployment', '/api/deployments/1',
-                                              {'links' => [{'rel' => 'link1', 'href' => 'link1_href'},
-                                                           {'rel' => 'link2', 'href' => 'link2_href'}]})
-      resource.api_methods.sort.collect{|s| s.to_s}.should == ["destroy", "link1", "link2", "links", "show", "update"]
-    end
-
-    it "has the actions for instances of the ResourceDetail class" do
-      resource = RightApi::ResourceDetail.new(@client, 'deployment', '/api/deployments/1',
-                                              {'links' => [{'rel' => 'self', 'href' => 'self'}],
-                                               'actions' => [{'rel' => 'action1'}, {'rel' => 'action2'}]})
-      resource.api_methods.sort.collect{|s| s.to_s}.should == ["action1", "action2", "destroy", "href", "links", "show", "update"]
-
-      flexmock(@rest_client).should_receive(:post).with({}, @header, Proc).and_return('ok')
-      resource.action1.should == 'ok'
-    end
-
-    it "has live_tasks for the 'instance' resource" do
-      resource = RightApi::ResourceDetail.new(@client, 'instance', '/api/instances/1', {})
-      resource.api_methods.sort.collect{|s| s.to_s}.should == ["destroy", "links", "live_tasks", "show", "update"]
-      flexmock(RightApi::Resource).should_receive(:process).with(@client, 'live_task', '/api/instances/1/live/tasks/1').and_return('ok')
-      resource.live_tasks(:id => '1').should == 'ok'
-    end
-
-    it "adds methods for child resources from detailed views" do
-      resource = RightApi::ResourceDetail.new(@client, 'server', '/api/servers/1', {
-          'links' => [
-              {'href' => '/api/servers/1', 'rel' => 'self'},
-              {'href' => '/api/clouds/1/instances/1', 'rel' => 'current_instance'}],
-          'current_instance' => {'links' => [{'href' => '/api/clouds/1/instances/1', 'rel' => 'self'}]}})
-      resource.api_methods.collect{|s| s.to_s}.sort.should == ["current_instance", "destroy", "href", "links", "show", "update"]
-    end
-  end
-end

data/spec/unit/resource_spec.rb

@@ -1,24 +0,0 @@
-require File.expand_path('../../spec_helper', __FILE__)
-
-describe RightApi::Resource do
-  context "given a logged in RightScale user" do
-    before(:each) do
-      given_user_facing_client
-    end
-
-    it "has the required methods for instances of the Resource class" do
-      resource = RightApi::Resource.process(@client, 'deployment', '/api/deployments/1')
-      resource.api_methods.sort.map(&:to_s).should == %w[ destroy show update ]
-    end
-
-    it "has destroy/show/update for all instances of the Resource class" do
-      resource = RightApi::Resource.process(@client, 'session', '/api/session')
-      resource.api_methods.sort.map(&:to_s).should == %w[ destroy show update ]
-    end
-
-    it "has an array of ResourceDetail instances for index calls" do
-      resources = RightApi::Resource.process(@client, 'deployment', '/api/deployments', [{}])
-      resources.first.class.should == RightApi::ResourceDetail
-    end
-  end
-end

data/spec/unit/resources_spec.rb

@@ -1,27 +0,0 @@
-require File.expand_path('../../spec_helper', __FILE__)
-
-describe RightApi::Resources do
-  context "given a logged in RightScale user" do
-    before(:each) do
-      given_user_facing_client
-    end
-
-    it "has the required methods for instances of the Resources class" do
-      resource = RightApi::Resources.new(@client, '/api/deployments', 'deployments')
-      resource.api_methods.sort.collect(&:to_s).should == %w[
-        create index ]
-    end
-
-    it "has index even for instances of the Resources class that do not support it" do
-      resource = RightApi::Resources.new(@client, '/api/tags', 'tags')
-      resource.api_methods.sort.collect(&:to_s).should == %w[
-        by_resource by_tag create index multi_add multi_delete ]
-    end
-
-    it "has resource-specific methods for instances of the Resources class" do
-      resource = RightApi::Resources.new(@client, '/api/backups', 'backups')
-      resource.api_methods.sort.collect(&:to_s).should == %w[
-        cleanup create index ]
-    end
-  end
-end