request_context 0.0.1 → 0.0.2

data/README.md

@@ -1,6 +1,7 @@
 # RequestContext
 
-This is a gem that adds a hash containing request information to `Thread.current[:request_context]`
+This is a gem that adds Rack::Request to `Thread.current[:request_context]`.
+This may be useful, for example, if you want access to request information in your models.
 
 ## Installation
 

data/lib/rack/request_context.rb

@@ -1,7 +1,6 @@
 module Rack
 
-  # Public: Rack middleware that stores request data in a
-  # thread local variable.
+  # Public: Rack middleware that stores Rack Request in a thread local variable.
   #
   # app - The Rack app.
   #
@@ -9,8 +8,8 @@ module Rack
   #
   #   use Rack::RequestContext
   #
-  #   puts "Thread.current[:request_context]"
-  #   # => {origo: nil, url: 'https...', user_agent: 'Mozilla...', referrer: 'http...', ip: '1.1.1.1'}
+  #   puts "Thread.current[:request_context].url"
+  #   # => 'https://www.remind101.com'
   class RequestContext
 
     def initialize(app)
@@ -18,20 +17,10 @@ module Rack
     end
 
     def call(env)
-      ::RequestContext.with_request_context(request_context(env)) do
-        @app.call(env)
-      end
-    end
-
-  private
-
-    def request_context(env)
-      request = Rack::Request.new(env)
-      { origo:      request.cookies['origo'],
-        url:        request.url,
-        user_agent: request.user_agent,
-        referrer:   request.referer,
-        ip:         request.ip }
+      ::RequestContext.request_context = Rack::Request.new(env)
+      @app.call(env)
+    ensure
+      ::RequestContext.request_context = nil
     end
 
   end

data/lib/request_context.rb

@@ -12,15 +12,11 @@ module RequestContext
     #
     # Examples
     #
-    #   RequestContext.request_context
-    #   # => {:origo=>nil,
-    #   #     :url=>"http://localhost:5000/v2/groups/31419?group%5Bclass_name%5D=Spanish+6&auth_token=btVuzxrUYcaYJvnkVTbA",
-    #   #     :user_agent=>"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.57 Safari/537.36",
-    #   #     :referrer=>"http://localhost:5000/",
-    #   #     :ip=>"127.0.0.1"}
+    #   RequestContext.request_context.url
+    #   # => 'https://www.remind101.com'
 
     #
-    # Returns the Hash request context.
+    # Returns Rack::Request.
     def request_context
       Thread.current[:request_context]
     end
@@ -29,34 +25,13 @@ module RequestContext
     #
     # Examples
     #
-    #   RequestContext.request_context = {origo: nil, url: 'https://www.remind101.com'}
-    #   # => {origo: nil, url: 'https://www.remind101.com'}
+    #   RequestContext.request_context = Rack::Request(env)
+    #   # => #<Rack::Request:0x007fe675a39950 @env={...}>
     #
-    # Returns the new Hash request context.
+    # Returns the new Rack::Request request context.
     def request_context=(request_context)
       Thread.current[:request_context] = request_context
     end
 
-    # Public: Runs the block with the given request context set.
-    #
-    # Examples
-    #
-    #   RequestContext.request_context
-    #   # => {url: 'https://www.remind101.com'}
-    #
-    #   RequestContext.with_request_context({url: 'https://www.remind101.com/users/sign_in'}) do
-    #     RequestContext.request_context
-    #     # => {url: 'https://www.remind101.com/users/sign_in'}
-    #   end
-    #
-    #   RequestContext.request_context
-    #   # => {url: 'https://www.remind101.com'}
-    def with_request_context(request_context)
-      last_request_context = RequestContext.request_context
-      RequestContext.request_context = request_context
-      yield
-    ensure
-      RequestContext.request_context = last_request_context
-    end
   end
 end

data/lib/request_context/version.rb

@@ -1,3 +1,3 @@
 module RequestContext
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/spec/rack/request_context_spec.rb

@@ -6,17 +6,13 @@ describe Rack::RequestContext do
   let(:middleware) { described_class.new app }
 
   describe '.call' do
-    let(:request_context) do
-      {origo: nil, url: '://::0', user_agent: 'hello', referrer: nil, ip: nil}
-    end
-
-    let(:env) { {'HTTP_USER_AGENT' => 'hello'} }
+    let(:request_context) { Rack::Request.new({}) }
 
     it 'stores the request_context in a thread local' do
-      Thread.current.should_receive(:[]=).with(:request_context, request_context)
+      Thread.current.should_receive(:[]=).with(:request_context, kind_of(Rack::Request) )
       app.should_receive(:call)
       Thread.current.should_receive(:[]=).with(:request_context, nil)
-      middleware.call(env)
+      middleware.call({})
     end
 
   end

data/spec/request_context_spec.rb

@@ -1,13 +1,7 @@
 require 'spec_helper'
 
 describe RequestContext do
-  let(:request_context) do
-    { origo:      nil,
-      url:        'https://www.remind101.com',
-      user_agent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.57 Safari/537.36',
-      referrer:   'http://search.yahoo.com/search?p=remind101',
-      ip:         '127.0.0.1' }
-  end
+  let(:request_context) { Rack::Request.new({}) }
 
   describe '.request_context' do
     subject { described_class.request_context }
@@ -25,14 +19,4 @@ describe RequestContext do
     end
   end
 
-  describe '.with_request_context' do
-    before { Thread.current[:request_context] = request_context }
-
-    it 'sets the request_context to the new request_context' do
-      described_class.with_request_context( {url: 'https://www.remind101.com', ip: '10.10.10.10'} ) do
-        expect(described_class.request_context).to eq({url: 'https://www.remind101.com', ip: '10.10.10.10'})
-      end
-      expect(described_class.request_context).to eq request_context
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: request_context
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: