rack_ssi 0.0.4 → 0.0.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 899d18689b60d6ff2533d84b1f94c0a04d1a90f7
+  data.tar.gz: 9f7105dc0d3b7da27fa9e0bc643b0c319089c15d
+SHA512:
+  metadata.gz: dc1c5645e72223e7275d06c24e3c747ad73587786d45b605ad7120c7c040975885fd420e9f241809cc5f7d3b2dfc78783a940313b991112f1c58c3a143110c64
+  data.tar.gz: d491818ea3a54e3d4437343455073febb1865a585d4e2c0f85d1b013379ffce8723923cd0f350f41b98aadd6791e5f9de16fb0ec54a5762b6019fe87a9e7833f

data/.gitignore

@@ -1,4 +1,5 @@
 .rbenv-version
+.ruby-version
 *.gem
 *.rbc
 .bundle

data/lib/rack_ssi.rb

@@ -1,6 +1,6 @@
 require 'compatibility'
 require 'ssi_processor'
-require 'rest_client'
+require 'httparty'
 require 'logger'
 
 module Rack
@@ -21,7 +21,7 @@ module Rack
       return unprocessed unless headers["Content-Type"] && headers["Content-Type"].include?("text/html")
       return unprocessed unless status == 200
       
-      ssi = Rack::SSIProcessor.new
+      ssi = Rack::SSIProcessor.new(env)
       ssi.locations = @locations
       ssi.logger = logger(env) if @logging
       new_body = ssi.process(body)      

data/lib/ssi_processor.rb

@@ -2,6 +2,10 @@ module Rack
   class SSIProcessor
     
     attr_accessor :logger, :locations
+
+    def initialize(env)
+      @env = env
+    end
     
     def process(body)
       # see http://wiki.nginx.org/HttpSsiModule
@@ -51,10 +55,10 @@ module Rack
     
     def _get(url)
       _info "fetching #{url}"
-      RestClient.get(url) do |response, request, result|
-        _error "error fetching #{url}: #{response.code} response" if response.code != 200
-        [response.code, response.headers, response.body]
-      end
+      headers = @env['HTTP_COOKIE'] ? {'Cookie' => @env['HTTP_COOKIE']} : {}
+      response = HTTParty.get(url, headers: headers)
+      _error "error fetching #{url}: #{response.code} response" if response.code != 200
+      [response.code, response.headers, response.body]
     end
     
     def _info(message)

data/rack-ssi.gemspec

@@ -8,13 +8,13 @@ Gem::Specification.new do |gem|
     Directives currently supported: 'block' and 'include'
   EOS
   gem.summary       = "Rack middleware for processing SSI based on the nginx HttpSsiModule."
-  gem.homepage      = "https://github.com/forward/rack-ssi"
+  gem.homepage      = "https://github.com/uswitch/rack-ssi"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "rack_ssi"
   gem.require_paths = ["lib"]
-  gem.version       = "0.0.4"
-  gem.add_dependency "rest-client"
+  gem.version       = "0.0.6"
+  gem.add_dependency "httparty"
 end

data/spec/ssi_processor_spec.rb

@@ -4,6 +4,11 @@ require File.expand_path('../spec_helper', __FILE__)
 
 describe Rack::SSIProcessor do
   
+  before :each do
+    env = double("env", :[] => "")
+    @processor = Rack::SSIProcessor.new(env)
+  end
+
   describe "#process_block" do
     it "should yield block directives and strip them out of the html" do
       html = <<-eos
@@ -24,10 +29,9 @@ describe Rack::SSIProcessor do
         </html>
       eos
      
-      ssi = Rack::SSIProcessor.new
       blocks = []
 
-      processed = ssi.process_block(html) {|block| blocks << block}
+      processed = @processor.process_block(html) {|block| blocks << block}
 
       processed.gsub(/\s+/, "").should == expected
       blocks.should == [["shush", ""], ["shouty", "<h1>ERROR!</h1>"]]      
@@ -51,10 +55,9 @@ describe Rack::SSIProcessor do
         </html>
       eos
      
-      ssi = Rack::SSIProcessor.new
       blocks = []
 
-      processed = ssi.process_block(html) {|block| blocks << block}
+      processed = @processor.process_block(html) {|block| blocks << block}
 
       processed.gsub(/\s+/, "").should == expected
       blocks.should == [["shush", ""], ["shouty", "<h1>ERROR!</h1>"]]      
@@ -82,11 +85,10 @@ describe Rack::SSIProcessor do
           </html>
         eos
      
-        ssi = Rack::SSIProcessor.new
-        ssi.stub(:fetch).with("/some/location").and_return([200, {}, "<p>some content</p>"])
-        ssi.stub(:fetch).with("/some/other/location").and_return([200, {}, "<p>some more content</p>"])
+        @processor.stub(:fetch).with("/some/location").and_return([200, {}, "<p>some content</p>"])
+        @processor.stub(:fetch).with("/some/other/location").and_return([200, {}, "<p>some more content</p>"])
 
-        processed = ssi.process_include(html, {})
+        processed = @processor.process_include(html, {})
 
         processed.gsub(/\s+/, "").should == expected
       end
@@ -109,10 +111,9 @@ describe Rack::SSIProcessor do
           </html>
         eos
      
-        ssi = Rack::SSIProcessor.new
-        ssi.stub(:fetch).with("/some/other/location_from_haml").and_return([200, {}, "<p>some content from haml</p>"])
+        @processor.stub(:fetch).with("/some/other/location_from_haml").and_return([200, {}, "<p>some content from haml</p>"])
 
-        processed = ssi.process_include(html, {})
+        processed = @processor.process_include(html, {})
 
         processed.gsub(/\s+/, "").should == expected
       end
@@ -136,10 +137,9 @@ describe Rack::SSIProcessor do
           </html>
         eos
      
-        ssi = Rack::SSIProcessor.new
-        ssi.stub(:fetch).with("/some/broken/location").and_return([200, {}, ""])
+        @processor.stub(:fetch).with("/some/broken/location").and_return([200, {}, ""])
 
-        processed = ssi.process_include(html, {"oops" => "<p>oops, something went wrong!</p>"})
+        processed = @processor.process_include(html, {"oops" => "<p>oops, something went wrong!</p>"})
 
         processed.gsub(/\s+/, "").should == expected
       end
@@ -153,10 +153,9 @@ describe Rack::SSIProcessor do
           </html>
         eos
         
-        ssi = Rack::SSIProcessor.new
-        ssi.stub(:fetch).with("/some/broken/location").and_return([200, {}, ""])
+        @processor.stub(:fetch).with("/some/broken/location").and_return([200, {}, ""])
 
-        processed = ssi.process_include(html, {})
+        processed = @processor.process_include(html, {})
 
         processed.gsub(/\s+/, "").should == "<html><body></body></html>"
       end
@@ -179,11 +178,10 @@ describe Rack::SSIProcessor do
             </body>
           </html>
         eos
-     
-        ssi = Rack::SSIProcessor.new
-        ssi.stub(:fetch).with("/some/broken/location").and_return([500, {}, "<crap>"])
 
-        processed = ssi.process_include(html, {"oops" => "<p>oops, something went wrong!</p>"})
+        @processor.stub(:fetch).with("/some/broken/location").and_return([500, {}, "<crap>"])
+
+        processed = @processor.process_include(html, {"oops" => "<p>oops, something went wrong!</p>"})
 
         processed.gsub(/\s+/, "").should == expected
       end
@@ -196,11 +194,10 @@ describe Rack::SSIProcessor do
             </body>
           </html>
         eos
-        
-        ssi = Rack::SSIProcessor.new
-        ssi.stub(:fetch).with("/some/broken/location").and_return([500, {}, "<bang>"])
 
-        processed = ssi.process_include(html, {})
+        @processor.stub(:fetch).with("/some/broken/location").and_return([500, {}, "<bang>"])
+
+        processed = @processor.process_include(html, {})
 
         processed.gsub(/\s+/, "").should == "<html><body><bang></body></html>"
       end
@@ -224,10 +221,9 @@ describe Rack::SSIProcessor do
           </html>
         eos
 
-        ssi = Rack::SSIProcessor.new
-        ssi.stub(:fetch).with("/some/location").and_return([200, {}, "<p>€254</p>".force_encoding("ASCII-8BIT")])
+        @processor.stub(:fetch).with("/some/location").and_return([200, {}, "<p>€254</p>".force_encoding("ASCII-8BIT")])
 
-        processed = ssi.process_include(html, {})
+        processed = @processor.process_include(html, {})
         processed.gsub(/\s+/, "").should == expected
       end
     end
@@ -235,25 +231,25 @@ describe Rack::SSIProcessor do
   
   describe "#fetch" do
     it "should resolve locations by exact match first" do
-      ssi = Rack::SSIProcessor.new
-      ssi.locations = {
+      @processor.locations = {
         /\/pants/ => "http://host1",
         "/pants" => "http://host2"
       }
       
-      RestClient.should_receive(:get).with("http://host2/pants")
-      ssi.fetch("/pants")      
+      HTTParty.stub(:get).and_return(double("response", code: 200, headers: [], body: ''))
+      HTTParty.should_receive(:get).with("http://host2/pants", anything)
+      @processor.fetch("/pants")      
+
     end
     
     it "should resolve locations by regex if no exact match" do
-      ssi = Rack::SSIProcessor.new
-      ssi.locations = {
+      @processor.locations = {
         /^\/pants\/.*/ => "http://host1",
         "/pants" => "http://host2"
       }
-      
-      RestClient.should_receive(:get).with("http://host1/pants/on/fire")
-      ssi.fetch("/pants/on/fire")      
+      HTTParty.stub(:get).and_return(double("response", code: 200, headers: [], body: ''))
+      HTTParty.should_receive(:get).with("http://host1/pants/on/fire", anything)
+      @processor.fetch("/pants/on/fire")      
     end
   end
   
@@ -266,11 +262,10 @@ describe Rack::SSIProcessor do
         '<!--# include virtual="/includes/header" -->',
         '</body></html>'
       ]
-      ssi = Rack::SSIProcessor.new
-      ssi.stub(:fetch).with("/includes/broken").and_return([500, {}, "<p>pants!</p>"])
-      ssi.stub(:fetch).with("/includes/header").and_return([200, {}, "<h1>Hello</h1>"])
+      @processor.stub(:fetch).with("/includes/broken").and_return([500, {}, "<p>pants!</p>"])
+      @processor.stub(:fetch).with("/includes/header").and_return([200, {}, "<h1>Hello</h1>"])
       
-      ssi.process(body).join.should == "<html><body><p>ERROR!</p><h1>Hello</h1></body></html>"
+      @processor.process(body).join.should == "<html><body><p>ERROR!</p><h1>Hello</h1></body></html>"
     end
   end
   

metadata

@@ -1,34 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: rack_ssi
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 0.0.6
 platform: ruby
 authors:
 - Thibaut Sacreste
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "    Rack middleware for processing SSI based on the nginx HttpSsiModule.\n
-  \   Directives currently supported: 'block' and 'include'\n"
+description: |2
+      Rack middleware for processing SSI based on the nginx HttpSsiModule.
+      Directives currently supported: 'block' and 'include'
 email:
 - thibaut.sacreste@gmail.com
 executables: []
@@ -47,29 +45,28 @@ files:
 - spec/rack_ssi_spec.rb
 - spec/spec_helper.rb
 - spec/ssi_processor_spec.rb
-homepage: https://github.com/forward/rack-ssi
+homepage: https://github.com/uswitch/rack-ssi
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rack middleware for processing SSI based on the nginx HttpSsiModule.
 test_files:
 - spec/rack_ssi_spec.rb