rightresource 0.3.2 → 0.3.3

data/lib/right_resource/base.rb

@@ -87,6 +87,7 @@ module RightResource
 
       # RestFul Method
       def action(method, path, params={})
+        connection.clear
         case method
         when :get
           connection.get(path, params)
@@ -96,6 +97,8 @@ module RightResource
           connection.put(path, params)
         when :delete
           connection.delete(path, params)
+        else
+          raise ArgumentError, "Unsupported HTTP method!!"
         end
       rescue => e
         logger.error("#{e.class}: #{e.pretty_inspect}")
@@ -138,7 +141,6 @@ module RightResource
         connection.clear
         result = format.decode(connection.get(path || [])).map do |resource|
           correct_attributes(resource)
-          resource
         end
         instantiate_collection(result)
       rescue => e
@@ -166,8 +168,6 @@ module RightResource
         connection.clear
         result = format.decode(connection.get(path)).tap do |resource|
           correct_attributes(resource)
-          resource[:id] = resource[:href].match(/[0-9]+$/).to_s.to_i
-          resource
         end
         instantiate_record(result)
       rescue => e
@@ -210,11 +210,13 @@ module RightResource
       end
 
       # Update resource
-#      def update(id, params={})
-#        #TODO: refactor
-#        path = element_path(id)
-#        connection.put(path, params)
-#      end
+      def update(id, params={})
+        resource = self.show(id)
+        return nil if resource.nil?
+
+        resource.update_attributes(params)
+        resource.save
+      end
 
       # Delete resource
       # Example:
@@ -224,6 +226,7 @@ module RightResource
       #   Server.destory(server.id)
       def destory(id)
         path = element_path(id)
+        connection.clear
         connection.delete(path)
       end
 
@@ -254,27 +257,28 @@ module RightResource
       # '-'(dash) is included but not '_'(under score) in AWS Parameter keys.
       # On the other hand '_'(under score) is included in RightScale Parameter keys
       # e.g. Hash["ip-address"] -> Hash[:ip_address], Hash["deployment_href"] -> Hash[:deployment_href]
-      def correct_attributes(attributes)
-        return unless attributes.is_a?(Hash)
+      def correct_attributes(attrs)
+        return unless attrs.is_a?(Hash)
 
-        attributes.alter_keys
-        attributes.each do |key,value|  # recursive
-          attributes[key] =
+        attrs.alter_keys
+        attrs.each do |key,value|  # recursive
+          attrs[key] =
             case value
             when Array
-              value.map do |attrs|
-                if attrs.is_a?(Hash)
-                  correct_attributes(attrs)
+              value.map do |a|
+                if a.is_a?(Hash)
+                  a.dup.alter_keys rescue a.alter_keys
                 else
-                  attrs.dup rescue attrs
+                  a.dup rescue a
                 end
               end
             when Hash
-              correct_attributes(value)
+              value.dup.alter_keys rescue value.alter_keys
             else
               value.dup rescue value
             end
         end
+        attrs
       end
 
       protected
@@ -330,52 +334,68 @@ module RightResource
     #  self.class.known_attributes + self.attributes.keys.map(&:to_s)
     end
 
-    # Duplicate resource
+    # Duplicate resource without save
     def dup
       self.class.new.tap do |resource|
         resource.attributes = @attributes.reject {|key,value| key == :href}
-        resource.load_accessor(resource.attributes)
       end
     end
 
-    def initialize(attributes={})
-      # sub-resource4json's key name contains '-'
-      @attributes = {}
-      load_attributes(attributes)
-      if @attributes
-        if self.class.resource_id && self.class.status_code == 201
-          @id = self.class.resource_id
-        else
-          @id = @attributes[:href].match(/\d+$/).to_s if @attributes[:href]
-        end
-        load_accessor(@attributes)
+    # Duplicate resource with save
+    def clone
+      resource = dup
+      resource.save
+    end
+
+    def initialize(attrs={})
+      if self.class.resource_id && self.class.status_code == 201
+        @id = self.class.resource_id
+      else
+        @id = attrs[:href].match(/\d+$/).to_s if attrs[:href]
       end
+
+      @attributes = {}
+      # sub-resource4json's key name contains '-'
+      loads(attrs)
       yield self if block_given?
     end
 
-    def load_attributes(attributes)
-      raise ArgumentError, "expected an attributes Hash, got #{attributes.pretty_inspect}" unless attributes.is_a?(Hash)
-      @attributes = self.class.correct_attributes(attributes)
+    def loads(attrs)
+      raise ArgumentError, "expected an attributes Hash, got #{attrs.pretty_inspect}" unless attrs.is_a?(Hash)
+
+      attrs.each do |key,value|  # recursive
+        @attributes[key] =
+          case value
+          when Array
+            value.map do |a|
+              if a.is_a?(Hash)
+                a.dup.alter_keys rescue a.alter_keys
+              else
+                a.dup rescue a
+              end
+            end
+          when Hash
+            value.dup.alter_keys rescue value.alter_keys
+          else
+            value.dup rescue value
+          end
+      end
       self
     end
 
-    def update_attributes(attributes)
-      load_attributes(attributes) && load_accessor(attributes) && save
+    # reload attributes of resource from the rightscale web api(discard local modified)
+    def reload
+      self.loads(self.class.show(self.id).attributes)
     end
 
-    def load_accessor(attributes)
-      raise ArgumentError, "expected an attributes Hash, got #{attributes.pretty_inspect}" unless attributes.is_a?(Hash)
-      attributes.each_pair do |key, value|
-        instance_variable_set("@#{key}", value) # Initialize instance variables
-        self.class.class_eval do
-          define_method("#{key}=") do |new_value| # ex. obj.key = new_value
-            instance_variable_set("@#{key}", new_value)
-          end
-          define_method(key) do
-            instance_variable_get("@#{key}")
-          end
-        end
-      end
+    # Updates a single attribute and then saves the object.
+    def update_attribute(name, value)
+      self.send("#{name}=".to_sym, value)
+      self.save
+    end
+
+    def update_attributes(attrs)
+      loads(attrs) && save
     end
 
     def new?
@@ -388,15 +408,13 @@ module RightResource
     end
 
     def destory
+      connection.clear
       connection.delete(element_path)
     end
 
     # For checking <tt>respond_to?</tt> without searching the attributes (which is faster).
     alias_method :respond_to_without_attributes?, :respond_to?
 
-    # A method to determine if an object responds to a message (e.g., a method call). In Active Resource, a Person object with a
-    # +name+ attribute can answer <tt>true</tt> to <tt>my_person.respond_to?(:name)</tt>, <tt>my_person.respond_to?(:name=)</tt>, and
-    # <tt>my_person.respond_to?(:name?)</tt>.
     def respond_to?(method, include_priv = false)
       method_name = method.to_s
       if attributes.nil?
@@ -422,7 +440,9 @@ module RightResource
         pair = URI.decode({resource_name.to_sym => attrs}.to_params).split('&').map {|l| l.split('=')}
         h = Hash[*pair.flatten]
         @@non_rs_params.each {|key| h[key.to_s] = self.attributes[key] if self.attributes.has_key?(key) && self.attributes[key]}
+        connection.clear
         connection.put(element_path, h)
+        self
       end
 
       def create
@@ -430,9 +450,11 @@ module RightResource
         pair = URI.decode({resource_name.to_sym => attrs}.to_params).split('&').map {|l| l.split('=')}
         h= Hash[*pair.flatten]
         @@non_rs_params.each {|key| h[key.to_s] = self.attributes[key] if self.attributes.has_key?(key) && self.attributes[key]}
+        connection.clear
         connection.post(collection_path, h)
         self.id = self.class.resource_id
         self.href = self.class.headers[:location]
+        self
       end
 
       def resource_name
@@ -454,12 +476,12 @@ module RightResource
         if method_name =~ /(=|\?)$/
           case $1
           when "="
-            attributes[$`.to_sym] = arguments.first
+            self.attributes[$`.to_sym] = arguments.first
           when "?"
-            attributes[$`.to_sym]
+            self.attributes[$`.to_sym]
           end
         else
-          return attributes[method_symbol] if attributes.include?(method_symbol)
+          return self.attributes[method_symbol] if self.attributes.include?(method_symbol)
           # not set right now but we know about it
 #          return nil if known_attributes.include?(method_name)
           super

data/lib/right_resource/ec2_elastic_ip.rb

@@ -1,3 +1,6 @@
 class Ec2ElasticIp < RightResource::Base
+  class << self
+    undef :update
+  end
   undef :update
 end

data/lib/right_resource/multi_cloud_image.rb

@@ -1,6 +1,6 @@
 class MultiCloudImage < RightResource::Base
   class << self
-    undef :create, :destory
+    undef :create, :update, :destory
   end
   undef :create, :update, :destory
 end

data/lib/right_resource/right_script.rb

@@ -1,6 +1,6 @@
 class RightScript < RightResource::Base
   class << self
-    undef :create, :destory
+    undef :create, :update, :destory
   end
   undef :create, :update, :destory
 end

data/lib/right_resource/s3_bucket.rb

@@ -1,3 +1,6 @@
 class S3Bucket < RightResource::Base
+  class << self
+    undef :update
+  end
   undef :update
 end

data/lib/right_resource/server_template.rb

@@ -1,5 +1,6 @@
 class ServerTemplate < RightResource::Base
   class << self
+    # Get scripts added to the ServerTemplate every phases
     # === Parameters
     # * _id_ - ServerTemplate id
     # * _params_ - Hash (keys = [:phase]) ex. 'boot', 'operational', 'decommission' if not defined, all phases

data/lib/right_resource/status.rb

@@ -1,6 +1,6 @@
 class Status < RightResource::Base
   class << self
-    undef :index, :create, :destory
+    undef :index, :create, :update, :destory
   end
   undef :create, :update, :destory
 end

data/lib/right_resource/tag.rb

@@ -14,7 +14,7 @@
 #     p Tag.search(:resource_href => ec2_href)
 class Tag < RightResource::Base
   class << self
-    undef :index, :show, :create, :destory
+    undef :index, :show, :create, :update, :destory
 
     [:set, :unset].each do |act_method|
       define_method(act_method) do |params|
@@ -54,10 +54,10 @@ class Tag < RightResource::Base
         if params[:resource_type] == "ec2_instance"
           resource_name = "Server"
         else
-          resource_name = params[:resource_type].split(/-/).map {|r| r.capitalize}.join
+          resource_name = params[:resource_type].split(/-/).map {|r| r.capitalize}.join # underscore2pascal
         end
-        klass = const_get(resource_name)
-        klass.instantiate_collection(result)
+        klass = const_get(resource_name)  # Get class name
+        klass.instantiate_collection(result)  # Get every class instance
       end
     rescue => e
       logger.error("#{e.class}: #{e.pretty_inspect}")
@@ -67,6 +67,7 @@ class Tag < RightResource::Base
       logger.debug {"#{__FILE__} #{__LINE__}: #{self.class}\n#{self.pretty_inspect}\n"}
     end
 
+    # Get all taggable resources name (server, server_array, server_template, etc.)
     # === Examples
     #   Tag.taggable_resources
     def taggable_resources

data/lib/right_resource.rb

@@ -38,6 +38,6 @@ require 'right_resource/macro'
 require 'right_resource/credential'
 
 module RightResource
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
   API_VERSION = "1.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rightresource
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Satoshi Ohki
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-24 00:00:00 +09:00
+date: 2010-11-29 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency