brauser 3.2.6 → 3.3.0

data/lib/brauser/definition.rb

@@ -38,12 +38,37 @@ module Brauser
     # @param args [Array] Arguments to pass to the matcher. The first is the definition itself.
     # @return [Object|NilClass] A match if matcher succeeded, `nil` otherwise.
     def match(type, *args)
-      matcher = self.send(type || :primary) rescue nil
-      target = args[1]
+      begin
+        matcher = send(type || :primary)
+      rescue NoMethodError
+        nil
+      end
+
+      perform_match(matcher, args[1], args)
+    end
+
+    private
 
-      if matcher.is_a?(::Regexp) then
+    # Recognizes a browser disambiguating against another.
+    #
+    # @param agent [String] The agent to match.
+    # @param positive_matcher [Regexp] The expression to match.
+    # @param negative_matcher [Regexp] The expression NOT to match.
+    # @return [Boolean] `true` if matching succeeded, `false otherwise`.
+    def self.disambiguate_browser(agent, positive_matcher, negative_matcher)
+      agent =~ positive_matcher && agent !~ negative_matcher
+    end
+
+    # Performs a match against a target.
+    #
+    # @param matcher [Object] The matcher to run, can be a `Regexp`, a `Proc` or a string.
+    # @param target [String] The string to match.
+    # @param args [Array] Arguments to pass to the matcher. The first is definition itself.
+    # @return [Object|NilClass] A match if matcher succeeded, `nil` otherwise.
+    def perform_match(matcher, target, args)
+      if matcher.is_a?(::Regexp)
         matcher.match(target)
-      elsif matcher.respond_to?(:call) then
+      elsif matcher.respond_to?(:call)
         matcher.call(*args)
       elsif target == matcher
         target
@@ -52,4 +77,4 @@ module Brauser
       end
     end
   end
-end
+end

data/lib/brauser/definitions/browsers.rb

@@ -0,0 +1,66 @@
+# encoding: utf-8
+#
+# This file is part of the brauser gem. Copyright (C) 2013 and above Shogun <shogun@cowtech.it>.
+# Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
+#
+
+module Brauser
+  # The interface of brauser browsers.
+  module Browseable
+    # The default browsers definitions.
+    module DefaultDefinitions
+      # Default mobile browsers.
+      MOBILE_BROWSERS = [
+        [:coremedia, "Apple CoreMedia", /coremedia/i, /.+CoreMedia v([a-z0-9.]+)/i],
+
+        [:opera_mobile, "Opera Mobile", /opera mobi/i, /.+Opera Mobi.+((.+Opera )|(Version\/))([a-z0-9.]+)/i],
+        [:opera, "Opera", /opera/i, proc { |_, agent|
+          version = ((agent !~ /wii/i) ? /((.+Opera )|(Version\/))(?<version>[a-z0-9.]+)/i : /(.+Nintendo Wii; U; ; )(?<version>[a-z0-9.]+)/i).match(agent)
+          version ? version["version"] : nil
+        }],
+
+        [:android, "Android", /android/i, /(.+Android )([a-z0-9.]+)/i],
+        [:blackberry, "RIM BlackBerry", /blackberry/i, /(.+Version\/)([a-z0-9.]+)/i],
+        [:kindle, "Amazon Kindle", /(kindle)/i, /(.+(Kindle|Silk)\/)([a-z0-9.]+)/i],
+        [:psp, "Sony Playstation Portable", /psp/i, /(.+PlayStation Portable\); )([a-z0-9.]+)/i],
+        [:ps3, "Sony Playstation 3", /playstation 3/i, /(.+PLAYSTATION 3; )([a-z0-9.]+)/i],
+        [:windows_phone, "Microsoft Windows Phone", /windows phone/i, /(.+IEMobile\/)([a-z0-9.]+)/i],
+        [:wii, "Nintendo Wii", /nintendo wii/, /(.+Nintendo Wii; U; ; )([a-z0-9.]+)/i],
+
+        [:chrome_ios, "Chrome iOS", /crios/i, /(.+CriOS\/)([a-z0-9.]+)/i],
+        [:ipod, "Apple iPod", /ipod/i, /(.+Version\/)([a-z0-9.]+)/i],
+        [:iphone, "Apple iPhone", /iphone/i, /(.+Version\/)([a-z0-9.]+)/i],
+        [:ipad, "Apple iPad", /ipad/i, /(.+Version\/)([a-z0-9.]+)/i],
+
+        [:mobile, "Other Mobile Browser", /(mobile|symbian|midp|windows ce)/i, /.+\/([a-z0-9.]+)/i]
+      ]
+
+      # Default major desktop browsers.
+      MAJOR_DESKTOP_BROWSERS = [
+        [:chrome, "Google Chrome", /((chrome)|(chromium))/i, /(.+Chrom[a-z]+\/)([a-z0-9.]+)/i],
+        [:netscape, "Netscape Navigator", /(netscape|navigator)\//i, /((Netscape|Navigator)\/)([a-z0-9.]+)/i],
+        [:firefox, "Mozilla Firefox", /firefox/i, /(.+Firefox\/)([a-z0-9.]+)/i],
+        [:safari, "Apple Safari", proc { |_, agent|
+          Brauser::Definition.disambiguate_browser(agent, /safari/i, /((chrome)|(chromium)|(crios))/i)
+        }, /(.+Version\/)([a-z0-9.]+)/i]
+      ]
+
+      # Default Microsoft Internet Explorer browsers.
+      MSIE_BROWSERS = [
+        [:msie_compatibility, "Microsoft Internet Explorer (Compatibility View)", /(msie 7\.0).+(trident)/i, proc { |_, agent|
+          version = /(.+trident\/)(?<version>[a-z0-9.]+)/i.match(agent)["version"].split(".")
+          version[0] = version[0].to_integer + 4
+          version.join(".")
+        }],
+        [:msie, "Microsoft Internet Explorer", proc { |_, agent| Brauser::Definition.disambiguate_browser(agent, /msie/i, /opera/i) }, /(.+MSIE )([a-z0-9.]+)/i]
+      ]
+
+      # Default minor desktop browsers.
+      MINOR_DESKTOP_BROWSERS = [
+        [:quicktime, "Apple QuickTime", /quicktime/i, /(.+((QuickTime\/)|(qtver=)))([a-z0-9.]+)/i],
+        [:webkit, "WebKit Browser", /webkit/i, /(.+WebKit\/)([a-z0-9.]+)/i],
+        [:gecko, "Gecko Browser", /gecko/i, /(.+rv:|Gecko\/)([a-z0-9.]+)/i]
+      ]
+    end
+  end
+end

data/lib/brauser/definitions/languages.rb

@@ -0,0 +1,130 @@
+# encoding: utf-8
+#
+# This file is part of the brauser gem. Copyright (C) 2013 and above Shogun <shogun@cowtech.it>.
+# Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
+#
+
+module Brauser
+  # The interface of brauser browsers.
+  module Browseable
+    # The default browsers definitions.
+    module DefaultDefinitions
+      # Default languages.
+      LANGUAGES = {
+        "af" => "Afrikaans",
+        "sq" => "Albanian",
+        "eu" => "Basque",
+        "bg" => "Bulgarian",
+        "be" => "Byelorussian",
+        "ca" => "Catalan",
+        "zh" => "Chinese",
+        "zh-cn" => "Chinese/China",
+        "zh-tw" => "Chinese/Taiwan",
+        "zh-hk" => "Chinese/Hong Kong",
+        "zh-sg" => "Chinese/singapore",
+        "hr" => "Croatian",
+        "cs" => "Czech",
+        "da" => "Danish",
+        "nl" => "Dutch",
+        "nl-nl" => "Dutch/Netherlands",
+        "nl-be" => "Dutch/Belgium",
+        "en" => "English",
+        "en-gb" => "English/United Kingdom",
+        "en-us" => "English/United States",
+        "en-au" => "English/Australian",
+        "en-ca" => "English/Canada",
+        "en-nz" => "English/New Zealand",
+        "en-ie" => "English/Ireland",
+        "en-za" => "English/South Africa",
+        "en-jm" => "English/Jamaica",
+        "en-bz" => "English/Belize",
+        "en-tt" => "English/Trinidad",
+        "et" => "Estonian",
+        "fo" => "Faeroese",
+        "fa" => "Farsi",
+        "fi" => "Finnish",
+        "fr" => "French",
+        "fr-be" => "French/Belgium",
+        "fr-fr" => "French/France",
+        "fr-ch" => "French/Switzerland",
+        "fr-ca" => "French/Canada",
+        "fr-lu" => "French/Luxembourg",
+        "gd" => "Gaelic",
+        "gl" => "Galician",
+        "de" => "German",
+        "de-at" => "German/Austria",
+        "de-de" => "German/Germany",
+        "de-ch" => "German/Switzerland",
+        "de-lu" => "German/Luxembourg",
+        "de-li" => "German/Liechtenstein",
+        "el" => "Greek",
+        "he" => "Hebrew",
+        "he-il" => "Hebrew/Israel",
+        "hi" => "Hindi",
+        "hu" => "Hungarian",
+        "ie-ee" => "Internet Explorer/Easter Egg",
+        "is" => "Icelandic",
+        "id" => "Indonesian",
+        "in" => "Indonesian",
+        "ga" => "Irish",
+        "it" => "Italian",
+        "it-ch" => "Italian/ Switzerland",
+        "ja" => "Japanese",
+        "km" => "Khmer",
+        "km-kh" => "Khmer/Cambodia",
+        "ko" => "Korean",
+        "lv" => "Latvian",
+        "lt" => "Lithuanian",
+        "mk" => "Macedonian",
+        "ms" => "Malaysian",
+        "mt" => "Maltese",
+        "no" => "Norwegian",
+        "pl" => "Polish",
+        "pt" => "Portuguese",
+        "pt-br" => "Portuguese/Brazil",
+        "rm" => "Rhaeto-Romanic",
+        "ro" => "Romanian",
+        "ro-mo" => "Romanian/Moldavia",
+        "ru" => "Russian",
+        "ru-mo" => "Russian /Moldavia",
+        "sr" => "Serbian",
+        "sk" => "Slovack",
+        "sl" => "Slovenian",
+        "sb" => "Sorbian",
+        "es" => "Spanish",
+        "es-do" => "Spanish",
+        "es-ar" => "Spanish/Argentina",
+        "es-co" => "Spanish/Colombia",
+        "es-mx" => "Spanish/Mexico",
+        "es-es" => "Spanish/Spain",
+        "es-gt" => "Spanish/Guatemala",
+        "es-cr" => "Spanish/Costa Rica",
+        "es-pa" => "Spanish/Panama",
+        "es-ve" => "Spanish/Venezuela",
+        "es-pe" => "Spanish/Peru",
+        "es-ec" => "Spanish/Ecuador",
+        "es-cl" => "Spanish/Chile",
+        "es-uy" => "Spanish/Uruguay",
+        "es-py" => "Spanish/Paraguay",
+        "es-bo" => "Spanish/Bolivia",
+        "es-sv" => "Spanish/El salvador",
+        "es-hn" => "Spanish/Honduras",
+        "es-ni" => "Spanish/Nicaragua",
+        "es-pr" => "Spanish/Puerto Rico",
+        "sx" => "Sutu",
+        "sv" => "Swedish",
+        "sv-se" => "Swedish/Sweden",
+        "sv-fi" => "Swedish/Finland",
+        "ts" => "Thai",
+        "tn" => "Tswana",
+        "tr" => "Turkish",
+        "uk" => "Ukrainian",
+        "ur" => "Urdu",
+        "vi" => "Vietnamese",
+        "xh" => "Xshosa",
+        "ji" => "Yiddish",
+        "zu" => "Zulu"
+      }
+    end
+  end
+end

data/lib/brauser/definitions/platforms.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+#
+# This file is part of the brauser gem. Copyright (C) 2013 and above Shogun <shogun@cowtech.it>.
+# Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
+#
+
+module Brauser
+  # The interface of brauser browsers.
+  module Browseable
+    # The default browsers definitions.
+    module DefaultDefinitions
+      # Default platforms.
+      PLATFORMS = [
+        [:symbian, "Symbian", /s60|symb/i],
+        [:windows_phone, "Microsoft Windows Phone", /windows phone/i],
+        [:kindle, "Nokia Symbian", /kindle|silk/i],
+        [:ios, "Apple iOS", proc { |_, agent| [:iphone, :ipad, :ipod, :chrome_ios].include?(name) || agent =~ /ipad|iphone|ipod|crios/i }],
+        [:android, "Android", /android/i],
+        [:blackberry, "RIM BlackBerry", /blackberry/i],
+        [:psp, "Sony Playstation Portable", /psp/i],
+        [:ps3, "Sony Playstation 3", /playstation 3/i],
+        [:wii, "Nintendo Wii", /wii/i],
+
+        [:linux, "Linux", /linux/i],
+        [:osx, "Apple MacOS X", /mac|macintosh|mac os x/i],
+        [:windows, "Microsoft Windows", /windows/i]
+      ]
+    end
+  end
+end

data/lib/brauser/query.rb

@@ -4,106 +4,11 @@
 # Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
 #
 
-# A framework agnostic browser detection and querying helper.
 module Brauser
-  # Methods to chain queries.
-  module Chainers
-    # Checks if the browser is a specific name and optionally of a specific version and platform.
-    #
-    # @see #version?
-    # @see #on?
-    #
-    # @param names [Symbol|Array] A list of specific names to match. Also, this meta-names are supported: `:capable` and `:tablet`.
-    # @param versions [Hash] An hash with specific version to match against. Need to be in any form that {#v} understands.
-    # @param platforms [Symbol|Array] A list of specific platform to match. Valid values are all those possible for the platform attribute.
-    # @return [Query] The query itself.
-    def is(names = [], versions = {}, platforms = [])
-      @result = is?(names, versions, platforms)
-      self
-    end
-
-    # Checks if the browser is a specific version.
-    #
-    # @param versions [String|Hash] A string in the form `operator version && ...` (example: `>= 7 && < 4`) or an hash with specific version to match against,
-    #   in form `{:operator => version}`, where operator is one of `:lt, :lte, :eq, :gt, :gte`.
-    # @return [Query] The query itself.
-    def v(versions = {})
-      @result = v?(versions)
-      self
-    end
-
-    # Check if the browser is on a specific platform.
-    #
-    # @param platforms [Symbol|Array] A list of specific platform to match.
-    # @return [Query] The query itself.
-    def on(platforms = [])
-      @result = on?(platforms)
-      self
-    end
-
-    # Check if the browser accepts the specified languages.
-    #
-    # @param langs [String|Array] A list of languages to match against.
-    # @return [Query] The query itself.
-    def accepts(langs = [])
-      @result = accepts?(langs)
-      self
-    end
-  end
-
-  # Methods to make queries.
-  module Queries
-    # Checks if the browser is a specific name and optionally of a specific version and platform.
-    #
-    # This version returns a boolean and it is equal to append a call to `#result` to the method `#is`.
-    #
-    # @see #v?
-    # @see #on?
-    #
-    # @param names [Symbol|Array] A list of specific names to match. Also, this meta-names are supported: `:capable` and `:tablet`.
-    # @param versions [Hash] An hash with specific version to match against. Need to be in any form that `#v` understands.
-    # @param platforms [Symbol|Array] A list of specific platform to match. Valid values are all those possible for the platform attribute.
-    # @return [Boolean] `true` if current browser matches, `false` otherwise.
-    def is?(names = [], versions = {}, platforms = [])
-      @result ? @target.is?(names, versions, platforms) : @result
-    end
-
-    # Checks if the browser is a specific version.
-    #
-    # This version returns a boolean and it is equal to append a call to `#result` to the method `#v`.
-    #
-    # @param versions [String|Hash] A string in the form `operator version && ...` (example: `>= 7 && < 4`) or an hash with specific version to match against,
-    #   in form `{:operator => version}`, where operator is one of `:lt, :lte, :eq, :gt, :gte`.
-    # @return [Boolean] `true` if current browser matches, `false` otherwise.
-    def v?(versions = {})
-      @result ? @target.v?(versions) : @result
-    end
-
-    # Check if the browser is on a specific platform.
-    #
-    # This version returns a boolean and it is equal to append a call to `#result` to the method `#on.
-    #
-    # @param platforms [Symbol|Array] A list of specific platform to match.
-    # @return [Boolean] `true` if current browser matches, `false` otherwise.
-    def on?(platforms = [])
-      @result ? @target.on?(platforms) : @result
-    end
-
-    # Check if the browser accepts the specified languages.
-    #
-    # This version returns a boolean and it is equal to append a call to `#result` to the method `#accepts.
-    #
-    # @param langs [String|Array] A list of languages to match against.
-    # @return [Boolean] `true` if current browser matches, `false` otherwise.
-    def accepts?(langs = [])
-      @result ? @target.accepts?(langs) : @result
-    end
-  end
-
   # A query to a browser. This class enables concatenation, like:
   #
   # ```ruby
-  # Brauser::Browser.new.is(:msie).v(">= 7").on?(:windows)
+  # Brauser::Browser.new.is(:msie).version(">= 7").on?(:windows)
   # ```
   #
   # To end concatenation, use the `?` form of the queries or call `.result`.
@@ -116,8 +21,8 @@ module Brauser
     attr_accessor :target
     attr_accessor :result
 
-    include Brauser::Chainers
-    include Brauser::Queries
+    include Brauser::Queryable::Chainers
+    include Brauser::Queryable::Queries
 
     # Creates a new query.
     #
@@ -128,4 +33,4 @@ module Brauser
       @result = result
     end
   end
-end
+end

data/lib/brauser/queryable/chainers.rb

@@ -0,0 +1,56 @@
+# encoding: utf-8
+#
+# This file is part of the brauser gem. Copyright (C) 2013 and above Shogun <shogun@cowtech.it>.
+# Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
+#
+
+module Brauser
+  # The interface of brauser queries.
+  module Queryable
+    # Methods to chain queries.
+    module Chainers
+      # Checks if the browser is a specific name and optionally of a specific version and platform.
+      #
+      # @see #version?
+      # @see #on?
+      #
+      # @param names [Symbol|Array] A list of specific names to match. Also, this meta-names are supported: `:capable` and `:tablet`.
+      # @param versions [Hash] An hash with specific version to match against. Need to be in any form that {#v} understands.
+      # @param platforms [Symbol|Array] A list of specific platform to match. Valid values are all those possible for the platform attribute.
+      # @return [Query] The query itself.
+      def is(names = [], versions = {}, platforms = [])
+        @result = is?(names, versions, platforms)
+        self
+      end
+
+      # Checks if the browser is a specific version.
+      #
+      # @param versions [String|Hash] A string in the form `operator version && ...` (example: `>= 7 && < 4`) or an hash with specific version to match against,
+      #   in form `{:operator => version}`, where operator is one of `:lt, :lte, :eq, :gt, :gte`.
+      # @return [Query] The query itself.
+      def version(versions = {})
+        @result = version?(versions)
+        self
+      end
+      alias_method :v, :version
+
+      # Check if the browser is on a specific platform.
+      #
+      # @param platforms [Symbol|Array] A list of specific platform to match.
+      # @return [Query] The query itself.
+      def on(platforms = [])
+        @result = on?(platforms)
+        self
+      end
+
+      # Check if the browser accepts the specified languages.
+      #
+      # @param langs [String|Array] A list of languages to match against.
+      # @return [Query] The query itself.
+      def accepts(langs = [])
+        @result = accepts?(langs)
+        self
+      end
+    end
+  end
+end