Merge branch 'develop'

Author: toastercup

.gitignore

@@ -1,3 +1,4 @@
 .bundle/
 .idea/
 .ruby-version
+Gemfile.lock

Gemfile.lock

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.version       = Cortex::VERSION
   s.summary       = 'Cortex API Client'
   s.homepage      = 'https://github.com/cb-talent-development/cortex-client'
-  s.authors       = ['Bennett Goble']
+  s.authors       = ['Bennett Goble', 'Colin Ewen']
   s.license       = 'MIT'
 
   s.files         = `git ls-files`.split($/).reject { |f| f == '.gitignore' }
@@ -20,4 +20,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'faraday', '~> 0.9'
   s.add_dependency 'faraday_middleware', '~> 0.9.0'
   s.add_dependency 'oauth2', '~>0.9'
+  s.add_dependency 'cortex-exceptions', '~> 0.0.4'
+  s.add_dependency 'hashie', '~> 3.4.0'
 end

cortex-client-0.4.0.gem

@@ -1,2 +1,3 @@
 require 'cortex/client'
 require 'cortex/version'
+require 'cortex/client_exceptions'

cortex-client.gemspec

@@ -5,6 +5,7 @@
 require 'cortex/users'
 require 'cortex/result'
 require 'oauth2'
+require 'cortex/exceptions'
 
 module Cortex
   class Client
@@ -30,8 +31,12 @@ def initialize(hasharg)
     end
 
     def get_cc_token
-      client = OAuth2::Client.new(@key, @secret, site: @base_url)
-      client.client_credentials.get_token
+      begin
+        client = OAuth2::Client.new(@key, @secret, site: @base_url)
+        client.client_credentials.get_token
+      rescue Faraday::ConnectionFailed
+        raise Cortex::Exceptions::ConnectionFailed.new(base_url: @base_url)
+      end
     end
   end
 end

lib/cortex-client.rb

@@ -0,0 +1,13 @@
+module Cortex
+  module ClientExceptions
+    class ErrorFromResult < StandardError
+      attr_accessor :status, :contents, :errors
+      def initialize(arg)
+        throw ArgumentError.new(msg: "Expected: Cortex::Result, Received: #{arg.class}") unless arg.is_a?(Cortex::Result)
+        @status = arg.status
+        @errors = arg.errors
+        @contents = arg.contents
+      end
+    end
+  end
+end

lib/cortex/client.rb

@@ -1,5 +1,6 @@
 require 'faraday'
 require 'faraday_middleware'
+require 'cortex/faraday_middleware'
 
 module Cortex
   module Connection
@@ -16,6 +17,7 @@ def connection
       end
 
       Faraday.new options do |conn|
+        conn.use Cortex::FaradayMiddleware
         conn.request :oauth2, access_token.is_a?(OAuth2::AccessToken) ? access_token.token : access_token
         conn.request :json
         conn.response :json, :content_type => /\bjson$/

lib/cortex/client_exceptions.rb

@@ -0,0 +1,14 @@
+require 'faraday'
+require 'faraday_middleware'
+
+module Cortex
+  class FaradayMiddleware < Faraday::Middleware
+    def call(env)
+      begin
+        @app.call(env)
+      rescue Faraday::ConnectionFailed
+        raise Cortex::Exceptions::ConnectionFailed.new(base_url: env[:url])
+      end
+    end
+  end
+end

lib/cortex/connection.rb

@@ -1,9 +1,10 @@
+require 'hashie'
 module Cortex
   class Result
     attr_reader :raw_headers, :contents, :total_items, :page, :per_page, :errors, :range_start, :range_end, :range, :status
 
     def initialize(body, headers, status)
-      @contents = body
+      @contents = parse(body)
       @raw_headers = headers
       @status = status
       @total_items = headers['x-total-items'] unless headers['x-total-items'].nil?
@@ -18,16 +19,27 @@ def is_error?
     private
 
     def parse_headers(headers)
-      if headers['x-total-items']
-        @count = headers['x-total-items']
+      if headers['X-Total']
+        @count = headers['X-Total'].to_i
       end
-      if headers['content-range']
-        matches = headers['content-range'].match(/^(\w+) (\d+)\-(\d+):(\d+)\/\d+$/i)
-        @per_page = matches[4].to_i
-        @range_start = matches[2].to_i
-        @range_end = matches[3].to_i
+      if headers['X-Total']
+        @page = headers['X-Page'].to_i
+        @per_page = headers['X-Per-Page'].to_i
+        @range_start = (@page-1) * @per_page
+        @range_end = @per_page * @page - 1
         @range = "#{@range_start}-#{@range_end}"
-        @page = (@range_end / @per_page) + 1
+
+      end
+    end
+
+    def parse(body)
+      case body
+        when Hash
+          ::Hashie::Mash.new(body)
+        when Array
+          body.map { |item| parse(item) }
+        else
+          body
       end
     end
 
@@ -47,4 +59,4 @@ def find_errors
       end
     end
   end
-end
+end