tickr_client 1.0.0 → 1.1.0

data/README.md

@@ -14,9 +14,9 @@ makes no guarantee about sequentiality.
 
     $tickr = TickrClient.new(
       servers: [
-        {host: '192.168.1.1', port: 8080},
-        {host: '192.168.1.2', port: 8080},
-        {host: '192.168.1.3', port: 8080}
+        {host: '192.168.1.1', port: 8080, http_auth_password: 'lockd0wn'},
+        {host: '192.168.1.2', port: 8080, http_auth_password: 'lockd0wn'},
+        {host: '192.168.1.3', port: 8080, http_auth_password: 'lockd0wn'}
       ],
       timeout: 1000, # Try next host after 1 second.
       cache_size: 100, # Keep up to 100 tickets (unique IDs) at the ready.

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/lib/tickr_client.rb

@@ -39,10 +39,16 @@ class TickrClient
 
   def fetch_tickets_from_server(index)
     new_ticket_group = begin
-      uri = URI("http://#{servers[index][:host]}:#{servers[index][:port]}/tickets/create/#{replenish_capacity}")
-      Timeout::timeout(timeout / 1000.0) do
-        JSON.parse(Net::HTTP.get(uri))
+      uri = URI.parse("http://#{servers[index][:host]}:#{servers[index][:port]}/tickets/create/#{replenish_capacity}")
+      request = Net::HTTP::Get.new(uri.request_uri)
+      if servers[index][:http_auth_password] && servers[index][:http_auth_password] != ''
+        request.basic_auth '', servers[index][:http_auth_password]
       end
+
+      response = Timeout::timeout(timeout / 1000.0) do
+        Net::HTTP.new(uri.host, uri.port).start{|http| http.request(request)}
+      end
+      JSON.parse(response.body)
     rescue Timeout::Error
       return false
     end

data/spec/tickr_client_spec.rb

@@ -5,18 +5,26 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'tickr_client')
 require 'json'
 
 describe TickrClient do
+  def create_client(num_servers = 4, http_password = nil, client_opts = {})
+    client_opts[:cache_size] ||= 10
+    ports = (8080..(8080 + num_servers - 1))
+    ports.each do |port|
+      FakeWeb.register_uri :get, "http://#{":#{http_password}@" if http_password}127.0.0.1:#{port}/tickets/create/#{client_opts[:cache_size]}", body: {'first' => 1, 'increment' => 1, 'count' => 5}.to_json
+    end
+    TickrClient.new(
+      client_opts.merge(servers: ports.inject([]) {|servers, port| servers.push({host: '127.0.0.1', port: port, http_auth_password: http_password})})
+    )
+  end
+
   after do
     # Make sure threads finish before we fail based on expectations
     Thread.list.each {|t| t.join unless t == Thread.current}
   end
-  def get_client(opts = {})
-    TickrClient.new(
-      {servers: [{host: '127.0.0.1', port: 8080}, {host: '127.0.0.1', port: 8081}]}.merge(opts)
-    )
-  end
   describe '#initialize' do
     it 'sets configurable instance variables' do
-      TickrClient.any_instance.stub :fetch_tickets
+      (8080..8081).each do |port|
+        FakeWeb.register_uri :get, "http://127.0.0.1:#{port}/tickets/create/500", body: {'first' => 1, 'increment' => 1, 'count' => 5}.to_json
+      end
       client = TickrClient.new(
         servers: [{host: '127.0.0.1', port: 8080}, {host: '127.0.0.1', port: 8081}],
         timeout: 150,
@@ -30,7 +38,10 @@ describe TickrClient do
       client.replenish_cache_at.should == 100
     end
     it 'applies sensible defaults' do
-      TickrClient.any_instance.stub :fetch_tickets
+      (8080..8081).each do |port|
+        FakeWeb.register_uri :get, "http://127.0.0.1:#{port}/tickets/create/100", body: {'first' => 1, 'increment' => 1, 'count' => 5}.to_json
+      end
+
       client = TickrClient.new(
         servers: [{host: '127.0.0.1', port: 8080}, {host: '127.0.0.1', port: 8081}]
       )
@@ -44,22 +55,26 @@ describe TickrClient do
         servers: [{host: '127.0.0.1', port: 8080}, {host: '127.0.0.1', port: 8081}]
       )
     end
+    it 'supports http authentication enabled' do
+      # Notice that there is no register_uri set for a non-http authed request.
+      # Therefore if a non-http authed request is made, it will bomb.
+      FakeWeb.register_uri :get, 'http://:password@127.0.0.1:8080/tickets/create/100', body: {'first' => 1, 'increment' => 1, 'count' => 5}.to_json
+      TickrClient.new(
+        servers: [{host: '127.0.0.1', port: 8080, http_auth_password: 'password'}]
+      )
+    end
   end
 
   describe '#get_ticket' do
     it 'loads ticket from cache and removes it from the cache' do
-      TickrClient.any_instance.stub :fetch_tickets
-      client = get_client
-
+      client = create_client(1, nil, cache_size: 4, replenish_cache_at: 2)
       client.send(:tickets=, [1, 2, 3, 4])
       client.get_ticket.should == 1
       client.send(:tickets).should == [2, 3, 4]
     end
 
     it 'asynchronously fetches more tickets after falling below the replenesh_cache_at threshold' do
-      TickrClient.any_instance.stub :fetch_tickets
-
-      client = get_client(cache_size: 10, replenesh_cache_at: 2)
+      client = create_client(2, nil, cache_size: 10, replenesh_cache_at: 2)
       client.send(:tickets=, [5, 6, 7])
       client.should_receive :fetch_tickets_async
       client.get_ticket
@@ -68,16 +83,8 @@ describe TickrClient do
 
   describe 'private instance methods' do
     describe '#fetch_tickets' do
-      it 'fetches tickets from servers one at a time' do
-        Net::HTTP.should_receive(:get).and_return({'first' => 1, 'increment' => 1, 'count' => 5}.to_json)
-        client = TickrClient.new(
-          servers: [
-            {host: '127.0.0.1', port: 8080},
-            {host: '127.0.0.1', port: 8081},
-            {host: '127.0.0.1', port: 8082},
-            {host: '127.0.0.1', port: 8083}
-          ]
-        )
+      it 'fetches tickets from servers one at a time until it succeeds' do
+        client = create_client(4)
         Thread.list.each {|t| t.join unless t == Thread.current}
 
         client.send(:next_server_index=, 0)
@@ -91,13 +98,7 @@ describe TickrClient do
 
     describe '#fetch_tickets_async' do
       it 'fetches tickets in a separate thread' do
-        FakeWeb.register_uri :get, 'http://127.0.0.1:8080/tickets/create/10', body: {'first' => 1, 'increment' => 1, 'count' => 2}.to_json
-        client = TickrClient.new(
-          servers: [
-            {host: '127.0.0.1', port: 8080}
-          ],
-          cache_size: 10
-        )
+        client = create_client(1, nil, cache_size: 10)
         client.send(:tickets=, [1, 2])
         FakeWeb.register_uri :get, 'http://127.0.0.1:8080/tickets/create/8', body: {'first' => 5, 'increment' => 1, 'count' => 8}.to_json
 
@@ -110,23 +111,13 @@ describe TickrClient do
 
     describe '#fetch_tickets_from_server' do
       it 'returns false on timeout error' do
-        TickrClient.any_instance.stub :fetch_tickets
-        client = get_client
-
-        Net::HTTP.should_receive(:get).and_raise(Timeout::Error)
+        client = create_client(2)
+        Net::HTTP.should_receive(:new).and_raise(Timeout::Error)
         client.send(:fetch_tickets_from_server, 0).should be_false
       end
 
       it 'adds tickets to array and returns true' do
-        TickrClient.any_instance.stub :fetch_tickets
-        client = TickrClient.new(
-          servers: [
-            {host: '127.0.0.1', port: 8080},
-            {host: '127.0.0.1', port: 8081},
-            {host: '127.0.0.1', port: 8082}
-          ],
-          cache_size: 10
-        )
+        client = create_client(3, nil, cache_size: 10)
         client.send(:tickets=, [1, 2])
         client.send(:next_server_index=, 1)
 
@@ -139,9 +130,7 @@ describe TickrClient do
 
     describe '#replenish_capacity' do
       it 'is the difference between the cache size and the number of tickets' do
-        TickrClient.any_instance.stub :fetch_tickets
-
-        client = get_client(cache_size: 10)
+        client = create_client(2, nil, cache_size: 10)
         client.send(:tickets=, [5, 6, 7])
         client.send(:replenish_capacity).should == 7
       end
@@ -149,9 +138,7 @@ describe TickrClient do
 
     describe '#create_tickets_from_ticket_group' do
       it 'should create an array of tickets' do
-        TickrClient.any_instance.stub :fetch_tickets
-
-        client = get_client
+        client = create_client(2)
         tickets = client.send(:create_tickets_from_ticket_group, {'first' => 100, 'increment' => 100, 'count' => 5})
         tickets.should == [100, 200, 300, 400, 500]
       end

data/tickr_client.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "tickr_client"
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robby Grossman"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tickr_client
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -177,7 +177,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 453379598713018140
+      hash: 130854216530279690
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: