cherby 0.0.5 → 0.0.6

data/cherby.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "cherby"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
   s.summary = "Cherwell-Ruby bridge"
   s.description = <<-EOS
     Cherby is a Ruby wrapper for the Cherwell Web Service.

data/lib/cherby/cherwell.rb

@@ -54,21 +54,22 @@ module Cherby
       rescue => e
         # This can happen if a bad URL is given
         raise Cherby::LoginFailed, e.message
-      else
-        if response.body[:login_response][:login_result] == true
-          # FIXME: Using the workaround described in this issue:
-          #   https://github.com/savonrb/savon/issues/363
-          # because the version recommended in the documentation:
-          #   auth_cookies = response.http.cookies
-          # does not work, giving:
-          #   NoMethodError: undefined method `cookies' for #<HTTPI::Response:0x...>
-          @client.globals[:headers] = {"Cookie" => response.http.headers["Set-Cookie"]}
-          return true
-        # This can happen if invalid credentials are given
-        else
-          raise Cherby::LoginFailed, "Cherwell returned false status"
-        end
       end
+
+      # This can happen if invalid credentials are given
+      if response.body[:login_response][:login_result] == false
+        raise Cherby::LoginFailed, "Cherwell returned false status"
+      end
+
+      # Store cookies so subsequent requests will be authorized
+      @client.cookies = response.http.cookies
+
+      # Double-check that login worked
+      if self.last_error
+        raise Cherby::LoginFailed, "Cherwell returned error: '#{self.last_error}'"
+      end
+
+      return true
     end
 
     # Log out of Cherwell.

data/lib/cherby/client.rb

@@ -26,6 +26,9 @@ module Cherby
       super(:wsdl => wsdl_url, :log => verbose_logging)
     end
 
+    # Allow setting cookies
+    attr_accessor :cookies
+
     # Call a given SOAP method with an optional body.
     #
     # @example
@@ -52,7 +55,7 @@ module Cherby
       response_field = (method.to_s + '_response').to_sym
       result_field = (method.to_s + '_result').to_sym
       # Submit the request
-      response = self.call(method, :message => body)
+      response = self.call(method, :message => body, :cookies => self.cookies)
       return response.to_hash[response_field][result_field]
     end
 

data/spec/cherwell_spec.rb

@@ -32,13 +32,22 @@ describe Cherby::Cherwell do
   end #initialize
 
   describe "#login" do
-    it "success when Cherwell returns a true status" do
+    it "returns true when Cherwell returns true with nil last_error" do
       login_response = savon_response('Login', 'true')
-      savon.expects(:login).with(:message => :any).
-        returns(login_response)
+      savon.expects(:login).with(:message => :any).returns(login_response)
+      @cherwell.stub(:last_error => nil)
       @cherwell.login.should be_true
     end
 
+    it "raises Cherby::LoginFailed when Cherwell returns true, but last_error is non-nil" do
+      login_response = savon_response('Login', 'true')
+      savon.expects(:login).with(:message => :any).returns(login_response)
+      @cherwell.stub(:last_error => "Kaboom")
+      lambda do
+        @cherwell.login
+      end.should raise_error(Cherby::LoginFailed, /Cherwell returned error/)
+    end
+
     it "raises Cherby::LoginFailed when client.login raises any exception" do
       error = "Arbitrary exception message"
       @cherwell.client.stub(:call).with(:login, :message => anything).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cherby
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors: