rest_connection 0.0.13 → 0.0.14

data/VERSION

@@ -1 +1 @@
-0.0.13
+0.0.14

data/lib/rest_connection.rb

@@ -29,7 +29,7 @@ module RestConnection
     # :api_url =>
     # :user =>
     # :pass =>
-    attr_accessor :settings
+    attr_accessor :settings, :cookie
 
     # RestConnection api settings configuration file:
     # Settings are loaded from a yaml configuration file in users home directory.
@@ -48,6 +48,8 @@ module RestConnection
         logger("WARNING:  see GEM_HOME/rest_connection/config/rest_api_config.yaml for example config")
         @settings = {}
       end
+      @settings[:extension] = ".js"
+      @settings[:api_href] = @settings[:api_url] unless @settings[:api_href]
     end
 
     # Main HTTP connection loop. Common settings are set here, then we yield(BASE_URI, OPTIONAL_HEADERS) to other methods for each type of HTTP request: GET, PUT, POST, DELETE
@@ -60,16 +62,19 @@ module RestConnection
     # end
     #   
     def rest_connect(&block)
-      uri = URI.parse(@settings[:api_url])
+      uri = URI.parse(@settings[:api_href])
       http = Net::HTTP.new(uri.host, uri.port)
       if uri.scheme == 'https'
         http.use_ssl = true 
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
       headers = @settings[:common_headers]
+      headers.merge!("Cookie" => @cookie) if @cookie 
       http.start do |http|
         req = yield(uri, headers)
-        req.basic_auth(@settings[:user], @settings[:pass]) if @settings[:user]
+        unless @cookie
+          req.basic_auth(@settings[:user], @settings[:pass]) if @settings[:user]
+        end
         logger("#{req.method}: #{req.path}")
         logger("\trequest body: #{req.body}") if req.body
         response, body = http.request(req)
@@ -84,7 +89,7 @@ module RestConnection
     def get(href, additional_parameters = "")
       rest_connect do |base_uri,headers|
         href = "#{base_uri}/#{href}" unless begins_with_slash(href)
-        new_path = URI.escape(href + '.js?' + requestify(additional_parameters))
+        new_path = URI.escape(href + @settings[:extension] + "?") + requestify(additional_parameters)
         Net::HTTP::Get.new(new_path, headers)
       end
     end
@@ -146,7 +151,7 @@ module RestConnection
     def handle_response(res)
       if res.code.to_i == 201
         return res['Location']
-      elsif [200,203,204].detect { |d| d == res.code.to_i }
+      elsif [200,203,204,302].detect { |d| d == res.code.to_i }
         if res.body
           begin
             return JSON.load(res.body)

data/lib/rest_connection/rightscale/deployment.rb

@@ -36,4 +36,13 @@ class Deployment
       s.reload
     end
   end
+
+  def duplicate
+    clone
+  end
+
+  def clone
+    deploy_href = URI.parse(self.href)
+    Deployment.new(:href => connection.post(deploy_href.path + "/duplicate"))
+  end
 end

data/lib/rest_connection/rightscale/mc_server.rb

@@ -0,0 +1,39 @@
+#    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 McServer
+  include RightScale::Api::Gateway
+  extend RightScale::Api::GatewayExtend
+  
+  def resource_plural_name
+    "servers"
+  end
+
+  def resource_singular_name
+    "server"
+  end
+
+  def self.resource_plural_name
+    "servers"
+  end
+
+  def self.resource_singular_name
+    "server"
+  end
+  
+end

data/lib/rest_connection/rightscale/rightscale_api_base.rb

@@ -20,6 +20,11 @@ module RightScale
     module BaseExtend
       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"
+        @@connection
       end
 
       def resource_plural_name
@@ -121,6 +126,11 @@ module RightScale
 
       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"
+        @@connection
       end
    
       def resource_plural_name

data/lib/rest_connection/rightscale/rightscale_api_gateway.rb

@@ -0,0 +1,48 @@
+module RightScale
+  module Api
+    module Gateway
+      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] = ""
+        unless @@gateway_connection.cookie
+          # login
+          params = { "email" => settings[:user], "password" => settings[:pass], "account_href" => "/api/accounts/#{account}" }
+          resp = @@gateway_connection.post("session", params)
+          raise "ERROR: Login failed. #{resp.message}. Code:#{resp.code}" unless resp.code == "302" || resp.code == "204"
+          @@gateway_connection.cookie = resp.response['set-cookie']
+            
+          # test session
+          resp, data = @@gateway_connection.get("session")
+          raise "ERROR: Invalid session. #{resp.message}. Code:#{resp.code}" unless resp.code == "200" 
+        end
+        @@gateway_connection
+      end
+    end
+
+    module GatewayExtend
+      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] = ""
+        unless @@gateway_connection.cookie
+          # login
+          params = { "email" => settings[:user], "password" => settings[:pass], "account_href" => "/api/accounts/#{account}" }
+          resp = @@gateway_connection.post("session", params)
+          raise "ERROR: Login failed. #{resp.message}. Code:#{resp.code}" unless resp.code == "302" || resp.code == "204"
+          @@gateway_connection.cookie = resp.response['set-cookie']
+            
+          # test session
+          resp, data = @@gateway_connection.get("session")
+          raise "ERROR: Invalid session. #{resp.message}. Code:#{resp.code}" unless resp.code == "200"
+        end
+        @@gateway_connection
+      end
+    end
+  end
+end
+ 

data/lib/rest_connection/rightscale/rightscale_api_internal.rb

@@ -3,7 +3,10 @@ module RightScale
     module Internal
       def connection
         @@little_brother_connection ||= RestConnection::Connection.new
-        @@little_brother_connection.settings[:common_headers] = { 'X-API-VERSION' => '0.1' }
+        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
     end
@@ -11,7 +14,10 @@ module RightScale
     module InternalExtend
       def connection
         @@little_brother_connection ||= RestConnection::Connection.new
-        @@little_brother_connection.settings[:common_headers] = { 'X-API-VERSION' => '0.1' }
+        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
     end

data/lib/rest_connection/rightscale/rightscale_api_resources.rb

@@ -16,6 +16,7 @@
 
 require 'rest_connection/rightscale/rightscale_api_base'
 require 'rest_connection/rightscale/rightscale_api_internal'
+require 'rest_connection/rightscale/rightscale_api_gateway'
 require 'rest_connection/rightscale/executable'
 require 'rest_connection/rightscale/server'
 require 'rest_connection/rightscale/deployment'
@@ -33,6 +34,7 @@ require 'rest_connection/rightscale/alert_spec'
 require 'rest_connection/rightscale/ec2_ebs_volume'
 require 'rest_connection/rightscale/ec2_ebs_snapshot'
 require 'rest_connection/rightscale/server_internal'
+require 'rest_connection/rightscale/mc_server'
 require 'rest_connection/rightscale/ec2_ssh_key_internal'
 require 'rest_connection/rightscale/server_template_internal'
 require 'rest_connection/rightscale/right_script_internal'

data/lib/rest_connection/rightscale/rs_internal.rb

@@ -22,13 +22,19 @@ class RsInternal
 
   def connection
     @@little_brother_connection ||= RestConnection::Connection.new
-    @@little_brother_connection.settings[:common_headers] = { 'X-API-VERSION' => '0.1' }
+    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
 
   def self.connection
     @@little_brother_connection ||= RestConnection::Connection.new
-    @@little_brother_connection.settings[:common_headers] = { 'X-API-VERSION' => '0.1' }
+    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
 

data/lib/rest_connection/rightscale/server.rb

@@ -184,9 +184,9 @@ class Server
     connection.post(serv_href.path + "/attach_volume", hash)
   end
 
-  def get_sketchy_data
+  def get_sketchy_data(params = {})
     serv_href = URI.parse(self.href)
-    @params.merge! connection.get(serv_href.path + "/get_sketchy_data")
+    @params.merge! connection.get(serv_href.path + "/get_sketchy_data", params)
   end
 
   def monitoring

data/rest_connection.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rest_connection}
-  s.version = "0.0.13"
+  s.version = "0.0.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Deininger"]
-  s.date = %q{2010-11-01}
+  s.date = %q{2010-12-13}
   s.description = %q{provides rest_connection}
   s.email = %q{jeremy@rubyonlinux.org}
   s.extra_rdoc_files = [
@@ -42,12 +42,14 @@ Gem::Specification.new do |s|
      "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/mc_server.rb",
      "lib/rest_connection/rightscale/multi_cloud_image.rb",
      "lib/rest_connection/rightscale/multi_cloud_image_cloud_setting_internal.rb",
      "lib/rest_connection/rightscale/multi_cloud_image_internal.rb",
      "lib/rest_connection/rightscale/right_script.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",
      "lib/rest_connection/rightscale/rightscale_api_internal.rb",
      "lib/rest_connection/rightscale/rightscale_api_resources.rb",
      "lib/rest_connection/rightscale/rs_internal.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rest_connection
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 0
-  - 13
-  version: 0.0.13
+  - 14
+  version: 0.0.14
 platform: ruby
 authors: 
 - Jeremy Deininger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-01 00:00:00 -07:00
+date: 2010-12-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -95,12 +95,14 @@ files:
 - 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/mc_server.rb
 - lib/rest_connection/rightscale/multi_cloud_image.rb
 - lib/rest_connection/rightscale/multi_cloud_image_cloud_setting_internal.rb
 - lib/rest_connection/rightscale/multi_cloud_image_internal.rb
 - lib/rest_connection/rightscale/right_script.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
 - lib/rest_connection/rightscale/rightscale_api_internal.rb
 - lib/rest_connection/rightscale/rightscale_api_resources.rb
 - lib/rest_connection/rightscale/rs_internal.rb