vertebrae 0.2.11 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abf8d85f53410dfaef4ad36bd30202818d843ebc
-  data.tar.gz: 7d83314db1b94909a999208fc8bf0a5319dd388e
+  metadata.gz: 66681bd5a28cd8a756c12d3c06b03a0534aa5f62
+  data.tar.gz: a0869a74347720678db034f85aecf679a22d2132
 SHA512:
-  metadata.gz: 2691bf821b17a9637319b82a7bce356e7383662d2e732e7710fa1a672844273b73129e69f0dd34c11e048bcf23b48af00d6d3af517011c47f9f0345b4c8990d7
-  data.tar.gz: 6e6100a90b5c9976fda2eff2725c77744cdb6d6cfb5e3e64a0ada66be66475d856d27c3987b347e6a86782eef5b6edc79c3df5b210c15165e47534c1bd8a389c
+  metadata.gz: 0a50a353163fc47da628bd596a422a2ba8dd47270380587da1e20be974528599427db980c9eab714ed3faa3f3645b03894507abfa99c148a9e23653d6e5f1299
+  data.tar.gz: f5628a99c3d66c80a045fe5128c736321f3a113a35afc75cc574d6004df242738fa05108e53c4c5f8946f75e33d0ef77db991914ff7040762e4d6fb3415a3792

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0-p353
+2.2.4

data/Gemfile

@@ -15,5 +15,5 @@ group :development do
   gem "bundler"
   gem "webmock"
   gem "rspec-its"
-  gem "jeweler", "~> 2.0.0"
+  gem "juwelier", "~> 2.1.0"
 end

data/Gemfile.lock

@@ -7,9 +7,9 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    addressable (2.3.6)
+    addressable (2.4.0)
     builder (3.2.2)
-    crack (0.4.2)
+    crack (0.4.3)
       safe_yaml (~> 1.0.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
@@ -18,8 +18,8 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.9.1)
       faraday (>= 0.7.4, < 0.10)
-    git (1.2.8)
-    github_api (0.12.0)
+    git (1.3.0)
+    github_api (0.12.1)
       addressable (~> 2.3)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
@@ -27,10 +27,12 @@ GEM
       multi_json (>= 1.7.5, < 2.0)
       nokogiri (~> 1.6.3)
       oauth2
+    hashdiff (0.3.0)
     hashie (3.2.0)
-    highline (1.6.21)
+    highline (1.7.8)
     i18n (0.6.11)
-    jeweler (2.0.1)
+    json (1.8.1)
+    juwelier (2.1.2)
       builder
       bundler (>= 1.0)
       git (>= 1.2.5)
@@ -39,43 +41,52 @@ GEM
       nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.8.1)
-    jwt (1.0.0)
-    mini_portile (0.6.0)
+      semver
+    jwt (1.5.4)
+    mini_portile2 (2.1.0)
     minitest (5.4.0)
-    multi_json (1.10.1)
+    multi_json (1.12.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
-    oauth2 (1.0.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    oauth2 (1.2.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (1.5.2)
-    rake (10.3.2)
-    rdoc (4.1.1)
+      rack (>= 1.2, < 3)
+    pkg-config (1.1.7)
+    rack (2.0.1)
+    rake (11.2.2)
+    rdoc (4.2.2)
       json (~> 1.4)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.1)
-    rspec-expectations (2.99.2)
-      diff-lcs (>= 1.1.3, < 2.0)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.2)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
     rspec-its (1.0.1)
       rspec-core (>= 2.99.0.beta1)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-mocks (2.99.2)
-    safe_yaml (1.0.3)
+    rspec-mocks (3.3.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
+    safe_yaml (1.0.4)
+    semver (1.0.1)
     thread_safe (0.3.4)
     tzinfo (1.2.1)
       thread_safe (~> 0.1)
-    webmock (1.18.0)
+    webmock (2.1.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
+      hashdiff
 
 PLATFORMS
   ruby
@@ -86,7 +97,10 @@ DEPENDENCIES
   faraday
   faraday_middleware
   hashie
-  jeweler (~> 2.0.0)
+  juwelier (~> 2.1.0)
   rspec
   rspec-its
   webmock
+
+BUNDLED WITH
+   1.12.5

data/Rakefile

@@ -11,8 +11,9 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
+require 'juwelier'
+Juwelier::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
   gem.name = "vertebrae"
   gem.homepage = "http://github.com/controlshift/vertebrae"
   gem.license = "MIT"
@@ -20,9 +21,10 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{A set of low level infrastructure and reusable code for building API clients}
   gem.email = "nathan@controlshiftlabs.com"
   gem.authors = ["Nathan Woodhull"]
+
   # dependencies defined in Gemfile
 end
-Jeweler::RubygemsDotOrgTasks.new
+Juwelier::RubygemsDotOrgTasks.new
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
@@ -30,9 +32,10 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+desc "Code coverage detail"
+task :simplecov do
+  ENV['COVERAGE'] = "true"
+  Rake::Task['spec'].execute
 end
 
 task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.2.11
+0.3.0

data/lib/configuration.rb

@@ -16,6 +16,7 @@ module Vertebrae
         :connection_options,
         :content_type,
         :scheme,
+        :port
     ].freeze
 
     # Other adapters are :typhoeus, :patron, :em_synchrony, :excon, :test
@@ -27,6 +28,9 @@ module Vertebrae
     # The default SSL configuration
     DEFAULT_SSL = {}
 
+    # by default do not set a port so that it is not specified on endpoint
+    DEFAULT_PORT = nil
+
     # By default the <tt>Accept</tt> header will make a request for <tt>JSON</tt>
     DEFAULT_MIME_TYPE = :json
 
@@ -108,7 +112,7 @@ module Vertebrae
 
 
     def endpoint
-      "#{self.scheme}://#{self.host}#{self.prefix}"
+      "#{self.scheme}://#{self.host}#{self.port.present? ? ":#{self.port}" : ''}#{self.prefix}"
     end
   end
 end

data/lib/connection.rb

@@ -56,9 +56,9 @@ module Vertebrae
     def stack(&block)
       @stack ||= begin
         if block_given?
-          Faraday::Builder.new(&block)
+          Faraday::RackBuilder.new(&block)
         else
-          Faraday::Builder.new(&default_middleware)
+          Faraday::RackBuilder.new(&default_middleware)
         end
       end
     end

data/spec/api_spec.rb

@@ -3,11 +3,11 @@ require 'spec_helper'
 describe Vertebrae::API do
   subject { described_class.new(options) }
 
-  it { described_class.included_modules.should include Vertebrae::Request }
+  it { expect(described_class.included_modules).to include Vertebrae::Request }
 
   describe 'initialize' do
     before(:each) do
-      Vertebrae::API.any_instance.stub(:default_options).and_return({content_type: 'foo'})
+      allow_any_instance_of(Vertebrae::API).to receive(:default_options).and_return({content_type: 'foo'})
     end
 
     context 'with an empty hash' do
@@ -23,8 +23,8 @@ describe Vertebrae::API do
 
   describe 'dummy' do
     describe 'should delegate to the client class' do
-      specify{ Dummy.new.should respond_to(:api)  }
-      specify{ Dummy.should respond_to(:api) }
+      specify { expect(Dummy.new).to respond_to(:api)  }
+      specify { expect(Dummy).to respond_to(:api) }
     end
   end
-end
+end

data/spec/configuration_spec.rb

@@ -38,9 +38,25 @@ describe Vertebrae::Configuration do
   end
 
   describe 'endpoint' do
-    subject { Vertebrae::Configuration.new({host: 'test.com', prefix: ''}) }
+    context 'with no port specification' do
+      subject { Vertebrae::Configuration.new({host: 'test.com', prefix: ''}) }
 
-    specify { subject.host.should == 'test.com' }
-    specify { subject.endpoint.should == 'https://test.com'}
+      specify { expect(subject.host).to eq('test.com') }
+      specify { expect(subject.endpoint).to eq('https://test.com')}
+    end
+
+    context 'with port specification' do
+      subject { Vertebrae::Configuration.new({host: 'test.com', prefix: '', port: 8080}) }
+
+      specify { expect(subject.port).to eq(8080) }
+      specify { expect(subject.endpoint).to eq('https://test.com:8080')}
+
+      context 'with prefix' do
+        subject { Vertebrae::Configuration.new({host: 'test.com', prefix: '/api/v1', port: 8080}) }
+
+        specify { expect(subject.prefix).to eq('/api/v1') }
+        specify { expect(subject.endpoint).to eq('https://test.com:8080/api/v1')}
+      end
+    end
   end
-end
+end

data/spec/logger_spec.rb

@@ -2,17 +2,17 @@ require 'spec_helper'
 
 describe 'logging' do
   it "should have a logger" do
-    Dummy.respond_to?(:logger).should be_truthy
+    expect(Dummy).to respond_to(:logger)
   end
 
   it "should be able to log debug methods" do
-    Dummy.logger.respond_to?(:debug).should be_truthy
+    expect(Dummy.logger).to respond_to(:debug)
   end
 
   it "should be settable" do
-    Dummy.respond_to?(:logger=).should be_truthy
-    log = double()
+    expect(Dummy).to respond_to(:logger=)
+    log = double
     Dummy.logger = log
-    Dummy.logger.should == log
+    expect(Dummy.logger).to eq(log)
   end
 end

data/spec/request_spec.rb

@@ -7,22 +7,22 @@ describe Vertebrae::Request do
   let(:options) { {} }
 
   it "knows how to make get request" do
-    vb.should_receive(:request).with(:get, path, params, options)
+    expect(vb).to receive(:request).with(:get, path, params, options)
     vb.get_request path, params, options
   end
 
   it "knows how to make patch request" do
-    vb.should_receive(:request).with(:patch, path, params, options)
+    expect(vb).to receive(:request).with(:patch, path, params, options)
     vb.patch_request path, params, options
   end
 
   it "knows how to make post request" do
-    vb.should_receive(:request).with(:post, path, params, options)
+    expect(vb).to receive(:request).with(:post, path, params, options)
     vb.post_request path, params, options
   end
 
   it "knows how to make put request" do
-    vb.should_receive(:request).with(:put, path, params, options)
+    expect(vb).to receive(:request).with(:put, path, params, options)
     vb.put_request path, params, options
   end
 
@@ -32,46 +32,46 @@ describe Vertebrae::Request do
   end
 
   describe 'it should result in an appropriately configured connection object when it comes time to run transactions' do
-      before(:each) do
-        logger = double
-        logger.stub(:debug).and_return(true)
-        Vertebrae::Base.stub(:logger).and_return(logger)
-        Vertebrae::API.any_instance.stub(:default_options).and_return({host: 'test.com'})
-      end
+    before(:each) do
+      logger = double
+      logger.stub(:debug).and_return(true)
+      allow(Vertebrae::Base).to receive(:logger).and_return(logger)
+      allow_any_instance_of(Vertebrae::API).to receive(:default_options).and_return({host: 'test.com'})
+    end
 
-      context 'with an empty hash' do
-        let(:options) { {} }
-        it 'should make the request to the default host' do
-          stub_request(:get, 'https://test.com/path')
-          vb.request(:get, '/path', {}, options)
-        end
+    context 'with an empty hash' do
+      let(:options) { {} }
+      it 'should make the request to the default host' do
+        stub_request(:get, 'https://test.com/path')
+        vb.request(:get, '/path', {}, options)
       end
+    end
 
-      context 'with a different host' do
-        let(:options) { {host: 'test2.com'} }
-        it 'should make the request to the default host' do
-          stub_request(:get, 'https://test2.com/path')
-          vb.request(:get, '/path', {}, options)
-        end
+    context 'with a different host' do
+      let(:options) { {host: 'test2.com'} }
+      it 'should make the request to the default host' do
+        stub_request(:get, 'https://test2.com/path')
+        vb.request(:get, '/path', {}, options)
       end
+    end
 
-      context 'with host specified at client initiation time' do
-        let(:options) { {} }
+    context 'with host specified at client initiation time' do
+      let(:options) { {} }
 
-        let(:vb) { Vertebrae::API.new host: 'test3.com' }
+      let(:vb) { Vertebrae::API.new host: 'test3.com' }
 
+      it 'should make the request to the default host' do
+        stub_request(:get, 'https://test3.com/path')
+        vb.request(:get, '/path', {}, options)
+      end
+
+      context 'with a different host' do
+        let(:options) { {host: 'test2.com'} }
         it 'should make the request to the default host' do
-          stub_request(:get, 'https://test3.com/path')
+          stub_request(:get, 'https://test2.com/path')
           vb.request(:get, '/path', {}, options)
         end
-
-        context 'with a different host' do
-          let(:options) { {host: 'test2.com'} }
-          it 'should make the request to the default host' do
-            stub_request(:get, 'https://test2.com/path')
-            vb.request(:get, '/path', {}, options)
-          end
-        end
       end
     end
-end
+  end
+end

data/vertebrae.gemspec

@@ -1,17 +1,17 @@
-# Generated by jeweler
+# Generated by juwelier
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: vertebrae 0.2.11 ruby lib
+# stub: vertebrae 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "vertebrae"
-  s.version = "0.2.11"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Nathan Woodhull"]
-  s.date = "2014-08-04"
+  s.date = "2016-08-03"
   s.description = "A set of low level infrastructure and reusable code for building API clients"
   s.email = "nathan@controlshiftlabs.com"
   s.extra_rdoc_files = [
@@ -54,7 +54,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/controlshift/vertebrae"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.8"
   s.summary = "API Client Infrastructure"
 
   if s.respond_to? :specification_version then
@@ -69,7 +69,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<webmock>, [">= 0"])
       s.add_development_dependency(%q<rspec-its>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 2.0.0"])
+      s.add_development_dependency(%q<juwelier>, ["~> 2.1.0"])
     else
       s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<faraday>, [">= 0"])
@@ -79,7 +79,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<webmock>, [">= 0"])
       s.add_dependency(%q<rspec-its>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 2.0.0"])
+      s.add_dependency(%q<juwelier>, ["~> 2.1.0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 0"])
@@ -90,7 +90,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<webmock>, [">= 0"])
     s.add_dependency(%q<rspec-its>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 2.0.0"])
+    s.add_dependency(%q<juwelier>, ["~> 2.1.0"])
   end
 end
 

metadata

@@ -1,141 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: vertebrae
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.3.0
 platform: ruby
 authors:
 - Nathan Woodhull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: juwelier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 description: A set of low level infrastructure and reusable code for building API
   clients
 email: nathan@controlshiftlabs.com
@@ -145,11 +145,11 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .document
-- .rspec
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".document"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -187,17 +187,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: API Client Infrastructure