right_api_client 1.5.4 → 1.5.5

data/CHANGELOG.rdoc

@@ -1,5 +1,8 @@
 = right_api_client - CHANGELOG.rdoc
 
+== right_api_client - 1.5.5
+Fix crash on audit_entry.detail.show (text and not JSON).
+
 == right_api_client - 1.5.4
 Fix singular for audit_entries resources. Update rest-client gem version to 1.6.7.
 
@@ -10,4 +13,4 @@ Add support for audit_entries resources. Update RConf ruby version to ruby-1.9.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.
+Initial public release, supports all of the calls in RightScale API 1.5.

data/lib/right_api_client/client.rb

@@ -146,7 +146,12 @@ module RightApi
         end
       end
 
-      data = JSON.parse(body) # TODO: check type before parsing as JSON
+      data = if resource_type == 'text'
+        { 'text' => body }
+      else
+        JSON.parse(body)
+      end
+
       [resource_type, path, data]
     end
 

data/lib/right_api_client/version.rb

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

data/spec/audit_entries_spec.rb

@@ -0,0 +1,66 @@
+
+require 'spec_helper'
+
+
+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/spec_helper.rb

@@ -2,7 +2,8 @@ require 'simplecov'
 SimpleCov.start if ENV["COVERAGE"]
 require File.expand_path('../../lib/right_api_client', __FILE__)
 require 'spec'
-require 'rest_client'
+require 'pp'
+require 'yaml'
 
 Spec::Runner.configure do |config|
   config.mock_with :flexmock
@@ -38,4 +39,4 @@ module MockSpecHelper
         }]}'])
     @client = RightApi::Client.new(:instance_token => 'instance_token', :account_id => '1')
   end
-end
+end

metadata

@@ -2,7 +2,7 @@
 name: right_api_client
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors: 
 - RightScale, Inc.
@@ -10,11 +10,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-20 00:00:00 -07:00
+date: 2012-01-20 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -22,10 +23,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rest-client
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -33,10 +34,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.6.7
   type: :runtime
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rake
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -44,10 +45,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.8.7
   type: :development
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -55,10 +56,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.3.0
   type: :development
-  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: flexmock
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -66,10 +67,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.8.7
   type: :development
-  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: simplecov
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -77,10 +78,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.4.2
   type: :development
-  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: bundler
+  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -88,7 +89,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id007
 description: "\n\
   The right_api_client gem simplifies the use of RightScale's MultiCloud API. It provides\n\
@@ -120,6 +120,7 @@ files:
 - login_to_client_irb.rb
 - right_api_client.gemspec
 - right_api_client.rconf
+- spec/audit_entries_spec.rb
 - spec/client_spec.rb
 - spec/instance_facing_spec.rb
 - spec/resource_detail_spec.rb
@@ -140,18 +141,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3281147269510564278
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3281147269510564278
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
@@ -162,6 +157,7 @@ specification_version: 3
 summary: RightScale MultiCloud API HTTP Client
 test_files: 
 - config/login.yml.example
+- spec/audit_entries_spec.rb
 - spec/client_spec.rb
 - spec/instance_facing_spec.rb
 - spec/resource_detail_spec.rb