vertebrae 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d3d13a6b72c1baeb513620e39717bbada581049
-  data.tar.gz: bae900e52ac1a0d3ef22fd4ffb5664380b175891
+  metadata.gz: c36f7513900e9676643bff2e6d7d6ec05528c115
+  data.tar.gz: b9f03bbf801b10f655c837d0943bf7d1a2eadfc2
 SHA512:
-  metadata.gz: '09831d8fdf212c8180f9577688580b575ad9bb60c47171961d57af820ee6ee642d5a2347ee7d4258b1c8468112dd269e7445f7d2423164149306a16da6e178e4'
-  data.tar.gz: 13fd2deb93bd83e5db3b92162e9e0f15b6ff57d86e20c2ce68186900c618df68cb7967cec5c8674a9ea73e5775c8bb04bf1710c92cb801dc015ac4b4973ee091
+  metadata.gz: c4a6788755e1256f4176c0d221fd8f8b6437d76f4aba6f54451f93cdc34b5fbce68c58ed0796bb29f2324e1411c578f810168198d17bb947d6cbcdc5fd49088a
+  data.tar.gz: e27d47e5cbd778c753fa47caf9ae89dac15b666bd424fa7cd9be32b4803ccf9133422abff419db33646ca3e61ffc2da0a971200a47f4666561d0470b8fa729b8

data/Gemfile

@@ -1,12 +1,9 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
 
-gem 'activesupport'
+gem 'activesupport', '~> 5.1', '>= 5.1.4'
 gem 'faraday', '>= 0.9.2'
-gem 'faraday_middleware'
-gem 'hashie'
-
+gem 'faraday_middleware', '~> 0.12', '>= 0.12.2'
+gem 'hashie', '~> 3.5', '>= 3.5.7'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.5.0

data/lib/connection.rb

@@ -1,6 +1,5 @@
 require 'faraday'
 require 'faraday_middleware'
-require 'request/basic_auth'
 require 'response/raise_error'
 require 'authorization'
 
@@ -38,7 +37,9 @@ module Vertebrae
       Proc.new do |builder|
         builder.use Faraday::Request::Multipart
         builder.use Faraday::Request::UrlEncoded
-        builder.use Vertebrae::Request::BasicAuth, configuration.authentication if configuration.authenticated?
+        if configuration.authenticated?
+          builder.use Faraday::Request::BasicAuthentication, configuration.username, configuration.password
+        end
 
         builder.use Faraday::Response::Logger if ENV['DEBUG']
         unless options[:raw]
@@ -69,4 +70,4 @@ module Vertebrae
       Faraday.new(configuration.faraday_options.merge(:builder => stack))
     end
   end
-end
+end

data/spec/request_spec.rb

@@ -73,5 +73,15 @@ describe Vertebrae::Request do
         end
       end
     end
+
+    context 'with basic auth' do
+      let(:options) { {} }
+      let(:vb) { Vertebrae::API.new username: 'user', password: 'pass' }
+
+      it 'should make requests with basic auth' do
+        stub_request(:get, 'https://test3.com/path').with(basic_auth: ['user', 'pass'])
+        vb.request(:get, '/path', {}, {host: 'test3.com'})
+      end
+    end
   end
 end

data/vertebrae.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: vertebrae 0.4.3 ruby lib
+# stub: vertebrae 0.5.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "vertebrae".freeze
-  s.version = "0.4.3"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Nathan Woodhull".freeze]
-  s.date = "2017-12-27"
+  s.date = "2018-12-04"
   s.description = "A set of low level infrastructure and reusable code for building API clients".freeze
   s.email = "nathan@controlshiftlabs.com".freeze
   s.extra_rdoc_files = [
@@ -25,7 +25,6 @@ Gem::Specification.new do |s|
     ".ruby-version",
     ".travis.yml",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
@@ -40,7 +39,6 @@ Gem::Specification.new do |s|
     "lib/model.rb",
     "lib/railties.rb",
     "lib/request.rb",
-    "lib/request/basic_auth.rb",
     "lib/response/raise_error.rb",
     "lib/response_error.rb",
     "lib/vertebrae.rb",
@@ -62,20 +60,20 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>.freeze, [">= 5.1.4", "~> 5.1"])
       s.add_runtime_dependency(%q<faraday>.freeze, [">= 0.9.2"])
-      s.add_runtime_dependency(%q<faraday_middleware>.freeze, [">= 0"])
-      s.add_runtime_dependency(%q<hashie>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<faraday_middleware>.freeze, [">= 0.12.2", "~> 0.12"])
+      s.add_runtime_dependency(%q<hashie>.freeze, [">= 3.5.7", "~> 3.5"])
       s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
       s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
       s.add_development_dependency(%q<webmock>.freeze, [">= 0"])
       s.add_development_dependency(%q<rspec-its>.freeze, [">= 0"])
       s.add_development_dependency(%q<juwelier>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<activesupport>.freeze, [">= 0"])
+      s.add_dependency(%q<activesupport>.freeze, [">= 5.1.4", "~> 5.1"])
       s.add_dependency(%q<faraday>.freeze, [">= 0.9.2"])
-      s.add_dependency(%q<faraday_middleware>.freeze, [">= 0"])
-      s.add_dependency(%q<hashie>.freeze, [">= 0"])
+      s.add_dependency(%q<faraday_middleware>.freeze, [">= 0.12.2", "~> 0.12"])
+      s.add_dependency(%q<hashie>.freeze, [">= 3.5.7", "~> 3.5"])
       s.add_dependency(%q<rspec>.freeze, [">= 0"])
       s.add_dependency(%q<bundler>.freeze, [">= 0"])
       s.add_dependency(%q<webmock>.freeze, [">= 0"])
@@ -83,10 +81,10 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<juwelier>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<activesupport>.freeze, [">= 0"])
+    s.add_dependency(%q<activesupport>.freeze, [">= 5.1.4", "~> 5.1"])
     s.add_dependency(%q<faraday>.freeze, [">= 0.9.2"])
-    s.add_dependency(%q<faraday_middleware>.freeze, [">= 0"])
-    s.add_dependency(%q<hashie>.freeze, [">= 0"])
+    s.add_dependency(%q<faraday_middleware>.freeze, [">= 0.12.2", "~> 0.12"])
+    s.add_dependency(%q<hashie>.freeze, [">= 3.5.7", "~> 3.5"])
     s.add_dependency(%q<rspec>.freeze, [">= 0"])
     s.add_dependency(%q<bundler>.freeze, [">= 0"])
     s.add_dependency(%q<webmock>.freeze, [">= 0"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vertebrae
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Nathan Woodhull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-27 00:00:00.000000000 Z
+date: 2018-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.1.4
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.1.4
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +50,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.2
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.2
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.7
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.7
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +169,6 @@ files:
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile
@@ -166,7 +183,6 @@ files:
 - lib/model.rb
 - lib/railties.rb
 - lib/request.rb
-- lib/request/basic_auth.rb
 - lib/response/raise_error.rb
 - lib/response_error.rb
 - lib/vertebrae.rb

data/Gemfile.lock

@@ -1,108 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (5.1.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    builder (3.2.3)
-    concurrent-ruby (1.0.5)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.3)
-    faraday (0.12.2)
-      multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.12.2)
-      faraday (>= 0.7.4, < 1.0)
-    git (1.3.0)
-    github_api (0.18.2)
-      addressable (~> 2.4)
-      descendants_tracker (~> 0.0.4)
-      faraday (~> 0.8)
-      hashie (~> 3.5, >= 3.5.2)
-      oauth2 (~> 1.0)
-    hashdiff (0.3.7)
-    hashie (3.5.7)
-    highline (1.7.10)
-    i18n (0.9.1)
-      concurrent-ruby (~> 1.0)
-    juwelier (2.4.7)
-      builder
-      bundler
-      git
-      github_api
-      highline
-      kamelcase (~> 0)
-      nokogiri
-      psych
-      rake
-      rdoc
-      semver2
-    jwt (1.5.6)
-    kamelcase (0.0.1)
-      semver2 (~> 3)
-    mini_portile2 (2.3.0)
-    minitest (5.10.3)
-    multi_json (1.12.2)
-    multi_xml (0.6.0)
-    multipart-post (2.0.0)
-    nokogiri (1.8.1)
-      mini_portile2 (~> 2.3.0)
-    oauth2 (1.4.0)
-      faraday (>= 0.8, < 0.13)
-      jwt (~> 1.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
-    psych (3.0.2)
-    public_suffix (3.0.1)
-    rack (2.0.3)
-    rake (12.3.0)
-    rdoc (6.0.1)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-its (1.2.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
-    safe_yaml (1.0.4)
-    semver2 (3.4.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.4)
-      thread_safe (~> 0.1)
-    webmock (3.1.1)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport
-  bundler
-  faraday (>= 0.9.2)
-  faraday_middleware
-  hashie
-  juwelier
-  rspec
-  rspec-its
-  webmock
-
-BUNDLED WITH
-   1.16.1

data/lib/request/basic_auth.rb

@@ -1,26 +0,0 @@
-module Vertebrae
-  module Request
-    class BasicAuth < Faraday::Middleware
-      dependency 'base64'
-
-      def call(env)
-        env[:request_headers].merge!('Authorization' => "Basic #{@auth}\"")
-
-        @app.call env
-      end
-
-      def initialize(app, *args)
-        @app = app
-        credentials = ""
-        options = args.extract_options!
-        if options.has_key? :username
-          credentials = "#{options[:username]}:#{options[:password]}"
-        elsif options.has_key? :basic_auth
-          credentials = "#{options[:basic_auth]}"
-        end
-        @auth = Base64.encode64(credentials)
-        @auth.gsub!("\n", "")
-      end
-    end # BasicAuth
-  end
-end