right_api_client 1.5.1 → 1.5.2

data/CHANGELOG.rdoc

@@ -1,5 +1,8 @@
 = right_api_client - CHANGELOG.rdoc
 
 
+== right_api_client - 1.5.2
+Fix issues with client when using Ruby 1.8.7 (note that right_api_client has not been fully tested with 1.8.7 yet).
+
 == right_api_client - 1.5.1
 Initial public release, supports all of the calls in RightScale API 1.5.

data/lib/right_api_client/client.rb

@@ -195,7 +195,7 @@ module RightApi
     # Generic delete
     def do_delete(path)
       begin
-        @rest_client[path].delete(headers) do |response|
+        @rest_client[path].delete(headers) do |response, request, result|
           case response.code
           when 200, 204
           else
@@ -215,7 +215,7 @@ module RightApi
     # Generic put
     def do_put(path, params={})
       begin
-        @rest_client[path].put(params, headers) do |response|
+        @rest_client[path].put(params, headers) do |response, request, result|
           case response.code
           when 204
           else

data/lib/right_api_client/version.rb

@@ -2,7 +2,7 @@
 module RightApi
   class Client
     API_VERSION = '1.5'
-    CLIENT_VERSION = '1'
+    CLIENT_VERSION = '2'
     VERSION = "#{API_VERSION}.#{CLIENT_VERSION}"
   end
 end

data/right_api_client.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.platform     = Gem::Platform::RUBY
   s.date         = Time.now.utc.strftime("%Y-%m-%d")
   s.require_path = 'lib'
-  s.authors      = [ 'Ali Khajeh-Hosseini' ]
-  s.email        = [ 'alikhajeh1@gmail.com' ]
+  s.authors      = [ 'Ali Khajeh-Hosseini, Natalie Schauser, Nagender Paduru' ]
+  s.email        = [ 'ali@rightscale.com' ]
   s.homepage     = 'https://github.com/rightscale/right_api_client'
   s.summary      = 'RightScale MultiCloud API HTTP Client'
   s.description  = %{
@@ -25,7 +25,6 @@ in making HTTP calls and translating their responses.
   s.add_development_dependency 'rake',         '0.8.7'
   s.add_development_dependency 'rspec',        '1.3.0'
   s.add_development_dependency 'flexmock',     '0.8.7'
-  s.add_development_dependency 'ruby-debug19', '0.11.6'
   s.add_development_dependency 'simplecov',    '0.4.2'
   s.add_development_dependency 'bundler'
 end

data/spec/client_spec.rb

@@ -18,16 +18,25 @@ describe RightApi::Client do
       @client.session.index.message.should == 'You have successfully logged into the RightScale API.'
     end
 
-    it "Should return a cookies Hash with a 'domain' and a '_session_id'" do
-      @client.cookies.class.should     == Hash
-      @client.cookies.keys.sort.should == %w[ _session_id domain rs_gbl ]
+    it "Should return 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 "Should accept a cookie argument when creating a new client" do
-      client1 = RightApi::Client.new(:cookies => @client.cookies)
-      client2 = RightApi::Client.new(YAML.load_file(File.expand_path(@creds, __FILE__)))
+      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
 
-      client1.cookies.should     == @client.cookies
+    it "Should accept 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
 
@@ -57,4 +66,4 @@ describe RightApi::Client do
       new_deployment2.destroy.should be_nil
     end
   end
-end
+end

data/spec/instance_facing_spec.rb

@@ -8,7 +8,7 @@ describe RightApi::Client do
     end
 
     it "Should have the required methods for the client" do
-      @client.api_methods.sort.should == [:backups, :get_instance, :live_tasks, :volume_attachments, :volume_snapshots, :volume_types, :volumes]
+      @client.api_methods.sort.collect{|s| s.to_s}.should == ["backups", "get_instance", "live_tasks", "volume_attachments", "volume_snapshots", "volume_types", "volumes"]
     end
 
     it "Should return an instance of the Resource class when user provides an id" do

data/spec/resource_detail_spec.rb

@@ -9,32 +9,32 @@ describe RightApi::ResourceDetail do
 
     it "Should have the required methods for instances of the ResourceDetail class" do
       resource = RightApi::ResourceDetail.new(@client, 'deployment', '/api/deployments/1', {})
-      resource.api_methods.sort.should == [:destroy, :links, :show, :update]
+      resource.api_methods.sort.collect{|s| s.to_s}.should == ["destroy", "links", "show", "update"]
     end
 
     it "Should not have destroy/show/update for instances of the ResourceDetail class that do not support them" do
       resource = RightApi::ResourceDetail.new(@client, 'session', '/api/session', {})
-      resource.api_methods.sort.should == [:links]
+      resource.api_methods.sort.collect{|s| s.to_s}.should == ["links"]
     end
 
     it "Should have 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.should == [:attribute1, :attribute2, :destroy, :links, :show, :update]
+      resource.api_methods.sort.collect{|s| s.to_s}.should == ["attribute1", "attribute2", "destroy", "links", "show", "update"]
     end
 
     it "Should have 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.should == [:destroy, :link1, :link2, :links, :show, :update]
+      resource.api_methods.sort.collect{|s| s.to_s}.should == ["destroy", "link1", "link2", "links", "show", "update"]
     end
 
     it "Should have 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.should == [:action1, :action2, :destroy, :href, :links, :show, :update]
+      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'
@@ -42,7 +42,7 @@ describe RightApi::ResourceDetail do
 
     it "Should have live_tasks for the 'instance' resource" do
       resource = RightApi::ResourceDetail.new(@client, 'instance', '/api/instances/1', {})
-      resource.api_methods.sort.should == [:links, :live_tasks, :show, :update]
+      resource.api_methods.sort.collect{|s| s.to_s}.should == ["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
@@ -53,7 +53,7 @@ describe RightApi::ResourceDetail do
               {'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.sort.should == [:current_instance, :destroy, :href, :links, :show, :update]
+      resource.api_methods.collect{|s| s.to_s}.sort.should == ["current_instance", "destroy", "href", "links", "show", "update"]
     end
   end
 end

data/spec/resource_spec.rb

@@ -9,7 +9,7 @@ describe RightApi::Resource do
 
     it "Should have the required methods for instances of the Resource class" do
       resource = RightApi::Resource.process(@client, 'deployment', '/api/deployments/1')
-      resource.api_methods.sort.should == [:destroy, :show, :update]
+      resource.api_methods.sort.collect{|s| s.to_s}.should == ["destroy", "show", "update"]
     end
 
     it "Should not have destroy/show/update for instances of the Resource class that do not support them" do

data/spec/resources_spec.rb

@@ -9,17 +9,17 @@ describe RightApi::Resources do
 
     it "Should have the required methods for instances of the Resources class" do
       resource = RightApi::Resources.new(@client, '/api/deployments', 'deployments')
-      resource.api_methods.sort.should == [:create, :index]
+      resource.api_methods.sort.collect{|s| s.to_s}.should == ["create", "index"]
     end
 
     it "Should not have index for instances of the Resources class that do not support it" do
       resource = RightApi::Resources.new(@client, '/api/tags', 'tags')
-      resource.api_methods.sort.should == [:by_resource, :by_tag, :multi_add, :multi_delete]
+      resource.api_methods.sort.collect{|s| s.to_s}.should == ["by_resource", "by_tag", "multi_add", "multi_delete"]
     end
 
     it "Should have resource-specific methods for instances of the Resources class" do
       resource = RightApi::Resources.new(@client, '/api/backups', 'backups')
-      resource.api_methods.sort.should == [:cleanup, :create, :index]
+      resource.api_methods.sort.collect{|s| s.to_s}.should == ["cleanup", "create", "index"]
     end
   end
 end

metadata

@@ -2,15 +2,15 @@
 name: right_api_client
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors: 
-- Ali Khajeh-Hosseini
+- Ali Khajeh-Hosseini, Natalie Schauser, Nagender Paduru
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-08-28 00:00:00 +01:00
+date: 2011-09-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,20 +68,9 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug19
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.11.6
-  type: :development
-  prerelease: false
-  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: simplecov
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -89,10 +78,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -100,13 +89,13 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id007
 description: "\n\
   The right_api_client gem simplifies the use of RightScale's MultiCloud API. It provides\n\
   a simple object model of the API resources, and handles all of the fine details involved\n\
   in making HTTP calls and translating their responses.\n  "
 email: 
-- alikhajeh1@gmail.com
+- ali@rightscale.com
 executables: []
 
 extensions: []
@@ -151,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2710163890528289054
+      hash: -1047381825894058411
       segments: 
       - 0
       version: "0"
@@ -160,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2710163890528289054
+      hash: -1047381825894058411
       segments: 
       - 0
       version: "0"