wordnik 4.08 → 4.09

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wordnik (4.08)
+    wordnik (4.09)
       activemodel (>= 3.0.3)
       addressable (>= 2.2.4)
       htmlentities (>= 4.2.4)

data/README.md

@@ -92,8 +92,8 @@ Releasing
 ---------
 
 ```bash
-rake swagger
-open lib/version.rb           # bump the version number
+rake swagger                  # um, don't do this unless the API has changed
+edit lib/wordnik/version.rb   # bump the version number
 rake spec                     # test
 git commit -am "newness"      # commit
 git push origin master        # push

data/lib/wordnik/load_balancer.rb

@@ -19,8 +19,8 @@ module Wordnik
     attr_accessor :current_host
 
     def initialize(hosts)
-      @all_hosts = hosts
-      @hosts = @all_hosts
+      @all_hosts = hosts.clone
+      @hosts = @all_hosts.clone
       @failed_hosts_table = {}
       @current_host = nil
     end
@@ -36,7 +36,7 @@ module Wordnik
         #Wordnik.logger.debug "Informing failure about #{@current_host}. table: #{@failed_hosts_table.inspect}"
       if @failed_hosts_table.include?(@current_host)
         failures, failed_time = @failed_hosts_table[@current_host]
-        @failed_hosts_table[@current_host] = [failures+1, failed_time]
+        @failed_hosts_table[@current_host] = [failures+1, Time.now.to_f]
       else
         @failed_hosts_table[@current_host] = [1, Time.now.to_f] # failure count, first failure time
       end
@@ -57,15 +57,25 @@ module Wordnik
       return if @failed_hosts_table.size == 0
       @failed_hosts_table.each do |host, pair|
         failures, failed_time = pair
-        seconds_since_first_failure = (Time.now.to_f - failed_time)
-        #Wordnik.logger.debug "Seconds since #{host}'s first failure: #{seconds_since_first_failure} compared to #{2**(failures-1)}"
+        n = Time.now.to_f
+        seconds_since_last_failure = (n - failed_time)
         # exponential backoff, but try every hour...
-        if (seconds_since_first_failure > [3600, 2**(failures-1)].min)
+        if (seconds_since_last_failure > [3600, 2**(failures-1)].min)
           @hosts << host # give it a chance to succeed ...
-          #Wordnik.logger.debug "Added #{host} to @hosts; now: #{@hosts}"
+          update_failed_time(host, n)
         end
       end
     end
+
+    # mostly useful in mock testing...
+    def update_failed_time(host, time=Time.now)
+      if @failed_hosts_table.include? host
+        failures, _ = @failed_hosts_table[host]
+        @failed_hosts_table[host] = [failures, time.to_f]
+      else
+      @failed_hosts_table[host] = [1,time.to_f]
+      end
+    end
   end
 
 end

data/lib/wordnik/version.rb

@@ -1,3 +1,3 @@
 module Wordnik
-  VERSION = "4.08"
+  VERSION = "4.09"
 end

data/spec/load_balancer_spec.rb

@@ -1,28 +1,109 @@
 require 'spec_helper'
+require 'objspace' # ruby 1.9, I think
 
 describe Wordnik::LoadBalancer do
-	before(:each) do
-		@hosts = ["alpha","beta","gamma","delta"].map{|x| "#{x}.wordnik.com"}
-	end
+  before(:each) do
+    @hosts = ["alpha","beta","gamma","delta"].map{|x| "#{x}.wordnik.com"}
+  end
 
-	describe "Load Balancer" do
+  describe "Load Balancer" do
     it "allows creation with a list of hosts" do
-     	lb = Wordnik::LoadBalancer.new(@hosts)
-     	h = lb.host
-     	@hosts.should include(h)
+      lb = Wordnik::LoadBalancer.new(@hosts)
+      h = lb.host
+      @hosts.should include(h)
     end
 
     it "returns different (random) hosts" do
-    	lb = Wordnik::LoadBalancer.new(@hosts)
-    	counts = Hash.new(0)
-    	1.upto(1000) do
-    		h = lb.host
-    		counts[h] += 1
-    	end
-    	@hosts.each {|host| counts[host].should > 10}
+      lb = Wordnik::LoadBalancer.new(@hosts)
+      counts = Hash.new(0)
+      1.upto(1000) do
+        h = lb.host
+        counts[h] += 1
+      end
+      @hosts.each {|host| counts[host].should > 10}
+    end
+
+    it "should not leak memory" do
+      lb = Wordnik::LoadBalancer.new(@hosts)
+      free = ObjectSpace.count_objects[:TOTAL]
+      1000.times {h = lb.host}
+      free.should == ObjectSpace.count_objects[:TOTAL]
     end
 
-    it "should not leak memory"
+    describe "Success and failure modes" do
+      it "allows for a failure" do
+        lb = Wordnik::LoadBalancer.new(@hosts)
+        h = lb.host
+        lb.inform_failure
+        lb.failed_hosts_table.size.should == 1
+        lb.hosts.should_not include(h)
+        lb.hosts.size.should == lb.all_hosts.size - 1
+      end
+
+      it "allows for two failures" do
+        lb = Wordnik::LoadBalancer.new(@hosts)
+        h1 = lb.host
+        lb.inform_failure
+        h2 = lb.host
+        lb.inform_failure
+        lb.failed_hosts_table.size.should == 2
+        lb.hosts.should_not include(h1)
+        lb.hosts.should_not include(h2)
+        lb.hosts.size.should == lb.all_hosts.size - 2
+      end
+
+      it "should never leave hosts empty" do
+        lb = Wordnik::LoadBalancer.new(@hosts)
+        @hosts.size.times{h = lb.host; lb.inform_failure}
+        lb.hosts.size.should == 1
+      end
 
+      it "allows for a subsequent success" do
+        lb = Wordnik::LoadBalancer.new(@hosts)
+        h = lb.host
+        lb.inform_failure
+        lb.inform_success
+        lb.failed_hosts_table.size.should == 0
+        lb.hosts.should include(h)
+        lb.hosts.size.should == lb.all_hosts.size
+      end
+
+      it "does exponential back-off" do
+        lb = Wordnik::LoadBalancer.new(@hosts)
+        t = Time.now
+        h = lb.host
+        lb.inform_failure
+        lb.update_failed_time(h, t)
+        lb.update_failed_time(h, t-2) # pretend it happened two seconds ago
+        lb.restore_failed_hosts_maybe
+        lb.hosts.should include(h)
+        lb.hosts.size.should == lb.all_hosts.size
+        lb.inform_failure
+        lb.inform_failure
+        lb.update_failed_time(h, t-2) # pretend it happened two seconds ago
+        lb.restore_failed_hosts_maybe
+        lb.hosts.should_not include(h)
+        lb.hosts.size.should == lb.all_hosts.size - 1
+        lb.update_failed_time(h, t-4) # pretend it happened 4 seconds ago
+        lb.restore_failed_hosts_maybe
+        lb.hosts.should include(h)
+        lb.hosts.size.should == lb.all_hosts.size
+        # create a lot of failures
+        1000.times {lb.inform_failure}
+        lb.update_failed_time(h, t-((59*60)+59)) # pretend it happened 59:59 minutes ago
+        lb.restore_failed_hosts_maybe
+        lb.hosts.should_not include(h)
+        lb.hosts.size.should == lb.all_hosts.size - 1
+        lb.update_failed_time(h, t-(60*60)) # pretend it happened 1 hour ago
+        lb.restore_failed_hosts_maybe
+        lb.hosts.should include(h)
+        lb.hosts.size.should == lb.all_hosts.size
+        lb.inform_success
+        lb.failed_hosts_table.size.should == 0
+      end
+    end
   end
+
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wordnik
 version: !ruby/object:Gem::Version
-  version: '4.08'
+  version: '4.09'
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-29 00:00:00.000000000 Z
+date: 2012-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -310,7 +310,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -796298365332589124
+      hash: 1161348886692951169
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -319,7 +319,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -796298365332589124
+      hash: 1161348886692951169
 requirements: []
 rubyforge_project: wordnik
 rubygems_version: 1.8.24