rspreedly 0.1.6 → 0.1.8

data/README.rdoc

@@ -63,10 +63,10 @@ View all plans
     
 Raise an invoice, and pay it
 
-    invoice = Invoice.new(:subscription_plan_id => 5, :subscriber => sub)
+    invoice = RSpreedly::Invoice.new(:subscription_plan_id => 5, :subscriber => sub)
     invoice.save
     
-    payment = RSpreedly::PaymentMethod::CreditCard(:card_type => 'visa', :number => '123456', ...)
+    payment = RSpreedly::PaymentMethod::CreditCard.new(:card_type => 'visa', :number => '123456', ...)
     invoice.pay(payment)
 
 Error messages

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.8

data/lib/rspreedly/base.rb

@@ -8,29 +8,35 @@ module RSpreedly
     attr_reader :errors
 
     def self.api_request(type, path, options={})
-      path = "/#{::RSpreedly::Config.site_name}#{path}"
+      site_name = RSpreedly::Config.site_name.class == Array ? RSpreedly::Config.site_name.first : RSpreedly::Config.site_name
+      api_key = RSpreedly::Config.api_key.class == Array ?  RSpreedly::Config.api_key.first : RSpreedly::Config.api_key
+      path = "/#{site_name}#{path}"
+
       options.merge!({
-        :basic_auth => {:username => RSpreedly::Config.api_key, :password => 'X'},
+        :basic_auth => {:username => api_key, :password => 'X'},
         :headers    => {"Content-Type" => 'application/xml'}
       })
       self.do_request(type, path, options)
     end
 
     def self.do_request(type, path, options)
-      response  = self.send(type.to_s, path, options)      
-      message   = "#{response.code}: #{response.body}"
+      begin
+        response = self.send(type.to_s, path, options)      
+      rescue SocketError
+        raise(RSpreedly::Error::ConnectionFailed.new, "Failed to connect to payment gateway.")
+      end
       
       case response.code.to_i
       when 401
-        raise(RSpreedly::Error::AccessDenied.new(response), message)
+        raise(RSpreedly::Error::AccessDenied.new(response), response.body)
       when 403
-        raise(RSpreedly::Error::Forbidden.new(response), message)
+        raise(RSpreedly::Error::Forbidden.new(response), response.body)
       when 422
-        raise(RSpreedly::Error::BadRequest.new(response), message)
+        raise(RSpreedly::Error::BadRequest.new(response), response.body)
       when 404
-        raise(RSpreedly::Error::NotFound.new(response), message)
+        raise(RSpreedly::Error::NotFound.new(response), response.body)
       when 504
-        raise(RSpreedly::Error::GatewayTimeout.new(response), message)
+        raise(RSpreedly::Error::GatewayTimeout.new(response), response.body)
       end      
 
       response
@@ -58,6 +64,8 @@ module RSpreedly
           else
             @errors = [e.response.body]
           end      
+        else
+          @errors = [e.message]
         end
         raise
       end
@@ -79,7 +87,7 @@ module RSpreedly
       xml << "<#{tag}>" unless no_tag
       xml << "<#{inner}>" if inner
       self.instance_variables.each do |var|
-        name = var.gsub('@', '')
+        name = var.to_s.gsub('@', '')
         next if exclude.include?(name.to_sym)
         value = self.instance_variable_get(var)
         if value.respond_to?(:to_xml)

data/lib/rspreedly/error.rb

@@ -9,10 +9,11 @@ module RSpreedly
       end
     end
     
-    class AccessDenied    < Base;             end # 401 errors    
-    class Forbidden       < Base;             end # 403 errors
-    class BadRequest      < Base;             end # 422 errors
-    class NotFound        < Base;             end # 404 errors
-    class GatewayTimeout  < Base;             end # 504 errors  
+    class AccessDenied    < Base; end # 401 errors    
+    class Forbidden       < Base; end # 403 errors
+    class BadRequest      < Base; end # 422 errors
+    class NotFound        < Base; end # 404 errors
+    class GatewayTimeout  < Base; end # 504 errors  
+    class ConnectionFailed< Base; end 
   end  
 end

data/rspreedly.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspreedly}
-  s.version = "0.1.6"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Livsey"]
-  s.date = %q{2009-11-04}
+  s.date = %q{2009-11-25}
   s.email = %q{richard@livsey.org}
   s.extra_rdoc_files = [
     "LICENSE",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspreedly
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors: 
 - Richard Livsey
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 +01:00
+date: 2009-11-25 00:00:00 +01:00
 default_executable: 
 dependencies: []