steamcannon-deltacloud-client 0.1.0.4 → 0.1.0.5

data/lib/base_object.rb

@@ -192,7 +192,7 @@ module DeltaCloud
 
     end
 
-    class StateFullObject < ActionObject
+    class StatefulObject < ActionObject
       attr_reader :state
 
       def initialize(opts={}, &block)
@@ -263,33 +263,28 @@ module DeltaCloud
     end
 
     def self.add_class(name, parent=:base)
-      parent_class = case parent
-        when :base then 'BaseObject'
-        when :action then 'ActionObject'
-        when :state then 'StateFullObject'
-      end
+      parent = parent.to_s
+      parent_class = "#{parent.classify}Object"
       @defined_classes ||= []
-      type_name = "::DeltaCloud::API::#{parent.to_s.classify}"
-      class_name = "#{type_name}::#{name.classify}"
-      unless @defined_classes.include?(type_name)
-        DeltaCloud::API.class_eval("class #{parent.to_s.classify}; end") 
-        @defined_classes << type_name
-      end
-      
-      type_const = DeltaCloud::API.const_get(parent.to_s.classify)
+      class_name = "#{parent.classify}::#{name.classify}"
       unless @defined_classes.include?(class_name)
-        type_const.class_eval("class #{name.classify} < DeltaCloud::#{parent_class}; end")
+        DeltaCloud::API.class_eval("class #{class_name} < DeltaCloud::#{parent_class}; end")
         @defined_classes << class_name
       end
       
-      type_const.const_get(name.classify)
+      DeltaCloud::API.const_get(parent.classify).const_get(name.classify)
     end
 
     def self.guess_model_type(response)
       response = Nokogiri::XML(response.to_s)
       return :action if ((response/'//actions').length == 1) and ((response/'//state').length == 0)
-      return :state if ((response/'//actions').length == 1) and ((response/'//state').length == 1)
+      return :stateful if ((response/'//actions').length == 1) and ((response/'//state').length == 1)
       return :base
     end
 
+    class API
+      class Action; end
+      class Base; end
+      class Stateful; end
+    end
 end

data/lib/deltacloud.rb

@@ -159,7 +159,7 @@ module DeltaCloud
           end
         end
 
-        # If there are actions, add they to ActionObject/StateFullObject
+        # If there are actions, add them to ActionObject/StatefulObject
         if attribute.name == 'actions'
           (attribute/'link').each do |link|
             obj.add_action_link!(item['id'], link)
@@ -287,7 +287,7 @@ module DeltaCloud
 
     # Re-raise backend errors as on exception in client with message from
     # backend
-    class BackendError < Exception
+    class BackendError < StandardError
       def initialize(opts={})
         @message = opts[:message]
       end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
     - 0
     - 1
     - 0
-    - 4
-  version: 0.1.0.4
+    - 5
+  version: 0.1.0.5
 platform: ruby
 authors: 
   - Red Hat, Inc.
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 -05:00
+date: 2010-12-08 00:00:00 -05:00
 default_executable: deltacloudc
 dependencies: 
   - !ruby/object:Gem::Dependency