rightstuff 0.0.1 → 0.0.2

data/README.rdoc

@@ -39,4 +39,4 @@ It should be of the form:
 = TODO
 
 * Cache connections
-* Don't query inactive serevrs for settings
+

data/lib/rightstuff.rb

@@ -1,5 +1,3 @@
-#!ruby
-
 require 'rubygems' if RUBY_VERSION < '1.9'
 require 'yaml'
 require 'net/https'
@@ -11,7 +9,7 @@ module Rightstuff
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
  
     STRING = [ MAJOR, MINOR, TINY ].join('.')
   end
@@ -51,10 +49,10 @@ module Rightstuff
         node.class == Nokogiri::XML::Element ? node : nil
       end
       elements.compact!
-      elements.reduce({}) do | memo, element |
+      elements.reduce( {} ) do | memo, element |
         name = element.name
         name.gsub!( /-/, '_' )
-        memo[ name.intern ] = element.children[0].to_s
+        memo[ name.intern ] = element.children[ 0 ].to_s
         memo
       end
     end
@@ -73,7 +71,8 @@ module Rightstuff
   class Server < Base
     
     def initialize( client, item )
-      @settings = false
+      @settings = nil
+      @inputs   = nil
       super
     end
 
@@ -84,6 +83,7 @@ module Rightstuff
     def method_missing( name , *args, &block )
       result = super
       return result unless result.nil?
+      return nil    unless @attributes[ :state ] == 'operational'
       settings unless @settings
       return @attributes[ name ]
     end
@@ -93,15 +93,17 @@ module Rightstuff
     end
 
     def inputs
+      return @inputs if @inputs
       # Add inputs to instance data
       # @client.get( @attributes[ 'href' ] )
     end
 
     def settings
-      doc = @client.get_rest( 'servers/' + id + '/settings' )
-      xml = Nokogiri::XML( doc )
-      @attributes.merge!( Base.extract_attributes( xml.children ) )
-      @settings = true
+      return @settings if @settings
+      doc      = @client.get_rest( 'servers/' + id + '/settings' )
+      xml      = Nokogiri::XML( doc )
+      @settings = Base.extract_attributes( xml.children )
+      @attributes.merge!( settings )
     end
 
   end
@@ -109,29 +111,29 @@ module Rightstuff
   class Client
 
     def initialize( options = {} )
-      @base_url = 'https://my.rightscale.com/api/acct'
       @username = options[ :username ] or raise 'no username supplied'
       @password = options[ :password ] or raise 'no password supplied'
       @account  = options[ :account ]  or raise 'no account id supplied'
       @account = @account.to_s
+
+      @base_url               = 'https://my.rightscale.com/api/acct'
+      url                     = URI.parse( @base_url )
+      @connection             = Net::HTTP.new( url.host, url.port )
+      @connection.use_ssl     = true
+      @connection.verify_mode = OpenSSL::SSL::VERIFY_NONE
     end
 
     def get_rest( rest )
       get( account_url( rest ) )
     end
 
-    def get( path )
-      address         = path
-      url             = URI.parse( address )
-      con             = Net::HTTP.new( url.host, url.port )
-      con.use_ssl     = true
-      con.verify_mode = OpenSSL::SSL::VERIFY_NONE
-
-      request         = Net::HTTP::Get.new( url.request_uri )
+    def get( address )
+      url     = URI.parse( address )
+      request = Net::HTTP::Get.new( url.request_uri )
       request.add_field( 'X-API-VERSION', '1.0' )
       request.basic_auth @username, @password
 
-      response = con.request( request )
+      response = @connection.request( request )
 
       case response.code
       when '200'
@@ -142,8 +144,9 @@ module Rightstuff
     end
 
     def servers
-      body = Nokogiri::XML( get_rest( 'servers' ) )
-      Server.load_collection( self, body )
+      return @servers if @servers
+      body     = Nokogiri::XML( get_rest( 'servers' ) )
+      @servers = Server.load_collection( self, body )
     end
 
     def account_url( rest )

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rightstuff
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Joe Yates