cortex-client 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b344d2092431f0f6f392a2f1ca342ce0e70f6705
-  data.tar.gz: c501c028bb02bee309120a3624a345114e5b6865
+  metadata.gz: 768df683d683b218c75ebbae0b67927dce32e211
+  data.tar.gz: fbf51535a0892d97853ed8a59833bdc36857f1d4
 SHA512:
-  metadata.gz: 27a6bf2e5747a8a412bdd9a337b0209e4fdeac13ec1e0c0a5510567a904d354c4877963fdfcdd12d6797e252b0aa0a40d47f35101ea137285e9ccef730e3c781
-  data.tar.gz: 98ab2b349ef4391bc14b87d31a5ca07e18e9e6d67fedb31d409e267bb19ddf634948ed2bceca13aafbac95d277331e681e41d1a5925abd9ce87e738fbefd7d2b
+  metadata.gz: 8ee64ea46efce98f7de179cf14989fa2de44325d57b0fe1c859815cf0e07e842062c0a08382539693ddabe67cb86054b572b85264b9372287e2756de676cb501
+  data.tar.gz: 2a8b2dd854f242b77b6dda313c8fb4e03e18e31df157c0cd256805ea5a7a8433062bb836dfb429aac2e1a69970fc7b173c57e3a6e942af635ebf4310ba8187c5

data/.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+trim_trailing_whitespace = true

data/cortex-client.gemspec

@@ -17,8 +17,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake', '~> 12.0'
   s.add_development_dependency 'rspec', '~> 3.5'
   s.add_development_dependency 'mocha', '~> 1.2'
+  s.add_development_dependency 'webmock', '~> 2.3'
 
-  s.add_dependency 'oauth2', '~> 1.1.0'
+  s.add_dependency 'oauth2', '~> 1.1'
   s.add_dependency 'faraday', '~> 0.9'
   s.add_dependency 'faraday_middleware', '~> 0.10'
   s.add_dependency 'addressable', '~> 2.5'

data/lib/cortex/client.rb

@@ -20,7 +20,7 @@ module Cortex
     include Cortex::Request
 
     def initialize(hasharg)
-      @base_url = hasharg[:base_url] || 'https://cbcortex.com/api/v1'
+      @base_url = hasharg[:base_url] || 'http://cortex.dev/api/v1'
       if hasharg.has_key? :access_token
         @access_token = hasharg[:access_token]
       else

data/lib/cortex/connection.rb

@@ -1,9 +1,9 @@
 require 'faraday'
 require 'faraday_middleware'
-require 'addressable/uri'
 require 'hashie/mash'
 
 require 'cortex/faraday_middleware/response_failures'
+require 'cortex/faraday_middleware/normalize_uri_path'
 
 module Cortex
   module Connection
@@ -22,13 +22,13 @@ module Cortex
       Faraday::Utils.default_uri_parser = Addressable::URI
       Faraday.new options do |conn|
         ## Request middleware first:
-        conn.use ::FaradayMiddleware::OAuth2, access_token.is_a?(OAuth2::AccessToken) ? access_token.token : access_token
+        conn.use Cortex::FaradayMiddleware::NormalizeURIPath
+        conn.request :oauth2, access_token.is_a?(OAuth2::AccessToken) ? access_token.token : access_token
+        conn.request :json
 
         ## Response middleware second:
-        conn.use ::FaradayMiddleware::Mashify
+        conn.response :mashify
         conn.use Cortex::FaradayMiddleware::ResponseFailures
-
-        conn.request :json
         conn.response :json, :content_type => /\bjson$/
 
         ## Adapter always last:

data/lib/cortex/faraday_middleware/normalize_uri_path.rb

@@ -0,0 +1,14 @@
+require 'faraday/middleware'
+require 'addressable/uri'
+
+module Cortex
+  module FaradayMiddleware
+    class NormalizeURIPath < Faraday::Middleware
+      def call(env)
+        env[:url].path = Addressable::URI.normalize_component(env[:url].path)
+
+        @app.call env
+      end
+    end
+  end
+end

data/lib/cortex/version.rb

@@ -1,3 +1,3 @@
 module Cortex
-  VERSION = '0.10.0'
+  VERSION = '0.10.1'
 end

data/spec/posts_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 RSpec.describe Cortex::Posts do
-
-  # TODO: Stub out Faraday somewhere. See: https://github.com/lostisland/faraday#using-faraday-for-testing
   let(:client) { Cortex::Client.new(access_token: '123') }
 
   describe :get do
@@ -18,8 +16,17 @@ RSpec.describe Cortex::Posts do
       expect(client.posts.get_published(1)).to eq('response')
     end
 
-    it 'should work with special characters' do
-      expect { client.posts.get_published('1 post') }.to_not raise_error(URI::InvalidURIError)
+    context 'with special characters' do
+      let!(:stubbed_request) { stub_request(:get, 'http://cortex.dev/api/v1/posts/feed/1%20post?access_token=123') }
+
+      it 'should correctly make the request' do
+        client.posts.get_published('1 post')
+        expect(stubbed_request).to have_been_made.once
+      end
+
+      it 'should not be considered an invalid URI' do
+        expect { client.posts.get_published('1 post') }.to_not raise_error(URI::InvalidURIError)
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
-require 'ostruct'
+require 'webmock/rspec'
+
 require_relative '../lib/cortex-client'
 
 RSpec.configure do |config|
   config.mock_framework = :mocha
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cortex-client
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - CareerBuilder Employer Site & Content Products
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -52,20 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -143,6 +157,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -154,6 +169,7 @@ files:
 - lib/cortex/client.rb
 - lib/cortex/client_exceptions.rb
 - lib/cortex/connection.rb
+- lib/cortex/faraday_middleware/normalize_uri_path.rb
 - lib/cortex/faraday_middleware/response_failures.rb
 - lib/cortex/posts.rb
 - lib/cortex/request.rb