deltacloud-client 0.0.5 → 0.0.6

data/lib/deltacloud.rb

@@ -23,7 +23,7 @@ require 'logger'
 module DeltaCloud
 
   # Get a new API client instance
-  # 
+  #
   # @param [String, user_name] API user name
   # @param [String, password] API password
   # @param [String, user_name] API URL (eg. http://localhost:3001/api)
@@ -39,17 +39,30 @@ module DeltaCloud
     API.new(nil, nil, url).driver_name
   end
 
+  def self.define_class(name)
+    @defined_classes ||= []
+    if @defined_classes.include?(name)
+      self.module_eval("API::#{name}")
+    else
+      @defined_classes << name unless @defined_classes.include?(name)
+      API.const_set(name, Class.new)
+    end
+  end
+
+  def self.classes
+    @defined_classes || []
+  end
+
   class API
     attr_accessor :logger
     attr_reader   :api_uri, :driver_name, :api_version, :features, :entry_points
-    attr_reader   :classes
 
     def initialize(user_name, password, api_url, opts={}, &block)
+      opts[:version] = true
       @logger = opts[:verbose] ? Logger.new(STDERR) : []
       @username, @password = user_name, password
       @api_uri = URI.parse(api_url)
       @features, @entry_points = {}, {}
-      @classes = []
       @verbose = opts[:verbose] || false
       discover_entry_points
       yield self if block_given?
@@ -77,7 +90,7 @@ module DeltaCloud
           define_method model do |*args|
             request(:get, "/#{model}", args.first) do |response|
               # Define a new class based on model name
-              c = Kernel.define_class("#{model.to_s.classify}")
+              c = DeltaCloud.define_class("#{model.to_s.classify}")
               # Create collection from index operation
               base_object_collection(c, model, response)
             end
@@ -86,7 +99,7 @@ module DeltaCloud
           define_method :"#{model.to_s.singularize}" do |*args|
             request(:get, "/#{model}/#{args[0]}") do |response|
               # Define a new class based on model name
-              c = Kernel.define_class("#{model.to_s.classify}")
+              c = DeltaCloud.define_class("#{model.to_s.classify}")
               # Build class for returned object
               base_object(c, model, response)
             end
@@ -201,7 +214,6 @@ module DeltaCloud
           end
         end
       end
-      add_class_record(obj)
       return obj
     end
 
@@ -260,7 +272,7 @@ module DeltaCloud
       instance = nil
 
       request(:post, entry_points[:instances], {}, params) do |response|
-        c = Kernel.define_class("Instance")
+        c = DeltaCloud.define_class("Instance")
         instance = base_object(c, :instance, response)
         yield instance if block_given?
       end
@@ -356,11 +368,6 @@ module DeltaCloud
       }
     end
 
-    def add_class_record(obj)
-      return if self.classes.include?(obj.class)
-      self.classes << obj.class
-    end
-
   end
 
   class Documentation
@@ -429,7 +436,7 @@ module DeltaCloud
       attr_reader :name, :unit, :value, :kind
 
       def initialize(xml, name)
-        @kind, @value, @unit = xml['kind'].to_sym, xml['value'], xml['unit']
+        @name, @kind, @value, @unit = xml['name'], xml['kind'].to_sym, xml['value'], xml['unit']
         declare_ranges(xml)
         self
       end
@@ -470,19 +477,25 @@ end
 
 class String
 
-  # Create a class name from string
-  def classify
-    self.singularize.camelize
+  unless method_defined?(:classify)
+    # Create a class name from string
+    def classify
+      self.singularize.camelize
+    end
   end
 
-  # Camelize converts strings to UpperCamelCase
-  def camelize
-    self.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+  unless method_defined?(:camelize)
+    # Camelize converts strings to UpperCamelCase
+    def camelize
+      self.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+    end
   end
 
-  # Strip 's' character from end of string
-  def singularize
-    self.gsub(/s$/, '')
+  unless method_defined?(:singularize)
+    # Strip 's' character from end of string
+    def singularize
+      self.gsub(/s$/, '')
+    end
   end
 
   # Convert string to float if string value seems like Float
@@ -497,12 +510,3 @@ class String
   end
 
 end
-
-module Kernel
-
-  # Get defined class or declare a new one, when class was not declared before
-  def define_class(name)
-    DeltaCloud.const_get(name) rescue DeltaCloud.const_set(name, Class.new)
-  end
-
-end

data/lib/documentation.rb

@@ -1,4 +1,5 @@
 require 'lib/deltacloud'
+require 'ap'
 
 skip_methods = [ "id=", "uri=" ]
 
@@ -12,86 +13,30 @@ end
 @dc.entry_points.keys.each do |ep|
   @dc.send(ep)
 end
-class_list = @dc.classes
-
-def read_method_description(c, method)
-  if method =~ /es$/
-    "    # Read #{c.downcase} collection from Deltacloud API"
-  else
-    case method
-      when "uri"
-        "    # Return URI to API for this object"
-      when "action_urls"
-        "    # Return available actions API URL"
-      when "client"
-        "    # Return instance of API client"
-      else
-        "    # Get #{method} attribute value from #{c.downcase}"
-    end
-  end
-end
-
-def read_parameters(c, method)
-  out = []
-  if method =~ /es$/
-    out << "    # @param [String, #id] Filter by ID"
-  end
-  out.join("\n")
-end
 
-def read_return_value(c, method)
-  if method =~ /es$/
-    rt = "Array"
-  else
-    rt = "String"
-  end
-  "    # @return [String] Value of #{method}"
-end
+class_list = @dc.classes
 
 out = []
 
-class_list.each do |c|
-  class_name = "#{c}".gsub(/^DeltaCloud::/, '')
-  out << "module DeltaCloud"
-  out << "  class API"
-  @dc.entry_points.keys.each do |ep|
-    out << "# Return #{ep.to_s.classify} object with given id\n"
-    out << "# "
-    out << "# *#{@dc.documentation(ep.to_s).description}*"
-    out << "# @return [#{ep.to_s.classify}]"
-    out << "def #{ep.to_s.gsub(/s$/, '')}"
-    out << "end"
-    out << "# Return collection of #{ep.to_s.classify} objects"
-    out << "# "
-    out << "# *#{@dc.documentation(ep.to_s).description}*"
-    @dc.documentation(ep.to_s, 'index').params.each do |p|
-      out << p.to_comment
-    end
-    out << "# @return [Array] [#{ep.to_s.classify}]"
-    out << "def #{ep}(opts={})"
-    out << "end"
-  end
-  out << "  end"
-  out << "  class #{class_name}"
-  c.instance_methods(false).each do |method|
-    next if skip_methods.include?(method)
-    params = read_parameters(class_name, method)
-    retval = read_return_value(class_name, method)
-    out << read_method_description(class_name, method)
-    out << params if params
-    out << retval if retval
-    out << "    def #{method}"
-    out << "      # This method was generated dynamically from API"
-    out << "    end\n"
-  end
-  out << "  end"
+out << "module DeltaCloud"
+out << "class API"
+@dc.entry_points.keys.each do |method|
+  out << "# @return [#{method.to_s.singularize.classify}]"
+  out << "def #{method}(opts={})"
+  out << "end"
+  out << "# @return #{method.to_s.singularize.classify}"
+  out << "def #{method.to_s.singularize}(id)"
   out << "end"
 end
-
-FileUtils.rm_r('doc') rescue nil
-FileUtils.mkdir_p('doc')
-File.open('doc/deltacloud.rb', 'w') do |f|
-  f.puts(out.join("\n"))
-end
-system("yardoc -m markdown --readme README --title 'Deltacloud Client Library' 'lib/*.rb' 'doc/deltacloud.rb' --verbose")
-FileUtils.rm('doc/deltacloud.rb')
+out << "end"
+out << "end"
+
+ap out
+
+#FileUtils.rm_r('doc') rescue nil
+#FileUtils.mkdir_p('doc')
+#File.open('doc/deltacloud.rb', 'w') do |f|
+#  f.puts(out.join("\n"))
+#end
+#system("yardoc -m markdown --readme README --title 'Deltacloud Client Library' 'lib/*.rb' 'doc/deltacloud.rb' --verbose")
+#FileUtils.rm('doc/deltacloud.rb')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: deltacloud-client
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Red Hat, Inc.
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-29 00:00:00 +02:00
+date: 2010-07-07 00:00:00 +02:00
 default_executable: deltacloudc
 dependencies: 
 - !ruby/object:Gem::Dependency