rest_connection 0.1.1 → 0.1.2

data/lib/rest_connection/rightscale/rightscale_api_gateway.rb

@@ -1,5 +1,29 @@
 module RightScale
   module Api
+    GATEWAY_COOKIE_REFRESH = proc do
+      def refresh_cookie
+        # login
+        ignored, account = @settings[:api_url].split(/\/acct\//) if @settings[:api_url].include?("acct")
+        params = {
+          "email" => @settings[:user],
+          "password" => @settings[:pass],
+          "account_href" => "/api/accounts/#{account}"
+        }
+        @cookie = nil
+        resp = post("session", params)
+        unless resp.code == "302" || resp.code == "204"
+          raise "ERROR: Login failed. #{resp.message}. Code:#{resp.code}"
+        end
+        # TODO: handle 302 redirects
+        @cookie = resp.response['set-cookie']
+
+        # test session
+        resp = get("session")
+        raise "ERROR: Invalid session. #{resp["message"]}." unless resp.is_a?(Hash)
+        true
+      end
+    end
+
     module Gateway
       include RightScale::Api::Base
 
@@ -17,17 +41,12 @@ module RightScale
         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.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 = @@gateway_connection.get("session")
-          raise "ERROR: Invalid session. #{resp["message"]}." unless resp.is_a?(Hash)
+        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
 
@@ -130,23 +149,30 @@ module RightScale
       end
 
       def load(resource)
-        if resource.is_a?(Class)
-          param_string = resource.resource_singular_name
-          class_name = resource
+        mod = RightScale::Api::GatewayExtend
+        @@gateway_resources ||= Object.constants.map do |const|
+          klass = Object.const_get(const)
+          (mod === klass ? klass : nil)
+        end.compact
+        pp @@gateway_resources
+        if mod === resource
+          klass = resource
         elsif resource.is_a?(String) or resource.is_a?(Symbol)
-          param_string = resource
-          begin
-            class_name = Kernel.const_get(resource.singularize.camelize)
-          rescue
-            class_name = Kernel.const_get("Mc#{resource.singularize.camelize}")
+          klass = @@gateway_resources.detect do |const|
+            [const.resource_singular_name, const.resource_plural_name].include?(resource.to_s)
           end
+        elsif Class === resource
+          raise TypeError.new("#{resource} doesn't extend #{mod}")
+        else
+          raise TypeError.new("can't convert #{resource.class} into supported Class")
         end
-        if self[param_string].nil?
-          return class_name.load_all(self[param_string.pluralize])
-        elsif param_string.pluralize == param_string
-          return class_name.load_all(self[param_string])
+
+        if self[klass.resource_singular_name]
+          return klass.load(self[klass.resource_singular_name])
+        elsif self[klass.resource_plural_name]
+          return klass.load_all(self[klass.resource_plural_name])
         else
-          return class_name.load(self[param_string])
+          raise NameError.new("no resource_hrefs found for #{klass}")
         end
       end
     end
@@ -159,17 +185,12 @@ module RightScale
         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.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 = @@gateway_connection.get("session")
-          raise "ERROR: Invalid session. #{resp["message"]}." unless resp.is_a?(Hash)
+        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
 
@@ -238,8 +259,14 @@ module RightScale
         []
       end
 
-      def create(opts)
-        location = connection.post(self.resource_plural_name, self.resource_singular_name.to_sym => opts)
+      def create(*args)
+        if args.last.is_a?(Hash)
+          opts = args.pop
+        else
+          raise ArgumentError.new("create requires the last argument to be a Hash")
+        end
+        url = "#{parse_args(*args)}#{self.resource_plural_name}"
+        location = connection.post(url, self.resource_singular_name.to_sym => opts)
         newrecord = self.new('links' => [ {'rel' => 'self', 'href' => location } ])
         newrecord.reload
         newrecord

data/lib/rest_connection/rightscale/rightscale_api_resources.rb

@@ -20,6 +20,9 @@ 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/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'
@@ -49,6 +52,7 @@ require 'rest_connection/rightscale/mc_server'
 require 'rest_connection/rightscale/server_interface'
 require 'rest_connection/rightscale/mc_instance'
 require 'rest_connection/rightscale/monitoring_metric'
+require 'rest_connection/rightscale/session'
 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'
@@ -60,6 +64,7 @@ require 'rest_connection/rightscale/multi_cloud_image_cloud_setting_internal'
 require 'rest_connection/rightscale/multi_cloud_image_internal'
 require 'rest_connection/rightscale/ec2_server_array'
 require 'rest_connection/rightscale/mc_server_array'
+require 'rest_connection/rightscale/security_group_rule'
 require 'rest_connection/rightscale/mc_security_group'
 require 'rest_connection/rightscale/mc_deployment'
 require 'rest_connection/rightscale/mc_datacenter'

data/lib/rest_connection/rightscale/s3_bucket.rb

@@ -17,6 +17,8 @@ class S3Bucket
   include RightScale::Api::Base
   extend RightScale::Api::BaseExtend
 
+  deny_methods :update
+
   def self.resource_singular_name
     "s3_bucket"
   end
@@ -32,5 +34,4 @@ class S3Bucket
   def resource_plural_name
     "s3_buckets"
   end
-
 end

data/lib/rest_connection/rightscale/security_group_rule.rb

@@ -0,0 +1,31 @@
+#    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 SecurityGroupRule
+  include RightScale::Api::Gateway
+  extend RightScale::Api::GatewayExtend
+
+  deny_methods :update
+
+  def self.parse_args(cloud_id=nil, security_group_id=nil)
+    if cloud_id.nil? ^ security_group_id.nil?
+      raise ArgumentError.new("#{self} requires either 0 arguments, or 2 arguments")
+    end
+    "clouds/#{cloud_id}/security_groups/#{security_group_id}/"
+  end
+end

data/lib/rest_connection/rightscale/server_ec2_ebs_volume.rb

@@ -0,0 +1,40 @@
+#    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 ServerEc2EbsVolume
+  include  RightScale::Api::Base
+  extend RightScale::Api::BaseExtend
+  include RightScale::Api::Taggable
+  extend RightScale::Api::TaggableExtend
+
+  deny_methods :index, :update
+
+  def resource_plural_name
+    "component_ec2_ebs_volumes"
+  end
+
+  def resource_singular_name
+    "component_ec2_ebs_volume"
+  end
+
+  def self.resource_plural_name
+    "component_ec2_ebs_volumes"
+  end
+
+  def self.resource_singular_name
+    "component_ec2_ebs_volume"
+  end
+end

data/lib/rest_connection/rightscale/session.rb

@@ -0,0 +1,61 @@
+#    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 Session
+  include RightScale::Api::Gateway
+  extend RightScale::Api::GatewayExtend
+
+  deny_methods :index, :destroy, :update, :show
+
+  def self.index
+    self.new(connection.get(resource_singular_name))
+  end
+
+  def self.create(opts={})
+    settings = connection.settings
+    ignored, account = settings[:api_url].split(/\/acct\//) if settings[:api_url].include?("acct")
+    params = {
+      "email" => settings[:user],
+      "password" => settings[:pass],
+      "account_href" => "/api/accounts/#{account}"
+    }.merge(opts)
+    resp = connection.post(resource_singular_name, params)
+    connection.cookie = resp.response['set-cookie']
+  end
+
+  def self.accounts(opts={})
+    settings = connection.settings
+    params = {
+      "email" => settings[:user],
+      "password" => settings[:pass],
+    }.merge(opts)
+    a = Array.new
+    connection.get(resource_singular_name + "/accounts").each do |object|
+      a << Account.new(object)
+    end
+    return a
+  end
+
+  def self.create_instance_session
+    # TODO
+  end
+
+  def self.index_instance_session
+    # TODO
+  end
+end

data/lib/rest_connection/rightscale/sqs_queue.rb

@@ -0,0 +1,22 @@
+#    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 SqsQueue
+  include RightScale::Api::Base
+  extend RightScale::Api::BaseExtend
+
+  deny_methods :update
+end

data/lib/rest_connection/rightscale/tag.rb

@@ -17,6 +17,8 @@ class Tag
   include RightScale::Api::Base
   extend RightScale::Api::BaseExtend
 
+  deny_methods :index, :create, :destroy, :update, :show
+
   def self.search(resource_name, tags, opts=nil)
     parameters = { :resource_type => resource_name.to_s, :tags => tags }
     parameters.merge!(opts) unless opts.nil?

data/lib/rest_connection/rightscale/task.rb

@@ -20,6 +20,8 @@ class Task
   include RightScale::Api::Gateway
   extend RightScale::Api::GatewayExtend
 
+  deny_methods :index, :create, :destroy, :update
+
   def self.parse_args(cloud_id, instance_id)
     "clouds/#{cloud_id}/instances/#{instance_id}/live/"
   end
@@ -41,7 +43,7 @@ class Task
     raise "FATAL: Timeout waiting for Executable to complete.  State was #{self.summary}" if timeout <= 0
   end
 
-  def wait_for_completed(legacy=nil)
-    wait_for_state("completed")
+  def wait_for_completed(timeout=900)
+    wait_for_state("completed", timeout)
   end
 end

data/lib/rest_connection/rightscale/user.rb

@@ -25,6 +25,8 @@ class User
   include RightScale::Api::Gateway
   extend RightScale::Api::GatewayExtend
 
+  deny_methods :destroy, :update
+
   def self.filters
     [:email, :first_name, :last_name]
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rest_connection
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jeremy Deininger
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-17 00:00:00 Z
+date: 2012-01-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -78,7 +78,7 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id004
-description: provides rest_connection
+description: "Current implemented modules: RightScale API"
 email: 
 - jeremy@rubyonlinux.org
 - tw.rodriguez@gmail.com
@@ -102,6 +102,7 @@ files:
 - examples/cucumber/step_definitions/spot_check_steps.rb
 - examples/relaunch_deployment.rb
 - examples/right_scale_ec2_instances_api_test.rb
+- git_hooks/post-commit
 - git_hooks/post-commit.disabled
 - git_hooks/post-merge.disabled
 - git_hooks/pre-commit
@@ -109,6 +110,7 @@ files:
 - lib/rest_connection/patches.rb
 - lib/rest_connection/rightscale/account.rb
 - 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/child_account.rb
 - lib/rest_connection/rightscale/cloud.rb
@@ -160,11 +162,15 @@ files:
 - lib/rest_connection/rightscale/rightscale_api_taggable.rb
 - lib/rest_connection/rightscale/rs_internal.rb
 - lib/rest_connection/rightscale/s3_bucket.rb
+- lib/rest_connection/rightscale/security_group_rule.rb
 - lib/rest_connection/rightscale/server.rb
+- lib/rest_connection/rightscale/server_ec2_ebs_volume.rb
 - lib/rest_connection/rightscale/server_interface.rb
 - lib/rest_connection/rightscale/server_internal.rb
 - lib/rest_connection/rightscale/server_template.rb
 - lib/rest_connection/rightscale/server_template_internal.rb
+- lib/rest_connection/rightscale/session.rb
+- lib/rest_connection/rightscale/sqs_queue.rb
 - lib/rest_connection/rightscale/status.rb
 - lib/rest_connection/rightscale/tag.rb
 - lib/rest_connection/rightscale/task.rb
@@ -217,6 +223,6 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: lib for restful connections to the rightscale api
+summary: Modular RESTful API library
 test_files: []