ftw 0.0.40 → 0.0.41

data/lib/ftw/dns/dns.rb

@@ -34,7 +34,7 @@ class FTW::DNS::DNS
     if address.length == 16
       # Unpack 16 bit chunks, convert to hex, join with ":"
       address.unpack("n8").collect { |p| p.to_s(16) } \
-        .join(":").sub(/(?:0:(?:0:)+)/, ":")
+        .join(":").sub(/(?:^|:)0:(?:0:)+/, "::")
     else 
       # assume ipv4
       # Per the following sites, "::127.0.0.1" is valid and correct

data/lib/ftw/http/headers.rb

@@ -117,7 +117,7 @@ class FTW::HTTP::Headers
   def each(&block)
     @headers.each do |field_name, field_value|
       if field_value.is_a?(Array)
-        field_value.map { |value| yield field_name, v }
+        field_value.map { |value| yield field_name, value }
       else
         yield field_name, field_value
       end

data/lib/ftw/version.rb

@@ -3,5 +3,5 @@ require "ftw/namespace"
 # :nodoc:
 module FTW
   # The version of this library
-  VERSION = "0.0.40"
+  VERSION = "0.0.41"
 end

data/lib/ftw/websocket.rb

@@ -102,8 +102,8 @@ class FTW::WebSocket
   def handshake_ok?(response)
     # See RFC6455 section 4.2.2
     return false unless response.status == 101 # "Switching Protocols"
-    return false unless response.headers.get("upgrade") == "websocket"
-    return false unless response.headers.get("connection") == "Upgrade"
+    return false unless response.headers.get("upgrade").downcase == "websocket"
+    return false unless response.headers.get("connection").downcase == "upgrade"
 
     # Now verify Sec-WebSocket-Accept. It should be the SHA-1 of the
     # Sec-WebSocket-Key (in base64) + WEBSOCKET_ACCEPT_UUID

data/lib/ftw/websocket/writer.rb

@@ -68,8 +68,8 @@ class FTW::WebSocket::Writer
 
   # Pack the payload.
   def pack_payload(data, pack, text, mode)
-    pack_maskbit_and_length(data, pack, text.length, mode)
-    pack_extended_length(data, pack, text.length) if text.length >= 126
+    pack_maskbit_and_length(data, pack, text.bytesize, mode)
+    pack_extended_length(data, pack, text.bytesize) if text.bytesize >= 126
     if mode == :client
       mask_key = [rand(1 << 32)].pack("Q")
       pack_mask(data, pack, mask_key)

data/test/ftw/http/headers.rb

@@ -47,4 +47,13 @@ describe FTW::HTTP::Headers do
     @headers.remove("foo", "two")
     assert_equal("one", @headers.get("foo"))
   end
+
+  test "duplicate headers return multiple key value pairs" do
+    @headers.add("foo", "bar")
+    @headers.add("foo", "fizz")
+    @headers.each do |key, value|
+      assert_equal("foo", key)
+      assert( value == "bar" || value == "fizz")
+    end
+  end
 end # describe FTW::HTTP::Headers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ftw
 version: !ruby/object:Gem::Version
-  version: 0.0.40
+  version: 0.0.41
 platform: ruby
 authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cabin