vertebrae 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33d170118c5e28ae1a2a0a935533a6eb91399f59
-  data.tar.gz: 143acc85ac9cc3bc3f20d94eef9754b014820858
+  metadata.gz: abf8d85f53410dfaef4ad36bd30202818d843ebc
+  data.tar.gz: 7d83314db1b94909a999208fc8bf0a5319dd388e
 SHA512:
-  metadata.gz: a04607160374094ce65eb834e41b91f2de6fb9ea39789d3503a368edc929ddc8fd5bf6dd50acbb9752207784e44fa0d7080f7cc71763562aab7d8daeadd61677
-  data.tar.gz: 3109d36f5fd4fa04d2c81b4dfd59f67c6c57d4c4eb2361236eda59d4f31eb9e7d1d2b2502394984cb303f42fe1d3fb465dd1873584b3357026220b6c4add9413
+  metadata.gz: 2691bf821b17a9637319b82a7bce356e7383662d2e732e7710fa1a672844273b73129e69f0dd34c11e048bcf23b48af00d6d3af517011c47f9f0345b4c8990d7
+  data.tar.gz: 6e6100a90b5c9976fda2eff2725c77744cdb6d6cfb5e3e64a0ada66be66475d856d27c3987b347e6a86782eef5b6edc79c3df5b210c15165e47534c1bd8a389c

data/Gemfile

@@ -13,5 +13,7 @@ gem 'hashie'
 group :development do
   gem "rspec"
   gem "bundler"
+  gem "webmock"
+  gem "rspec-its"
   gem "jeweler", "~> 2.0.0"
 end

data/Gemfile.lock

@@ -1,33 +1,35 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.0.0)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+    activesupport (4.1.4)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
+      tzinfo (~> 1.1)
     addressable (2.3.6)
-    atomic (1.1.10)
     builder (3.2.2)
-    descendants_tracker (0.0.3)
-    diff-lcs (1.2.4)
-    faraday (0.8.9)
-      multipart-post (~> 1.2.0)
-    faraday_middleware (0.9.0)
-      faraday (>= 0.7.4, < 0.9)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.2.5)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.9.1)
+      faraday (>= 0.7.4, < 0.10)
     git (1.2.8)
-    github_api (0.11.3)
+    github_api (0.12.0)
       addressable (~> 2.3)
-      descendants_tracker (~> 0.0.1)
+      descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 1.2)
+      hashie (>= 3.2)
       multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6.3)
       oauth2
     hashie (3.2.0)
     highline (1.6.21)
-    i18n (0.6.4)
+    i18n (0.6.11)
     jeweler (2.0.1)
       builder
       bundler (>= 1.0)
@@ -40,10 +42,10 @@ GEM
     json (1.8.1)
     jwt (1.0.0)
     mini_portile (0.6.0)
-    minitest (4.7.5)
+    minitest (5.4.0)
     multi_json (1.10.1)
     multi_xml (0.5.5)
-    multipart-post (1.2.0)
+    multipart-post (2.0.0)
     nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
     oauth2 (1.0.0)
@@ -56,17 +58,24 @@ GEM
     rake (10.3.2)
     rdoc (4.1.1)
       json (~> 1.4)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.2)
-    rspec-expectations (2.14.0)
+    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-mocks (2.14.1)
-    thread_safe (0.1.0)
-      atomic
-    tzinfo (0.3.37)
+    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)
+    thread_safe (0.3.4)
+    tzinfo (1.2.1)
+      thread_safe (~> 0.1)
+    webmock (1.18.0)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
 
 PLATFORMS
   ruby
@@ -79,3 +88,5 @@ DEPENDENCIES
   hashie
   jeweler (~> 2.0.0)
   rspec
+  rspec-its
+  webmock

data/VERSION

@@ -1 +1 @@
-0.2.10
+0.2.11

data/lib/api.rb

@@ -2,11 +2,12 @@ module Vertebrae
   class API
     include Request
 
-    attr_accessor :connection
+    attr_accessor :connection, :initialisation_options
 
     # Create new API
     #
     def initialize(options={}, &block)
+      self.initialisation_options = options
       options = default_options.merge(options)
 
       yield_or_eval(&block) if block_given?

data/lib/request.rb

@@ -28,7 +28,7 @@ module Vertebrae
       if !::Vertebrae::Request::METHODS.include?(method)
         raise ArgumentError, "unknown http method: #{method}"
       end
-      connection.options = default_options.merge(options)
+      connection.options = default_options.merge(initialisation_options.merge(options))
 
       path =  connection.configuration.prefix + '/' + path
 

data/spec/logger_spec.rb

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

data/spec/request_spec.rb

@@ -30,4 +30,48 @@ describe Vertebrae::Request do
     vb.should_receive(:request).with(:delete, path, params, options)
     vb.delete_request path, params, options
   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
+
+      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
+      end
+
+      context 'with host specified at client initiation time' do
+        let(:options) { {} }
+
+        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://test2.com/path')
+            vb.request(:get, '/path', {}, options)
+          end
+        end
+      end
+    end
 end

data/spec/spec_helper.rb

@@ -4,14 +4,22 @@ require 'rspec'
 require 'vertebrae'
 require 'dummy/dummy'
 require 'dummy/client'
+require 'webmock/rspec'
 
+require 'rspec/its'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  
+  config.mock_with :rspec do |mocks|
+    mocks.syntax = [:should, :expect]
+  end
+
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
 end
 
 

data/vertebrae.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: vertebrae 0.2.10 ruby lib
+# stub: vertebrae 0.2.11 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "vertebrae"
-  s.version = "0.2.10"
+  s.version = "0.2.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -67,6 +67,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<hashie>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       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"])
     else
       s.add_dependency(%q<activesupport>, [">= 0"])
@@ -75,6 +77,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<hashie>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       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"])
     end
   else
@@ -84,6 +88,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<hashie>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     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"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vertebrae
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors:
 - Nathan Woodhull
@@ -94,6 +94,34 @@ dependencies:
     - - '>='
       - !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
   requirement: !ruby/object:Gem::Requirement