rightresource 0.4.4 → 0.4.5

data/lib/right_resource.rb

@@ -42,6 +42,6 @@ require 'right_resource/macro'
 require 'right_resource/credential'
 
 module RightResource
-  VERSION = '0.4.4'
+  VERSION = '0.4.5'
   API_VERSION = "1.0"
 end

data/lib/right_resource/deployment.rb

@@ -4,28 +4,6 @@
 # * +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
@@ -33,15 +11,4 @@ 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)
-        JSON.parse(json)
+        Crack::JSON.parse(json)
       end
     end
   end

data/lib/right_resource/server.rb

@@ -115,38 +115,4 @@ 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,12 +44,6 @@ 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|
@@ -57,20 +51,4 @@ 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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rightresource
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 4
-  - 4
-  version: 0.4.4
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - Satoshi Ohki