rightresource 0.4.0 → 0.4.2

data/lib/right_resource/deployment.rb

@@ -4,6 +4,28 @@
 # * +id+ - RightScale deployment resource id(https://my.rightscale.com/deployments/{id})
 class Deployment < RightResource::Base
   class << self
+    # Override RightResource::Base#index
+    # Hash2Object of RightScale servers
+    def index(params = {})
+      deployments = super
+      deployments.each do |deployment|
+        deployment.servers
+      end
+
+      deployments
+    end
+
+    # Override RightResource::Base#show
+    # Hash2Object of RightScale servers
+    def show(id, params = {})
+      deployment = super
+      unless deployment.nil?
+        deployment.servers
+      end
+
+      deployment
+    end
+
     [:start_all, :stop_all, :duplicate].each do |act_method|
       define_method(act_method) do |id|
         path = element_path(id, act_method).sub(/\.#{format.extension}$/, '') # response empty and format xml only
@@ -11,4 +33,15 @@ class Deployment < RightResource::Base
       end
     end
   end
+
+  # Convert servers
+  def servers
+    unless self.attributes[:servers].nil?
+      self.attributes[:servers].map! do |record|
+        record.is_a?(Hash) ? Server.new(record) : record
+      end
+    end
+
+    self.attributes[:servers]
+  end
 end

data/lib/right_resource/formats/json_format.rb

@@ -16,7 +16,7 @@ module RightResource
       end
 
       def decode(json)
-        Crack::JSON.parse(json)
+        JSON.parse(json)
       end
     end
   end

data/lib/right_resource/server.rb

@@ -115,4 +115,38 @@ class Server < RightResource::Base
       }.flatten]
     end
   end
+
+  # Get Server settings with merge to instance(attributes[:settings])
+  # === Examples
+  #   server = Server.index(:filter => "nickname=dev-001").first
+  #   Server.settings
+  #   # => Server#attributes[:settings]
+  #   # {:dns_name => "ec2-175-...", :aws_id => "i-12345", ..., :ip_address => "175...."}
+  def settings
+    # first access
+    if self.attributes[:settings].nil?
+      self.attributes[:settings] = _settings
+    end
+
+    self.attributes[:settings]
+  end
+
+  # Get Server settings with merge to instance(destructive)
+  # === Examples
+  #   server = Server.index(:filter => "nickname=dev-001").first
+  #   Server.settings!
+  #   # => self
+  #   #
+  #   # > Server.attributes
+  #   # => [:nickname => "server1", :aws_id => "i-12345", ..., :ip_address => "175..."]
+  def settings!
+    self.loads(_settings)
+
+    self
+  end
+
+  private
+    def _settings
+      self.class.settings(self.id) rescue nil
+    end
 end

data/lib/right_resource/server_array.rb

@@ -44,6 +44,12 @@ class ServerArray < RightResource::Base
       RightResource::Formats::XmlFormat.decode(action(:post, path, h)).tap {|resource| correct_attributes(resource)}
     end
 
+    # Get Server Array instances(subresource)
+    # === Examples
+    #   array_id = ServerArray.index.first.id
+    #   instances = ServerArray.instances(array_id)
+    #   => [{:nickname => "web #1", :resource_uid => "i-12345", ...},
+    #      {:nickname => "web #2", :resource_uid => "i-67890", ...}]
     def instances(id)
       path = element_path(id, :instances)
       format.decode(action(:get, path)).map do |instance|
@@ -51,4 +57,20 @@ class ServerArray < RightResource::Base
       end
     end
   end
+
+  # Get Server Array with merge to ServerArray instance(attributes[:instances])
+  # === Examples
+  #   array = ServerArray.index.first
+  #   array.instances
+  #   # => ServerArray#attributes[:instances]
+  #   => [{:nickname => "web #1", :resource_uid => "i-12345", ...},
+  #      {:nickname => "web #2", :resource_uid => "i-67890", ...}]
+  def instances
+    # first access
+    if self.attributes[:instances].nil?
+      self.attributes[:instances] = self.class.instances(self.id) rescue nil
+    end
+
+    self.attributes[:instances]
+  end
 end

data/lib/right_resource.rb

@@ -39,6 +39,6 @@ require 'right_resource/macro'
 require 'right_resource/credential'
 
 module RightResource
-  VERSION = '0.4.0'
+  VERSION = '0.4.2'
   API_VERSION = "1.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rightresource
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Satoshi Ohki
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-27 00:00:00 +09:00
+date: 2011-10-01 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,12 +24,13 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
+        - 1
         - 0
-        version: "0"
+        version: "1.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -38,12 +39,13 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
+        - 1
         - 0
-        version: "0"
+        version: "1.0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -52,12 +54,14 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 27
         segments: 
         - 0
-        version: "0"
+        - 1
+        - 0
+        version: 0.1.0
   type: :runtime
   version_requirements: *id003
 description: |
@@ -115,6 +119,8 @@ rdoc_options:
 - RightResource API documentation
 - --main
 - README.rdoc
+- --template
+- direct
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -140,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: "RightResource: RightScale Resource API wrapper"