browser 1.1.0 → 2.0.0.rc1

data/lib/browser/platform/chrome_os.rb

@@ -0,0 +1,21 @@
+module Browser
+  class Platform
+    class ChromeOS < Base
+      def match?
+        ua =~ /CrOS/
+      end
+
+      def name
+        "Chrome OS"
+      end
+
+      def id
+        :chrome_os
+      end
+
+      def version
+        ua[/CrOS(?: x86_64)? ([\d.]+)/, 1]
+      end
+    end
+  end
+end

data/lib/browser/platform/firefox_os.rb

@@ -0,0 +1,21 @@
+module Browser
+  class Platform
+    class FirefoxOS < Base
+      def version
+        "0"
+      end
+
+      def name
+        "Firefox OS"
+      end
+
+      def id
+        :firefox_os
+      end
+
+      def match?
+        ua !~ /(Android|Linux|BlackBerry|Windows|Mac)/ && ua =~ /Firefox/
+      end
+    end
+  end
+end

data/lib/browser/platform/ios.rb

@@ -0,0 +1,28 @@
+module Browser
+  class Platform
+    class IOS < Base
+      MATCHER = /(iPhone|iPad|iPod)/
+      VERSION_MATCHER = /OS ([\d.]+)/
+
+      def version
+        ua[VERSION_MATCHER, 1] || "0"
+      end
+
+      def name
+        "iOS (#{device})"
+      end
+
+      def id
+        :ios
+      end
+
+      def match?
+        ua =~ MATCHER
+      end
+
+      def device
+        ua[MATCHER, 1]
+      end
+    end
+  end
+end

data/lib/browser/platform/linux.rb

@@ -0,0 +1,21 @@
+module Browser
+  class Platform
+    class Linux < Base
+      def version
+        "0"
+      end
+
+      def name
+        "Generic Linux"
+      end
+
+      def id
+        :linux
+      end
+
+      def match?
+        ua =~ /Linux/
+      end
+    end
+  end
+end

data/lib/browser/platform/mac.rb

@@ -0,0 +1,21 @@
+module Browser
+  class Platform
+    class Mac < Base
+      def version
+        "0"
+      end
+
+      def name
+        "Macintosh"
+      end
+
+      def id
+        :mac
+      end
+
+      def match?
+        ua =~ /Mac/
+      end
+    end
+  end
+end

data/lib/browser/platform/other.rb

@@ -0,0 +1,21 @@
+module Browser
+  class Platform
+    class Other < Base
+      def version
+        "0"
+      end
+
+      def name
+        "Other"
+      end
+
+      def id
+        :other
+      end
+
+      def match?
+        true
+      end
+    end
+  end
+end

data/lib/browser/platform/windows.rb

@@ -0,0 +1,21 @@
+module Browser
+  class Platform
+    class Windows < Base
+      def version
+        "0"
+      end
+
+      def name
+        "Windows"
+      end
+
+      def id
+        :windows
+      end
+
+      def match?
+        ua =~ /Windows/
+      end
+    end
+  end
+end

data/lib/browser/platform/windows_mobile.rb

@@ -0,0 +1,21 @@
+module Browser
+  class Platform
+    class WindowsMobile < Base
+      def version
+        "0"
+      end
+
+      def name
+        "Windows Mobile"
+      end
+
+      def id
+        :windows_mobile
+      end
+
+      def match?
+        ua =~ /Windows CE/
+      end
+    end
+  end
+end

data/lib/browser/platform/windows_phone.rb

@@ -0,0 +1,21 @@
+module Browser
+  class Platform
+    class WindowsPhone < Base
+      def version
+        ua[/Windows Phone ([\d.]+)/, 1]
+      end
+
+      def name
+        "Windows Phone"
+      end
+
+      def id
+        :windows_phone
+      end
+
+      def match?
+        ua =~ /Windows Phone/
+      end
+    end
+  end
+end

data/lib/browser/rails.rb

@@ -2,13 +2,14 @@ require "rails/railtie"
 require "browser/action_controller"
 require "browser/middleware/context/additions"
 
-class Browser
+module Browser
   class Railtie < Rails::Railtie
     config.browser = ActiveSupport::OrderedOptions.new
 
     initializer "browser" do
       ::ActionController::Base.send :include, Browser::ActionController
-      Browser::Middleware::Context.send :include, Browser::Middleware::Context::Additions
+      Browser::Middleware::Context.send :include,
+                                        Browser::Middleware::Context::Additions
     end
   end
 end

data/lib/browser/safari.rb

@@ -0,0 +1,22 @@
+module Browser
+  class Safari < Base
+    def id
+      :safari
+    end
+
+    def name
+      "Safari"
+    end
+
+    def full_version
+      ua[%r[Version/([\d.]+)], 1] ||
+        ua[%r[Safari/([\d.]+)], 1] ||
+        ua[%r[AppleWebKit/([\d.]+)], 1] ||
+        "0.0"
+    end
+
+    def match?
+      !!(ua =~ /Safari/ && ua !~ /Chrome|CriOS|PhantomJS|FxiOS/)
+    end
+  end
+end

data/lib/browser/testing.rb

@@ -0,0 +1,23 @@
+module Browser
+  def self.user_agents
+    @user_agents ||= browser_user_agents
+                     .merge(bot_user_agents)
+                     .merge(search_engine_user_agents)
+  end
+
+  def self.browser_user_agents
+    @browser_user_agents ||= YAML.load_file(Browser.root.join("test/ua.yml"))
+  end
+
+  def self.bot_user_agents
+    @bot_user_agents ||= YAML.load_file(Browser.root.join("test/ua_bots.yml"))
+  end
+
+  def self.search_engine_user_agents
+    @search_engine_user_agents ||= YAML.load_file(Browser.root.join("test/ua_search_engines.yml"))
+  end
+
+  def self.[](key)
+    user_agents.fetch(key)
+  end
+end

data/lib/browser/uc_browser.rb

@@ -0,0 +1,19 @@
+module Browser
+  class UCBrowser < Base
+    def id
+      :uc_browser
+    end
+
+    def name
+      "UCBrowser"
+    end
+
+    def full_version
+      ua[%r[UCBrowser/([\d.]+)], 1]
+    end
+
+    def match?
+      ua =~ /UCBrowser/
+    end
+  end
+end

data/lib/browser/version.rb

@@ -1,8 +1,3 @@
-class Browser
-  module Version
-    MAJOR = 1
-    MINOR = 1
-    PATCH = 0
-    STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
-  end
+module Browser
+  VERSION = "2.0.0.rc1"
 end

data/search_engines.yml

@@ -1,6 +1,6 @@
-Baidu: "Chinese search engine"
+baidu: "Chinese search engine"
 bingbot: "Microsoft bing bot"
-Googlebot: "Google spider"
-Slurp: "Yahoo spider"
-DuckDuckBot: "Duck Duck Go"
-Ask Jeeves: "Ask Jeeves"
+googlebot: "Google spider"
+slurp: "Yahoo spider"
+duckduckbot: "Duck Duck Go"
+ask jeeves: "Ask Jeeves"

data/test/browser_test.rb

@@ -1,147 +1,88 @@
 require "test_helper"
 
 class BrowserTest < Minitest::Test
-  setup do
-    @browser = Browser.new
-  end
-
-  test "yields self when block is given" do
-    browser = nil
-    Browser.new {|b| browser = b }
-    assert_kind_of Browser, browser
-  end
-
-  test "responds to ua methods" do
-    assert @browser.respond_to?(:ua)
-    assert @browser.respond_to?(:ua=)
-  end
-
-  test "delegates ua methods" do
-    @browser.user_agent = "Safari"
-    assert_equal "Safari", @browser.ua
-
-    @browser.ua = "Mozilla"
-    assert_equal "Mozilla", @browser.user_agent
-  end
-
-  test "sets accept language while instantiating object" do
-    @browser = Browser.new(:accept_language => "pt-br")
-    assert_equal ["pt-br"], @browser.accept_language
-  end
-
   test "sets user agent while instantianting object" do
-    @browser = Browser.new(:ua => "Safari")
-    assert_equal "Safari", @browser.ua
-
-    @browser = Browser.new(:user_agent => "Chrome")
-    assert_equal "Chrome", @browser.ua
+    browser = Browser.new("Safari")
+    assert_equal "Safari", browser.ua
   end
 
   test "detects android" do
-    @browser.ua = $ua["ANDROID"]
+    browser = Browser.new(Browser["ANDROID"])
 
-    assert_equal "Android", @browser.name
-    assert @browser.android?
-    refute @browser.safari?
-    assert @browser.webkit?
-    assert @browser.mobile?
-    refute @browser.tablet?
-    assert @browser.modern?
-    assert_equal "3.1.2", @browser.full_version
-    assert_equal "3", @browser.version
+    assert_equal "Safari", browser.name
+    assert browser.platform.android?
+    assert browser.safari?
+    assert browser.webkit?
+    assert browser.modern?
+    assert_equal "3.1.2", browser.full_version
+    assert_equal "3", browser.version
   end
 
   test "detects android tablet" do
-    @browser.ua = $ua["TABLOID"]
+    browser = Browser.new(Browser["TABLOID"])
 
-    assert_equal "Android", @browser.name
-    assert @browser.android?
-    refute @browser.safari?
-    assert @browser.webkit?
-    refute @browser.mobile?
-    assert @browser.tablet?
-    assert @browser.modern?
-    assert_equal "4.0", @browser.full_version
-    assert_equal "4", @browser.version
+    assert_equal "Safari", browser.name
+    assert browser.platform.android?
+    assert browser.safari?
+    assert browser.webkit?
+    assert browser.modern?
+    assert_equal "4.0", browser.full_version
+    assert_equal "4", browser.version
   end
 
   test "detects surface tablet" do
-    @browser.ua = $ua["SURFACE"]
+    browser = Browser.new(Browser["SURFACE"])
 
-    assert_equal "Internet Explorer", @browser.name
-    assert @browser.surface?
-    assert @browser.ie?
-    refute @browser.mobile?
-    assert @browser.tablet?
-    assert @browser.modern?
-    assert_equal "10.0", @browser.full_version
-    assert_equal "10", @browser.version
+    assert_equal "Internet Explorer", browser.name
+    assert browser.device.surface?
+    assert browser.ie?
+    assert browser.modern?
+    assert_equal "10.0", browser.full_version
+    assert_equal "10", browser.version
   end
 
   test "detects quicktime" do
-    @browser.ua = $ua["QUICKTIME"]
+    browser = Browser.new(Browser["QUICKTIME"])
 
-    assert_equal "QuickTime", @browser.name
-    assert @browser.quicktime?
-    assert_equal "7.6.8", @browser.full_version
-    assert_equal "7", @browser.version
+    assert_equal "QuickTime", browser.name
+    assert browser.quicktime?
+    assert_equal "7.6.8", browser.full_version
+    assert_equal "7", browser.version
   end
 
   test "detects core media" do
-    @browser.ua = $ua["COREMEDIA"]
+    browser = Browser.new(Browser["COREMEDIA"])
 
-    assert_equal "Apple CoreMedia", @browser.name
-    assert @browser.core_media?
-    assert_equal "1.0.0.10F569", @browser.full_version
-    assert_equal "1", @browser.version
+    assert_equal "Apple CoreMedia", browser.name
+    assert browser.core_media?
+    assert_equal "1.0.0.10", browser.full_version
+    assert_equal "1", browser.version
   end
 
   test "detects phantom.js" do
-    @browser.ua = $ua["PHANTOM_JS"]
+    browser = Browser.new(Browser["PHANTOM_JS"])
 
-    assert_equal "PhantomJS", @browser.name
-    assert @browser.phantom_js?
-    refute @browser.tablet?
-    refute @browser.mobile?
-    assert @browser.modern?
-    assert_equal "1.9.0", @browser.full_version
-    assert_equal "1", @browser.version
-  end
-
-  test "detects other mobiles" do
-    @browser.ua = "Symbian OS"
-    assert @browser.mobile?
-    refute @browser.tablet?
-
-    @browser.ua = "MIDP-2.0"
-    assert @browser.mobile?
-    refute @browser.tablet?
-  end
-
-  test "detects windows mobile" do
-    @browser.ua = $ua["WINDOWS_MOBILE"]
-
-    assert @browser.mobile?
-    assert @browser.windows?
-    assert @browser.windows_mobile?
-    refute @browser.windows_phone?
-    refute @browser.tablet?
+    assert_equal "PhantomJS", browser.name
+    assert browser.phantom_js?
+    assert browser.modern?
+    assert_equal "1.9.0", browser.full_version
+    assert_equal "1", browser.version
   end
 
   test "returns a zero version" do
-    @browser.ua = "Bot"
-    assert_equal "0.0", @browser.full_version
-    assert_equal "0", @browser.version
+    browser = Browser.new("Bot")
+    assert_equal "0.0", browser.full_version
+    assert_equal "0", browser.version
   end
 
   test "sets meta" do
-    @browser.ua = $ua["CHROME"]
-    assert_kind_of Array, @browser.meta
+    browser = Browser.new(Browser["CHROME"])
+    assert_kind_of Array, browser.meta
   end
 
   test "returns string representation" do
-    @browser.ua = $ua["CHROME"]
-    meta = @browser.to_s
+    browser = Browser.new(Browser["CHROME"])
+    meta = browser.to_s
 
     assert meta.include?("chrome")
     assert meta.include?("webkit")
@@ -150,99 +91,57 @@ class BrowserTest < Minitest::Test
   end
 
   test "returns string representation for mobile" do
-    @browser.ua = $ua["BLACKBERRY"]
-    meta = @browser.to_s
+    browser = Browser.new(Browser["BLACKBERRY"])
+    meta = browser.to_s
 
     assert meta.include?("blackberry")
-    assert meta.include?("blackberry4")
-    assert meta.include?("other")
     assert meta.include?("mobile")
   end
 
   test "detects unknown id" do
-    @browser.ua = "Unknown"
-    assert_equal :other, @browser.id
+    browser = Browser.new("Unknown")
+    assert_equal :generic, browser.id
   end
 
   test "detects unknown name" do
-    @browser.ua = "Unknown"
-    assert_equal "Other", @browser.name
+    browser = Browser.new("Unknown")
+    assert_equal "Generic Browser", browser.name
   end
 
-  test "detects mac platform" do
-    @browser.ua = "Mac OS X"
-    assert_equal :mac, @browser.platform
-    assert @browser.mac?
+  test "returns empty language set for missing accept language" do
+    browser = Browser.new("")
+    assert_equal [], browser.accept_language
   end
 
-  test "detects linux platform" do
-    @browser.ua = "Linux"
-    assert_equal :linux, @browser.platform
-    assert @browser.linux?
-  end
+  test "sets accept language while instantiating object" do
+    browser = Browser.new("", accept_language: "pt-br")
 
-  test "detects unknown platform" do
-    @browser.ua = "Unknown"
-    assert_equal :other, @browser.platform
+    assert_kind_of Array, browser.accept_language
+    assert_equal ["pt-BR"], browser.accept_language.map(&:full)
   end
 
   test "returns all known languages" do
-    @browser.accept_language = "en-us,en;q=0.8,pt-br;q=0.5,pt;q=0.3"
-    assert_equal ["en-us", "en", "pt-br", "pt"], @browser.accept_language
-  end
-
-  test "detects xoom" do
-    @browser.ua = $ua["XOOM"]
-
-    assert @browser.android?
-    assert @browser.tablet?
-    refute @browser.mobile?
-  end
-
-  test "detects nexus tablet" do
-    @browser.ua = $ua["NEXUS_TABLET"]
-
-    assert @browser.android?
-    assert @browser.tablet?
-    refute @browser.mobile?
-  end
-
-  test "detects nook" do
-    @browser.ua = $ua["NOOK"]
-
-    assert @browser.tablet?
-    refute @browser.mobile?
-  end
-
-  test "detects samsung" do
-    @browser.ua = $ua["SAMSUNG"]
-
-    assert @browser.tablet?
-    refute @browser.mobile?
+    browser = Browser.new("", accept_language: "en-us,en;q=0.8,pt-br;q=0.5,pt;q=0.3")
+    assert_equal ["en-US", "en", "pt-BR", "pt"], browser.accept_language.map(&:full)
   end
 
   test "removes duplicate items" do
-    @browser.ua = $ua["SAFARI"]
-    assert_equal ["safari"], @browser.meta.select {|item| item == "safari" }
+    browser = Browser.new(Browser["SAFARI"])
+    assert_equal ["safari"], browser.meta.select {|item| item == "safari" }
   end
 
   test "detects meta aliased as to_a" do
-    @browser.ua = $ua["SAFARI"]
-    assert_equal @browser.meta, @browser.to_a
-  end
-
-  test "detects tv" do
-    @browser.ua = $ua["SMART_TV"]
-    assert @browser.tv?
+    browser = Browser.new(Browser["SAFARI"])
+    assert_equal browser.meta, browser.to_a
   end
 
   test "knows a supported browser" do
-    @browser.ua = "Chrome"
-    assert @browser.known?
+    browser = Browser.new("Chrome")
+    assert browser.known?
   end
 
   test "does not know an unsupported browser" do
-    @browser.ua = "Fancy new browser"
-    refute @browser.known?
+    browser = Browser.new("Fancy new browser")
+    refute browser.known?
   end
 end