rest_connection 0.1.9 → 0.1.10

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.1.10

data/lib/rest_connection/rightscale/mc_multi_cloud_image.rb

@@ -29,9 +29,8 @@ class McMultiCloudImage
   extend RightScale::Api::GatewayExtend
   include RightScale::Api::McTaggable
   extend RightScale::Api::McTaggableExtend
-  attr_reader :settings
 
-  deny_methods :create, :destroy, :update
+  deny_methods :update #supported in API, not imp'd in code yet
 
   def resource_plural_name
     "multi_cloud_images"
@@ -58,10 +57,17 @@ class McMultiCloudImage
   end
 
   def supported_cloud_ids
-    @settings.map { |mcics| mcics.cloud_id }
+    settings.map { |mcics| mcics.cloud_id }
   end
 
-  def get_settings
+  def reload
+    @settings = nil
+    super
+  end
+
+  # Note, only returns API 1.5 clouds, API 1.0 omitted
+  def settings
+    return @settings if @settings
     @settings = []
     url = URI.parse(self.href)
     connection.get(url.path + '/settings').each { |s|
@@ -69,4 +75,6 @@ class McMultiCloudImage
     }
     @settings
   end
+  def get_settings; settings; end
+
 end

data/lib/rest_connection/rightscale/mc_multi_cloud_image_setting.rb

@@ -28,7 +28,7 @@ class McMultiCloudImageSetting
   include RightScale::Api::Gateway
   extend RightScale::Api::GatewayExtend
 
-  deny_methods :create, :destroy, :update
+  deny_methods :update #supported in API, not imp'd in code yet
 
   def resource_plural_name
     "settings"
@@ -57,4 +57,11 @@ class McMultiCloudImageSetting
   def cloud_id
     self.cloud.split(/\//).last.to_i
   end
+
+  # API 1.5 MultiCloudImageSetting is posted to url
+  # /api/multi_cloud_images/:id/settings but the object it posts to the
+  # API is named :multi_cloud_image_setting => { attrs }
+  def self.resource_post_name
+    "multi_cloud_image_setting"
+  end
 end

data/lib/rest_connection/rightscale/mc_server_template.rb

@@ -53,7 +53,7 @@ class McServerTemplate
 
   def get_mcis_and_settings
     @params["multi_cloud_images"] = McMultiCloudImage.find_all(self.rs_id)
-    @params["multi_cloud_images"].each { |mci| mci.get_settings }
+    @params["multi_cloud_images"].each { |mci| mci.settings } # Eager load
     @mci_links = McServerTemplateMultiCloudImage.find_with_filter(:server_template_href => self.href)
   end
 

data/lib/rest_connection/rightscale/multi_cloud_image.rb

@@ -41,7 +41,7 @@ class MultiCloudImage
     # 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
+      more_settings = McMultiCloudImage.find(rs_id.to_i).settings
     end
     @params["multi_cloud_image_cloud_settings"] = internal.settings + more_settings
   end

data/lib/rest_connection/rightscale/rightscale_api_gateway.rb

@@ -280,6 +280,11 @@ module RightScale
         []
       end
 
+      # Hack for McMultiCloudImageSetting class to fix a API quirk
+      def resource_post_name
+        self.resource_singular_name
+      end
+
       def create(*args)
         if args.last.is_a?(Hash)
           opts = args.pop
@@ -287,7 +292,7 @@ module RightScale
           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)
+        location = connection.post(url, self.resource_post_name.to_sym => opts)
         newrecord = self.new('links' => [ {'rel' => 'self', 'href' => location } ])
         newrecord.reload
         newrecord

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rest_connection
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 1
-  - 9
-  version: 0.1.9
+  - 10
+  version: 0.1.10
 platform: ruby
 authors: 
 - Jeremy Deininger
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-26 00:00:00 Z
+date: 2012-05-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport