RubyGems - slimmer - Versions diffs - 1.1.29 → 1.1.30 - Mend

slimmer 1.1.29 → 1.1.30

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

data/lib/slimmer/app.rb +23 -5
data/lib/slimmer/related_items_inserter.rb +1 -1
data/lib/slimmer/skin.rb +1 -1
data/lib/slimmer/version.rb +1 -1
data/test/test_helper.rb +11 -4
data/test/typical_usage_test.rb +44 -5
metadata +5 -5

data/lib/slimmer/app.rb CHANGED

@@ -23,15 +23,32 @@ module Slimmer
     def call(env)
       logger.debug "Slimmer: capturing response"
-      response_array = @app.call(env)
-      if response_array[1][SKIP_HEADER]
+      backend_response = @app.call(env)
+      if in_development? and skip_slimmer_param?(env)
+        logger.debug "Slimmer: Asked to skip slimmer via skip_slimmer param"
+        return backend_response
+      elsif skip_slimmer_header?(backend_response)
         logger.debug "Slimmer: Asked to skip slimmer via HTTP header"
-        response_array
+        return backend_response
       else
-        rewrite_response(env, response_array)
+        rewrite_response(env, backend_response)
       end
     end
+    def in_development?
+      ENV['RAILS_ENV'] == 'development'
+    end
+    def skip_slimmer_param?(env)
+      skip = Rack::Request.new(env).params['skip_slimmer']
+      skip and skip.to_i > 0
+    end
+    def skip_slimmer_header?(backend_response)
+      !! backend_response[1][SKIP_HEADER]
+    end
     def on_success(source_request, request, body)
       @skin.success(source_request, request, body)
     end
@@ -68,6 +85,7 @@ module Slimmer
       logger.debug "Slimmer: constructing request headers object"
       request = Rack::Request.new(headers)
       content_type = headers['Content-Type'] || headers['content-type']
       logger.debug "Slimmer: Content-Type: #{content_type}"
       if content_type =~ /text\/html/
         logger.debug "Slimmer: Status code = #{status}"

data/lib/slimmer/related_items_inserter.rb CHANGED

@@ -1,6 +1,6 @@
 require 'gds_api/helpers'
-class RelatedItemsInserter
+class Slimmer::RelatedItemsInserter
   include GdsApi::Helpers
   include ERB::Util

data/lib/slimmer/skin.rb CHANGED

@@ -170,7 +170,7 @@ module Slimmer
         GoogleAnalyticsConfigurator.new(request.env),
         RelatedItemsInserter.new(template('related.raw'), source_request),
       ]
       template_name = request.env.has_key?(TEMPLATE_HEADER) ? request.env[TEMPLATE_HEADER] : 'wrapper'
       process(processors,body,template(template_name))
     end

data/lib/slimmer/version.rb CHANGED

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = '1.1.29'
+  VERSION = '1.1.30'
 end

data/test/test_helper.rb CHANGED

@@ -27,7 +27,7 @@ end
 class SlimmerIntegrationTest < MiniTest::Unit::TestCase
   include Rack::Test::Methods
-  def self.given_response(code, body, headers={}, url="/")
+  def self.given_response(code, body, headers={})
     define_method(:app) do
       inner_app = proc { |env|
         [code, headers.merge("Content-Type" => "text/html"), body]
@@ -39,8 +39,7 @@ class SlimmerIntegrationTest < MiniTest::Unit::TestCase
       WebMock.reset!
     end
-    define_method(:setup) do
-      additional_setup if self.class.method_defined? :additional_setup
+    define_method(:setup_template) do
       template_name = case code
       when 200 then 'wrapper'
       when 404 then '404'
@@ -49,10 +48,18 @@ class SlimmerIntegrationTest < MiniTest::Unit::TestCase
       use_template(template_name)
       use_template('related.raw')
-      get url
     end
   end
+  def setup
+    setup_template if respond_to? :setup_template
+    fetch_page
+  end
+  def fetch_page
+    get "/"
+  end
   def use_template(template_name)
     template = File.read File.dirname(__FILE__) + "/fixtures/#{template_name}.html.erb"
     stub_request(:get, "http://template.local/templates/#{template_name}.html.erb").

data/test/typical_usage_test.rb CHANGED

@@ -10,6 +10,35 @@ module TypicalUsage
       assert_equal "Don't template me", last_response.body
     end
   end
+  class SkipUsingQueryParamTest < SlimmerIntegrationTest
+    given_response 200, %{<html><body><div id='unskinned'>Unskinned</div><div id="wrapper">Don't template me</div></body></html>}, {}
+    def fetch_page; end
+    def with_rails_env(new_env, &block)
+      old_env, ENV['RAILS_ENV'] = ENV['RAILS_ENV'], new_env
+      begin
+        yield
+      ensure
+        ENV['RAILS_ENV'] = old_env
+      end
+    end
+    def test_should_return_the_response_as_is_in_development
+      with_rails_env('development') do
+        get "/some-slug?skip_slimmer=1"
+      end
+      assert_rendered_in_template '#unskinned', "Unskinned"
+    end
+    def test_not_skip_slimmer_in_production
+      with_rails_env('production') do
+        get "/some-slug?skip_slimmer=1"
+      end
+      assert_rendered_in_template '#wrapper', "Don't template me"
+    end
+  end
   class ContentLengthTest < SlimmerIntegrationTest
     given_response 200, %{
@@ -82,7 +111,7 @@ module TypicalUsage
   class ResponseWithRelatedItemsTest < SlimmerIntegrationTest
     include GdsApi::TestHelpers::Panopticon
-    def additional_setup
+    def setup
       panopticon_has_metadata(
         'slug' => 'some-slug',
         'title' => 'Example document',
@@ -96,6 +125,7 @@ module TypicalUsage
             }
           ]
         )
+      super
     end
   end
@@ -106,7 +136,11 @@ module TypicalUsage
       <div id="wrapper">The body of the page<div id="related-items"></div></div>
       </body>
       </html>
-    }, {}, "/some-slug"
+    }, {}
+    def fetch_page
+      get "/some-slug"
+    end
     def test_should_insert_related_items_block
       assert_rendered_in_template "div.related nav li.guide a", "How to test computer software automatically &amp; ensure that 2&gt;1"
@@ -121,7 +155,11 @@ module TypicalUsage
       <div id="wrapper">The body of the page<div id="related-items"></div></div>
       </body>
       </html>
-    }, {}, "/some-slug"
+    }, {}
+    def fetch_page
+      get "/some-slug"
+    end
     def test_should_not_insert_related_items_block
       assert_rendered_in_template "div#related-items", ""
@@ -262,8 +300,9 @@ module TypicalUsage
       </html>
     }
-    def additional_setup
-      RelatedItemsInserter.any_instance.stubs(:metadata_from_panopticon).raises(GdsApi::TimedOutException)
+    def setup
+      ::Slimmer::RelatedItemsInserter.any_instance.stubs(:metadata_from_panopticon).raises(GdsApi::TimedOutException)
+      super
     end
     def test_should_return_503_if_an_API_call_times_out

metadata CHANGED

@@ -2,7 +2,7 @@
 name: slimmer
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 1.1.29
+  version: 1.1.30
 platform: ruby
 authors:
 - Ben Griffiths
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-01-31 00:00:00 Z
+date: 2012-02-02 00:00:00 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -193,7 +193,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      hash: 582425073
+      hash: -400948941029337357
       segments:
       - 0
       version: "0"
@@ -202,14 +202,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      hash: 582425073
+      hash: -400948941029337357
       segments:
       - 0
       version: "0"
 requirements: []
 rubyforge_project: slimmer
-rubygems_version: 1.8.12
+rubygems_version: 1.8.13
 signing_key:
 specification_version: 3
 summary: Thinner than the skinner