rack-policy 0.2.0 → 0.3.0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+0.3.0 (June 30, 2012)
+
+* Add thread safety.
+* Update documentation with usage examples for sinatra, rackup.
+* Ensure information type requests don't have body.
+* Add sinatra app to code examples.
+
 0.2.0 (June 24, 2012)
 
 * Fix bug when checking allowed cookie.

data/README.md

@@ -27,14 +27,14 @@ Or install it yourself as:
 By default when the Rack application is loaded no cookies will be set(provided no session cookies already exist), and any existing session cookies will be destroyed. Throughout the request cycle cookies now won't be set until the user has given explicit consent. This can be controlled by setting consent token
 
 ```ruby
-Rack::Policy::CookieLimiter consent_token: 'allow_me'
+Rack::Policy::CookieLimiter, consent_token: 'allow_me'
 ```
 
 The very same `consent_token` is used to toggle the limiter behaviour.
 
 ## Examples
 
-Adding `Rack::Policy::CookieLimiter` do Rack applications
+Adding `Rack::Policy::CookieLimiter` to Rack applications
 
 ### Rails 3.x
 
@@ -43,11 +43,11 @@ Adding `Rack::Policy::CookieLimiter` do Rack applications
 require 'rack/policy'
 
 class Application < Rails::Application
-  config.middleware.use Rack::Policy::CookieLimiter consent_token: 'rack.policy'
+  config.middleware.use Rack::Policy::CookieLimiter, consent_token: 'rack.policy'
 end
 ```
 
-And then in your custome controller create actions responsible for setting and unsetting cookie policy
+And then in your custom controller create actions responsible for setting and unsetting cookie policy
 
 ```ruby
 class CookiePolicyController < ApplicationController
@@ -55,6 +55,7 @@ class CookiePolicyController < ApplicationController
   def allow
     response.set_cookie 'rack.policy', {
       value: 'true',
+      path: '/',
       expires: 1.year.from_now.utc
     }
     render nothing: true
@@ -73,7 +74,8 @@ end
 # config/environment
 
 Rails::Initializer.run do |config|
-  config.middleware.use Rack::Policy::CookieLimiter consent_token: 'rack.policy'
+  require 'rack/policy'
+  config.middleware.insert_before Rack::Lock, Rack::Policy::CookieLimiter, consent_token: 'rack.policy'
 end
 ```
 
@@ -88,7 +90,9 @@ For classic style sinatra application do
 require 'sinatra'
 require 'rack/policy'
 
-use Rack::Policy::CookieLimiter consent_token: 'rack.policy'
+configure do
+  use Rack::Policy::CookieLimiter, consent_token: 'rack.policy'
+end
 
 get('/') { "Allow cookies to be set? <a href='/allow'>Allow</a>" }
 
@@ -97,9 +101,19 @@ get('/allow') { response.set_cookie 'rack.policy' }
 get('/deny') { response.delete_cookie 'rack.policy' }
 ```
 
-### Padrino app
+### Padrino
+
+```ruby
+#!/usr/bin/env ruby -rubygems
+require 'padrino'
+require 'rack/policy'
+
+class MyApp < Padrino::Application
+  use Rack::Policy::CookieLimiter consent_token: 'rack.policy'
+end
+```
 
-### Rackup app
+### Rackup
 
 ```ruby
 #!/usr/bin/env rackup

data/examples/sinatra.ru

@@ -0,0 +1,18 @@
+require 'sinatra'
+require 'rack/policy'
+
+configure do
+  use Rack::Policy::CookieLimiter
+end
+
+get '/' do
+  response.set_cookie 'foo', 'bar'
+end
+
+get '/allow' do
+  response.set_cookie 'rack.policy', :expires => Time.now + 360
+end
+
+get '/deny' do
+  response.delete_cookie 'rack.policy'
+end

data/lib/rack/policy/cookie_limiter.rb

@@ -29,6 +29,10 @@ module Rack
       end
 
       def call(env)
+        dup.call!(env)
+      end
+
+      def call!(env)
         self.status, self.headers, self.body = @app.call(env)
         request = Rack::Request.new(env)
         response = Rack::Response.new body, status, headers
@@ -50,7 +54,8 @@ module Rack
 
       # Finish http response with proper headers
       def finish(env)
-        if [204, 304].include?(status.to_i)
+        if [204, 304].include?(status.to_i) || (status.to_i / 100 == 1)
+          headers.delete "Content-Length"
           headers.delete "Content-Type"
           [status.to_i, headers, []]
         elsif env['REQUEST_METHOD'] == 'HEAD'

data/lib/rack/policy/version.rb

@@ -2,6 +2,6 @@
 
 module Rack
   module Policy
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-policy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-24 00:00:00.000000000 Z
+date: 2012-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2152703340 !ruby/object:Gem::Requirement
+  requirement: &2152543580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2152703340
+  version_requirements: *2152543580
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2152702840 !ruby/object:Gem::Requirement
+  requirement: &2152543140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152702840
+  version_requirements: *2152543140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152702300 !ruby/object:Gem::Requirement
+  requirement: &2152542560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152702300
+  version_requirements: *2152542560
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152701660 !ruby/object:Gem::Requirement
+  requirement: &2152541880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152701660
+  version_requirements: *2152541880
 description: This is Rack middleware that makes your app compliant with the 'EU ePrivacy
   Directive'
 email:
@@ -74,6 +74,7 @@ files:
 - Rakefile
 - examples/rails_3/Gemfile
 - examples/rails_3/rails_3.ru
+- examples/sinatra.ru
 - lib/rack-policy.rb
 - lib/rack/policy.rb
 - lib/rack/policy/cookie_limiter.rb