RubyGems - sinatra-support - Versions diffs - 1.1.2 → 1.1.3 - Mend

sinatra-support 1.1.2 → 1.1.3

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 (6) hide show

data/HISTORY.md +6 -0
data/lib/sinatra/support.rb +1 -0
data/lib/sinatra/support/useragenthelpers.rb +134 -0
data/lib/sinatra/support/version.rb +1 -1
data/test/test_useragent_app.rb +25 -0
metadata +3 -1

data/HISTORY.md CHANGED Viewed

@@ -1,3 +1,9 @@
+v1.1.3 - May 27, 2011
+---------------------
+### Added:
+  * `Sinatra::UserAgentHelpers` for browser detection
 v1.1.2 - May 27, 2011
 ---------------------

data/lib/sinatra/support.rb CHANGED Viewed

@@ -8,6 +8,7 @@ module Sinatra
   autoload :HtmlHelpers,     File.expand_path('../support/htmlhelpers', __FILE__)
   autoload :JsSupport,       File.expand_path('../support/jssupport', __FILE__)
   autoload :OhmErrorHelpers, File.expand_path('../support/ohmerrorhelpers', __FILE__)
+  autoload :UserAgentHelpers,File.expand_path('../support/useragenthelpers', __FILE__)
   autoload :Numeric,         File.expand_path('../support/numeric', __FILE__)
   autoload :IfHelpers,       File.expand_path('../support/ifhelpers', __FILE__)
   autoload :I18nSupport,     File.expand_path('../support/i18nsupport', __FILE__)

data/lib/sinatra/support/useragenthelpers.rb ADDED Viewed

@@ -0,0 +1,134 @@
+# == Usage
+#
+#   register Sinatra::UserAgentHelpers
+#
+# == Example
+#
+# After you have registered the UserAgentHelpers, use the {#browser} helper to
+# check for features:
+#
+#   <% if browser.ios? %>
+#     <p>Download our mobile app!</p>
+#   <% end %>
+#
+# Or use the #body_class method:
+#
+#   <body class="<%= browser.body_class %>">
+#
+# The above line can have an output like so:
+#
+#   <body class="webkit safari mac">
+#   <body class="windows ie ie6">
+#
+# == Helper
+#
+#   #browser -- provides the browser helper. Refer to the {UserAgent} class
+#   for more info.
+#
+module Sinatra::UserAgentHelpers
+  def browser
+    UserAgent.new(env['HTTP_USER_AGENT'] || '')
+  end
+end
+class UserAgent
+  UA_REGEXP = %r{([^ /]+)/([^ ]+)(?: \(([^)]+)\))?}
+  def initialize(ua)
+    @ua_string = ua
+    @ua = ua.scan(UA_REGEXP).map { |r|
+      r[2] = r[2].split(';').map { |s| s.strip }  unless r[2].nil?
+      { :product => r[0], :version => r[1], :details => r[2] }
+    }
+  end
+  # Browsers
+  def webkit?()    product?('AppleWebKit'); end
+  def chrome?()    product?('Chrome'); end
+  def safari?()    product?('Safari') && !chrome?; end
+  def ios?()       product?('Safari') && product?('Mobile'); end
+  def gecko?()     product?('Gecko'); end
+  def opera?()     product?('Opera'); end
+  def ie?()        detail?(/^MSIE/, 'Mozilla'); end
+  # OS's and devices
+  def linux?()     detail?(/^Linux/, 'Mozilla'); end
+  def iphone?()    detail?(/^iPhone/, 'Mozilla'); end
+  def rim?()       detail?(/^Blackberry/, 'Mozilla'); end
+  def android?()   detail?(/^Android/, 'Mozilla'); end
+  def android1?()  detail?(/^Android 1\./, 'Mozilla'); end
+  def android2?()  detail?(/^Android 2\./, 'Mozilla'); end
+  def nokia?()     detail?(/^Nokia/, 'Mozilla') || detail?(/^Series[38]0/, 'Mozilla'); end
+  def ipad?()      detail?(/^iPad/, 'Mozilla'); end
+  def windows?()   detail?(/^Windows/, 'Mozilla'); end
+  def osx?()       detail?(/^(Intel )?Mac OS X/, 'Mozilla'); end
+  def mac?()       detail?(/^Macintosh/, 'Mozilla') || osx?; end
+  def blackberry?() detail?(/^Blackberry/, 'Mozilla'); end
+  # IE
+  def ie9?()       detail?('MSIE 9.0', 'Mozilla'); end
+  def ie8?()       detail?('MSIE 8.0', 'Mozilla'); end
+  def ie7?()       detail?(/^MSIE 7.0/, 'Mozilla'); end
+  def ie6?()       detail?(/^MSIE 6/, 'Mozilla'); end
+  # Different Firefox versions
+  def gecko40?()   gecko_version?(20100401, 20110101); end
+  def gecko36?()   gecko_version?(20091111, 20100401); end
+  def gecko35?()   gecko_version?(20090612, 20091111); end
+  def gecko30?()   gecko_version?(20080610, 20090612); end
+  def gecko20?()   gecko_version?(20061010, 20080610); end
+  def gecko_old?() gecko_version?(0, 20061010); end
+  def gecko_version?(from, to)
+    g = product('Gecko')
+    return nil  if g.nil?
+    v = g[:version][0...8].to_i
+    (v >= from) and (v < to)
+  end
+  # Returns the list of applicable browser features.
+  #
+  # == Examples
+  #
+  #   <body class="<%= browser.body_class %>">
+  #
+  # This can return one of the following:
+  #
+  #   <body class="ios webkit ipad">
+  #   <body class="chrome linux webkit">
+  #   <body class="gecko linux">
+  #   <body class="windows ie ie6">
+  #
+  def body_class
+    (%w(webkit chrome safari ios gecko opera ie linux) +
+     %w(blackberry nokia android iphone) +
+     %w(gecko36 gecko35 gecko30 gecko20 gecko_old) +
+     %w(ipad windows osx mac ie6 ie7 ie8 ie9)).map do |aspect|
+      aspect  if self.send :"#{aspect}?"
+    end.compact.join(' ')
+  end
+private
+  def to_s()       @ua_string; end
+  def inspect()    @ua.inspect; end
+  # Checks for, say, 'Gecko' in 'Gecko/3.9.82'
+  def product?(str)
+    !! product(str)
+  end
+  def product(str)
+    @ua.detect { |p| p[:product] == str }
+  end
+  # Checks for, say, 'MSIE' in 'Mozilla/5.0 (MSIE; x; x)'
+  def detail?(detail, prod=nil)
+    !! @ua.detect { |p|
+      prod.nil? || prod == p[:product] && has_spec(p[:details], detail)
+    }
+  end
+  def has_spec(haystack, spec)
+    !haystack.nil? && haystack.detect { |d| d.match(spec) }
+  end
+end

data/lib/sinatra/support/version.rb CHANGED Viewed

@@ -1,6 +1,6 @@
 module Sinatra
   module Support
-    VERSION = "1.1.2"
+    VERSION = "1.1.3"
     def self.version
       VERSION

data/test/test_useragent_app.rb ADDED Viewed

@@ -0,0 +1,25 @@
+require File.expand_path('../helper', __FILE__)
+Encoding.default_external = 'utf-8'
+class UserAgentAppTest < Test::Unit::TestCase
+  include Rack::Test::Methods
+  class App < Sinatra::Base
+    helpers Sinatra::UserAgentHelpers
+    get('/class') { "<body class='#{browser.body_class}'>" }
+  end
+  UA_CHROME = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.68 Safari/534.24"
+  def app
+    App.new
+  end
+  test "boogie" do
+    header 'User-Agent', UA_CHROME
+    get '/class'
+    assert_equal "<body class='webkit chrome osx mac'>", last_response.body.strip
+  end
+end

metadata CHANGED Viewed

@@ -2,7 +2,7 @@
 name: sinatra-support
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Cyril David
@@ -116,6 +116,7 @@ files:
 - lib/sinatra/support/multirender.rb
 - lib/sinatra/support/numeric.rb
 - lib/sinatra/support/ohmerrorhelpers.rb
+- lib/sinatra/support/useragenthelpers.rb
 - lib/sinatra/support/version.rb
 - lib/sinatra/support.rb
 - test/fixtures/css/style-less.less
@@ -141,6 +142,7 @@ files:
 - test/test_multirender.rb
 - test/test_numeric.rb
 - test/test_ohmerror.rb
+- test/test_useragent_app.rb
 - HISTORY.md
 - Rakefile
 has_rdoc: true