Merge branch 'develop'

Author: toastercup

Diff for: .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

Diff for: 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'

Diff for: lib/cortex/client.rb

@@ -20,7 +20,7 @@ class Client
     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

Diff for: 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 @@ def connection
       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:

Diff for: 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

Diff for: lib/cortex/version.rb

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

Diff for: 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 @@
       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
 

Diff for: 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