basic_api_client 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ec4537be034ae24cc1669827f84ff405a2209c8
-  data.tar.gz: 454c667842535fce5112bedfcc56746e7f6c8d6f
+  metadata.gz: 20e7c36a1f799484ef9491436647986933287950
+  data.tar.gz: a979582b06128b2976b261eb3009dfc15ca52c23
 SHA512:
-  metadata.gz: 04ca334680d7de2b799a3c6c670275a54aca7e500c2dfdff5521e9986b55638835f6625299d20706be6e3ebbf0123d4d95daff5f56f4da025ae553859ca113da
-  data.tar.gz: f03c73904c65ccd3f2b93c5c690ae3494b28be7b02f020018cd7304a5b7db0ef348b4c1355d60e8ede16f108477d6c67b3e9bee378d7d72ba10c4790a181a3bf
+  metadata.gz: 4650dd17e0c88fbc905d4d1f5b615fc28d5908472c7922f8bc267418ecea83bb42b1a59ad614cdc88a59e771acff1d9f5089f0827296decbf29ec2ff10726eea
+  data.tar.gz: 3f56203af9fca4bc82f10c4fa817ee049fc8aaf8cb5bc6e5f85c99af848746369edb14862292ca62ed1af631dc23348894b32800c67c894061fd790ae02fe623

data/lib/basic_api_client.rb

@@ -1,77 +1,79 @@
-require 'faraday'
+require 'curb'
 require 'json'
 
 class BasicApiClient
   AUTH_HEADERS = %w{ access-token token-type uid expiry client }.sort
 
   attr_reader :headers
-  attr_accessor :last_response
+  attr_accessor :last_response, :last_return
 
-  def initialize(cn, password, site, auth_url)
+  def initialize(cn, password, site, auth_path)
     @cn = cn
     @password = password
     @site = site
-    @auth_url = auth_url
+    @site.sub!(/\/+$/, '')
+    @auth_url = url_for(auth_path)
   end
 
   def headers
     @headers ||= {}
   end
 
-  def conn
-    @conn ||= begin
-      Faraday.new(url: @site) do |faraday|
-        faraday.request :url_encoded
-        faraday.response :logger
-        faraday.adapter Faraday.default_adapter
-      end
-    end
+  def authorize
+    @headers = {}
+    params = { cn: @cn, password: @password }
+    Curl.post(@auth_url, params, &method(:setup_request))
+    last_return
   end
 
-  def authorize
-    res = conn.post do |req|
-      req.url @auth_url 
-      req.params['cn'] = @cn
-      req.params['password'] = @password
-    end
+  def get(path, params = {})
+    authorize unless auth_headers?
 
-    handle_response(res)
+    url = url_for(path)
+    Curl.get(url, params, &method(:setup_request))
+    last_return
   end
 
-  def get(url, params = {})
+  def post(path, params = {})
     authorize unless auth_headers?
 
-    res = conn.get do |req|
-      req.url url
-      req.params = params.merge(req.params)
-      req.headers = headers
-    end
+    url = url_for(path)
+    Curl.post(url, params, &method(:setup_request))
+    last_return
+  end
 
-    handle_response(res)
+  private 
+  def url_for(path)
+    path = path.sub(/^\/+/, '')
+    [@site, path].join('/')
   end
 
-  def post(url, params = {})
-    authorize unless auth_headers?
+  def setup_request(req)
+    req.headers = headers
+    req.on_failure &method(:handle_failure)
+    req.on_missing &method(:handle_failure)
+    req.on_success &method(:handle_success)
+  end
 
-    res = conn.post do |req|
-      req.url url
-      req.params = params.merge(req.params)
-      req.headers = headers
-    end
+  def handle_success(res)
+    @last_response = res
+    @headers = parse_headers(res).select { |name, _| 
+      AUTH_HEADERS.include?(name) }
+    @last_return = JSON.parse(res.body_str)
+  end
 
-    handle_response(res)
+  def handle_failure(res, code)
+    @last_response = res
+    @headers = {}
+    @last_return = nil
   end
 
-  private 
-  def handle_response(res)
-    self.last_response = res
-    if res.success?
-      @headers = res.headers.select { |k, v| AUTH_HEADERS.include?(k) }
-      JSON.parse(res.body)
-    else
-      @headers = {}
-      false
-    end
+  def parse_headers(res)
+    lines = res.header_str.split("\r\n").drop(1)
+    lines.each_with_object({}) { |line, headers| 
+      name, value = line.split(": ")
+      name.downcase!
+      headers[name] = value }
   end
 
   def auth_headers?

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: basic_api_client
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - jphager2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: curb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Example of a basic api client that keeps access-token headers