slimmer 1.1.18 → 1.1.19

data/lib/slimmer.rb

@@ -27,4 +27,7 @@ module Slimmer
   autoload :UrlRewriter, 'slimmer/url_rewriter'
   autoload :HeaderContextInserter, 'slimmer/header_context_inserter'
   autoload :GoogleAnalyticsConfigurator, 'slimmer/google_analytics_configurator'
+
+  class TemplateNotFoundException < StandardError; end
+  class CouldNotRetrieveTemplate < StandardError; end
 end

data/lib/slimmer/app.rb

@@ -92,27 +92,8 @@ module Slimmer
         rewritten_body = app_body
       end
       rewritten_body = [rewritten_body] unless rewritten_body.respond_to?(:each)
-      filtered_headers = filter_headers headers
       logger.debug "Slimmer: Returning final status, headers and body"
-      [status, filtered_headers, rewritten_body]
-    end
-
-    def filter_headers(header_hash)
-      valid_keys = %w{vary set-cookie location content-type expires cache-control www-authenticate last-modified etag}
-      logger.debug "Slimmer: removing headers except #{valid_keys} from #{header_hash.keys}"
-      removed_keys = []
-      header_hash.keys.each do |key|
-        unless valid_keys.include?(key.downcase)
-          removed_keys << key
-          header_hash.delete(key)
-        end
-      end
-      if removed_keys.size > 0
-        logger.debug "Slimmer: removed #{removed_keys.size} headers: #{removed_keys.inspect}"
-      else
-        logger.debug "Slimmer: no headers removed"
-      end
-      header_hash
+      [status, headers, rewritten_body]
     end
   end
 end

data/lib/slimmer/skin.rb

@@ -61,6 +61,10 @@ module Slimmer
       cache template_name, template
       logger.debug "Slimmer: Returning evaluated template"
       template
+    rescue OpenURI::HTTPError
+      raise TemplateNotFoundException
+    rescue Errno::ECONNREFUSED
+      raise CouldNotRetrieveTemplate
     end
 
     def template_url template_name

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = '1.1.18'
+  VERSION = '1.1.19'
 end

data/test/skin_test.rb

@@ -20,4 +20,24 @@ class SkinTest < MiniTest::Unit::TestCase
     template = skin.load_template 'example'
     assert_equal "<p>this-is-the-prefix</p>", template
   end
+
+  def test_should_raise_appropriate_exception_when_template_not_found
+    skin = Slimmer::Skin.new "http://example.local/"
+    expected_url = "http://example.local/templates/example.html.erb"
+    stub_request(:get, expected_url).to_return(:status => '404')
+
+    assert_raises(Slimmer::TemplateNotFoundException) do
+      skin.load_template 'example'
+    end
+  end
+
+  def test_should_raise_appropriate_exception_when_cant_reach_template_host
+    skin = Slimmer::Skin.new "http://example.local/"
+    expected_url = "http://example.local/templates/example.html.erb"
+    stub_request(:get, expected_url).to_raise(Errno::ECONNREFUSED)
+
+    assert_raises(Slimmer::CouldNotRetrieveTemplate) do
+      skin.load_template 'example'
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slimmer
 version: !ruby/object:Gem::Version
-  version: 1.1.18
+  version: 1.1.19
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-10 00:00:00.000000000 Z
+date: 2012-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70351908621780 !ruby/object:Gem::Requirement
+  requirement: &70164012495200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70351908621780
+  version_requirements: *70164012495200
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70351908620040 !ruby/object:Gem::Requirement
+  requirement: &70164012494660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70351908620040
+  version_requirements: *70164012494660
 - !ruby/object:Gem::Dependency
   name: plek
-  requirement: &70351908619480 !ruby/object:Gem::Requirement
+  requirement: &70164012494160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.1.8
   type: :runtime
   prerelease: false
-  version_requirements: *70351908619480
+  version_requirements: *70164012494160
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70351908618940 !ruby/object:Gem::Requirement
+  requirement: &70164012493740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70351908618940
+  version_requirements: *70164012493740
 - !ruby/object:Gem::Dependency
   name: null_logger
-  requirement: &70351908617580 !ruby/object:Gem::Requirement
+  requirement: &70164012493260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70351908617580
+  version_requirements: *70164012493260
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70351908611760 !ruby/object:Gem::Requirement
+  requirement: &70164012492300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70351908611760
+  version_requirements: *70164012492300
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70351908609820 !ruby/object:Gem::Requirement
+  requirement: &70164012491740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *70351908609820
+  version_requirements: *70164012491740
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70351908606800 !ruby/object:Gem::Requirement
+  requirement: &70164012491020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *70351908606800
+  version_requirements: *70164012491020
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70351908602140 !ruby/object:Gem::Requirement
+  requirement: &70164012488760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: '1.7'
   type: :development
   prerelease: false
-  version_requirements: *70351908602140
+  version_requirements: *70164012488760
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &70351908599800 !ruby/object:Gem::Requirement
+  requirement: &70164012488340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,7 +121,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70351908599800
+  version_requirements: *70164012488340
 description: Rack middleware for skinning pages using a specific template
 email:
 - bengriffiths@gmail.com
@@ -157,7 +157,6 @@ files:
 - test/fixtures/500.html.erb
 - test/fixtures/wrapper.html.erb
 - test/google_analytics_test.rb
-- test/header_filtering_test.rb
 - test/headers_test.rb
 - test/processors/body_inserter_test.rb
 - test/processors/header_context_inserter_test.rb
@@ -177,12 +176,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1615013662764741884
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1615013662764741884
 requirements: []
 rubyforge_project: slimmer
 rubygems_version: 1.8.11
@@ -194,7 +199,6 @@ test_files:
 - test/fixtures/500.html.erb
 - test/fixtures/wrapper.html.erb
 - test/google_analytics_test.rb
-- test/header_filtering_test.rb
 - test/headers_test.rb
 - test/processors/body_inserter_test.rb
 - test/processors/header_context_inserter_test.rb

data/test/header_filtering_test.rb

@@ -1,20 +0,0 @@
-require "test_helper"
-
-class HeaderFilteringTest < SlimmerIntegrationTest
-  ALLOWED_HEADERS = ["Vary", "Set-Cookie", "Location", "Content-Type", "Expires", "Cache-Control", "WWW-Authenticate", "Last-Modified", "ETag"]
-  FORBIDDEN_HEADERS = ["Anything-Else"]
-
-  given_response 200, %{Anything}, (ALLOWED_HEADERS + FORBIDDEN_HEADERS).inject({}) {|memo, header| memo[header] = header.downcase; memo}
-
-  def test_allows_whitelisted_headers
-    ALLOWED_HEADERS.each do |header|
-      assert last_response.headers.keys.include?(header)
-    end
-  end
-
-  def test_filters_other_headers
-    FORBIDDEN_HEADERS.each do |header|
-      refute last_response.headers.keys.include?(header)
-    end
-  end
-end