jamesn-softlayer-ruby 0.6.1.0 → 0.6.3.0

data/Changes

@@ -1,4 +1,10 @@
 
+Change since 0.6.1
+
+Silenced the name space warning (I think this is a bug in soap4r)
+Created an exception class that's really used as a proxy for soap exceptions.  This exception is 
+raised in a few places where needed.
+
 Changes since 0.6.0.
 
 Implement SoftLayer::Base#call to make dynamic method calls possible.

data/lib/softlayer.rb

@@ -47,7 +47,7 @@ module SoftLayer
   def SoftLayer::declareClasses(args)
     classes = args[:ruby]
     services = args[:soap]
-    
+
     unless (services.nil? || services.empty?)
       services.each do |s|
         c = s.gsub(/_/,'::')
@@ -60,7 +60,7 @@ module SoftLayer
       k.cacheWSDL
     end
   end
-  
+
   # Create a Ruby class to match an SLAPI WSDL endpoint.
   # Args:
   # +class+:: The name of the class to create in Ruby format.
@@ -111,11 +111,11 @@ module SoftLayer
     def on_simple_outbound
       @out
     end
-        
+
     def [](k)
       return @out[k]
     end
-    
+
     def []=(k,v)
       @out[k]=v
     end
@@ -123,7 +123,7 @@ module SoftLayer
 
   # A class to hold the object mask.
   class ObjectMask < SOAP::Header::SimpleHandler
-    
+
     def initialize(tag, out)
       @out = out
       super(XSD::QName.new(nil, tag))
@@ -132,19 +132,19 @@ module SoftLayer
     def on_simple_outbound
       { 'mask' => @out }
     end
-    
+
     def [](k)
       @out[k]
     end
-    
+
     def []=(k,v)
       @out[k]=v
     end
   end
-  
+
   class ResultLimit < SOAP::Header::SimpleHandler
     attr_accessor :limit, :offset
-    
+
     # limit should be an array of two elements; limit and offset.
     def initialize(tag, limit)
       @limit = limit[0]
@@ -157,6 +157,23 @@ module SoftLayer
     end
   end
 
+
+  # An Exception proxy class
+  # This doesn't do anything yet, but it probably
+  # will at some point.
+  class Exception < RuntimeError
+
+    def initialize(args)
+      e = args[:exception]
+      message = args[:message] unless args[:message].nil?
+      message = e.message unless e.nil?
+      super(message)
+      
+      @realException = e unless e.nil?
+      @realException = self if @realException.nil?
+    end
+  end
+
   # The Base class for our generated class.
   class BaseClass
 
@@ -190,7 +207,9 @@ module SoftLayer
       @authHeader = Param.new('authenticate', {'username' => @apiUser, 'apiKey' => @apiKey})
 
       self.class.cacheWSDL
-      @slapi = @@wsdl[self.soapClass].create_rpc_driver
+      @slapi = @@wsdl[self.soapClass].create_rpc_driver unless @@wsdl[self.soapClass].nil?
+      raise SoftLayer::Exception.new(:message => 'WSDL endpoint not available.') if @slapi.nil?
+      
       self.debug=args[:debug] unless args[:debug].nil?
     end
 
@@ -204,7 +223,7 @@ module SoftLayer
       @slapiObject = self.getObject if @slapiobject.nil?
       return @slapiObject[key.to_s]
     end
-    
+
     def setObject(obj)
       @slapiObject = obj
     end
@@ -236,11 +255,11 @@ module SoftLayer
       end
       @slapiObject = nil
     end
-    
+
     def objectMask
       return @objectMask
     end
-    
+
     # Set an object wide result set (or clear it)
     # arg can be one of three things:
     # * nil clears the resultLimit
@@ -256,11 +275,11 @@ module SoftLayer
         @resultLimit = arg
       end
     end
-    
+
     def resultLimit
       return @resultLimit
     end
-    
+
 
     # Make a direct api call.  Paramaters are a hash where the key is passed to ParamHeader as the tag, and the value
     # is passed as the tag content, unless it's a magic paramater.
@@ -273,7 +292,7 @@ module SoftLayer
     # is exhausted.  If no limit is provided with the block a limit of [1,0] is assumed initially.
     # Aliased to #method_missing.
     def slapiCall(method, args = { }, &block)
-      
+
       initParam = args[:initParam] unless args[:initParam].nil?
       args.delete(:initParam) unless args[:initParam].nil?
       initParam = Param.new("#{self.soapClass}InitParameters", { 'id' => initParam }) unless initParam.nil?
@@ -294,13 +313,13 @@ module SoftLayer
       @slapi.headerhandler << initParam unless @slapi.headerhandler.include?(@authHeader)
       @slapi.headerhandler << @objectMask unless @objectMask.nil?
       @slapi.headerhandler << resultLimit unless resultLimit.nil?
-      
+
       if block_given?
         go=true
         resultLimit = ResultLimit.new('resultLimit', [1,0]) if resultLimit.nil? # this is broken.
         @slapi.headerhandler << resultLimit unless @slapi.headerhandler.include?(resultLimit)
         while(go) do
-          res = @slapi.call(method.to_s)
+          res = realCall(method.to_s)
           yield(res) unless (res.nil? || (res.respond_to?(:empty) && res.empty?))
           go = false if res.nil?
           go = false if (res.respond_to?(:size) && (res.size < resultLimit.limit))
@@ -309,19 +328,17 @@ module SoftLayer
         headerClean(resultLimit,paramHeaders)
         return true
       else
-        res = @slapi.call(method.to_s)
+        res = realCall(method.to_s)
         headerClean(resultLimit,paramHeaders)
         return res
       end
     end
 
-    # Alias the above call method to #method_missing.
+    # Alias the above slapiCall to #method_missing.
     alias_method  :method_missing, :slapiCall
-    
-    def call(method, args = { }, &block)
-      return slapiCall(method, args, &block)
-    end
-    
+    # Alias slapiCall to #call specifically because of it's special paramter list.
+    alias_method :call, :slapiCall
+
     # Enable (or disable) debug. (paramater is the IO handler to write to)
     def debug=(dev)
       @slapi.wiredump_dev=(dev)
@@ -331,12 +348,16 @@ module SoftLayer
     # Returns false of we couldn't parse the WSDL.
     def self.cacheWSDL
       return unless @@wsdl[self.soapClass].nil?
-      
+
       begin
+        # XXX: Silence soap4r's bogus use of Kernel#warn
+        v = $VERBOSE
+        $VERBOSE=nil
         @@wsdl[self.soapClass] = SOAP::WSDLDriverFactory.new(self.wsdlUrl)
+        $VERBOSE = v
         return true
       rescue => e
-        return false
+        return SoftLayer::Exception.new(:exception => e)
       end 
     end
 
@@ -354,14 +375,27 @@ module SoftLayer
     def self.soapClass
       self.name.to_s.gsub(/::/, '_')
     end
-    
+
     private
-    
+
     # Clean the headers out of the driver.
     def headerClean(rl,ha)
       @slapi.headerhandler.delete(rl)
       ha.each { |h| @slapi.headerhandler.delete(h) }
-      
+    end
+
+    # This really calls the soap method.
+    # This catches all exceptions, creates a copy of our exception proxy class
+    # and copies the message.  This insures exceptions make it up to user code
+    # as opposed to soap4r's tendancy to just exit when there's a soap exception.
+    #  todo:  Add header processing/clean up.
+    def realCall(m)
+      begin
+        return @slapi.call(m)
+      rescue => e
+        re = SoftLayer::Exception.new(:exception => e)
+        raise re
+      end
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jamesn-softlayer-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.6.1.0
+  version: 0.6.3.0
 platform: ruby
 authors: 
 - James Nuckolls
@@ -9,7 +9,7 @@ autorequire: softlayer
 bindir: bin
 cert_chain: []
 
-date: 2009-04-19 13:00:00 -07:00
+date: 2009-04-19 21:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency