tokyo_api 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b31314db88bda36022a686b1cf9e33bd95d870bbdfa3ca2fbefab8e0a36df72
-  data.tar.gz: 98a5e4540b99f31cdbb6d9abc05f1bb14c21451dcfccd9592c182ffb96ab2c28
+  metadata.gz: 879c3eec6862437e9ab0804668b7cdc48d0194320af0dbc16d990bed2565d1c1
+  data.tar.gz: 6322d8e872f7cc5ae26708795c42809d50eab916766fa2035306836ee982c697
 SHA512:
-  metadata.gz: 217d35539205c967954ecedcabe6bb52d9eba88405c36b877dffe828dec937e24c4cefccbf97fcdccb3ef00bcca73ab6e8cef53f5c683955b594ff25e7ead7ee
-  data.tar.gz: 4ff16723f4dc8d5ccfcf8e1c2e96f65f7071c60959fbee53a183806985757f975e9f4fcf4c1b02c12166396866ef31615c63810f4f3efc2c58474e830d32e7ab
+  metadata.gz: 1505f232ce2c5e21c1446e39b891b36358536351ef0884ebdea5171c0ec21a0a68bf6b19fe04acc72689f79e3c2fca86421de80cf106f122ce4c1a2d65ecf834
+  data.tar.gz: 8814d7b820864e694e3e3de69c7ea24542479aa389db00e10cc4da1ab28f3bd100120f4a5339d8ac7f93f279a6dbde72e8c97f5201101700ec72783b8ea44c35

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem 'vertebrae', '~> 0.5.0'
+gem 'vertebrae', '~> 0.5.1'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/README.md

@@ -7,7 +7,7 @@ A ruby gem for communicating with ControlShift's Tokyo API.
 ## Usage
 
 ```ruby
-ta = TokyoApi.new(host: 'localhost:9000', username: 'tokyo', password: 'Passw0rd!', scheme: 'http')
+ta = TokyoApi.new(host: 'localhost:9000', username: 'tokyo', password: 'Passw0rd!', scheme: 'http', timeout: 5)
 ta.organisation.expire('foo.com')
 ```
 

data/VERSION

@@ -1 +1 @@
-1.4.1
+1.5.0

data/lib/tokyo_api/client.rb

@@ -26,11 +26,17 @@ module TokyoApi
 
 
     def default_options
-      {
+      opts = {
         user_agent: 'TokyoApi Gem',
         prefix: '',
         content_type: 'application/json'
       }
+
+      if initialisation_options.has_key?(:timeout)
+        opts[:connection_options] = {request: {timeout: initialisation_options[:timeout]}}
+      end
+
+      opts
     end
 
     def request(method, path, params, options) # :nodoc:

data/spec/client_spec.rb

@@ -1,16 +1,26 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe TokyoApi::Client do
-
-  describe "instantiated" do
+  describe 'initialisation' do
     subject { described_class.new(options) }
 
-    context 'process_basic_auth' do
-      let(:options) { { :basic_auth => 'login:password' } }
-      let(:config) { subject.connection.configuration  }
-      specify { expect(config.username).to eq 'login' }
-      specify { expect(config.password).to eq 'password' }
+    context 'with a basic_auth string parameter' do
+      let(:options) { {basic_auth: 'login:password'} }
+
+      it 'should set username/password on the configuration' do
+        config = subject.connection.configuration
+        expect(config.username).to eq 'login'
+        expect(config.password).to eq 'password'
+      end
     end
 
+    context 'with a timeout' do
+      let(:options) { {timeout: 5} }
+
+      it 'should set the timeout on the faraday options' do
+        config = subject.connection.configuration
+        expect(config.faraday_options[:request][:timeout]).to eq 5
+      end
+    end
   end
-end
+end

data/tokyo_api.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: tokyo_api 1.4.1 ruby lib
+# stub: tokyo_api 1.5.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "tokyo_api".freeze
-  s.version = "1.4.1"
+  s.version = "1.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 = "2019-05-23"
+  s.date = "2020-03-16"
   s.description = "Tokyo is a CRM middleware, this gem helps apps talk to it.".freeze
   s.email = "nathan@controlshiftlabs.com".freeze
   s.extra_rdoc_files = [
@@ -58,21 +58,21 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/controlshift/tokyo_api".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.7.7".freeze
+  s.rubygems_version = "3.0.8".freeze
   s.summary = "Ruby API Wrapper for Tokyo CRM service".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<vertebrae>.freeze, ["~> 0.5.0"])
+      s.add_runtime_dependency(%q<vertebrae>.freeze, ["~> 0.5.1"])
       s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
       s.add_development_dependency(%q<webmock>.freeze, [">= 0"])
       s.add_development_dependency(%q<byebug>.freeze, [">= 0"])
       s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
       s.add_development_dependency(%q<juwelier>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<vertebrae>.freeze, ["~> 0.5.0"])
+      s.add_dependency(%q<vertebrae>.freeze, ["~> 0.5.1"])
       s.add_dependency(%q<rspec>.freeze, [">= 0"])
       s.add_dependency(%q<webmock>.freeze, [">= 0"])
       s.add_dependency(%q<byebug>.freeze, [">= 0"])
@@ -80,7 +80,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<juwelier>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<vertebrae>.freeze, ["~> 0.5.0"])
+    s.add_dependency(%q<vertebrae>.freeze, ["~> 0.5.1"])
     s.add_dependency(%q<rspec>.freeze, [">= 0"])
     s.add_dependency(%q<webmock>.freeze, [">= 0"])
     s.add_dependency(%q<byebug>.freeze, [">= 0"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tokyo_api
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Nathan Woodhull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-23 00:00:00.000000000 Z
+date: 2020-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vertebrae
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -157,8 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Ruby API Wrapper for Tokyo CRM service