pokitdok-ruby 0.7.4 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eec04d8678df0b571cc7a591479a22e0a7e73499
-  data.tar.gz: 8b3fc476ba113e13fd494656810a0b3f038723a9
+  metadata.gz: 39fe6e6cd01f6b839d325c3f36a8c431f4bb28e1
+  data.tar.gz: 8eb46680810f6453958ae8d914861aa30e4150d4
 SHA512:
-  metadata.gz: b1b269d7a96ccdc7ef731a9845d19b9432226d9894e668d9743f67ac9850ffdd6ecfe0ec7a82661e45831fb9f41d4a4fc308d391017ad0470d60b4c9ac915403
-  data.tar.gz: 91f3d356570058b1ed4bbf751fb33c7693fe94dd7dd2b8e1d41ea467b5f340f147ef39a92eba8a79a3d25feed55720197b7c1c398110ee8d11cb4b151b6eae64
+  metadata.gz: c87e045eecc7c3e9b663da64bc18cc546cb17c77e09c0cdaff5076ca764f9fe87f6fd92b268d98f089985d412befd793db2fe81906740201e7e0f73ff2671a84
+  data.tar.gz: 81923ed48261191bb967eaead0278e6f5308f56b7bc2f93d29f816af28b9836c24071843ae928edc6c07a1c7b9cd0bba832d76bff067db9bc6046843bb4e2189

data/Gemfile

@@ -12,7 +12,6 @@ group :development do
 	gem 'jeweler', '~> 2.0'
 	gem 'ansi', '~> 1.4'
 	gem 'minitest-reporters', '~> 1.0'
-	gem 'vcr', '~> 2.9'
 	gem 'webmock', '~> 1.17'
 	gem 'guard', '~> 2.6'
 	gem 'guard-minitest', '~> 2.2'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.8)
+    addressable (2.4.0)
     ansi (1.5.0)
     ast (2.0.0)
     astrolabe (1.3.0)
@@ -26,15 +26,14 @@ GEM
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.8)
+    ffi (1.9.8-java)
     formatador (0.2.5)
-    git (1.2.9.1)
-    github_api (0.12.3)
-      addressable (~> 2.3)
+    git (1.3.0)
+    github_api (0.14.1)
+      addressable (~> 2.4.0)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 3.3)
-      multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.3)
+      hashie (>= 3.4)
       oauth2
     guard (2.12.5)
       formatador (>= 0.2.4)
@@ -52,12 +51,13 @@ GEM
     guard-rubocop (1.2.0)
       guard (~> 2.0)
       rubocop (~> 0.20)
-    hashie (3.4.1)
-    highline (1.7.2)
+    hashie (3.4.4)
+    highline (1.7.8)
     hitimes (1.2.2)
+    hitimes (1.2.2-java)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
-    jeweler (2.0.1)
+    jeweler (2.1.1)
       builder
       bundler (>= 1.0)
       git (>= 1.2.5)
@@ -66,7 +66,9 @@ GEM
       nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.8.2)
+      semver
+    json (1.8.3)
+    json (1.8.3-java)
     jwt (1.5.1)
     listen (2.10.0)
       celluloid (~> 0.16.0)
@@ -76,7 +78,7 @@ GEM
     metaclass (0.0.4)
     method_source (0.8.2)
     mime-types (2.5)
-    mini_portile (0.6.2)
+    mini_portile2 (2.1.0)
     minitest (5.6.1)
     minitest-reporters (1.0.16)
       ansi
@@ -85,13 +87,15 @@ GEM
       ruby-progressbar
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.12.0)
+    multi_json (1.12.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     nenv (0.2.0)
     netrc (0.10.3)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    nokogiri (1.6.8-java)
     notiffany (0.0.6)
       nenv (~> 0.1)
       shellany (~> 0.0)
@@ -103,18 +107,24 @@ GEM
       rack (>= 1.2, < 3)
     parser (2.2.2.3)
       ast (>= 1.1, < 3.0)
+    pkg-config (1.1.7)
     powerpack (0.1.1)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
+    pry (0.10.1-java)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+      spoon (~> 0.0)
     rack (1.6.4)
     rainbow (2.0.0)
-    rake (10.4.2)
+    rake (11.2.2)
     rb-fsevent (0.9.5)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rdoc (4.2.0)
+    rdoc (4.2.2)
       json (~> 1.4)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -128,6 +138,7 @@ GEM
       ruby-progressbar (~> 1.4)
     ruby-progressbar (1.7.5)
     safe_yaml (1.0.4)
+    semver (1.0.1)
     shellany (0.0.1)
     simplecov (0.10.0)
       docile (~> 1.1.0)
@@ -135,24 +146,28 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
+    spoon (0.0.4)
+      ffi
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     terminal-notifier (1.6.3)
     terminal-notifier-guard (1.6.4)
     thor (0.19.1)
     thread_safe (0.3.5)
+    thread_safe (0.3.5-java)
     timers (4.0.1)
       hitimes
     tins (1.5.1)
     unf (0.1.4)
       unf_ext
+    unf (0.1.4-java)
     unf_ext (0.0.7.1)
-    vcr (2.9.3)
     webmock (1.21.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
@@ -173,8 +188,7 @@ DEPENDENCIES
   simplecov (~> 0.8)
   terminal-notifier
   terminal-notifier-guard (~> 1.5)
-  vcr (~> 2.9)
   webmock (~> 1.17)
 
 BUNDLED WITH
-   1.12.1
+   1.12.5

data/README.md

@@ -135,14 +135,38 @@ you can pass a third parameter to PokitDok::Pokitdok.new, like this:
 This library aims to support and is tested against these Ruby versions, 
 using travis-ci:
 
+* 2.2.3
 * 2.1.1
 * 2.0.0
 * 1.9.3
 * JRuby in 1.9 mode
-* Rubinius 2.2.7
 
 You may have luck with other interpreters - let us know how it goes.
 
+## Development/Debugging
+
+##### Prerequisite: Make sure to have the RubyMine plugin installed with IntelliJ.
+
+#### Steps to getting setup in the IntelliJ IDE:
+1. Fork and/or clone the `pokitdok-ruby` github repository onto your local machine.
+2. Open IntelliJ IDE.
+3. Select `File > New > Project From Existing Sources` and select the directory of the cloned `pokitdok-ruby` project.
+4. In the pop-up GUI select `Create project from existing sources` and continue selecting next/finish with the default settings.
+5. Next you want to make sure ruby has selected the correct ruby SDK. It is recommended to use rvm for ruby version management.
+  * Select `File > Project Structure`. Then under the Project -> SDK settings select the ruby version you wish to use with the project (i.e.- `RVM: ruby-1.9.3-p551 [global]`).
+6. You will probably be prompted to install the project dependencies with bundler which you should do.
+7. Now to debug tests you need to create a `run configuration`.
+  * Select `Run > Edit Configurations`. 
+  * We use `rake` to run our project tasks. So select the `+` button and add a new `Rake` configuration.
+  * A few properties you need to set: 
+    * Task Name: `spec`
+    * Ruby SDK -> Use other SDK and 'rake' gem: `Whichever ruby version you chose in step 5`
+    * Bundler Tab: Check the box labeled `Run the script in the context of the bundle (bundle exec)`
+8. You can now run/debug the project tests in the IntelliJ IDE.
+  * NOTE: Currently the tests will not finish executing though all are completed. This is a known issue with RubyMine.
+
+NOTE: If you would just like to run the test framework outside of the IDE make sure to have all the dependencies installed via bundle in the project directory then run the following command: `bundle exec rake spec`.
+
 ## License
 Copyright (c) 2014 PokitDok Inc. See [LICENSE][] for details.
 

data/Rakefile

@@ -29,6 +29,7 @@ Rake::TestTask.new(:spec) do |spec|
   spec.libs << 'lib' << 'spec'
   spec.pattern = 'spec/**/*_spec.rb'
   spec.verbose = true
+  spec.warning = false
 end
 
 require 'coveralls'

data/VERSION

@@ -1 +1 @@
-0.7.4
+0.8.0

data/lib/OAuthApplicationClient.rb

@@ -0,0 +1,149 @@
+require 'oauth2'
+
+# OAuth 2.0 Client implementation for Ruby.
+class OAuthApplicationClient
+  attr_accessor :token, :user_agent
+
+  # Connect to the PokitDok API with the specified Client ID and Client
+  # Authentication logic located within this class.
+  #
+  # +client_id+     your client ID, provided by PokitDok
+  # +client_secret+ your client secret, provided by PokitDok
+  # +token_url+ token url to be appended for authentication. Defaults to '/oauth2/token'
+  # +redirect_uri+ the Redirect URI set for the PokitDok Platform Application.
+  #   This value is managed at https://platform.pokitdok.com in the App Settings
+  # +scope+ a list of scope names that should be used when requesting authorization
+  # +code+ code value received from an authorization code grant
+  # +token+ The current API access token for your PokitDok Platform Application. If not provided a new token is generated.
+  # +user_agent+ user agent to be used as a header in HTTP requests
+  def initialize(client_id, client_secret, token_url, redirect_uri, scope, code, token, user_agent)
+    @client_id = client_id
+    @client_secret = client_secret
+    @token_url = token_url
+    @redirect_uri = redirect_uri
+    @scope = scope
+    @code = code
+    @user_agent = user_agent
+    @token  = token
+
+    @api_client = OAuth2::Client.new(@client_id, @client_secret, site: @api_url, token_url: @token_url, raise_errors: false)
+    if @token.nil?
+      fetch_access_token(@code)
+    end
+  end
+
+  # Perform a GET request given the http request path and optional params
+  #
+  # +path+ request path
+  # +params+ an optional hash of parameters that will be sent in the request
+  def get_request(path, params, &block)
+    if isAccessTokenExpired?
+      fetch_access_token()
+    end
+    @token.get(path, params: params, headers: headers, &block)
+  end
+
+  # Perform a PUT request given the http request path and optional params
+  #
+  # +path+ request path
+  # +params+ an optional hash of parameters that will be sent in the request
+  def put_request(path, params = {}, &block)
+    if isAccessTokenExpired?
+      fetch_access_token()
+    end
+    headers.merge({ headers: { :'Content-Type' => 'application/json'}})
+    @token.put(path, body: params.to_json, headers: headers({:'Content-Type' => 'application/json'}), &block)
+  end
+
+  # Perform a POST request given the http request path and optional params
+  #
+  # +path+ request path
+  # +params+ an optional hash of parameters that will be sent in the request
+  def post_request(path, params = {}, &block)
+    if isAccessTokenExpired?
+      fetch_access_token()
+    end
+    headers.merge({ headers: { :'Content-Type' => 'application/json'}})
+    @token.post(path, body: params.to_json, headers: headers({:'Content-Type' => 'application/json'}), &block)
+  end
+
+  # Perform a POST request given the http request path, a file and optional params
+  #
+  # +path+ request path
+  # +file+ the file to be sent with the request
+  # +params+ an optional hash of parameters that will be sent in the request
+  def post_file(endpoint, file=nil, params={})
+    if isAccessTokenExpired?
+      fetch_access_token()
+    end
+    url = URI.parse(@api_url + endpoint)
+
+    File.open(file) do |f|
+      additional_params = params.merge({'file' => UploadIO.new(f, 'application/EDI-X12', file)})
+      req = Net::HTTP::Post::Multipart.new(url.path, additional_params)
+
+      req['Authorization'] = "Bearer #{self.token.token}"
+      req['User-Agent'] = @user_agent
+
+      @response = Net::HTTP.start(url.host, url.port) do |http|
+        http.request(req)
+      end
+      JSON.parse(@response.body)
+    end
+  end
+
+  # Perform a DELETE request given the http request path and optional params
+  #
+  # +path+ request path
+  # +params+ an optional hash of parameters that will be sent in the request
+  def delete_request(path, params = {}, &block)
+    if isAccessTokenExpired?
+      fetch_access_token()
+    end
+    @token.delete(path, body: params.to_json, headers: headers({:'Content-Type' => 'application/json'}), &block)
+  end
+
+  # Construct OAuth2 Authorization Grant URL
+  def authorization_url()
+    if @redirect_uri.nil? || @scope.nil?
+      raise 'A redirect_uri and scope must be specified when the client is instantiated in order to get a working authorization URL'
+    end
+    @api_client.auth_code.authorize_url(redirect_uri: @redirect_uri, scope: @scope)
+  end
+
+  ### PRIVATE METHODS ###
+
+  # Retrieves an OAuth2 access token.  If `code` is not specified, the client_credentials
+  # grant type will be used based on the client_id and client_secret.  If `code` is not None,
+  # an authorization_code grant type will be used.
+  #
+  # +code+ optional authorization code used for scope purposes
+  def fetch_access_token(code = nil)
+    if code
+      # Currently non functioning as our OAuth2 authorization_code grant type is not implemented on the server
+      params =  {
+          headers: { 'Authorization' => 'Basic' },
+          scope: @scope,
+          redirect_uri: @redirect_uri
+      }
+      @token = @api_client.auth_code.get_token(code, params)
+    else
+      @token = @api_client.client_credentials.get_token(headers: { 'Authorization' => 'Basic' })
+    end
+  end
+
+  # Returns a standard set of headers to be passed along with all requests
+  def headers(additional_headers = {})
+    { 'User-Agent' => @user_agent }.merge(additional_headers)
+  end
+
+  # Check if the access token is expired
+  def isAccessTokenExpired?
+    if !@token.is_a?(OAuth2::AccessToken)
+      return true
+    end
+    @token.expired?
+  end
+
+  private :headers, :isAccessTokenExpired?, :fetch_access_token
+end

data/lib/pokitdok.rb

@@ -11,15 +11,13 @@ require 'rubygems'
 require 'bundler/setup'
 require 'base64'
 require 'json'
-require 'oauth2'
+require 'OAuthApplicationClient'
 require 'net/http/post/multipart'
 
 module PokitDok
   # PokitDok API client implementation for Ruby.
-  class PokitDok
-    POKITDOK_URL_BASE = 'https://platform.pokitdok.com' # :nodoc:
-
-    attr_reader :client # :nodoc:
+  class PokitDok < OAuthApplicationClient
+    attr_reader :api_client # :nodoc:
     attr_reader :api_url
     attr_reader :version
 
@@ -27,36 +25,19 @@ module PokitDok
     # Secret.
     #
     # +client_id+     your client ID, provided by PokitDok
-    #
     # +client_secret+ your client secret, provided by PokitDok
+    # +version+ The API version that should be used for requests.  Defaults to the latest version.
+    # +base+ The base URL to use for API requests.  Defaults to https://platform.pokitdok.com
     #
-    def initialize(client_id, client_secret, version='v4')
-      @client_id = client_id
-      @client_secret = client_secret
+    #  TODO: Make it simpler to pass in params out of order (also so you don't have to do init(..., nil, nil, nil, param))
+    #
+    def initialize(client_id, client_secret, version='v4', base='https://platform.pokitdok.com',
+                   redirect_uri=nil, scope= nil, code=nil, token= nil)
       @version = version
+      @api_url = "#{base}/api/#{version}"
+      @user_agent = "pokitdok-ruby 0.8 #{RUBY_DESCRIPTION}"
 
-      @api_url = "#{url_base}/api/#{version}"
-      @client = OAuth2::Client.new(@client_id, @client_secret,
-                                   site: @api_url, token_url: '/oauth2/token')
-
-
-      @scopes = {}
-      @scopes['default'] = { scope: refresh_token }
-      scope 'default'
-    end
-
-    # Accessor for the PokitDok Platform URL, overridable for testing.
-    def url_base
-      POKITDOK_URL_BASE
-    end
-
-    # Adds an authorization code for a given OAuth2 scope.
-    #
-    # +name+ the scope name
-    # +code+ the authorization code
-    #
-    def scope_code(name, code)
-      @scopes[name] = { code: code }
+      super(client_id, client_secret, '/oauth2/token', redirect_uri, scope, code, token, user_agent)
     end
 
     # Invokes the appointments endpoint, to query for open appointment slots
@@ -66,7 +47,6 @@ module PokitDok
     # +params+ an optional Hash of parameters
     #
     def activities(params = {})
-      scope 'default'
       get('activities/', params)
     end
 
@@ -75,7 +55,6 @@ module PokitDok
     # +params+ an optional hash of parameters that will be sent in the POST body
     #
     def authorizations(params = {})
-      scope 'default'
       post('authorizations/', params)
     end
 
@@ -84,7 +63,6 @@ module PokitDok
     # +params+ an optional hash of parameters that will be sent in the POST body
     #
     def cash_prices(params = {})
-      scope 'default'
       get('prices/cash', params)
     end
 
@@ -93,7 +71,6 @@ module PokitDok
     # +params+ an optional hash of parameters that will be sent in the POST body
     #
     def claims(params = {})
-      scope 'default'
       post('claims/', params)
     end
 
@@ -102,16 +79,39 @@ module PokitDok
     # +params+ an optional hash of parameters that will be sent in the POST body
     #
     def claims_status(params = {})
-      scope 'default'
       post('claims/status', params)
     end
 
+    # Invokes the ICD convert endpoint.
+    #
+    # +params+ an optional hash of parameters
+    #
+    def icd_convert(params = {})
+      get("icd/convert/#{params[:code]}")
+    end
+
+    # Invokes the mpc endpoint.
+    #
+    # +params+ an optional hash of parameters
+    #
+    def mpc(params = {})
+      get('mpc/', params)
+    end
+
+    # Uploads an .837 file to the claims convert endpoint.
+    # Uses the multipart-post gem, since oauth2 doesn't support multipart.
+    #
+    # +x12_claims_file+ the path to the file to transmit
+    #
+    def claims_convert(x12_claims_file)
+      request('/claims/convert', 'POST', x12_claims_file)
+    end
+
     # Invokes the eligibility endpoint.
     #
     # +params+ an optional hash of parameters that will be sent in the POST body
     #
     def eligibility(params = {})
-      scope 'default'
       post('eligibility/', params)
     end
 
@@ -120,10 +120,36 @@ module PokitDok
     # +params+ an optional hash of parameters that will be sent in the POST body
     #
     def enrollment(params = {})
-      scope 'default'
       post('enrollment/', params)
     end
 
+    # Uploads an .834 file to the enrollment snapshot endpoint.
+    # Uses the multipart-post gem, since oauth2 doesn't support multipart.
+    #
+    # +trading_partner_id+ the trading partner to transmit to
+    # +x12_file+ the path to the file to transmit
+    #
+    def enrollment_snapshot(trading_partner_id, x12_file)
+      request("/enrollment/snapshot/#{trading_partner_id}", "POST", x12_file)
+    end
+
+    # Invokes the enrollment snapshots endpoint.
+    #
+    # +params+ an optional Hash of parameters
+    #
+    def enrollment_snapshots(params = {})
+      snapshot_id = params.delete :snapshot_id
+      get("enrollment/snapshot" + (snapshot_id ? "/#{snapshot_id}" : ''), params)
+    end
+
+    # Invokes the enrollment snapshots data endpoint.
+    #
+    # +params+ an optional Hash of parameters
+    #
+    def enrollment_snapshot_data(params = {})
+      get("enrollment/snapshot/#{params[:snapshot_id]}/data")
+    end
+
     # Uploads an EDI file to the files endpoint.
     # Uses the multipart-post gem, since oauth2 doesn't support multipart.
     #
@@ -131,22 +157,7 @@ module PokitDok
     # +filename+ the path to the file to transmit
     #
     def files(trading_partner_id, filename)
-      scope 'default'
-      url = URI.parse(@api_url + '/files/')
-
-      File.open(filename) do |f|
-        req = Net::HTTP::Post::Multipart.new url.path,
-          'file' => UploadIO.new(f, 'application/EDI-X12', filename),
-          'trading_partner_id' => trading_partner_id
-        req['Authorization'] = "Bearer #{default_scope.token}"
-        req['User-Agent'] = user_agent
-
-        @response = Net::HTTP.start(url.host, url.port) do |http|
-          http.request(req)
-        end
-      end
-
-      JSON.parse(@response.body)
+      request('/files/', 'POST', filename, { trading_partner_id: trading_partner_id})
     end
 
     # Invokes the insurance prices endpoint.
@@ -154,7 +165,6 @@ module PokitDok
     # +params+ an optional hash of parameters
     #
     def insurance_prices(params = {})
-      scope 'default'
       get('prices/insurance', params)
     end
 
@@ -163,7 +173,6 @@ module PokitDok
     # +params+ an optional hash of parameters
     #
     def payers(params = {})
-      scope 'default'
       get('payers/', params)
     end
 
@@ -172,7 +181,6 @@ module PokitDok
     # +params+ an optional Hash of parameters
     #
     def plans(params = {})
-      scope 'default'
       get('plans/', params)
     end
 
@@ -181,10 +189,7 @@ module PokitDok
     # +params+ an optional Hash of parameters
     #
     def providers(params = {})
-      response = default_scope.get('providers/') do |request|
-        request.params = params
-      end
-      JSON.parse(response.body)
+      get('providers/', params)
     end
 
     # Invokes the referrals endpoint.
@@ -192,7 +197,6 @@ module PokitDok
     # +params+ an optional Hash of parameters
     #
     def referrals(params = {})
-      scope 'default'
       post('referrals/', params)
     end
 
@@ -202,12 +206,7 @@ module PokitDok
     #
     def trading_partners(params = {})
       trading_partner_id = params.delete :trading_partner_id
-
-      response =
-        default_scope.get("tradingpartners/#{trading_partner_id}") do |request|
-          request.params = params
-        end
-      JSON.parse(response.body)
+      get("tradingpartners/#{trading_partner_id}")
     end
 
     # Scheduling endpoints
@@ -219,23 +218,18 @@ module PokitDok
     # +params+ an optional Hash of parameters
     #
     def appointment(params = {})
-      @appointment_id = params.delete :appointment_id
-      scope 'user_schedule'
-
-      get_one('schedule/appointmenttypes/', @appointment_id, params)
+      appointment_id = params.delete :appointment_id
+      get("schedule/appointmenttypes/#{appointment_id}", params)
     end
 
     # Invokes the activities endpoint.
     #
     # This endpoint uses the user_schedule OAuth2 scope. You'll need to
-    # get the user's authorization via our OAuth2 provider, and pass the
-    # authorization code you received into
-    # scope_code('user_schedule', '(the authorization code)')
+    # get the user's authorization via our OAuth2 provider
     #
     # +params+ an optional Hash of parameters
     #
     def appointments(params = {})
-      scope 'user_schedule'
       get('schedule/appointments/', params)
     end
 
@@ -246,13 +240,7 @@ module PokitDok
     #
     def appointment_type(params = {})
       appointment_type = params.delete :uuid
-
-      response =
-      default_scope.get("schedule/appointmenttypes/#{appointment_type}") do |request|
-        request.params = params
-      end
-
-      JSON.parse(response.body)
+      get("schedule/appointmenttypes/#{appointment_type}")
     end
 
     # Invokes the appointment_types endpoint.
@@ -260,51 +248,39 @@ module PokitDok
     # +params+ an optional hash of parameters
     #
     def appointment_types(params = {})
-      scope 'default'
       get('schedule/appointmenttypes/', params)
     end
 
     # Books an appointment.
     #
     # This endpoint uses the user_schedule OAuth2 scope. You'll need to
-    # get the user's authorization via our OAuth2 provider, and pass the
-    # authorization code you received into
-    # scope_code('user_schedule', '(the authorization code)')
+    # get the user's authorization via our OAuth2 provider
     #
     # +params+ an optional hash of parameters that will be sent in the POST body
     #
     def book_appointment(appointment_uuid, params = {})
-      scope 'user_schedule'
-      
-      put_one("schedule/appointments", appointment_uuid, params)
+      put("schedule/appointments/#{appointment_uuid}", params)
     end
 
     # Cancels the specified appointment.
     #
     # This endpoint uses the user_schedule OAuth2 scope. You'll need to
-    # get the user's authorization via our OAuth2 provider, and pass the
-    # authorization code you received into
-    # scope_code('user_schedule', '(the authorization code)')
+    # get the user's authorization via our OAuth2 provider
     #    
     # +params+ an optional Hash of parameters
     #
     def cancel_appointment(appointment_uuid, params={})
-      scope 'user_schedule'
-
-      delete_one("schedule/appointments", appointment_uuid, params)
+      delete("schedule/appointments/#{appointment_uuid}", params)
     end
 
     # Invokes the schedule/appointments endpoint.
     #
     # This endpoint uses the user_schedule OAuth2 scope. You'll need to
-    # get the user's authorization via our OAuth2 provider, and pass the
-    # authorization code you received into
-    # scope_code('user_schedule', '(the authorization code)')
+    # get the user's authorization via our OAuth2 provider
     #    
     # +params+ an optional hash of parameters
     #
     def open_appointment_slots(params = {})
-      scope 'user_schedule'
       get('schedule/appointments', params)
     end
 
@@ -313,7 +289,6 @@ module PokitDok
     # +params an optional Hash of parameters
     #
     def schedulers(params = {})
-      scope 'default'
       get('schedule/schedulers/', params)
     end
 
@@ -324,25 +299,18 @@ module PokitDok
     #
     def scheduler(params = {})
       scheduler_id = params.delete :uuid
-
-      response =
-        default_scope.get("schedule/schedulers/#{scheduler_id}") do |request|
-          request.params = params
-        end
-      JSON.parse(response.body)
+      get("schedule/schedulers/#{scheduler_id}")
     end
 
     # Invokes the slots endpoint.
     #
     # This endpoint uses the user_schedule OAuth2 scope. You'll need to
-    # get the user's authorization via our OAuth2 provider, and pass the
-    # authorization code you received into
-    # scope_code('user_schedule', '(the authorization code)')
+    # get the user's authorization via our OAuth2 provider
     #    
     # +params+ an optional Hash of parameters
     #
-    def slots(params = {})
-      scope 'user_schedule'
+    def schedule_slots(params = {})
+      post('/schedule/slots/', params)
     end
 
     # Invokes the pharmacy plans endpoint.
@@ -350,10 +318,7 @@ module PokitDok
     # +params+ an optional Hash of parameters
     #
     def pharmacy_plans(params = {})
-      response = default_scope.get('pharmacy/plans') do |request|
-        request.params = params
-      end
-      JSON.parse(response.body)
+      get('pharmacy/plans', params)
     end
 
     # Invokes the pharmacy formulary endpoint.
@@ -361,10 +326,7 @@ module PokitDok
     # +params+ an optional Hash of parameters
     #
     def pharmacy_formulary(params = {})
-      response = default_scope.get('pharmacy/formulary') do |request|
-        request.params = params
-      end
-      JSON.parse(response.body)
+      get('pharmacy/formulary', params)
     end
 
     # Invokes the pharmacy network cost endpoint.
@@ -374,76 +336,110 @@ module PokitDok
     def pharmacy_network(params = {})
       npi = params.delete :npi
       endpoint = npi ? "pharmacy/network/#{npi}" : "pharmacy/network"
-      response = default_scope.get(endpoint) do |request|
-        request.params = params
-      end
-      JSON.parse(response.body)
+      get(endpoint, params)
     end
 
     # Updates the specified appointment.
     #
     # This endpoint uses the user_schedule OAuth2 scope. You'll need to
-    # get the user's authorization via our OAuth2 provider, and pass the
-    # authorization code you received into
-    # scope_code('user_schedule', '(the authorization code)')
+    # get the user's authorization via our OAuth2 provider
     #    
     # +params+ an optional Hash of parameters
     #
     def update_appointment(appointment_uuid, params={})
-      scope 'user_schedule'
+      put("schedule/appointments/#{appointment_uuid}", params)
+    end
 
-      put_one("schedule/appointments", appointment_uuid, params)
-    end    
+    # Invokes the identity endpoint for creation
+    #
+    # +params+ a hash of parameters that will be sent in the POST body
+    #
+    def create_identity(params = {})
+      post('identity/', params)
+    end
 
-    private
-      # Returns a standard User-Agent string to be passed along with all requests
-      def user_agent
-        "pokitdok-ruby 0.8 #{RUBY_DESCRIPTION}"
-      end
+    # Invokes the identity endpoint for updating
+    #
+    # +identity_uuid+ unique id of the identity to be updated
+    # +params+ a hash of parameters that will be sent in the PUT body
+    #
+    def update_identity(identity_uuid, params = {})
+      put("identity/#{identity_uuid}", params)
+    end
 
-      # Returns a standard set of headers to be passed along with all requests
-      def headers
-        { 'User-Agent' => user_agent }
-      end
+    # Invokes the identity endpoint for querying
+    #
+    # +params+ an optional hash of parameters that will be sent in the GET body
+    #
+    def identity(params = {})
+      identity_uuid = params.delete :identity_uuid
+      get("identity" + (identity_uuid ? "/#{identity_uuid}" : ''), params)
+    end
 
-      def get(endpoint, params = {})
-        response = current_scope.get(endpoint, headers: headers, params: params)
+    # Invokes the identity history endpoint
+    #
+    # +identity_uuid+ unique id of the identity to be updated
+    # +historical_version+ historical version of the identity being requested
+    #
+    def identity_history(identity_uuid, historical_version=nil)
+      get("identity/#{identity_uuid}/history" + (historical_version ? "/#{historical_version}" : ''))
+    end
 
-        JSON.parse(response.body)
-      end
+    # Invokes the identity endpoint for querying
+    #
+    # +params+ hash of parameters that will be sent in the POST body
+    #
+    def identity_match(params = {})
+      post("identity/match", params)
+    end
 
-      def get_one(endpoint, id, params = {})
-        response = current_scope.get("#{endpoint}/#{id}", headers: headers,
-                                 body: params.to_json) do |request|
-          request.headers['Content-Type'] = 'application/json'
+    # Invokes the the general request method for submitting API request.
+    #
+    # +endpoint+ the API request path
+    # +method+ the http request method that should be used
+    # +file+ file when the API accepts file uploads as input
+    # +params+ an optional Hash of parameters
+    #
+    # NOTE: There might be a better way of achieving the seperation of get/get_request
+    # but currently using the "send" method will go down the ancestor chain until the correct
+    # method is found. In this case the 'httpMethod'_request
+    def request(endpoint, method='get', file=nil, params={})
+      method = method.downcase
+      if file
+        self.send('post_file', endpoint, file, params)
+      else
+        # Work around to delete the leading slash on the request endpoint
+        # Currently the module we're using appends a slash to the base url
+        # so an additional url will break the request.
+        # Refer to ...faraday/connection.rb L#404
+        if endpoint[0] == '/'
+          endpoint[0] = ''
         end
+        self.send("#{method}_request", endpoint, params)
+      end
+    end
+
+    private
+      def get(endpoint, params = {})
+        response = request(endpoint, 'GET', nil, params)
 
         JSON.parse(response.body)
       end
 
       def post(endpoint, params = {})
-        response = current_scope.post(endpoint, headers: headers,
-                               body: params.to_json) do |request|
-          request.headers['Content-Type'] = 'application/json'
-        end
+        response = request(endpoint, 'POST', nil, params)
 
         JSON.parse(response.body)
       end
 
-      def put_one(endpoint, id, params = {})
-        response = current_scope.put("#{endpoint}/#{id}", headers: headers,
-                                 body: params.to_json) do |request|
-          request.headers['Content-Type'] = 'application/json'
-        end
+      def put(endpoint, params = {})
+        response = request(endpoint, 'PUT', nil, params)
 
         JSON.parse(response.body)
       end
 
-      def delete_one(endpoint, id, params = {})
-        response = current_scope.delete("#{endpoint}/#{id}", headers: headers,
-                                 body: params.to_json) do |request|
-          request.headers['Content-Type'] = 'application/json'
-        end
+      def delete(endpoint, params = {})
+        response = request(endpoint, 'DELETE', nil, params)
 
         if response.body.empty?
           response.status == 204
@@ -451,38 +447,5 @@ module PokitDok
           JSON.parse(response.body)
         end
       end
-      
-      # Refreshes the client token associated with this PokitDok connection
-      #
-      # FIXME: automatic refresh on expiration
-      #
-      def refresh_token(code=nil)
-        body = {}
-        body[:code] = code unless code.nil?
-
-        @client.client_credentials.get_token(
-          headers: { 'Authorization' => 'Basic' })
-      end
-
-      def scope(name)
-        raise ArgumentError, "You need to provide an authorization code for " \
-          "the scope #{name} with the scope_code method" if @scopes[name].nil?
-
-        @current_scope = name
-
-        if @scopes[name][:scope].nil?
-          @scopes[name][:scope] = refresh_token(@scopes[name][:code])
-        end
-
-        @scopes[name][:scope]
-      end
-
-      def current_scope
-        @scopes[@current_scope][:scope]
-      end
-
-      def default_scope
-        @scopes['default'][:scope]
-      end
   end
 end