reward_station 0.0.5 → 0.0.6

data/lib/reward_station/client.rb

@@ -1,6 +1,8 @@
 module RewardStation
   class Client
 
+    attr_accessor :token
+
     def initialize options = {}
       [:client_id, :client_password].each do |arg|
         raise ArgumentError, "Missing required option '#{arg}'" unless options.has_key? arg
@@ -115,22 +117,8 @@ module RewardStation
 
     protected
 
-    def update_token
-      @token = return_token
-      @new_token_callback.call(@token) if @new_token_callback
-    end
-
-    def inject_token params = {}
-      (params[:body] ||= {})['Token'] = @token
-    end
-
-    def request_with_token method_name, params
-      update_token unless @token
-
-      retry_with_token :tries => 2 do
-        inject_token params
-        request method_name, params
-      end
+    def get_response method_name, params
+      Client.get_client.request(:wsdl, method_name , params).to_hash
     end
 
     def request method_name, params
@@ -141,10 +129,10 @@ module RewardStation
       result = response[:"#{method_name}_response"][:"#{method_name}_result"]
 
       unless (error_message = result.delete(:error_message).to_s).nil?
-        raise InvalidToken if error_message.start_with?("Invalid Token")
+        raise(InvalidToken, error_message) if error_message.start_with?("Invalid Token")
         raise InvalidAccount if error_message.start_with?("Invalid Account Number")
         raise InvalidUser if error_message.start_with?("Invalid User")
-        raise UserAlreadyExists if error_message.start_with?("User Name:") && error_message.end_with?("Please enter a different user name.")
+        raise(UserAlreadyExists, error_message) if error_message.start_with?("User Name:") && error_message.end_with?("Please enter a different user name.")
         raise MissingInformation if error_message.start_with?("The following information is missing:")
       end
 
@@ -155,8 +143,22 @@ module RewardStation
       raise ConnectionError.new
     end
 
-    def get_response method_name, params
-      Client.get_client.request(:wsdl, method_name , params).to_hash
+    def update_token
+      @token = return_token
+      @new_token_callback.call(@token) if @new_token_callback
+    end
+
+    def inject_token params = {}
+      (params[:body] ||= {})['Token'] = @token
+    end
+
+    def request_with_token method_name, params
+      update_token unless @token
+
+      retry_with_token :tries => 2 do
+        inject_token params
+        request method_name, params.dup
+      end
     end
 
     private

data/lib/reward_station/version.rb

@@ -1,3 +1,3 @@
 module RewardStation
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: reward_station
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Stepan Filatov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-21 00:00:00 +04:00
+date: 2011-07-29 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency