browser 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b3b6a159e6f696022dbcf224f2366040a014066
-  data.tar.gz: 12cfb603efd44bfa40a6211dc81cdbfc8cc3175a
+  metadata.gz: 8da651ebe15cf30e9eccffd7e45c2b2659785776
+  data.tar.gz: 08e9184e851b07fff6b2ff4efda0a820e042df50
 SHA512:
-  metadata.gz: 73d07937171c917f60c801a15f6d7ad4fe637d041c49b7fee0eb0327d8cbeaeeda0e1322ee08e208021e689ff7a357e4af6aa1e9d532f7e4705fda8289511de2
-  data.tar.gz: bcee3558d4278b99921b93d6eb8763d640c475da9e5351b6c3f8f692ba6f7984427d2020c5eb0ad146b34d70286ef020731c7fd73732650672da3b3136e178fe
+  metadata.gz: 1af5f14bd4c40f26773c2aecebf58802e3cc4f037481bfec8240c5cb54c52673a23249909d7280d13a1a7a0094942f2384ccf4e1e8a835c703bf6b9d5149dd22
+  data.tar.gz: b910d7e7b92cbc5456747369c27a1f955a1d33329b61caa2f50590aca90f20c80f13d75f6f8bab56b5e595b5ebaebe3437639f7dc8df0870090f33e67daad50b

data/.hound.yml

@@ -0,0 +1,90 @@
+ClassLength:
+  Enabled: false
+
+CyclomaticComplexity:
+  Enabled: false
+
+Documentation:
+  Enabled: false
+
+Encoding:
+  Enabled: false
+
+FileName:
+  Enabled: false
+
+IfUnlessModifier:
+  Enabled: false
+
+MethodLength:
+  Enabled: false
+
+ModuleFunction:
+  Enabled: false
+
+OneLineConditional:
+  Enabled: false
+
+ParameterLists:
+  Enabled: false
+
+Proc:
+  Enabled: false
+
+SingleLineBlockParams:
+  Enabled: false
+
+VariableInterpolation:
+  Enabled: false
+
+TrailingComma:
+  Enabled: false
+
+WhileUntilModifier:
+  Enabled: false
+
+PredicateName:
+  NamePrefixBlacklist:
+    - is_
+
+StringLiterals:
+  EnforcedStyle: double_quotes
+  SupportedStyles:
+    - single_quotes
+    - double_quotes
+
+DotPosition:
+  EnforcedStyle: leading
+
+SpaceBeforeBlockBraces:
+  EnforcedStyle: space
+
+SpaceInsideBlockBraces:
+  EnforcedStyle: no_space
+
+DoubleNegation:
+  Enabled: false
+
+SpaceInsideBlockBraces:
+  SpaceBeforeBlockParameters: false
+
+LineLength:
+  Max: 130
+
+RegexpLiteral:
+  MaxSlashes: 0
+
+SpaceInsideHashLiteralBraces:
+  Enabled: false
+
+PercentLiteralDelimiters:
+  PreferredDelimiters:
+    '%':  '[]'
+    '%i': '[]'
+    '%q': '[]'
+    '%Q': '[]'
+    '%r': '[]'
+    '%s': '[]'
+    '%w': '[]'
+    '%W': '[]'
+    '%x': '[]'

data/.travis.yml

@@ -2,7 +2,8 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1.1
 gemfile:
   - Gemfile
   - gemfiles/rails3.gemfile
+script: "bundle exec rake spec"

data/README.md

@@ -44,6 +44,24 @@ browser.to_s        # the meta info joined by space
 
 See the [tests](https://github.com/fnando/browser/blob/master/test/browser_test.rb) and [implementation](https://github.com/fnando/browser/blob/master/lib/browser.rb) for more examples.
 
+### What defines a modern browser?
+
+The current rules that define a modern browser are pretty loose:
+
+* Webkit
+* IE9+
+* Firefox 17+
+* Firefox Tablet 14+
+* Opera 12+
+
+You can define your your rules. A rule must be a proc/lambda or any object that implements the method === and accepts the browser object. To redefine all rules, clear the existing rules before adding your own.
+
+```ruby
+# Only Chrome Canary is considered modern.
+Browser.modern_rules.clear
+Browser.modern_rules << -> b { b.chrome? && b.version >= '37' }
+```
+
 ### Rails integration
 
 Just add it to the Gemfile.

data/Rakefile

@@ -1,26 +1,25 @@
 require "bundler"
+require "bundler/setup"
 Bundler::GemHelper.install_tasks
 
 require "rake/testtask"
-Rake::TestTask.new do |t|
+Rake::TestTask.new(:spec) do |t|
   t.libs << "lib"
   t.libs << "test"
-  t.test_files = FileList["test/**/*_test.rb"]
+  t.test_files = FileList["test/**/*_spec.rb"]
   t.verbose = true
   t.ruby_opts = %w[-rubygems]
 end
 
 desc "Run specs against all gemfiles"
-task "test:all" do
+task "spec:all" do
   %w[
     Gemfile
     gemfiles/rails3.gemfile
   ].each do |gemfile|
-    ENV["BUNDLE_GEMFILE"] = gemfile
     puts "=> Running with Gemfile: #{gemfile}"
-    Rake::Task["test"].reenable
-    Rake::Task["test"].invoke
+    system "BUNDLE_GEMFILE=#{gemfile} rake spec"
   end
 end
 
-task :default => "test"
+task :default => "spec"

data/bots.yml

@@ -63,6 +63,7 @@ Laconica: "Laconica"
 libwww-perl: "Perl client-server library loved by script kids"
 LinkedInBot: "LinkedIn"
 LinksCrawler: "LinksCrawler"
+Livelapbot: "Livelapbot"
 Lipperhey: "Lipperhey"
 LongURL: "URL expander service"
 Lumibot: "Lumibot"
@@ -107,6 +108,7 @@ Slurp: "Yahoo spider"
 Sogou: "Chinese search engine"
 spider: "generic web spider"
 Test Certificate Info: "C http library?"
+trendictionbot: "trendiction search"
 TweetmemeBot: "TweetMeMe Crawler"
 Twikle: "Social web search bot"
 TwitJobSearch: "TwitJobSearch"

data/browser.gemspec

@@ -21,6 +21,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_development_dependency "rails"
   s.add_development_dependency "rack-test"
-  s.add_development_dependency "pry-meta"
-  s.add_development_dependency "turn"
+  s.add_development_dependency "minitest"
 end

data/languages.yml

@@ -0,0 +1,114 @@
+"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"
+"gd": "Scots Gaelic"
+"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"

data/lib/browser.rb

@@ -37,38 +37,60 @@ class Browser
 
   # Set browser's UA string.
   attr_accessor :user_agent
-  alias :ua :user_agent
-  alias :ua= :user_agent=
+  alias_method :ua, :user_agent
+  alias_method :ua=, :user_agent=
 
   NAMES = {
-    :android     => "Android",
-    :blackberry  => "BlackBerry",
-    :chrome      => "Chrome",
-    :core_media  => "Apple CoreMedia",
-    :firefox     => "Firefox",
-    :ie          => "Internet Explorer",
-    :ipad        => "iPad",
-    :iphone      => "iPhone",
-    :ipod        => "iPod Touch",
-    :nintendo    => "Nintendo",
-    :opera       => "Opera",
-    :phantom_js  => "PhantomJS",
-    :psp         => "PlayStation Portable",
-    :playstation => "PlayStation",
-    :quicktime   => "QuickTime",
-    :safari      => "Safari",
-    :xbox        => "Xbox",
+    android: "Android",
+    blackberry: "BlackBerry",
+    chrome: "Chrome",
+    core_media: "Apple CoreMedia",
+    firefox: "Firefox",
+    ie: "Internet Explorer",
+    ipad: "iPad",
+    iphone: "iPhone",
+    ipod: "iPod Touch",
+    nintendo: "Nintendo",
+    opera: "Opera",
+    phantom_js: "PhantomJS",
+    psp: "PlayStation Portable",
+    playstation: "PlayStation",
+    quicktime: "QuickTime",
+    safari: "Safari",
+    xbox: "Xbox",
 
     # This must be last item, since Ruby 1.9+ has ordered keys.
-    :other      => "Other",
+    other: "Other",
   }
 
   VERSIONS = {
-    :default => %r[(?:Version|MSIE|Firefox|Chrome|CriOS|QuickTime|BlackBerry[^/]+|CoreMedia v|PhantomJS)[/ ]?([a-z0-9.]+)]i,
-    :opera => %r[(?:Opera/.*? Version/([\d.]+)|Chrome/([\d.]+).*?OPR)],
-    :ie => %r[(?:MSIE |Trident/.*?; rv:)([\d.]+)]
+    default: %r[(?:Version|MSIE|Firefox|Chrome|CriOS|QuickTime|BlackBerry[^/]+|CoreMedia v|PhantomJS)[/ ]?([a-z0-9.]+)]i,
+    opera: %r[(?:Opera/.*? Version/([\d.]+)|Chrome/([\d.]+).*?OPR)],
+    ie: %r[(?:MSIE |Trident/.*?; rv:)([\d.]+)]
   }
 
+  # Define the rules which define a modern browser.
+  # A rule must be a proc/lambda or any object that implements the method
+  # === and accepts the browser object.
+  #
+  # To redefine all rules, clear the existing rules before adding your own.
+  #
+  #   # Only Chrome Canary is considered modern.
+  #   Browser.modern_rules.clear
+  #   Browser.modern_rules << -> b { b.chrome? && b.version >= '37' }
+  #
+  def self.modern_rules
+    @modern_rules ||= []
+  end
+
+  self.modern_rules.tap do |rules|
+    rules << -> b { b.webkit? }
+    rules << -> b { b.firefox? && b.version.to_i >= 17 }
+    rules << -> b { b.ie? && b.version.to_i >= 9 }
+    rules << -> b { b.opera? && b.version.to_i >= 12 }
+    rules << -> b { b.firefox? && b.tablet? && b.android? && b.version.to_i >= 14 }
+  end
+
   # Create a new browser instance and set
   # the UA and Accept-Language headers.
   #
@@ -81,7 +103,7 @@ class Browser
     self.user_agent = (options[:user_agent] || options[:ua]).to_s
     self.accept_language = options[:accept_language].to_s
 
-    yield self if block_given?
+    yield self if block
   end
 
   # Get readable browser name.
@@ -108,11 +130,7 @@ class Browser
 
   # Return true if browser is modern (Webkit, Firefox 17+, IE9+, Opera 12+).
   def modern?
-    webkit? ||
-    newer_firefox? ||
-    newer_ie? ||
-    newer_opera? ||
-    newer_firefox_tablet?
+    self.class.modern_rules.any? {|rule| rule === self }
   end
 
   # Detect if browser is WebKit-based.
@@ -174,21 +192,4 @@ class Browser
   def to_s
     meta.to_a.join(" ")
   end
-
-  private
-  def newer_firefox?
-    firefox? && version.to_i >= 17
-  end
-
-  def newer_ie?
-    ie? && version.to_i >= 9
-  end
-
-  def newer_opera?
-    opera? && version.to_i >= 12
-  end
-
-  def newer_firefox_tablet?
-    firefox? && tablet? && android? && version.to_i >= 14
-  end
 end

data/lib/browser/action_controller.rb

@@ -9,6 +9,7 @@ class Browser
     end
 
     private
+
     def browser
       @browser ||= Browser.new(
         accept_language: request.headers["Accept-Language"],