cramp 0.15 → 0.15.1

data/lib/cramp.rb

@@ -15,12 +15,15 @@ require 'active_support/buffered_logger'
 
 require 'rack'
 
-if RUBY_VERSION >= '1.9.1'
+begin
+  require 'fiber'
   require File.join(File.dirname(__FILE__), 'vendor/fiber_pool')
+rescue LoadError
+  # No fibers available!
 end
   
 module Cramp
-  VERSION = '0.15'
+  VERSION = '0.15.1'
 
   mattr_accessor :logger
 

data/lib/cramp/abstract.rb

@@ -44,7 +44,9 @@ module Cramp
     end
 
     def build_headers
-      respond_to?(:respond_with, true) ? respond_with : [200, {'Content-Type' => 'text/html'}]
+      status, headers = respond_to?(:respond_with, true) ? respond_with.dup : [200, {'Content-Type' => 'text/html'}]
+      headers['Connection'] ||= 'keep-alive'
+      [status, headers]
     end
 
     def init_async_body
@@ -88,7 +90,7 @@ module Cramp
     end
 
     def route_params
-      @env['router.params'] || @env['usher.params']
+      @env['router.params'] || {}
     end
 
     private

data/lib/cramp/action.rb

@@ -38,9 +38,12 @@ module Cramp
         [status, headers.merge(self.default_sse_headers)]
       when :chunked
         status, headers = respond_to?(:respond_with, true) ? respond_with : [200, {}]
+
+        headers = headers.merge(self.default_chunked_headers)
         headers['Content-Type'] ||= 'text/html'
+        headers['Cache-Control'] ||= 'no-cache'
 
-        [status, headers.merge(self.default_chunked_headers)]
+        [status, headers]
       else
         super
       end
@@ -109,7 +112,7 @@ module Cramp
     end
 
     def websockets_protocol_10?
-      [8, 9, 10].include?(@env['HTTP_SEC_WEBSOCKET_VERSION'].to_i)
+      [7, 8, 9, 10].include?(@env['HTTP_SEC_WEBSOCKET_VERSION'].to_i)
     end
 
     def protocol10_parser

data/lib/cramp/fiber_pool.rb

@@ -8,8 +8,8 @@ module Cramp
 
     module ClassMethods
       def use_fiber_pool(options = {})
-        if RUBY_VERSION < '1.9.1'
-          raise "Fibers are supported only for Rubies >= 1.9.1"
+        unless defined?(::FiberPool)
+          raise "Fiber support is only available for Rubies >= 1.9.2"
         end
 
         self.fiber_pool = ::FiberPool.new(options[:size] || 100)

data/lib/cramp/generators/templates/application/Gemfile

@@ -14,10 +14,10 @@ gem 'async-rack'
 # For async Active Record models
 <% if active_record? -%>
 gem 'mysql2', '~> 0.2.11'
-gem 'activerecord'
+gem 'activerecord', :require => 'active_record'
 <% else -%>
 # gem 'mysql2', '~> 0.2.11'
-# gem 'activerecord'
+# gem 'activerecord', :require => 'active_record'
 <% end -%>
 
 # Using Fibers + async callbacks to emulate synchronous programming

data/lib/cramp/websocket/extension.rb

@@ -10,7 +10,7 @@ module Cramp
     end
 
     def websocket?
-      @env['HTTP_CONNECTION'] == 'Upgrade' && ['WebSocket', 'websocket'].include?(@env['HTTP_UPGRADE'])
+      ['WebSocket', 'websocket'].include?(@env['HTTP_UPGRADE'])
     end
 
     def secure_websocket?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cramp
 version: !ruby/object:Gem::Version
-  version: '0.15'
+  version: 0.15.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-13 00:00:00.000000000 +01:00
-default_executable: 
+date: 2011-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2156847620 !ruby/object:Gem::Requirement
+  requirement: &2155605620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +21,10 @@ dependencies:
         version: 3.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *2156847620
+  version_requirements: *2155605620
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2156847100 !ruby/object:Gem::Requirement
+  requirement: &2155604860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +32,10 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156847100
+  version_requirements: *2155604860
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2156846640 !ruby/object:Gem::Requirement
+  requirement: &2155604140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +43,10 @@ dependencies:
         version: 1.0.0.beta.3
   type: :runtime
   prerelease: false
-  version_requirements: *2156846640
+  version_requirements: *2155604140
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2156846160 !ruby/object:Gem::Requirement
+  requirement: &2155603680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +54,7 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *2156846160
+  version_requirements: *2155603680
 description: Cramp is a framework for developing asynchronous web applications.
 email: pratiknaik@gmail.com
 executables:
@@ -92,7 +91,6 @@ files:
 - lib/cramp.rb
 - lib/vendor/fiber_pool.rb
 - bin/cramp
-has_rdoc: false
 homepage: http://cramp.in
 licenses: []
 post_install_message: 
@@ -113,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Asynchronous web framework.