routemaster-client 0.0.3 → 1.0.0

data/.gitignore

@@ -1,2 +1,3 @@
 .bundle/
+pkg/
 tmp

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    routemaster-client (0.0.3)
-      faraday
+    routemaster-client (1.0.0)
+      faraday (>= 0.9.0)
       net-http-persistent
       wisper (>= 1.4.0)
 

data/README.md

@@ -30,13 +30,13 @@ Or install it yourself as:
 
 ```ruby
 require 'routemaster/client'
-client = RoutemasterClient.new(url: 'https://bus.example.com', uuid: 'john-doe')
+client = Routemaster::Client.new(url: 'https://bus.example.com', uuid: 'john-doe')
 ```
 
 You can also specify a timeout value in seconds if you like with the ```timeout``` option.
 
 ```ruby
-RoutemasterClient.new(url: 'https://bus.example.com', uuid: 'john-doe', timeout: 2)
+Routemaster::Client.new(url: 'https://bus.example.com', uuid: 'john-doe', timeout: 2)
 ```
 
 

data/routemaster/client/version.rb

@@ -1,5 +1,5 @@
 module Routemaster
   class Client
-    VERSION = '0.0.3'
+    VERSION = '1.0.0'
   end
 end

data/routemaster/client.rb

@@ -14,8 +14,10 @@ module Routemaster
       _assert (options[:uuid] =~ /^[a-z0-9_-]{1,64}$/), 'uuid should be alpha'
       _assert_valid_timeout(@_timeout)
 
-      _conn.get('/pulse').tap do |response|
-        raise 'cannot connect to bus' unless response.success?
+      unless options[:lazy]
+        _conn.get('/pulse').tap do |response|
+          raise 'cannot connect to bus' unless response.success?
+        end
       end
     end
 
@@ -47,10 +49,9 @@ module Routemaster
       options[:topics].each { |t| _assert_valid_topic(t) }
       _assert_valid_url(options[:callback])
 
-      data = options.to_json
       response = _post('/subscription') do |r|
         r.headers['Content-Type'] = 'application/json'
-        r.body = data
+        r.body = options.to_json
       end
       # $stderr.puts response.status
       unless response.success?
@@ -82,10 +83,10 @@ module Routemaster
     def _send_event(event, topic, callback)
       _assert_valid_url(callback)
       _assert_valid_topic(topic)
-      data = { type: event, url: callback }.to_json
+      data = { type: event, url: callback }
       response = _post("/topics/#{topic}") do |r|
         r.headers['Content-Type'] = 'application/json'
-        r.body = data
+        r.body = data.to_json
       end
       fail "event rejected (#{response.status})" unless response.success?
     end
@@ -107,9 +108,12 @@ module Routemaster
 
     def _conn
       @_conn ||= Faraday.new(@_url) do |f|
-        f.use Faraday::Request::BasicAuthentication, @_uuid, 'x'
+        f.request :retry, max: 2, interval: 100e-3, backoff_factor: 2
+        f.request :basic_auth, @_uuid, 'x'
         f.adapter :net_http_persistent
-        f.options[:timeout] = @_timeout
+
+        f.options.timeout      = @_timeout
+        f.options.open_timeout = @_timeout
       end
     end
   end

data/routemaster-client.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = %w(.)
 
-  spec.add_runtime_dependency     'faraday'
+  spec.add_runtime_dependency     'faraday', '>= 0.9.0'
   spec.add_runtime_dependency     'net-http-persistent'
   spec.add_runtime_dependency     'wisper', '>= 1.4.0'
 end

data/spec/{routemaster/client_spec.rb → client_spec.rb}

@@ -33,9 +33,20 @@ describe Routemaster::Client do
       expect { subject }.to raise_error(ArgumentError)
     end
 
-    it 'fails it it cannot connect' do
-      stub_request(:any, %r{^https://#{options[:uuid]}:x@bus.example.com}).to_raise(Faraday::ConnectionFailed)
-      expect { subject }.to raise_error
+    context 'when connection fails' do
+      before do
+        stub_request(:any, %r{^https://#{options[:uuid]}:x@bus.example.com}).
+          to_raise(Faraday::ConnectionFailed)
+      end
+
+      it 'fails' do
+        expect { subject }.to raise_error
+      end
+
+      it 'passes if :lazy' do
+        options[:lazy] = true
+        expect { subject }.not_to raise_error
+      end
     end
 
     it 'fails if it does not get a successful heartbeat from the app' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: routemaster-client
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
@@ -83,8 +83,8 @@ files:
 - routemaster/client/openssl.rb
 - routemaster/client/version.rb
 - routemaster/receiver.rb
+- spec/client_spec.rb
 - spec/receiver_spec.rb
-- spec/routemaster/client_spec.rb
 - spec/spec_helper.rb
 - spec/support/rack_test.rb
 homepage: http://github.com/HouseTrip/routemaster_client
@@ -102,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2540830957177487143
+      hash: -2844023106456295461
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2540830957177487143
+      hash: -2844023106456295461
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23.2
@@ -119,7 +119,7 @@ signing_key:
 specification_version: 3
 summary: Client API for the Routemaster event bus
 test_files:
+- spec/client_spec.rb
 - spec/receiver_spec.rb
-- spec/routemaster/client_spec.rb
 - spec/spec_helper.rb
 - spec/support/rack_test.rb