rest_connection 0.1.2 → 0.1.3

data/Rakefile

@@ -3,13 +3,14 @@ require 'jeweler'
 Jeweler::Tasks.new do |gemspec|
   gemspec.name = "rest_connection"
   gemspec.summary = "Modular RESTful API library"
-  gemspec.description = "Current implemented modules: RightScale API"
+  gemspec.description = "A Modular RESTful API library. Current implemented modules: RightScale API"
   gemspec.email = ["jeremy@rubyonlinux.org", "tw.rodriguez@gmail.com"]
-  gemspec.homepage = "http://github.com/twrodriguez/rest_connection"
+  gemspec.homepage = "http://github.com/rightscale/rest_connection"
   gemspec.authors = ["Jeremy Deininger", "Timothy Rodriguez"]
   gemspec.add_dependency('activesupport', "=2.3.10")
   gemspec.add_dependency('net-ssh', "=2.1.4")
   gemspec.add_dependency('json')
   gemspec.add_dependency('highline')
+  gemspec.add_dependency('rest-client')
 end
 Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/rest_connection.rb

@@ -24,55 +24,6 @@ require 'logger'
 require 'highline/import'
 
 module RestConnection
-  AWS_CLOUDS = [
-                {"cloud_id" => 1, "name" => "AWS US-East"},
-                {"cloud_id" => 2, "name" => "AWS EU"},
-                {"cloud_id" => 3, "name" => "AWS US-West"},
-                {"cloud_id" => 4, "name" => "AWS AP-Singapore"},
-                {"cloud_id" => 5, "name" => "AWS AP-Tokyo"},
-                {"cloud_id" => 6, "name" => "AWS US-Oregon"},
-                {"cloud_id" => 7, "name" => "AWS SA-Sao Paulo"},
-               ]
-
-  # Check for API 0.1 Access
-  def self.api0_1?
-    unless class_variable_defined?("@@api0_1")
-      begin
-        Ec2SshKeyInternal.find_all
-        @@api0_1 = true
-      rescue
-        @@api0_1 = false
-      end
-    end
-    return @@api0_1
-  end
-
-  # Check for API 1.0 Access
-  def self.api1_0?
-    unless class_variable_defined?("@@api1_0")
-      begin
-        Ec2SecurityGroup.find_all
-        @@api1_0 = true
-      rescue
-        @@api1_0 = false
-      end
-    end
-    return @@api1_0
-  end
-
-  # Check for API 1.5 Beta Access
-  def self.api1_5?
-    unless class_variable_defined?("@@api1_5")
-      begin
-        Cloud.find_all
-        @@api1_5 = true
-      rescue
-        @@api1_5 = false
-      end
-    end
-    return @@api1_5
-  end
-
   class Connection
     # Settings is a hash of options for customizing the connection.
     # settings.merge! {
@@ -94,15 +45,23 @@ module RestConnection
       @@user = nil
       @@pass = nil
       etc_config = File.join("#{File::SEPARATOR}etc", "rest_connection", "rest_api_config.yaml")
-      if File.exists?(config_yaml)
+      app_bin_dir = File.expand_path(File.dirname(caller.last))
+      app_yaml = File.join(app_bin_dir,"..","config","rest_api_config.yaml")
+      if config_yaml.is_a?(Hash)
+        @settings = config_yaml
+      elsif File.exists?(app_yaml)
+        @settings = YAML::load(IO.read(app_yaml))
+      elsif File.exists?(config_yaml)
         @settings = YAML::load(IO.read(config_yaml))
       elsif File.exists?(etc_config)
         @settings = YAML::load(IO.read(etc_config))
       else
-        logger("\nWARNING:  you must setup config file rest_api_config.yaml in #{config_yaml} or #{etc_config}")
+        logger("\nWARNING:  you must setup config file rest_api_config.yaml in #{app_yaml} or #{config_yaml} or #{etc_config}")
         logger("WARNING:  see GEM_HOME/rest_connection/config/rest_api_config.yaml for example config")
         @settings = {}
       end
+      @settings.keys.each { |k| @settings[k.to_sym] = @settings[k] if String === k }
+
       @settings[:extension] = ".js"
       @settings[:api_href] = @settings[:api_url] unless @settings[:api_href]
       unless @settings[:user]

data/lib/rest_connection/patches.rb

@@ -13,6 +13,9 @@ class Hash
   def deep_merge(second)
     target = dup
     return target unless second
+    unless Hash === second
+      raise TypeError.new("can't convert #{second.class} into #{self.class}")
+    end
     second.keys.each do |k|
       if second[k].is_a? Array and self[k].is_a? Array
         target[k] = target[k].deep_merge(second[k])
@@ -32,6 +35,9 @@ class Hash
 
   def deep_merge!(second)
     return nil unless second
+    unless Hash === second
+      raise TypeError.new("can't convert #{second.class} into #{self.class}")
+    end
     second.each_pair do |k,v|
       if self[k].is_a?(Array) and second[k].is_a?(Array)
         self[k].deep_merge!(second[k])
@@ -50,6 +56,9 @@ class Array
   def deep_merge(second)
     target = dup
     return target unless second
+    unless Array === second
+      raise TypeError.new("can't convert #{second.class} into #{self.class}")
+    end
     second.each_index do |k|
       if second[k].is_a? Array and self[k].is_a? Array
         target[k] = target[k].deep_merge(second[k])
@@ -65,6 +74,9 @@ class Array
 
   def deep_merge!(second)
     return nil unless second
+    unless Array === second
+      raise TypeError.new("can't convert #{second.class} into #{self.class}")
+    end
     second.each_index do |k|
       if self[k].is_a?(Array) and second[k].is_a?(Array)
         self[k].deep_merge!(second[k])

data/lib/rest_connection/rightscale/backup.rb

@@ -0,0 +1,70 @@
+#    This file is part of RestConnection
+#
+#    RestConnection is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    RestConnection is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with RestConnection.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# You must have Beta v1.5 API access to use these internal API calls.
+#
+class Backup
+  include RightScale::Api::Gateway
+  extend RightScale::Api::GatewayExtend
+
+  deny_methods :index
+
+  def self.filters
+    [:cloud_href, :committed, :completed, :from_master, :latest_before]
+  end
+
+  def self.find_all(lineage)
+    index(lineage)
+  end
+
+  def self.find_with_filter(lineage, filter={})
+    index(lineage, filter)
+  end
+
+  def self.index(lineage, filter={})
+    filter_params = []
+    filter.each { |key,val|
+      unless self.filters.include?(key.to_sym)
+        raise ArgumentError.new("#{key} is not a valid filter for resource #{self.resource_singular_name}")
+      end
+      filter_params << "#{key}==#{val}"
+    }
+
+    a = Array.new
+    url = self.resource_plural_name
+    hsh = {'lineage' => lineage}
+    hsh.merge(:filter => filter_params) unless filter_params.empty?
+    connection.get(url, hsh).each do |object|
+      a << self.new(object)
+    end
+
+    return a
+  end
+
+  def self.cleanup(lineage, keep_last, params={})
+    params.merge!('keep_last' => keep_last, 'lineage' => lineage)
+    connection.post(resource_plural_name + "/cleanup", params)
+  end
+
+  def restore(instance_href, name=nil, description=nil)
+    uri = URI.parse(self.href)
+    params = {'instance_href' => instance_href}
+    params.deep_merge!({'backup' => {'name' => name}}) if name
+    params.deep_merge!({'backup' => {'description' => description}}) if description
+    location = connection.post(uri.path + "/restore", params)
+    Task.new('href' => location)
+  end
+end

data/lib/rest_connection/rightscale/ec2_server_array.rb

@@ -19,6 +19,15 @@ class Ec2ServerArray
   include RightScale::Api::Taggable
   extend RightScale::Api::TaggableExtend
 
+  attr_accessor :internal
+
+  def initialize(*args, &block)
+    super(*args, &block)
+    if RightScale::Api::api0_1?
+      @internal = Ec2ServerArrayInternal.new(*args, &block)
+    end
+  end
+
 #  Example:
 #    right_script = @server_template.executables.first
 #    result = @my_array.run_script_on_all(right_script, [@server_template.href])

data/lib/rest_connection/rightscale/ec2_server_array_internal.rb

@@ -0,0 +1,43 @@
+#    This file is part of RestConnection
+#
+#    RestConnection is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    RestConnection is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with RestConnection.  If not, see <http://www.gnu.org/licenses/>.
+
+class Ec2ServerArray
+  include RightScale::Api::Base
+  extend RightScale::Api::BaseExtend
+  include RightScale::Api::Taggable
+  extend RightScale::Api::TaggableExtend
+
+  deny_methods :index, :show, :create, :update, :destroy
+
+  def run_script_on_instances(script, ec2_instance_hrefs=[], opts={})
+    uri = URI.parse(self.href)
+    case script
+    when Executable then script = script.right_script
+    when String then script = RightScript.new('href' => script)
+    end
+
+    params = {:right_script_href => script.href}
+    unless ec2_instance_hrefs.nil? || ec2_instance_hrefs.empty?
+      params[:ec2_instance_hrefs] = ec2_instance_hrefs
+    end
+    unless opts.nil? || opts.empty?
+      params[:parameters] = opts
+    end
+    params = {:ec2_server_array => params}
+    connection.post(uri.path + "/run_script_on_instances", params).map do |work_unit|
+      Status.new('href' => location)
+    end
+  end
+end

data/lib/rest_connection/rightscale/ec2_ssh_key.rb

@@ -19,6 +19,8 @@ class Ec2SshKey
 
   deny_methods :index, :update
 
+  attr_accessor :internal
+
   def self.create(opts)
     create_opts = { self.resource_singular_name.to_sym => opts }
     create_opts['cloud_id'] = opts['cloud_id'] if opts['cloud_id']
@@ -27,4 +29,11 @@ class Ec2SshKey
     newrecord.reload
     newrecord
   end
+
+  def initialize(*args, &block)
+    super(*args, &block)
+    if RightScale::Api::api0_1?
+      @internal = Ec2SshKeyInternal.new(*args, &block)
+    end
+  end
 end

data/lib/rest_connection/rightscale/ec2_ssh_key_internal.rb

@@ -16,10 +16,11 @@
 class Ec2SshKeyInternal
   include RightScale::Api::Base
   extend RightScale::Api::BaseExtend
-
   include RightScale::Api::Internal
   extend RightScale::Api::InternalExtend
 
+  deny_methods :show, :create, :update, :destroy
+
   def resource_plural_name
     "ec2_ssh_keys"
   end
@@ -35,5 +36,4 @@ class Ec2SshKeyInternal
   def self.resource_singular_name
     "ec2_ssh_key"
   end
-
 end

data/lib/rest_connection/rightscale/mc_audit_entry.rb

@@ -0,0 +1,101 @@
+#    This file is part of RestConnection
+#
+#    RestConnection is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    RestConnection is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with RestConnection.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# You must have Beta v1.5 API access to use these internal API calls.
+#
+class McAuditEntry
+  include RightScale::Api::Gateway
+  extend RightScale::Api::GatewayExtend
+
+  deny_methods :destroy, :index
+
+  def resource_plural_name
+    "audit_entries"
+  end
+
+  def resource_singular_name
+    "audit_entry"
+  end
+
+  def self.resource_plural_name
+    "audit_entries"
+  end
+
+  def self.resource_singular_name
+    "audit_entry"
+  end
+
+  def self.filters
+    [:auditee_href, :user_email]
+  end
+
+  def self.find_all(start_date=nil, end_date=nil, limit=1000)
+    start_date ||= (Time.now.utc - (60*60*24*31)).strftime(RightScale::Api::DATETIME_FMT)
+    end_date ||= Time.now.utc.strftime(RightScale::Api::DATETIME_FMT)
+    index(start_date, end_date, limit)
+  end
+
+  def self.find_with_filter(start_date, end_date, limit, filter)
+    index(start_date, end_date, limit, filter)
+  end
+
+  def self.index(start_date, end_date, limit=1000, filter={})
+    # Validate index params
+    ex_fmt = "2011/06/25 00:00:00 +0000"
+    regex = /^(\d{4})\/(\d{2})\/(\d{2}) (\d{2}):(\d{2}):(\d{2}) ([+-]\d{4})$/
+    unless start_date =~ regex
+      raise ArgumentError.new("start_date doesn't match format. e.g., #{ex_fmt}")
+    end
+    unless end_date =~ regex
+      raise ArgumentError.new("end_date doesn't match format. e.g., #{ex_fmt}")
+    end
+    unless (1..1000) === limit.to_i
+      raise ArgumentError.new("limit is not within the range of 1..1000")
+    end
+    filter_params = []
+    filter.each { |key,val|
+      unless self.filters.include?(key.to_sym)
+        raise ArgumentError.new("#{key} is not a valid filter for resource #{self.resource_singular_name}")
+      end
+      filter_params << "#{key}==#{val}"
+    }
+
+    a = Array.new
+    url = self.resource_plural_name
+    if filter_params.empty?
+      connection.get(url).each do |object|
+        a << self.new(object)
+      end
+    else
+      connection.get(url, :filter => filter_params).each do |object|
+        a << self.new(object)
+      end
+    end
+
+    return a
+  end
+
+  def append(detail, offset)
+    uri = URI.parse(self.href)
+    connection.post(uri.path + "/append", 'detail' => detail, 'offset' => offset)
+  end
+
+  def detail
+    uri = URI.parse(self.href)
+    res = connection.post(uri.path + "/detail")
+    return res.body
+  end
+end

data/lib/rest_connection/rightscale/mc_server.rb

@@ -181,37 +181,26 @@ class McServer < Server
     return cloud_href.split("/").last.to_i
   end
 
-=begin
-  def wait_for_operational_with_dns(state_wait_timeout=1200)
-    timeout = 600
-    wait_for_state("operational", state_wait_timeout)
-    step = 15
-    while(timeout > 0)
-      self.settings
-      break if self.reachable_ip
-      connection.logger "waiting for any IP for #{self.nickname}"
-      sleep step
-      timeout -= step
-    end
-    connection.logger "got IP: #{self.reachable_ip}"
-    raise "FATAL, this server #{self.audit_link} timed out waiting for an IP" if timeout <= 0
-  end
-=end
-
   def dns_name
     self.settings
+    ret = nil
     if @current_instance
-      return @current_instance.public_ip_addresses.first || @current_instance.public_dns_names.first
+      ret ||= @current_instance.public_ip_addresses.first
+      ret ||= @current_instance.public_dns_names.first
+      ret ||= get_tags_by_namespace("server")["current_instance"]["public_ip_0"]
     end
-    nil
+    ret
   end
 
   def private_ip
     self.settings
+    ret = nil
     if @current_instance
-      return @current_instance.private_ip_addresses.first || @current_instance.private_dns_names.first
+      ret ||= @current_instance.private_ip_addresses.first
+      ret ||= @current_instance.private_dns_names.first
+      ret ||= get_tags_by_namespace("server")["current_instance"]["private_ip_0"]
     end
-    nil
+    ret
   end
 
   def save

data/lib/rest_connection/rightscale/multi_cloud_image.rb

@@ -19,17 +19,30 @@ class MultiCloudImage
 
   deny_methods :create, :destroy, :update
 
+  attr_accessor :internal
+
   def supported_cloud_ids
     @params["multi_cloud_image_cloud_settings"].map { |mcics| mcics.cloud_id }
   end
 
   # You must have access to multiple APIs for this (0.1, and 1.5)
   def find_and_flatten_settings()
-    some_settings = McMultiCloudImage.find(rs_id.to_i).get_settings
     internal = MultiCloudImageInternal.new("href" => self.href)
     internal.reload
-    more_settings = internal.settings
-    @params["multi_cloud_image_cloud_settings"] = some_settings + more_settings
+    total_image_count = internal.multi_cloud_image_cloud_settings.size
+    # The .settings call filters out non-ec2 images
+    more_settings = []
+    if total_image_count > internal.settings.size
+      more_settings = McMultiCloudImage.find(rs_id.to_i).get_settings
+    end
+    @params["multi_cloud_image_cloud_settings"] = internal.settings + more_settings
+  end
+
+  def initialize(*args, &block)
+    super(*args, &block)
+    if RightScale::Api::api0_1?
+      @internal = MultiCloudImageInternal.new(*args, &block)
+    end
   end
 
 end

data/lib/rest_connection/rightscale/multi_cloud_image_cloud_setting_internal.rb

@@ -19,6 +19,8 @@ class MultiCloudImageCloudSettingInternal
   include RightScale::Api::Internal
   extend RightScale::Api::InternalExtend
 
+  deny_methods :index, :show, :update
+
   def resource_plural_name
     "multi_cloud_image_cloud_settings"
   end

data/lib/rest_connection/rightscale/right_script.rb

@@ -20,6 +20,8 @@ class RightScript
 
   deny_methods :create, :destroy, :update
 
+  attr_accessor :internal
+
   def self.from_yaml(yaml)
     scripts = []
     x = YAML.load(yaml)
@@ -44,4 +46,10 @@ class RightScript
     scripts
   end
 
+  def initialize(*args, &block)
+    super(*args, &block)
+    if RightScale::Api::api0_1?
+      @internal = RightScriptInternal.new(*args, &block)
+    end
+  end
 end

data/lib/rest_connection/rightscale/right_script_attachment_internal.rb

@@ -0,0 +1,92 @@
+#    This file is part of RestConnection
+#
+#    RestConnection is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    RestConnection is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with RestConnection.  If not, see <http://www.gnu.org/licenses/>.
+
+require 'rest-client'
+RestClient.log = ENV["REST_CONNECTION_LOG"] || "stdout"
+
+class RightScriptAttachmentInternal
+  include RightScale::Api::Base
+  extend RightScale::Api::BaseExtend
+  include RightScale::Api::Internal
+  extend RightScale::Api::InternalExtend
+
+  deny_methods :index, :create, :update
+
+  def resource_plural_name
+    "right_script_attachments"
+  end
+
+  def resource_singular_name
+    "right_script_attachment"
+  end
+
+  def self.resource_plural_name
+    "right_script_attachments"
+  end
+
+  def self.resource_singular_name
+    "right_script_attachment"
+  end
+
+  def self.get_s3_upload_params(right_script_href)
+    url = self.resource_plural_name + "/get_s3_upload_params"
+    params = {"right_script_href" => right_script_href}
+    params = {self.resource_singular_name => params}
+    connection.get(url, params)
+  end
+
+=begin
+  def self.upload(filepath, right_script_href)
+    hsh = get_s3_upload_params(right_script_href)
+    params = {}
+    hsh.keys.each { |k| params[k.gsub(/-/,"_").to_sym] = hsh[k] }
+    params[:file] = File.new(filepath, 'rb')
+    req = RestClient::Request.new({
+      :method => :post,
+      :url => hsh["url"],
+      :payload => params,
+      :multipart => true,
+    })
+    s = req.payload.to_s
+    splitter = s.split("\r\n").first
+    a = s.split(/#{splitter}-?-?\r\n/)
+    a.push(a.delete(a.detect { |n| n =~ %r{name="file";} }))
+    new_payload = a.join(splitter + "\r\n") + splitter + "--\r\n"
+
+    uri = URI.parse(hsh["url"])
+    net_http = Net::HTTP::Post.new(uri.request_uri)
+    req.transmit(uri, net_http, new_payload)
+    # TODO: Precondition Failing
+
+    callback_uri = URI.parse(hsh["success_action_redirect"])
+    connection.get(callback_uri.request_uri)
+  end
+=end
+
+  def download
+    self.reload unless @params["authenticated_s3_url"]
+    RestClient.get(@params["authenticated_s3_url"])
+  end
+
+  def download_to_file(path=Dir.pwd)
+    data = self.download
+    File.open(File.join(path, @params["filename"]), 'w') { |f| f.write(data) }
+  end
+
+  def reload
+    uri = URI.parse(self.href || "#{resource_plural_name}/#{@params["id"]}")
+    @params ? @params.merge!(connection.get(uri.path)) : @params = connection.get(uri.path)
+  end
+end

data/lib/rest_connection/rightscale/right_script_internal.rb

@@ -20,6 +20,8 @@ class RightScriptInternal
   include RightScale::Api::Internal
   extend RightScale::Api::InternalExtend
 
+  deny_methods :index, :show
+
   def resource_plural_name
     "right_scripts"
   end
@@ -36,6 +38,9 @@ class RightScriptInternal
     "right_script"
   end
 
+  # NOTE: only RightScriptInternal.create() allows you to pass the ["script"] param.
+  # Need to request that .save() allows update to "script"
+
   # commits a rightscript
   def commit(message)
     t = URI.parse(self.href)
@@ -48,4 +53,23 @@ class RightScriptInternal
     RightScript.new(:href => connection.post(t.path + "/clone"))
   end
 
+  def fetch_right_script_attachments
+    t = URI.parse(self.href)
+    @params["attachments"] = []
+    connection.get(t.path + "/right_script_attachments").each { |obj|
+      obj.merge!("right_script_href" => self.href)
+      @params["attachments"] << RightScriptAttachmentInternal.new(obj)
+    }
+    @params["attachments"]
+  end
+
+  def attachments
+    @params["attachments"] ||= fetch_right_script_attachments
+  end
+
+=begin
+  def upload_attachment(file) # TODO
+    filedata = (File.exists?(file) ? IO.read(file) : file)
+  end
+=end
 end

data/lib/rest_connection/rightscale/rightscale_api_base.rb

@@ -17,6 +17,17 @@ require 'active_support/inflector'
 
 module RightScale
   module Api
+    DATETIME_FMT = "%Y/%m/%d %H:%M:%S +0000"
+    AWS_CLOUDS = [
+      {"cloud_id" => 1, "name" => "AWS US-East"},
+      {"cloud_id" => 2, "name" => "AWS EU"},
+      {"cloud_id" => 3, "name" => "AWS US-West"},
+      {"cloud_id" => 4, "name" => "AWS AP-Singapore"},
+      {"cloud_id" => 5, "name" => "AWS AP-Tokyo"},
+      {"cloud_id" => 6, "name" => "AWS US-Oregon"},
+      {"cloud_id" => 7, "name" => "AWS SA-Sao Paulo"},
+    ]
+
     BASE_COOKIE_REFRESH = proc do
       def refresh_cookie
         # login
@@ -30,9 +41,60 @@ module RightScale
       end
     end
 
-    module BaseExtend
-      def connection()
-        @@connection ||= RestConnection::Connection.new
+    # Pass no arguments to reset to the default configuration,
+    # pass a hash to update the settings for all API Versions
+    def self.update_connection_settings(*settings)
+      if settings.size > 1
+        raise ArgumentError.new("wrong number of arguments (#{settings.size} for 1)")
+      end
+      konstants = constants.map { |c| const_get(c) }
+      konstants.reject! { |c| !(Module === c) }
+      konstants.reject! { |c| !(c.instance_methods.include?("connection")) }
+      konstants.each do |c|
+        c.instance_exec(settings) do |opts|
+          class_variable_set("@@connection", RestConnection::Connection.new(*opts))
+        end
+      end
+      @@api0_1, @@api1_0, @@api1_5 = nil, nil, nil
+      true
+    end
+
+    # Check for API 0.1 Access
+    def self.api0_1?
+      if class_variable_defined?("@@api0_1")
+        return @@api0_1 unless @@api0_1.nil?
+      end
+      Ec2SshKeyInternal.find_all
+      @@api0_1 = true
+    rescue RestConnection::Errors::Forbidden
+      @@api0_1 = false
+    end
+
+    # Check for API 1.0 Access
+    def self.api1_0?
+      if class_variable_defined?("@@api1_0")
+        return @@api1_0 unless @@api1_0.nil?
+      end
+      Ec2SecurityGroup.find_all
+      @@api1_0 = true
+    rescue RestConnection::Errors::Forbidden
+      @@api1_0 = false
+    end
+
+    # Check for API 1.5 Beta Access
+    def self.api1_5?
+      if class_variable_defined?("@@api1_5")
+        return @@api1_5 unless @@api1_5.nil?
+      end
+      Cloud.find_all
+      @@api1_5 = true
+    rescue RestConnection::Errors::Forbidden
+      @@api1_5 = false
+    end
+
+    module BaseConnection
+      def connection(*opts)
+        @@connection ||= RestConnection::Connection.new(*opts)
         settings = @@connection.settings
         settings[:common_headers]["X_API_VERSION"] = "1.0"
         settings[:api_href] = settings[:api_url]
@@ -45,6 +107,10 @@ module RightScale
         @@connection.refresh_cookie unless @@connection.cookie
         @@connection
       end
+    end
+
+    module BaseExtend
+      include RightScale::Api::BaseConnection
 
       def resource_plural_name
         self.to_s.underscore.pluralize
@@ -56,6 +122,10 @@ module RightScale
       # matches using result of block match expression
       # ex: Server.find_by(:nickname) { |n| n =~ /production/ }
       def find_by(attrib, &block)
+        attrib = attrib.to_sym
+        if self.filters.include?(attrib)
+          connection.logger("#{self} includes the filter '#{attrib}', you might be able to speed up this API call")
+        end
         self.find_all.select do |s|
           yield(s[attrib.to_s])
         end
@@ -204,27 +274,14 @@ module RightScale
     end
 
     module Base
+      include RightScale::Api::BaseConnection
+
       # The params hash of attributes for direct manipulation
       attr_accessor :params
       def initialize(params = {})
         @params = params
       end
 
-      def connection()
-        @@connection ||= RestConnection::Connection.new
-        settings = @@connection.settings
-        settings[:common_headers]["X_API_VERSION"] = "1.0"
-        settings[:api_href] = settings[:api_url]
-        settings[:extension] = ".js"
-
-        unless @@connection.respond_to?(:refresh_cookie)
-          @@connection.instance_exec(&(RightScale::Api::BASE_COOKIE_REFRESH))
-        end
-
-        @@connection.refresh_cookie unless @@connection.cookie
-        @@connection
-      end
-
       def resource_plural_name
         self.class.to_s.underscore.pluralize
       end

data/lib/rest_connection/rightscale/rightscale_api_gateway.rb

@@ -24,8 +24,26 @@ module RightScale
       end
     end
 
+    module GatewayConnection
+      def connection(*opts)
+        @@gateway_connection ||= RestConnection::Connection.new(*opts)
+        settings = @@gateway_connection.settings
+        settings[:common_headers]["X_API_VERSION"] = "1.5"
+        settings[:api_href], account = settings[:api_url].split(/\/acct\//) if settings[:api_url].include?("acct")
+        settings[:extension] = ".json"
+
+        unless @@gateway_connection.respond_to?(:refresh_cookie)
+          @@gateway_connection.instance_exec(&(RightScale::Api::GATEWAY_COOKIE_REFRESH))
+        end
+
+        @@gateway_connection.refresh_cookie unless @@gateway_connection.cookie
+        @@gateway_connection
+      end
+    end
+
     module Gateway
       include RightScale::Api::Base
+      include RightScale::Api::GatewayConnection
 
       def initialize(params = {})
         @params = parse_params(params)
@@ -35,27 +53,23 @@ module RightScale
         params
       end
 
-      def connection
-        @@gateway_connection ||= RestConnection::Connection.new
-        settings = @@gateway_connection.settings
-        settings[:common_headers]["X_API_VERSION"] = "1.5"
-        settings[:api_href], account = settings[:api_url].split(/\/acct\//) if settings[:api_url].include?("acct")
-        settings[:extension] = ".json"
+      def nickname
+        @params["nickname"] || @params["name"]
+      end
 
-        unless @@gateway_connection.respond_to?(:refresh_cookie)
-          @@gateway_connection.instance_exec(&(RightScale::Api::GATEWAY_COOKIE_REFRESH))
+      def rediscover
+        self.reload if @params['href']
+        raise "Cannot find attribute 'nickname' or 'name' in #{self.inspect}. Aborting." unless self.nickname
+        if self.class.filters.include?(:name)
+          @params = self.class.find_with_filter(:name => self.nickname).first.params
+        else
+          @params = self.class.find_by(:name) { |n| n == self.nickname }.first.params
         end
-
-        @@gateway_connection.refresh_cookie unless @@gateway_connection.cookie
-        @@gateway_connection
       end
 
       def hash_of_links
         ret = {}
-        unless @params['links']# and not (@params['nickname'] or @params['name'])
-          @params = Kernel.const_get(self.class.to_s).find_by(:name) { |n| n == self.nickname }.first.params
-          connection.logger("in hash_of_links: @params = #{@params.inspect}") if ENV['REST_CONNECT_DEBUG']
-        end
+        self.rediscover unless @params['links']
         @params['links'].each { |link| ret[link['rel']] = link['href'] } if @params['links']
         ret
       end
@@ -63,22 +77,14 @@ module RightScale
       def href
         return @params['href'] if @params['href']
         ret = nil
-        unless @params['links']
-          raise "Cannot find attribute 'nickname' or 'name' in #{self.inspect}. Aborting." unless self.nickname
-          @params = Kernel.const_get(self.class.to_s).find_by(:name) { |n| n == self.nickname }.first.params
-          connection.logger("in href: @params = #{@params.inspect}") if ENV['REST_CONNECT_DEBUG']
-        end
+        self.rediscover unless @params['links']
         @params['links'].each { |link| ret = link['href'] if link['rel'] == 'self' }
         ret
       end
 
       def actions
         ret = []
-        unless @params['actions']
-          raise "Cannot find attribute 'nickname' or 'name' in #{self.inspect}. Aborting." unless self.nickname
-          @params = Kernel.const_get(self.class.to_s).find_by(:name) { |n| n == self.nickname }.first.params
-          connection.logger("in actions: @params = #{@params.inspect}") if ENV['REST_CONNECT_DEBUG']
-        end
+        self.rediscover unless @params['actions']
         @params['actions'].each { |action| ret << action['rel'] }
         ret
       end
@@ -179,23 +185,14 @@ module RightScale
 
     module GatewayExtend
       include RightScale::Api::BaseExtend
-      def connection
-        @@gateway_connection ||= RestConnection::Connection.new
-        settings = @@gateway_connection.settings
-        settings[:common_headers]["X_API_VERSION"] = "1.5"
-        settings[:api_href], account = settings[:api_url].split(/\/acct\//) if settings[:api_url].include?("acct")
-        settings[:extension] = ".json"
-
-        unless @@gateway_connection.respond_to?(:refresh_cookie)
-          @@gateway_connection.instance_exec(&(RightScale::Api::GATEWAY_COOKIE_REFRESH))
-        end
-
-        @@gateway_connection.refresh_cookie unless @@gateway_connection.cookie
-        @@gateway_connection
-      end
+      include RightScale::Api::GatewayConnection
 
       def find_by(attrib, *args, &block)
+        attrib = attrib.to_sym
         attrib = :name if attrib == :nickname
+        if self.filters.include?(attrib)
+          connection.logger("#{self} includes the filter '#{attrib}', you might be able to speed up this API call")
+        end
         self.find_all(*args).select do |s|
           yield(s[attrib.to_s])
         end
@@ -212,7 +209,6 @@ module RightScale
       end
 
       def find_all(*args)
-#        self.find_with_filter(*args, {})
         a = Array.new
         url = "#{parse_args(*args)}#{self.resource_plural_name}"
         connection.get(url).each do |object|

data/lib/rest_connection/rightscale/rightscale_api_internal.rb

@@ -1,8 +1,8 @@
 module RightScale
   module Api
-    module Internal
-      def connection
-        @@little_brother_connection ||= RestConnection::Connection.new
+    module InternalConnection
+      def connection(*opts)
+        @@little_brother_connection ||= RestConnection::Connection.new(*opts)
         settings = @@little_brother_connection.settings
         settings[:common_headers]["X_API_VERSION"] = "0.1"
         settings[:api_href] = settings[:api_url]
@@ -11,16 +11,12 @@ module RightScale
       end
     end
 
+    module Internal
+      include RightScale::Api::InternalConnection
+    end
+
     module InternalExtend
-      def connection
-        @@little_brother_connection ||= RestConnection::Connection.new
-        settings = @@little_brother_connection.settings
-        settings[:common_headers]["X_API_VERSION"] = "0.1"
-        settings[:api_href] = settings[:api_url]
-        settings[:extension] = ".js"
-        @@little_brother_connection
-      end
+      include RightScale::Api::InternalConnection
     end
   end
 end
-

data/lib/rest_connection/rightscale/rightscale_api_resources.rb

@@ -20,24 +20,28 @@ require 'rest_connection/rightscale/rightscale_api_gateway'
 require 'rest_connection/rightscale/rightscale_api_taggable'
 require 'rest_connection/rightscale/rightscale_api_mc_taggable'
 require 'rest_connection/rightscale/rightscale_api_mc_input'
+require 'rest_connection/ssh_hax'
 require 'rest_connection/rightscale/alert_spec_subject'
 require 'rest_connection/rightscale/server_ec2_ebs_volume'
 require 'rest_connection/rightscale/sqs_queue'
 require 'rest_connection/rightscale/executable'
 require 'rest_connection/rightscale/cloud_account'
+require 'rest_connection/rightscale/server_internal'
 require 'rest_connection/rightscale/server'
 require 'rest_connection/rightscale/deployment'
 require 'rest_connection/rightscale/status'
+require 'rest_connection/rightscale/server_template_internal'
 require 'rest_connection/rightscale/server_template'
-require 'rest_connection/rightscale/right_script'
 require 'rest_connection/rightscale/instance'
 require 'rest_connection/rightscale/ec2_security_group'
 require 'rest_connection/rightscale/vpc_dhcp_option'
+require 'rest_connection/rightscale/ec2_ssh_key_internal'
 require 'rest_connection/rightscale/ec2_ssh_key'
-require 'rest_connection/rightscale/multi_cloud_image'
 require 'rest_connection/rightscale/tag'
 require 'rest_connection/rightscale/mc_tag'
 require 'rest_connection/rightscale/task'
+require 'rest_connection/rightscale/backup'
+require 'rest_connection/rightscale/mc_audit_entry'
 require 'rest_connection/rightscale/rs_internal'
 require 'rest_connection/rightscale/audit_entry'
 require 'rest_connection/rightscale/alert_spec'
@@ -47,7 +51,6 @@ require 'rest_connection/rightscale/mc_volume_attachment'
 require 'rest_connection/rightscale/mc_volume'
 require 'rest_connection/rightscale/mc_volume_snapshot'
 require 'rest_connection/rightscale/mc_volume_type'
-require 'rest_connection/rightscale/server_internal'
 require 'rest_connection/rightscale/mc_server'
 require 'rest_connection/rightscale/server_interface'
 require 'rest_connection/rightscale/mc_instance'
@@ -57,11 +60,13 @@ require 'rest_connection/rightscale/mc_multi_cloud_image_setting'
 require 'rest_connection/rightscale/mc_multi_cloud_image'
 require 'rest_connection/rightscale/mc_server_template_multi_cloud_image'
 require 'rest_connection/rightscale/mc_server_template'
-require 'rest_connection/rightscale/ec2_ssh_key_internal'
-require 'rest_connection/rightscale/server_template_internal'
+require 'rest_connection/rightscale/right_script_attachment_internal'
 require 'rest_connection/rightscale/right_script_internal'
+require 'rest_connection/rightscale/right_script'
 require 'rest_connection/rightscale/multi_cloud_image_cloud_setting_internal'
 require 'rest_connection/rightscale/multi_cloud_image_internal'
+require 'rest_connection/rightscale/multi_cloud_image'
+require 'rest_connection/rightscale/ec2_server_array_internal'
 require 'rest_connection/rightscale/ec2_server_array'
 require 'rest_connection/rightscale/mc_server_array'
 require 'rest_connection/rightscale/security_group_rule'

data/lib/rest_connection/rightscale/server.rb

@@ -13,8 +13,6 @@
 #    You should have received a copy of the GNU General Public License
 #    along with RestConnection.  If not, see <http://www.gnu.org/licenses/>.
 
-require 'rest_connection/ssh_hax'
-
 class Server
   include RightScale::Api::Base
   extend RightScale::Api::BaseExtend
@@ -22,6 +20,8 @@ class Server
   include RightScale::Api::Taggable
   extend RightScale::Api::TaggableExtend
 
+  attr_accessor :internal
+
   def self.filters
     [
       :aws_id,
@@ -47,6 +47,13 @@ class Server
     newrecord
   end
 
+  def initialize(*args, &block)
+    super(*args, &block)
+    if RightScale::Api::api0_1?
+      @internal = ServerInternal.new(*args, &block)
+    end
+  end
+
   # The RightScale api returns the server parameters as a hash with "name" and "value".
   # This must be transformed into a hash in case we want to PUT this back to the API.
   def transform_parameters(parameters)
@@ -328,16 +335,10 @@ class Server
     if self.state == "operational"
       return self["cloud_id"]
     end
-    cloud_ids = RestConnection::AWS_CLOUDS.map { |hsh| hsh["cloud_id"] }
-
-    api0_1 = false
-    begin
-      api0_1 = true if Ec2SshKeyInternal.find_all
-    rescue
-    end
+    cloud_ids = RightScale::Api::AWS_CLOUDS.map { |hsh| hsh["cloud_id"] }
 
     # Try ssh keys
-    if self.ec2_ssh_key_href and api0_1
+    if self.ec2_ssh_key_href and RightScale::Api::api0_1?
       ref = self.ec2_ssh_key_href
       cloud_ids.each { |cloud|
         if Ec2SshKeyInternal.find_by_cloud_id(cloud.to_s).select { |o| o.href == ref }.first
@@ -366,17 +367,26 @@ class Server
 
   def dns_name
     self.settings unless self["dns_name"]
+    if self.current_instance_href
+      self["dns_name"] ||= get_tags_by_namespace("server")["current_instance"]["public_ip_0"]
+    end
     self["dns_name"]
   end
 
   def private_ip
     self.settings unless @params["private-ip-address"]
+    if self.current_instance_href
+      self["private-ip-address"] ||= get_tags_by_namespace("server")["current_instance"]["private_ip_0"]
+    end
     @params["private-ip-address"]
   end
 
   def reachable_ip
-    return self.dns_name if self.dns_name
-    return self.private_ip if self.private_ip
+    if ret = self.dns_name
+      return ret
+    elsif ret = self.private_ip
+      return ret
+    end
     nil
   end
 

data/lib/rest_connection/rightscale/server_internal.rb

@@ -20,10 +20,11 @@ class ServerInternal
   include RightScale::Api::Base
   extend RightScale::Api::BaseExtend
   include SshHax
-
   include RightScale::Api::Internal
   extend RightScale::Api::InternalExtend
 
+  deny_methods :index, :show, :create, :destroy, :update
+
   def resource_plural_name
     "servers"
   end

data/lib/rest_connection/rightscale/server_template.rb

@@ -19,8 +19,13 @@ class ServerTemplate
   include RightScale::Api::Taggable
   extend RightScale::Api::TaggableExtend
 
-  def initialize(params)
-    @params = params
+  attr_accessor :internal
+
+  def initialize(*args, &block)
+    super(*args, &block)
+    if RightScale::Api::api0_1?
+      @internal = ServerTemplateInternal.new(*args, &block)
+    end
   end
 
   def reload

data/lib/rest_connection/rightscale/server_template_internal.rb

@@ -19,6 +19,8 @@ class ServerTemplateInternal
   include RightScale::Api::Internal
   extend RightScale::Api::InternalExtend
 
+  deny_methods :index, :create, :show, :update, :destroy
+
   def resource_plural_name
     "server_templates"
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rest_connection
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jeremy Deininger
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-26 00:00:00 Z
+date: 2012-02-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -78,7 +78,21 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id004
-description: "Current implemented modules: RightScale API"
+- !ruby/object:Gem::Dependency 
+  name: rest-client
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
+description: "A Modular RESTful API library. Current implemented modules: RightScale API"
 email: 
 - jeremy@rubyonlinux.org
 - tw.rodriguez@gmail.com
@@ -112,6 +126,7 @@ files:
 - lib/rest_connection/rightscale/alert_spec.rb
 - lib/rest_connection/rightscale/alert_spec_subject.rb
 - lib/rest_connection/rightscale/audit_entry.rb
+- lib/rest_connection/rightscale/backup.rb
 - lib/rest_connection/rightscale/child_account.rb
 - lib/rest_connection/rightscale/cloud.rb
 - lib/rest_connection/rightscale/cloud_account.rb
@@ -122,12 +137,14 @@ files:
 - lib/rest_connection/rightscale/ec2_elastic_ip.rb
 - lib/rest_connection/rightscale/ec2_security_group.rb
 - lib/rest_connection/rightscale/ec2_server_array.rb
+- lib/rest_connection/rightscale/ec2_server_array_internal.rb
 - lib/rest_connection/rightscale/ec2_ssh_key.rb
 - lib/rest_connection/rightscale/ec2_ssh_key_internal.rb
 - lib/rest_connection/rightscale/executable.rb
 - lib/rest_connection/rightscale/instance.rb
 - lib/rest_connection/rightscale/instance_type.rb
 - lib/rest_connection/rightscale/macro.rb
+- lib/rest_connection/rightscale/mc_audit_entry.rb
 - lib/rest_connection/rightscale/mc_datacenter.rb
 - lib/rest_connection/rightscale/mc_deployment.rb
 - lib/rest_connection/rightscale/mc_image.rb
@@ -152,6 +169,7 @@ files:
 - lib/rest_connection/rightscale/multi_cloud_image_internal.rb
 - lib/rest_connection/rightscale/permission.rb
 - lib/rest_connection/rightscale/right_script.rb
+- lib/rest_connection/rightscale/right_script_attachment_internal.rb
 - lib/rest_connection/rightscale/right_script_internal.rb
 - lib/rest_connection/rightscale/rightscale_api_base.rb
 - lib/rest_connection/rightscale/rightscale_api_gateway.rb
@@ -191,7 +209,7 @@ files:
 - spec/server_template_internal.rb
 - spec/spec_helper.rb
 - spec/tag_spec.rb
-homepage: http://github.com/twrodriguez/rest_connection
+homepage: http://github.com/rightscale/rest_connection
 licenses: []
 
 post_install_message: 
@@ -220,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Modular RESTful API library