unresponsys 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3db65d275faee24b555717b26df02af4ba5e3684
-  data.tar.gz: 7df075d3c39fa2811466b27f52e50a6b558fc471
+  metadata.gz: 654fdf045b48c09867a92606442babc46558b77f
+  data.tar.gz: 28ee8d75033acf29035487701471b0286966be31
 SHA512:
-  metadata.gz: fdd5952a174f298d1dd21a7079b0a6385998233bd9d95d1338569e0a79920527e6af43456782a681248a1b037d1ef28ca089b5abc4e5be120a09b18cb5f3a9e7
-  data.tar.gz: 9778034e84170dbb22e97a53a963bc519de92b97d99b88ef12866cb4fb677c6601ef4e501402fa8f820fc9a46411a1c06488397bc3a7fb06b87df3868cdf5e85
+  metadata.gz: a9f2e71ce44a02277286aa746978ce170382661e99bb9391025bcf2538b2e742c064d6556f49aa632894a44713e6cb30892166c551d55abe56736b6262847fb4
+  data.tar.gz: 8eb137a5edf619e4adde926469a014ee0537cb0dcd2b49e4349f81d6f42cb15275afd9a1d5fc60dfbf2334709b5ec38e6ad26b69f2438a1f97c7d3f29f165a09

data/lib/unresponsys/client.rb

@@ -5,53 +5,37 @@ class Unresponsys
     include HTTParty
 
     def initialize(options = {})
-      @@username ||= options[:username]
-      @@password ||= options[:password]
+      raise Unresponsys::ArgumentError, 'Username is required' unless options[:username]
+      @username = options[:username]
+
+      raise Unresponsys::ArgumentError, 'Password is required' unless options[:password]
+      @password = options[:password]
+
       raise Unresponsys::Error, 'Could not authenticate' unless authenticate
+
       self.class.debug_output($stdout) if options[:debug]
     end
 
     def self.get(path, options = {}, &block)
-      begin
-        r = perform_request Net::HTTP::Get, path, options, &block
-        handle_error(r)
-      rescue Unresponsys::Retry
-        r = perform_request Net::HTTP::Get, path, options, &block
-        handle_error(r)
-      end
+      r = perform_request Net::HTTP::Get, path, options, &block
+      handle_error(r)
     end
 
     def self.post(path, options = {}, &block)
-      begin
-        r = perform_request Net::HTTP::Post, path, options, &block
-        handle_error(r)
-      rescue Unresponsys::Retry
-        r = perform_request Net::HTTP::Post, path, options, &block
-        handle_error(r)
-      end
+      r = perform_request Net::HTTP::Post, path, options, &block
+      handle_error(r)
     end
 
     def self.delete(path, options = {}, &block)
-      begin
-        r = perform_request Net::HTTP::Delete, path, options, &block
-        handle_error(r)
-      rescue Unresponsys::Retry
-        r = perform_request Net::HTTP::Delete, path, options, &block
-        handle_error(r)
-      end
+      r = perform_request Net::HTTP::Delete, path, options, &block
+      handle_error(r)
     end
 
     private
 
     def self.handle_error(response)
       if response.is_a?(Hash) && response.keys.include?('errorCode')
-        if response['title'].include?('token expired')
-          self.new
-          raise Unresponsys::Retry
-        end
-        if response['title'].include?('not found')
-          raise Unresponsys::NotFoundError, response['detail']
-        end
+        raise Unresponsys::NotFoundError, response['detail'] if response['title'].include?('not found')
         raise Unresponsys::Error, "#{response['title']} - #{response['detail']}"
       end
       response
@@ -59,7 +43,7 @@ class Unresponsys
 
     def authenticate
       self.class.headers('Content-Type' => 'application/x-www-form-urlencoded')
-      body = { user_name: @@username, password: @@password, auth_type: 'password' }
+      body = { user_name: @username, password: @password, auth_type: 'password' }
       r = self.class.post('https://login2.responsys.net/rest/api/v1/auth/token', body: body)
       return false unless r.success?
       self.class.headers('Authorization' => r['authToken'], 'Content-Type' => 'application/json')

data/lib/unresponsys/errors.rb

@@ -2,5 +2,4 @@ class Unresponsys
   class ArgumentError < StandardError; end
   class Error < StandardError; end
   class NotFoundError < StandardError; end
-  class Retry < StandardError; end
 end

data/lib/unresponsys/version.rb

@@ -1,3 +1,3 @@
 class Unresponsys
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unresponsys
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Kevin Kimball
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-01 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty