cover_my_meds 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d57fb40d0155b2f86d8fe746f311a89c15bceaa
-  data.tar.gz: 2a9b70d8072b0820304c2d700f811b9265b7ad7a
+  metadata.gz: ab2c4a5403a14c4c6e3d376f164c9c12a967096a
+  data.tar.gz: 31afd606a40608f3f4ada82f631843604b31b395
 SHA512:
-  metadata.gz: b2bb8098036e6a170a955f7ae6fd18e89468fd7fa98fc6fa4240d81162c6d0f1b9fabb0b1242a842385db3c2467f2dbb1c19c84d0d4b0507de4da63230191808
-  data.tar.gz: 6bebc3febe32329bc623f43cda9311c02335bac3ec23c492251959ecf5d73a3fc22b7b961f155c552749a6fd5cf7df75fbe9c60e306d0a324c8daf8941dc17e1
+  metadata.gz: 4527b7f965c94cdcecf5b5108506b56de655807916395597a63dd6cfbee1504980743aaa857468d49cf7f6e9942e777cf47b56acaa897ef45bfd9de315e62de3
+  data.tar.gz: 4b2da155c780055ba5c86e40700c76e32126c5665c9da24c96d3d371dec9ca0a59a2fbc53a28faddc01dfda2cc45b3e102a31c0cd0e8eaa5a1fe609a0db6f261

data/.gitignore

@@ -25,3 +25,4 @@ quickfix.out
 
 # to keep out api keys and secrets
 spec/support/cassettes/**
+/vendor

data/cover_my_meds.gemspec

@@ -21,15 +21,16 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rspec", ">= 3.2"
   spec.add_development_dependency "rspec-junklet", ">= 2.0"
-  spec.add_development_dependency "webmock", "~> 1.11"
+  spec.add_development_dependency "webmock", "~> 2.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "dotenv"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "railties"
 
-  spec.add_runtime_dependency "rest-client", "~> 1.8"
+  spec.add_runtime_dependency "faraday", "~> 0.9"
+  spec.add_runtime_dependency "typhoeus"
+  spec.add_runtime_dependency "mime-types"
   spec.add_runtime_dependency "hashie", ">= 3.4.0"
-  spec.add_runtime_dependency "settingslogic"
   spec.add_runtime_dependency "activesupport"
 end

data/lib/cover_my_meds/api_request.rb

@@ -1,30 +1,43 @@
-require 'rest-client'
+require 'faraday'
+require 'typhoeus'
+require 'typhoeus/adapters/faraday'
 require 'json'
 require 'hashie'
 require 'active_support/core_ext/object/to_param'
 require 'active_support/core_ext/object/to_query'
 require 'cover_my_meds/error'
+require 'mime-types'
+
 
 module CoverMyMeds
   module ApiRequest
+    DEFAULT_TIMEOUT = 60 #seconds, matches Net::Http's default which rest-client used
 
     def request(http_method, host, path, params={}, auth_type = :basic, &block)
       params  = params.symbolize_keys
       headers = params.delete(:headers) || {}
 
-      tail = case auth_type
-        when :basic
-          { user: @username, password: @password, headers: headers }
-        when :bearer
-          { headers: { "Authorization" => "Bearer #{@username}+#{params.delete(:token_id)}" }.merge(headers) }
-        else
-          {}
+      conn = Faraday.new host do |faraday|
+        faraday.request :multipart
+        faraday.request :url_encoded
+        faraday.adapter :typhoeus
+      end
+      case auth_type
+      when :basic
+        conn.basic_auth @username, @password
+      when :bearer
+        conn.authorization :Bearer, "#{@username}+#{params.delete(:token_id)}"
       end
 
-      uri = api_uri(host, path, params)
-      rest_resource = RestClient::Resource.new(uri.to_s, tail)
+      response = conn.send http_method do |request|
+        request.url path
+        request.options.timeout = DEFAULT_TIMEOUT
+        request.params = params
+        request.headers.merge! headers
+        request.body = block_given? ? yield : {}
+      end
+      raise Error::HTTPError.new(response.status, response.body, http_method, conn) unless response.success?
 
-      response = call_api http_method, rest_resource, &block
       parse_response response
     end
 
@@ -34,19 +47,5 @@ module CoverMyMeds
     rescue JSON::ParserError
       response.body
     end
-
-    def call_api http_method, rest_resource
-      body = block_given? ? yield : {}
-      rest_resource.send http_method, body
-    rescue RestClient::Exception => e
-      raise Error::HTTPError.new(e.http_code, e.http_body, http_method, rest_resource)
-    end
-
-    def api_uri host, path, params
-      URI.parse(host).tap do |uri|
-        uri.path  = path
-        uri.query = params.to_param
-      end
-    end
   end
 end

data/lib/cover_my_meds/client/indicators.rb

@@ -6,7 +6,7 @@ module CoverMyMeds
 
     def post_indicators(prescription: prescription(), patient: patient(), payer: {}, prescriber: {}, version: CURRENT_VERSION)
       params = { prescription: prescription, prescriber: prescriber, patient: patient, payer: payer }
-      data = indicators_request POST, params: { v: version, headers: { content_type: :json } } do
+      data = indicators_request POST, params: { v: version, headers: { content_type: "application/json" } } do
         params.to_json
       end
       Hashie::Mash.new(data)
@@ -14,7 +14,7 @@ module CoverMyMeds
 
     def search_indicators(prescriptions: prescriptions(), patient: {}, payer: {}, prescriber: {}, version: CURRENT_VERSION)
       params = { prescriptions: Array(prescriptions), prescriber: prescriber, patient: patient, payer: payer }
-      data = indicators_request POST, path: 'search/', params: { v: version, headers: { content_type: :json } } do
+      data = indicators_request POST, path: 'search/', params: { v: version, headers: { content_type: "application/json" } } do
         params.to_json
       end
       Hashie::Mash.new(data)

data/lib/cover_my_meds/version.rb

@@ -1,3 +1,3 @@
 module CoverMyMeds
-  VERSION = "2.1.0"
+  VERSION = "3.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cover_my_meds
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Justin Rolston
@@ -23,7 +23,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2016-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -152,35 +152,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: settingslogic
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,6 +193,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -271,8 +285,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: CoverMyMeds Public API
 test_files: []
+has_rdoc: