rack-denyie 1.1.0 → 1.1.1

data/README.rdoc

@@ -1,5 +1,7 @@
 == IE Filter on Rack
 
+v1.1 = Fixed CSS issues with IE 4/5, Rewrote Tests
+
 === What?
 ===
 
@@ -33,7 +35,7 @@ With custom template and modified minimum version:
   :template => "/full/path/to/your/template.html"  # Custom HTML template
  }
 
-With redirection set (not well tested):
+With redirection set:
 
  use Rack::DenyIE, {
   :redirect_url => "http://browsehappy.com/"
@@ -60,8 +62,7 @@ Any key/value you pass in will be available to your ERB template.
 ===
 
 * Allow HAML templates
-* Write tests for url redirection
-* Tests need improvement
+* More Tests
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/rack-denyie.rb

@@ -1,99 +1,81 @@
 require 'rack'
-require 'erb'
 
 module Rack
-    
-    class DenyIE
-    
-      URL_REGEX = %r{\b(([\w-]+://?|[\w\d]+[.])[^\s()<>]+(?:(?:\([\w\d)]+\)[^\s()<>]*)+|([^[:punct:]\s]|/)))} # http://alanstorm.com/url_regex_explained
-    
-      # Default Options
-      DEFAULT_MIN_VERSION = 7
-      DEFAULT_HEADLINE = "This version of Internet Explorer is not supported."
-      DEFAULT_SITE = "this site"
-      DEFAULT_TEMPLATE_PATH = ::File.join(::File.dirname(__FILE__), 'html', 'default.erb')
-    
-      DEFAULT_REDIRECT_MESSAGE = "Your browser is unsupported."
-    
-      def initialize(app, options = {})
-        @app = app
-        @options = { 
-          :min_version => DEFAULT_MIN_VERSION, # The minimum version of IE you want allowed through
-          :headline => DEFAULT_HEADLINE, # The headline message displayed to filtered IE users
-          :site_name => DEFAULT_SITE, # Your site name.
-          :template => DEFAULT_TEMPLATE_PATH, # A custom template, either ERB or HTML
-          :redirect_url => nil }.merge options # Redirects users to a new location rather than displaying a template
-      end
-  
-      def call(env)
-        status, @headers, content = @app.call(env)
-        is_unsupported?(env) && is_content_html? ? act_on_ie : @app.call(env)
-      end
-    
-      private 
-    
-      # Uses a regex to filter IE versions
-      def is_unsupported?(env)
-        minimum_version = (@options[:min_version].to_i - 1)
-        env["HTTP_USER_AGENT"].match(/MSIE [0-#{minimum_version}]/) # \.[0-9][0-9]?
-      end
-    
-      # Checks if the content is html, this middleware ONLY filters content that is HTML
-      def is_content_html?
-        @headers["Content-Type"] && @headers["Content-Type"].include?("text/html")
-      end
-    
-      # Decides which action to take, either redirect or display template
-      def act_on_ie
-        should_redirect? ? redirect_browser : display_template
-      end
-    
-      # Checks if redirection is set
-      def should_redirect?
-        !@options[:redirect_url].nil? && @options[:redirect_url].match(URL_REGEX)
-      end
-    
-      # Redirects the browser to a new location
-      def redirect_browser
-        [302, { 'Location' => @options[:redirect_url] }, DEFAULT_REDIRECT_MESSAGE ]
-      end
-    
-      # Displays the template
-      def display_template
-        response = (::File.extname(@options[:template]) == ".erb") ? ProcessERB.new(@options).bound : ::File.read(@options[:template])
-        [200, @headers, response]
-      end
+  class DenyIE
 
+    URL_REGEX = %r{\b(([\w-]+://?|[\w\d]+[.])[^\s()<>]+(?:(?:\([\w\d)]+\)[^\s()<>]*)+|([^[:punct:]\s]|/)))} # http://alanstorm.com/url_regex_explained
+
+    # Default Options
+    DEFAULT_MIN_VERSION = 7
+    DEFAULT_HEADLINE = "This version of Internet Explorer is not supported."
+    DEFAULT_SITE = "this site"
+    DEFAULT_TEMPLATE_PATH = ::File.join(::File.dirname(__FILE__), 'html', 'default.erb')
+
+    DEFAULT_REDIRECT_MESSAGE = "Your browser is unsupported."
+
+    def initialize(app, options = {})
+      @app = app
+      @options = { 
+        :min_version => DEFAULT_MIN_VERSION, # The minimum version of IE you want allowed through
+        :headline => DEFAULT_HEADLINE, # The headline message displayed to filtered IE users
+        :site_name => DEFAULT_SITE, # Your site name.
+        :template => DEFAULT_TEMPLATE_PATH, # A custom template, either ERB or HTML
+        :redirect_url => nil }.merge options # Redirects users to a new location rather than displaying a template
+    end
+
+    def call(env)
+      status, @headers, content = @app.call(env)
+      is_unsupported?(env) && is_content_html? ? act_on_ie : @app.call(env)
+    end
+
+    private 
+
+    # Uses a regex to filter IE versions
+    def is_unsupported?(env)
+      minimum_version = (@options[:min_version].to_i - 1)
+      env["HTTP_USER_AGENT"].match(/MSIE [0-#{minimum_version}]/) # \.[0-9][0-9]?
+    end
+
+    # Checks if the content is html, this middleware ONLY filters content that is HTML
+    def is_content_html?
+      @headers["Content-Type"] && @headers["Content-Type"].include?("text/html")
     end
-  
-    class ProcessERB
-    
-      def initialize(options = {})
-        @options = options
-        @erb = ERB.new(::File.read(@options[:template]), nil, "%<>")
-      end
-    
-      def bound
-        binding = TemplateVars.new(@options).get_binding # Variables passed to ERB template
-        @template = @erb.result(binding)
-        @template.gsub(/\n$/,'')
-      end
-    
+
+    # Decides which action to take, either redirect or display template
+    def act_on_ie
+      should_redirect? ? redirect_browser : display_template
     end
-  
-    # Binds the options as template variables (NOTE: This is probably a better way of doing this, I just don't know it.)
-    class TemplateVars
-    
-      def initialize(options = {})
-        options.each_pair do |key, value|
-          self.instance_variable_set("@#{key}", value)
-        end
-      end
-    
-      def get_binding
-        binding
-      end
-    
+
+    # Checks if redirection is set
+    def should_redirect?
+      !@options[:redirect_url].nil? && @options[:redirect_url].match(URL_REGEX)
     end
-    
+
+    # Redirects the browser to a new location
+    def redirect_browser
+      [302, { 'Location' => @options[:redirect_url] }, DEFAULT_REDIRECT_MESSAGE ]
+    end
+
+    # Displays the template
+    def display_template
+      response = (::File.extname(@options[:template]) == ".erb") ? ProcessERB.new(@options).bound : ::File.read(@options[:template])
+      [200, @headers, response]
+    end
+
+  end
+
+  class ProcessERB
+    require 'erb'
+
+    def initialize(options = {})
+      @options = options
+      @erb = ERB.new(::File.read(@options[:template]), nil, "%<>")
+    end
+
+    def bound
+      @template = @erb.result(binding)
+      @template.gsub(/\n$/,'')
+    end
+
+  end    
 end

data/rack-denyie.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-denyie}
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brad Whitcomb"]

data/test/test_helper.rb

@@ -4,6 +4,5 @@ require 'shoulda'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rack-denyie'
 
-class Test::Unit::TestCase; end
+require 'rack-denyie'

data/test/test_rack-denyie.rb

@@ -1,5 +1,5 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'test_helper'
-require 'erb'
  
 class TestRackDenyIE < Test::Unit::TestCase
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-denyie
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Brad Whitcomb