faye 0.8.1 → 0.8.2

data/lib/faye.rb

@@ -13,7 +13,7 @@ require 'uri'
 require 'yajl'
 
 module Faye
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
   
   ROOT = File.expand_path(File.dirname(__FILE__))
   
@@ -37,6 +37,7 @@ module Faye
   autoload :Error,        File.join(ROOT, 'faye', 'error')
   
   autoload :RackAdapter,  File.join(ROOT, 'faye', 'adapters', 'rack_adapter')
+  autoload :StaticServer, File.join(ROOT, 'faye', 'adapters', 'static_server')
   
   BAYEUX_VERSION   = '1.0'
   JSONP_CALLBACK   = 'jsonpcallback'

data/lib/faye/adapters/rack_adapter.rb

@@ -9,7 +9,7 @@ module Faye
     ASYNC_RESPONSE = [-1, {}, []].freeze
     
     DEFAULT_ENDPOINT  = '/bayeux'
-    SCRIPT_PATH       = File.join(ROOT, 'faye-browser-min.js')
+    SCRIPT_PATH       = 'faye-browser-min.js'
     
     TYPE_JSON   = {'Content-Type' => 'application/json'}
     TYPE_SCRIPT = {'Content-Type' => 'text/javascript'}
@@ -25,9 +25,13 @@ module Faye
       @options  = [app, options].grep(Hash).first || {}
       
       @endpoint    = @options[:mount] || DEFAULT_ENDPOINT
-      @endpoint_re = Regexp.new('^' + @endpoint + '(/[^/]*)*(\\.js)?$')
+      @endpoint_re = Regexp.new('^' + @endpoint + '(/[^/]+)*(\\.[^\\.]+)?$')
       @server      = Server.new(@options)
       
+      @static = StaticServer.new(ROOT, /\.(?:js|map)$/)
+      @static.map(File.basename(@endpoint) + '.js', SCRIPT_PATH)
+      @static.map('client.js', SCRIPT_PATH)
+      
       return unless extensions = @options[:extensions]
       [*extensions].each { |extension| add_extension(extension) }
     end
@@ -75,8 +79,12 @@ module Faye
                       [404, TYPE_TEXT, ["Sure you're not looking for #{@endpoint} ?"]]
       end
       
-      return serve_client_script(env) if request.path_info =~ /\.js$/
-      return handle_options(request)  if env['REQUEST_METHOD'] == 'OPTIONS'
+      # http://groups.google.com/group/faye-users/browse_thread/thread/4a01bb7d25d3636a
+      if env['REQUEST_METHOD'] == 'OPTIONS' or env['HTTP_ACCESS_CONTROL_REQUEST_METHOD'] == 'POST'
+        return handle_options(request)
+      end
+      
+      return @static.call(env)        if @static =~ request.path_info
       return handle_websocket(env)    if Faye::WebSocket.websocket?(env)
       return handle_eventsource(env)  if Faye::EventSource.eventsource?(env)
       
@@ -85,27 +93,6 @@ module Faye
     
   private
     
-    def serve_client_script(env)
-      @client_script ||= File.read(SCRIPT_PATH)
-      @client_digest ||= Digest::SHA1.hexdigest(@client_script)
-      @client_mtime  ||= File.mtime(SCRIPT_PATH)
-      
-      headers = TYPE_SCRIPT.dup
-      ims     = env['HTTP_IF_MODIFIED_SINCE']
-      
-      headers['Content-Length'] = @client_script.bytesize.to_s unless env[HTTP_X_NO_CONTENT_LENGTH]
-      headers['ETag'] = @client_digest
-      headers['Last-Modified'] = @client_mtime.httpdate
-      
-      if env['HTTP_IF_NONE_MATCH'] == @client_digest
-        [304, headers, ['']]
-      elsif ims and @client_mtime <= Time.httpdate(ims)
-        [304, headers, ['']]
-      else
-        [200, headers, [@client_script]]
-      end
-    end
-    
     def handle_request(request)
       json_msg = message_from_request(request)
       message  = Yajl::Parser.parse(json_msg)

data/lib/faye/adapters/static_server.rb

@@ -0,0 +1,56 @@
+module Faye
+  class StaticServer
+    
+    def initialize(directory, path_regex)
+      @directory  = directory
+      @path_regex = path_regex
+      @path_map   = {}
+      @index      = {}
+    end
+    
+    def map(request_path, filename)
+      @path_map[request_path] = filename
+    end
+    
+    def =~(pathname)
+      @path_regex =~ pathname
+    end
+    
+    def call(env)
+      pathname = env['PATH_INFO']
+      pathname = File.basename(pathname)
+      pathname = @path_map[pathname] || pathname
+      
+      cache = @index[pathname] ||= {}
+      fullpath = File.join(@directory, pathname)
+      
+      begin
+        cache[:content] ||= File.read(fullpath)
+        cache[:digest]  ||= Digest::SHA1.hexdigest(cache[:content])
+        cache[:mtime]   ||= File.mtime(fullpath)
+      rescue
+        return [404, {}, []]
+      end
+      
+      type    = /\.js$/ =~ fullpath ? RackAdapter::TYPE_SCRIPT : RackAdapter::TYPE_JSON
+      headers = type.dup
+      ims     = env['HTTP_IF_MODIFIED_SINCE']
+      
+      no_content_length = env[RackAdapter::HTTP_X_NO_CONTENT_LENGTH]
+      
+      headers['Content-Length'] = '0' unless no_content_length
+      headers['ETag'] = cache[:digest]
+      headers['Last-Modified'] = cache[:mtime].httpdate
+      
+      if env['HTTP_IF_NONE_MATCH'] == cache[:digest]
+        [304, headers, ['']]
+      elsif ims and cache[:mtime] <= Time.httpdate(ims)
+        [304, headers, ['']]
+      else
+        headers['Content-Length'] = cache[:content].bytesize.to_s unless no_content_length
+        [200, headers, [cache[:content]]]
+      end
+    end
+    
+  end
+end

data/spec/browser.html

@@ -19,7 +19,7 @@
       JS.cacheBust = true
       
       JS.Packages(function() { with(this) {
-        file('../build/faye-browser-min.js').provides('Faye')
+        file('../build/browser/faye-browser-min.js').provides('Faye')
         autoload(/.*Spec/, {from: './javascript'})
       }})
 

data/spec/javascript/engine_spec.js

@@ -243,7 +243,7 @@ JS.ENV.EngineSpec = JS.Test.describe("Pub/sub engines", function() { with(this)
     
     describe("publish", function() { with(this) {
       before(function() { with(this) {
-        this.message = {"channel": "/messages/foo", "data": "ok"}
+        this.message = {"channel": "/messages/foo", "data": "ok", "blank": null}
         connect("alice", engine)
         connect("bob", engine)
         connect("carol", engine)

data/spec/javascript/faye_spec.js

@@ -12,4 +12,23 @@ JS.ENV.FayeSpec = JS.Test.describe("Faye", function() { with(this) {
       assertEqual( expected, ids )
     }})
   }})
+  
+  describe("copyObject", function() { with(this) {
+    before(function() { with(this) {
+      this.object = {foo: "bar", qux: 42, hey: null, obj: {bar: 67}}
+    }})
+    
+    it("returns an equal object", function() { with(this) {
+      assertEqual( {foo: "bar", qux: 42, hey: null, obj: {bar: 67}},
+                   Faye.copyObject(object) )
+    }})
+    
+    it("does not return the same object", function() { with(this) {
+      assertNotSame( object, Faye.copyObject(object) )
+    }})
+    
+    it("performs a deep clone", function() { with(this) {
+      assertNotSame( object.obj, Faye.copyObject(object).obj )
+    }})
+  }})
 }})

data/spec/javascript/server/integration_spec.js

@@ -66,8 +66,8 @@ JS.ENV.Server.IntegrationSpec = JS.Test.describe("Server integration", function(
     after(function() { this.stop() })
     
     it("delivers a message between clients", function() { with(this) {
-      publish("alice", "/foo", {hello: "world"})
-      check_inbox("bob", "/foo", [{hello: "world"}])
+      publish("alice", "/foo", {hello: "world", extra: null})
+      check_inbox("bob", "/foo", [{hello: "world", extra: null}])
     }})
     
     it("does not deliver messages for unsubscribed channels", function() { with(this) {

data/spec/node.js

@@ -1,5 +1,5 @@
 require('jsclass')
-Faye = require('../build/faye-node')
+Faye = require('../build/node/faye-node')
 Faye.logger = function() {}
 
 JS.Packages(function() { with(this) {

data/spec/ruby/engine_examples.rb

@@ -253,7 +253,7 @@ describe "Pub/sub engines" do
     
     describe :publish do
       before do
-        @message = {"channel" => "/messages/foo", "data" => "ok"}
+        @message = {"channel" => "/messages/foo", "data" => "ok", "blank" => nil}
         connect :alice, engine
         connect :bob,   engine
         connect :carol, engine

data/spec/ruby/faye_spec.rb

@@ -11,4 +11,20 @@ describe Faye do
       ids.should be_all { |id| id.size == 25 }
     end
   end
+  
+  describe :copy_obect do
+    let(:object) { {"foo" => "bar", "qux" => 42, "hey" => nil, "obj" => {"bar" => 67}} }
+    
+    it "returns an equal object" do
+      Faye.copy_object(object).should == {"foo" => "bar", "qux" => 42, "hey" => nil, "obj" => {"bar" => 67}}
+    end
+    
+    it "does not return the same object" do
+      Faye.copy_object(object).should_not be_equal(object)
+    end
+    
+    it "performs a deep clone" do
+      Faye.copy_object(object)["obj"].should_not be_equal(object["obj"])
+    end
+  end
 end

data/spec/ruby/server/integration_spec.rb

@@ -75,8 +75,8 @@ describe "server integration" do
   
   shared_examples_for "message bus" do
     it "delivers a message between clients" do
-      publish :alice, "/foo", {"hello" => "world"}
-      check_inbox :bob, "/foo", [{"hello" => "world"}]
+      publish :alice, "/foo", {"hello" => "world", "extra" => nil}
+      check_inbox :bob, "/foo", [{"hello" => "world", "extra" => nil}]
     end
     
     it "does not deliver messages for unsubscribed channels" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faye
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-15 00:00:00.000000000 Z
+date: 2012-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cookiejar
-  requirement: &15064400 !ruby/object:Gem::Requirement
+  requirement: &8179160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *15064400
+  version_requirements: *8179160
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &15063780 !ruby/object:Gem::Requirement
+  requirement: &8196520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *15063780
+  version_requirements: *8196520
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &15063320 !ruby/object:Gem::Requirement
+  requirement: &8196060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *15063320
+  version_requirements: *8196060
 - !ruby/object:Gem::Dependency
   name: faye-websocket
-  requirement: &15062820 !ruby/object:Gem::Requirement
+  requirement: &8195500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *15062820
+  version_requirements: *8195500
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &15062340 !ruby/object:Gem::Requirement
+  requirement: &8195000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *15062340
+  version_requirements: *8195000
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &15061860 !ruby/object:Gem::Requirement
+  requirement: &8194260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *15061860
+  version_requirements: *8194260
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &15061380 !ruby/object:Gem::Requirement
+  requirement: &8192940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,21 +87,21 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *15061380
+  version_requirements: *8192940
 - !ruby/object:Gem::Dependency
   name: jake
-  requirement: &15061000 !ruby/object:Gem::Requirement
+  requirement: &8192460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: *15061000
+  version_requirements: *8192460
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &15060540 !ruby/object:Gem::Requirement
+  requirement: &8192020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15060540
+  version_requirements: *8192020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15060040 !ruby/object:Gem::Requirement
+  requirement: &8191400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *15060040
+  version_requirements: *8191400
 - !ruby/object:Gem::Dependency
   name: rack-proxy
-  requirement: &15059600 !ruby/object:Gem::Requirement
+  requirement: &8190920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15059600
+  version_requirements: *8190920
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &15059140 !ruby/object:Gem::Requirement
+  requirement: &8190460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15059140
+  version_requirements: *8190460
 - !ruby/object:Gem::Dependency
   name: rainbows
-  requirement: &15058620 !ruby/object:Gem::Requirement
+  requirement: &8189960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *15058620
+  version_requirements: *8189960
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &15058000 !ruby/object:Gem::Requirement
+  requirement: &8189420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *15058000
+  version_requirements: *8189420
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &15057460 !ruby/object:Gem::Requirement
+  requirement: &8209100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15057460
+  version_requirements: *8209100
 - !ruby/object:Gem::Dependency
   name: staticmatic
-  requirement: &15073620 !ruby/object:Gem::Requirement
+  requirement: &8207860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15073620
+  version_requirements: *8207860
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &15073100 !ruby/object:Gem::Requirement
+  requirement: &8206760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,7 +197,7 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *15073100
+  version_requirements: *8206760
 description: 
 email: jcoglan@gmail.com
 executables: []
@@ -207,7 +207,9 @@ extra_rdoc_files:
 files:
 - History.txt
 - README.rdoc
+- lib/faye-browser.js
 - lib/faye-browser-min.js
+- lib/faye-browser-min.js.map
 - spec/browser.html
 - spec/phantom.js
 - spec/install.sh
@@ -269,6 +271,7 @@ files:
 - lib/faye/protocol/channel.rb
 - lib/faye/protocol/grammar.rb
 - lib/faye/adapters/rack_adapter.rb
+- lib/faye/adapters/static_server.rb
 - lib/faye/engines/proxy.rb
 - lib/faye/engines/connection.rb
 - lib/faye/engines/memory.rb