etapper 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/etapper.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{etapper}
-  s.version = "0.0.0"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Stephen Eley"]
-  s.date = %q{2009-10-16}
+  s.date = %q{2010-01-21}
   s.email = %q{seley@aarweb.org}
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -709,3 +709,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, [">= 0"])
   end
 end
+

data/lib/etapper/client.rb

@@ -65,35 +65,56 @@ module Etapper
       unless connected?
         raise ConnectionError, "Username is required!" unless username
         raise ConnectionError, "Password is required!" unless password
-        result = @driver.login(@username, @password)
-        if result == ''
-          @connected = true
-        else  # May need a redirect
-          newurl = URI.parse(result)
-          newurl.query = nil   # Strip off the '?wsdl' parameter at the end
-          driver.endpoint_url = newurl.to_s
-          @connected = connect
+        begin
+          result = driver.login(@username, @password)
+          if result == ''
+            @connected = true
+          else  # May need a redirect
+            newurl = URI.parse(result)
+            newurl.query = nil   # Strip off the '?wsdl' parameter at the end
+            driver.endpoint_url = newurl.to_s
+            @connected = connect
+          end
+        rescue  # We just can't connect right now, it seems
+          @connected = false
+          false
         end
       end
     end
     
     def disconnect
-      driver.logout if connected?
-      @connected = false
-      true
+      begin
+        driver.logout if connected?
+        true
+      rescue  # We don't care what went wrong, we just need to know we're not connected
+        false
+      ensure
+        @connected = false
+      end
     end
     
     # Our primary proxy. Sends anything we don't know about to the driver for processing.
     def method_missing(method, *params)
       raise NoMethodError if method == :driver  # This is protected for a reason
-      unless connected?
-        if autoconnect
-          connect
-        else
-          raise ConnectionError, "Autoconnect is disabled! Use the 'connect' method before making any API calls."
+      tries = 0
+      begin
+        unless connected?
+          if autoconnect
+            connect
+          else
+            raise ConnectionError, "Autoconnect is disabled! Use the 'connect' method before making any API calls."
+          end
         end
-      end
-      driver.send(method, *params)
+        driver.send(method, *params)
+      rescue StandardError, SocketError => e
+        # Try three times, waiting a few seconds and forcing login again each time
+        while tries < 3
+          sleep (tries += 1)
+          disconnect
+          retry
+        end
+        raise  # We give up
+      end 
     end
  
   protected

data/spec/authentication_spec.rb

@@ -92,12 +92,12 @@ describe "Authentication" do
   end
   
   it "doesn't try to connect without a username" do
-    client.expects(:username).returns(nil)
+    client.stubs(:username).returns(nil)
     lambda {client.fakeMethod}.should raise_error(Etapper::ConnectionError, "Username is required!")
   end
 
   it "doesn't try to connect without a password" do
-    client.expects(:password).returns(nil)
+    client.stubs(:password).returns(nil)
     lambda {client.fakeMethod}.should raise_error(Etapper::ConnectionError, "Password is required!")
   end
   
@@ -125,9 +125,9 @@ describe "Authentication" do
       client.connect
     end
     
-    it "bombs out on any failure" do
+    it "returns false on any failure" do
       @dummy.expects(:login).raises(MockFault, "Account Locked Out")
-      lambda{client.connect}.should raise_error
+      client.connect.should be_false
     end
   end
   

data/spec/client_spec.rb

@@ -17,15 +17,15 @@ describe "Bare client" do
   end
   
   it "knows its username" do
-    client.username.should == 'etapper_johntest'
+    client.username.should == 'etapper_sandbox'
   end
 
   it "knows its password" do
-    client.password.should == 'mypass'
+    client.password.should == 'mypass1234'
   end
   
   it "lets you set a password" do
-    lambda{client.password = 'mypass'}.should_not raise_error
+    lambda{client.password = 'mypass1234'}.should_not raise_error
   end
   
   it "knows if it's connected" do

data/spec/proxying_spec.rb

@@ -3,8 +3,8 @@ require File.dirname(__FILE__) + '/spec_helper'
 describe "Method Proxying" do
   before(:each) do
     @client = Etapper::Client.instance
-    @client.username = 'etapper_johntest'
-    @client.password = 'mypass'
+    @client.username = 'etapper_sandbox'
+    @client.password = 'mypass1234'
   end
   
   it "attempts to call methods on the driver if they aren't defined by the client" do

data/spec/spec_helper.rb

@@ -7,8 +7,8 @@ class TestError < StandardError; end
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 $:.unshift(File.dirname(__FILE__))
 
-ENV["ETAPPER_USERNAME"] = 'etapper_johntest'
-ENV["ETAPPER_PASSWORD"] = 'mypass'
+ENV["ETAPPER_USERNAME"] = 'etapper_sandbox'
+ENV["ETAPPER_PASSWORD"] = 'mypass1234'
 
 require 'etapper'
 require 'stub_driver'

data/spec/stub_driver.rb

@@ -28,7 +28,7 @@ share_as :MockDriver do
     @dummy = stub('driver') do  
     #   stubs(:endpoint_url).returns('### ORIGINAL URL ###')
     #   # Our good and bad logins
-      stubs(:login).with('etapper_johntest','mypass').returns('')
+      stubs(:login).with('etapper_sandbox','mypass1234').returns('')
       stubs(:login).with('etapper_jilltest','anotherpass').returns('http://redirect.etapestry.com/v2messaging/service?wsdl')
     #   stubs(:login).with('etapper_carltest','anotherpass').raises(MockFault, 'Account Password Expired')
     #   stubs(:login).with('etapper_fredtest','athirdpass').raises(MockFault, 'Account Locked Out')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: etapper
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Stephen Eley
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-13 00:00:00 -05:00
+date: 2010-01-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency