rack-useragent-filter 0.1.9 → 0.2.0

data/README.rdoc

@@ -13,10 +13,23 @@ Let's say you don't support IE6 and want to prevent IE6 users from accessing to
   
   use Rack::UserAgent::Filter, [
     ["Internet Explorer", "7.0"]
-  ]
+  ]  
   
-  
-Done! From now on users with IE version lower than 7.0 will get a nice error message saying that their browsers need to be updated... Ok, ok, not so nice message, you can personalize it by putting an <tt>upgrade.html</tt> file inside the <tt>/public</tt> directory of your application.
+Done! From now on users with IE version lower than 7.0 will get a nice error message saying that their browsers need to be updated... Ok, ok, not so nice message, you can personalize it by passing custom message, as shown below:
+
+  use Rack::UserAgent::Filter, [
+    ["Internet Explorer", "7.0"]
+  ], :custom_message => "You are using old browser..."
+
+<em> What about not just one sentence message ? </em>
+
+You can specify source url of template 
+
+  use Rack::UserAgent::Filter, [
+    ["Internet Explorer", "7.0"]
+  ], :template => "http://www.example.com/not_supported.html"
+
+<em> url should be valid http||https </em>
 
 <em>- Cool!, what about something more dynamic... like ERB or HAML?</em>
 
@@ -31,8 +44,6 @@ Then you could show the browser version as part of your message:
   Sorry but <%= "#{@browser.browser} #{@browser.version}" %> is not supported
   
 
-  
-  
 <em>- But... what if IE6 user do wants to see how page looks like in his favourite browser?</em>
 
 You can show button "I take full responsibility of using IE6. Let me in!". User clicks button and with some little help

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.2.0

data/lib/rack/useragent/filter.rb

@@ -2,6 +2,8 @@ require 'user_agent'
 require 'erb'
 require 'tilt'
 require 'ostruct'
+require 'net/http'
+require 'uri'
 
 module Rack
   module UserAgent
@@ -12,6 +14,7 @@ module Rack
         @browsers           = required_browsers.map{ |b| OpenStruct.new(:browser => b[0], :version => b[1]) }
         @template           = options[:template]
         @force_with_cookie  = options[:force_with_cookie]
+        @custom_message     = options[:custom_message]
       end
 
       def call(env)
@@ -31,16 +34,27 @@ module Rack
         useragent && @browsers.detect { |browser| useragent < browser }
       end
 
+      def template_is_url?
+        (@template =~ URI::regexp(%w(http https))).nil? ? false : true 
+      end
+      
       def detection_disabled_by_cookie?(cookies)
         @force_with_cookie && cookies.keys.include?(@force_with_cookie)
       end
 
+      def render_default_message
+        @custom_message ? @custom_message : "Sorry, your browser is not supported. Please upgrade"  
+      end
+
       def render_page(useragent)
         if @template && ::File.exists?(@template)
           @browser = useragent # for the template
           Tilt.new(@template).render(self)
+        elsif @template && template_is_url?
+          @browser = useragent
+          Net::HTTP.get(URI.parse(@template))
         else
-          "Sorry, your browser is not supported. Please upgrade"
+          render_default_message
         end
       end
     end

data/rack-useragent-filter.gemspec

@@ -1,44 +1,41 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{rack-useragent-filter}
-  s.version = "0.1.9"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tomasz Mazur", "Sergio Gil", "Luismi Cavall\303\251"]
-  s.date = %q{2010-10-14}
+  s.date = %q{2011-03-23}
   s.email = %q{defkode@gmail.com}
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "examples/upgrade.html",
-     "lib/rack/useragent/filter.rb",
-     "rack-useragent-filter.gemspec",
-     "test/fixtures/upgrade.erb",
-     "test/fixtures/upgrade.haml",
-     "test/test_helper.rb",
-     "test/user_agent_filter_test.rb"
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "examples/upgrade.html",
+    "lib/rack/useragent/filter.rb",
+    "rack-useragent-filter.gemspec",
+    "test/fixtures/upgrade.erb",
+    "test/fixtures/upgrade.haml",
+    "test/test_helper.rb",
+    "test/user_agent_filter_test.rb"
   ]
   s.homepage = %q{http://github.com/defkode/rack-useragent}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.0}
   s.summary = %q{Rack Middleware for filtering by user agent}
   s.test_files = [
     "test/test_helper.rb",
-     "test/user_agent_filter_test.rb"
+    "test/user_agent_filter_test.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/test/test_helper.rb

@@ -1,6 +1,7 @@
 require "rubygems"
 require "rack/test"
 require "shoulda"
+require 'webmock/test_unit'
 
 require File.dirname(__FILE__) + '/../lib/rack/useragent/filter'
 

data/test/user_agent_filter_test.rb

@@ -71,6 +71,58 @@ class UserAgentFilterTest < Test::Unit::TestCase
     end
     
   end
+
+  context "custom message" do
+    setup do
+      def app
+        Rack::Builder.new do
+           use Rack::UserAgent::Filter, [["Internet Explorer", "7.0"]], :custom_message => "I'm custom"
+           run SampleApp.new
+         end
+      end
+    end
+    
+    should "not work" do
+      header "User-Agent", @outdated_browser
+      get '/'
+      assert_equal "I'm custom", last_response.body
+    end
+  end
+
+  context "custom page (url as a template)" do
+    setup do
+      def app
+        Rack::Builder.new do
+           use Rack::UserAgent::Filter, [["Internet Explorer", "7.0"]], :template => "http://www.example.com"
+           run SampleApp.new
+         end
+      end
+      stub_request(:any, "http://www.example.com").to_return(:body => "test", :status => 200)
+    end
+    
+    should "work" do
+      header "User-Agent", @outdated_browser
+      get '/'
+      assert_equal "test", last_response.body
+    end
+  end
+
+  context "custom page (with bad url)" do
+    setup do
+      def app
+        Rack::Builder.new do
+           use Rack::UserAgent::Filter, [["Internet Explorer", "7.0"]], :template => "ppp"
+           run SampleApp.new
+         end
+      end
+    end
+    
+    should "not work" do
+      header "User-Agent", @outdated_browser
+      get '/'
+      assert_equal "Sorry, your browser is not supported. Please upgrade", last_response.body
+    end
+  end  
   
   context "cookie" do
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-useragent-filter
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
-  - 1
-  - 9
-  version: 0.1.9
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Tomasz Mazur
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-14 00:00:00 +02:00
+date: 2011-03-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,7 +77,6 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- .gitignore
 - README.rdoc
 - Rakefile
 - VERSION
@@ -93,8 +92,8 @@ homepage: http://github.com/defkode/rack-useragent
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -118,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Rack Middleware for filtering by user agent

data/.gitignore

@@ -1,2 +0,0 @@
-pkg
-*.gem