faye-websocket 0.4.0 → 0.4.1

data/CHANGELOG.txt

@@ -1,3 +1,9 @@
+=== 0.4.1 / 2012-02-26
+
+* Treat anything other than an Array as a string when calling send()
+* Fix error loading UTF-8 validation code on Ruby 1.9 with -Ku flag
+
+
 === 0.4.0 / 2012-02-13
 
 * Add ping() method to server-side WebSocket and EventSource

data/lib/faye/eventsource.rb

@@ -61,7 +61,7 @@ module Faye
     def send(message, options = {})
       return false unless @ready_state == OPEN
       
-      message = WebSocket.encode(message).
+      message = WebSocket.encode(message.to_s).
                 gsub(/(\r\n|\r|\n)/, '\1data: ')
       
       frame  = ""

data/lib/faye/websocket.rb

@@ -23,6 +23,10 @@ module Faye
     root = File.expand_path('../websocket', __FILE__)
     require root + '/../../faye_websocket_mask'
     
+    unless String.instance_methods.include?(:force_encoding)
+      require root + '/utf8_match'
+    end
+    
     autoload :Adapter,         root + '/adapter'
     autoload :API,             root + '/api'
     autoload :Client,          root + '/client'
@@ -30,9 +34,6 @@ module Faye
     autoload :Draft76Parser,   root + '/draft76_parser'
     autoload :HybiParser,      root + '/hybi_parser'
     
-    # http://www.w3.org/International/questions/qa-forms-utf-8.en.php
-    UTF8_MATCH = /^([\x00-\x7F]|[\xC2-\xDF][\x80-\xBF]|\xE0[\xA0-\xBF][\x80-\xBF]|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}|\xED[\x80-\x9F][\x80-\xBF]|\xF0[\x90-\xBF][\x80-\xBF]{2}|[\xF1-\xF3][\x80-\xBF]{3}|\xF4[\x80-\x8F][\x80-\xBF]{2})*$/
-    
     ADAPTERS = {
       'thin'     => :Thin,
       'rainbows' => :Rainbows,
@@ -45,17 +46,28 @@ module Faye
       require File.expand_path("../adapters/#{backend}", __FILE__)
     end
     
+    def self.utf8_string(string)
+      string = string.pack('C*') if Array === string
+      string.respond_to?(:force_encoding) ?
+          string.force_encoding('UTF-8') :
+          string
+    end
+    
     def self.encode(string, validate_encoding = false)
       if Array === string
+        string = utf8_string(string)
         return nil if validate_encoding and !valid_utf8?(string)
-        string = string.pack('C*')
       end
-      return string unless string.respond_to?(:force_encoding)
-      string.force_encoding('UTF-8')
+      utf8_string(string)
     end
     
     def self.valid_utf8?(byte_array)
-      UTF8_MATCH =~ byte_array.pack('C*') ? true : false
+      string = utf8_string(byte_array)
+      if defined?(UTF8_MATCH)
+        UTF8_MATCH =~ string ? true : false
+      else
+        string.valid_encoding?
+      end
     end
     
     def self.websocket?(env)

data/lib/faye/websocket/api.rb

@@ -57,6 +57,8 @@ module Faye
         
         return false if @ready_state == CLOSED
         
+        data = data.to_s unless Array === data
+        
         data = WebSocket.encode(data) if String === data
         frame = @parser.frame(data, type, error_type)
         @stream.write(frame) if frame
@@ -91,3 +93,4 @@ module Faye
     
   end
 end
+

data/lib/faye/websocket/utf8_match.rb

@@ -0,0 +1,8 @@
+module Faye
+  class WebSocket
+    
+    # http://www.w3.org/International/questions/qa-forms-utf-8.en.php
+    UTF8_MATCH = /^([\x00-\x7F]|[\xC2-\xDF][\x80-\xBF]|\xE0[\xA0-\xBF][\x80-\xBF]|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}|\xED[\x80-\x9F][\x80-\xBF]|\xF0[\x90-\xBF][\x80-\xBF]{2}|[\xF1-\xF3][\x80-\xBF]{3}|\xF4[\x80-\x8F][\x80-\xBF]{2})*$/
+    
+  end
+end

data/spec/faye/websocket/client_spec.rb

@@ -60,13 +60,13 @@ WebSocketSteps = EM::RSpec.async_steps do
     callback.call
   end
   
-  def send_message(&callback)
-    @ws.send("I expect this to be echoed")
+  def send_message(message, &callback)
+    @ws.send(message)
     EM.add_timer(0.1, &callback)
   end
   
-  def check_response(&callback)
-    @message.should == "I expect this to be echoed"
+  def check_response(message, &callback)
+    @message.should == message
     callback.call
   end
   
@@ -116,8 +116,14 @@ describe Faye::WebSocket::Client do
       
       it "can send and receive messages" do
         listen_for_message
-        send_message
-        check_response
+        send_message "I expect this to be echoed"
+        check_response "I expect this to be echoed"
+      end
+      
+      it "sends numbers as strings" do
+        listen_for_message
+        send_message 13
+        check_response "13"
       end
     end
     
@@ -129,7 +135,7 @@ describe Faye::WebSocket::Client do
       
       it "cannot send and receive messages" do
         listen_for_message
-        send_message
+        send_message "I expect this to be echoed"
         check_no_response
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faye-websocket
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-13 00:00:00.000000000 Z
+date: 2012-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &21030040 !ruby/object:Gem::Requirement
+  requirement: &20554820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *21030040
+  version_requirements: *20554820
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &21055040 !ruby/object:Gem::Requirement
+  requirement: &18050960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21055040
+  version_requirements: *18050960
 - !ruby/object:Gem::Dependency
   name: rainbows
-  requirement: &21054500 !ruby/object:Gem::Requirement
+  requirement: &18049600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *21054500
+  version_requirements: *18049600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &21054000 !ruby/object:Gem::Requirement
+  requirement: &18047720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *21054000
+  version_requirements: *18047720
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &21053620 !ruby/object:Gem::Requirement
+  requirement: &18046420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21053620
+  version_requirements: *18046420
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &21053080 !ruby/object:Gem::Requirement
+  requirement: &18045300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *21053080
+  version_requirements: *18045300
 description: 
 email: jcoglan@gmail.com
 executables: []
@@ -93,6 +93,7 @@ files:
 - lib/faye/websocket/client.rb
 - lib/faye/websocket/hybi_parser.rb
 - lib/faye/websocket/draft76_parser.rb
+- lib/faye/websocket/utf8_match.rb
 - lib/faye/websocket/api.rb
 - lib/faye/websocket/hybi_parser/handshake.rb
 - lib/faye/websocket/hybi_parser/stream_reader.rb