browser 2.0.0.rc1 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f578d8090bda26ced6964ce2894e545b7a10e5a6
-  data.tar.gz: e8b3f2a1f6b5f0052af82f531284a6f9bfa25042
+  metadata.gz: fb23db30128545d1362d657be31139c5c0d79ab1
+  data.tar.gz: dd8e2126bd5de416a2d29beb3ceff26c9ed28494
 SHA512:
-  metadata.gz: 5ac0365b335f80c2e460c80990523b928ee88e413ad47f9b52f47d5778e3ef12fe001b0f6f357d45c574ae6bb5503b248062273aa7b261da14638ee1dbff032e
-  data.tar.gz: 0269de18d4aeffa748e7752279579b505e2d1025a70c149421496caa227196e7b97fb8b1629cacbe597667a3aaa4ecc8ddc42127b21476f227727b37d82d53ce
+  metadata.gz: 6138595faa14527bc208ac1cdb8adb173ea3c0946988107d35846f67ad7c501e684e3f8eb28c84e71d6397156ac1259fc553bb64f78a87878fa8fd91e0586008
+  data.tar.gz: a750b44ed0eabdcaedf98755363a772772e0c58efc83fdad00ccc74f8ad5a1bc0a8c28648f31ad422934a54f3ea6f8f5595ce94b79c7999ac46a42c548e78a26

data/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,30 @@
+## Description
+
+[Add feature/bug description here]
+
+## How to reproduce
+
+[Add steps on how to reproduce this issue]
+
+## What do you expect
+
+[Describe what do you expect to happen]
+
+## What happened instead
+
+[Describe the actual results]
+
+## Software:
+
+- Rails version: [Add rails version here]
+- Browser gem version: [Add browser gem version here]
+
+## Full backtrace
+
+```text
+[Paste full backtrace here]
+```
+
+## Report
+
+[Visit <http://user-agent.herokuapp.com> and paste the URL here]

data/.rubocop.yml

@@ -1,3 +1,6 @@
+Style/FrozenStringLiteralComment:
+  EnforcedStyle: always
+
 Style/ClassCheck:
   EnforcedStyle: kind_of?
 

data/.travis.yml

@@ -8,6 +8,6 @@ rvm:
 gemfile:
   - Gemfile
   - gemfiles/rails3.gemfile
-script: "bundle exec rake spec"
+script: "bundle exec rake"
 notifications:
   email: false

data/CHANGELOG.md

@@ -1,10 +1,15 @@
 # Changelog
 
-## v2.0.0 [unreleased]
+## v2.0.1
+
+- Fix Rails integration.
+
+## v2.0.0
 
 - `Browser#platform` now returns instance of `Browser::Platform`, instead of a `String`. It contains information about the platform (software).
 - `Browser#device` was added. It returns information about the device (hardware).
 - `Browser#accept_language` now returns a list of `Browser::AcceptLanguage` objects.
 - `Browser#bot` now returns a `Browser::Bot` instance.
 - Safari running as web app mode is not recognized as Safari anymore.
+- ruby-2.3+ will always activate frozen strings.
 - [List of all commits since last release](https://github.com/fnando/browser/compare/v1.1.0...v2.0.0)

data/README.md

@@ -273,9 +273,33 @@ Rails.configuration.middleware.use Browser::Middleware do
 end
 ```
 
+### Migrating to v2
+
+#### Troubleshooting
+
+##### `TypeError: no implicit conversion of Hash into String`
+
+The class constructor now has a different signature. Change the instantiation from `Browser.new(options)` to `Browser.new(ua, options)`, where:
+
+- `ua`: must be a string representing the user agent.
+- `options`: must be a hash (for now it only accepts the `accept_language` option).
+
 ## Development
 
-If you want to contribute to this project, just follow the tips below.
+### Writing code
+
+Once you've made your great commits (include tests, please):
+
+1. [Fork](http://help.github.com/forking/) browser
+2. Create a topic branch - `git checkout -b my_branch`
+3. Push to your branch - `git push origin my_branch`
+4. Create a pull request
+5. That's it!
+
+Please respect the indentation rules and code style.
+And use 2 spaces, not tabs. And don't touch the version thing.
+
+## Configuring environment
 
 To configure your environment, you must have Ruby and bundler installed. Then run `bundle install` to install all dependencies.
 
@@ -285,12 +309,16 @@ To run tests, execute `./bin/rake`.
 
 Before using your time to code a new feature, open a ticket asking if it makes sense and if it's on this project's scope.
 
+Don't forget to add a new entry to `CHANGELOG.md`.
+
 #### Adding a new bot
 
 1. Add the user agent to `test/ua_bots.yml`.
 2. Add the readable name to `bots.yml`. The key must be something that matches the user agent, in lowercased text.
 3. Run tests.
 
+Don't forget to add a new entry to `CHANGELOG.md`.
+
 #### Adding a new search engine
 
 1. Add the user agent to `test/ua_search_engines.yml`.
@@ -298,9 +326,11 @@ Before using your time to code a new feature, open a ticket asking if it makes s
 3. Add the readable name to `search_engines.yml`. The key must be something that matches the user agent, in lowercased text.
 4. Run tests.
 
-#### Wrong browser detection
+Don't forget to add a new entry to `CHANGELOG.md`.
+
+#### Wrong browser/platform/device detection
 
-Follow the instructions of [CONTRIBUTING.md](https://github.com/fnando/browser/blob/master/CONTRIBUTING.md).
+If you know how to fix it, follow the "Writing code" above. Open an issue otherwise; make sure you fill in the issue template with all the required information.
 
 ## Maintainer
 

data/Rakefile

@@ -3,7 +3,7 @@ require "bundler/setup"
 Bundler::GemHelper.install_tasks
 
 require "rake/testtask"
-Rake::TestTask.new(:spec) do |t|
+Rake::TestTask.new(:test) do |t|
   t.libs << "lib"
   t.libs << "test"
   t.test_files = FileList["test/**/*_test.rb"]
@@ -12,14 +12,14 @@ Rake::TestTask.new(:spec) do |t|
 end
 
 desc "Run specs against all gemfiles"
-task "spec:all" do
+task "test:all" do
   %w[
     Gemfile
     gemfiles/rails3.gemfile
   ].each do |gemfile|
     puts "=> Running with Gemfile: #{gemfile}"
-    system "BUNDLE_GEMFILE=#{gemfile} rake spec"
+    system "BUNDLE_GEMFILE=#{gemfile} rake test"
   end
 end
 
-task default: "spec"
+task default: "test"

data/lib/browser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "set"
 require "yaml"
 require "pathname"

data/lib/browser/accept_language.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class AcceptLanguage
     def self.languages

data/lib/browser/action_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "action_controller/railtie"
 
 module Browser
@@ -12,8 +13,8 @@ module Browser
 
     def browser
       @browser ||= Browser.new(
-        accept_language: request.headers["Accept-Language"],
-        ua: request.headers["User-Agent"]
+        request.headers["User-Agent"],
+        accept_language: request.headers["Accept-Language"]
       )
     end
   end

data/lib/browser/base.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Base
     include DetectVersion

data/lib/browser/blackberry.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class BlackBerry < Base
     def id

data/lib/browser/bot.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Bot
     def self.detect_empty_ua!
@@ -5,7 +6,7 @@ module Browser
     end
 
     def self.detect_empty_ua?
-      !!@detect_empty_ua
+      @detect_empty_ua
     end
 
     def self.bots

data/lib/browser/chrome.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Chrome < Base
     def id

data/lib/browser/detect_version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   module DetectVersion
     private

data/lib/browser/device.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Device
     attr_reader :ua
@@ -39,10 +40,10 @@ module Browser
     # Detect if browser is tablet (currently iPad, Android, Surface or
     # Playbook).
     def tablet?
-      !!(
-        ipad? ||
-        (platform.android? && !detect_mobile?) || surface? || playbook?
-      )
+      ipad? ||
+        (platform.android? && !detect_mobile?) ||
+        surface? ||
+        playbook?
     end
 
     # Detect if browser is mobile.
@@ -159,12 +160,10 @@ module Browser
     # Regex taken from http://detectmobilebrowsers.com
     # rubocop:disable Metrics/LineLength
     def detect_mobile?
-      !!(
-        psp? ||
+      psp? ||
         /zunewp7/i.match(ua) ||
         /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.match(ua) ||
         /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.match(ua[0..3])
-      )
     end
     # rubocop:enable Metrics/LineLength
 

data/lib/browser/device/base.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Device
     class Base

data/lib/browser/device/blackberry_playbook.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Device
     class BlackBerryPlaybook < Base

data/lib/browser/device/ipad.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Device
     class Ipad < Base

data/lib/browser/device/iphone.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Device
     class Iphone < Base

data/lib/browser/device/ipod_touch.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Device
     class IpodTouch < Base

data/lib/browser/device/kindle.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Device
     class Kindle < Base

data/lib/browser/device/kindle_fire.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Device
     class KindleFire < Base

data/lib/browser/device/playstation3.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Device
     class PlayStation3 < Base

data/lib/browser/device/playstation4.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Device
     class PlayStation4 < Base

data/lib/browser/device/psp.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Device
     class PSP < Base

data/lib/browser/device/psvita.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Device
     class PSVita < Base

data/lib/browser/device/surface.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Device
     class Surface < Base
@@ -10,7 +11,7 @@ module Browser
       end
 
       def match?
-        platform.windows_rt? && !!(ua =~ /Touch/)
+        platform.windows_rt? && ua =~ /Touch/
       end
 
       private

data/lib/browser/device/tv.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Device
     class TV < Base

data/lib/browser/device/unknown.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Device
     class Unknown < Base

data/lib/browser/device/wii.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Device
     class Wii < Base

data/lib/browser/device/wiiu.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Device
     class WiiU < Base

data/lib/browser/device/xbox_360.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Device
     class Xbox360 < Base

data/lib/browser/device/xbox_one.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Device
     class XboxOne < Base

data/lib/browser/edge.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Edge < InternetExplorer
     def id

data/lib/browser/firefox.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Firefox < Base
     def id

data/lib/browser/generic.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Generic < Base
     NAMES = {

data/lib/browser/internet_explorer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class InternetExplorer < Base
     # https://msdn.microsoft.com/en-us/library/ms537503(v=vs.85).aspx#TriToken

data/lib/browser/meta/base.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   module Meta
     class Base

data/lib/browser/meta/device.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   module Meta
     class Device < Base

data/lib/browser/meta/generic_browser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   module Meta
     class GenericBrowser < Base

data/lib/browser/meta/id.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   module Meta
     class Id < Base

data/lib/browser/meta/ie.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   module Meta
     class IE < Base
@@ -8,10 +9,10 @@ module Browser
       def meta
         return unless browser.ie?
 
-        meta = ""
+        meta = []
         meta << "oldie lt-ie8 lt-ie9" if version < 8
         meta << "lt-ie9" if version == 8
-        meta
+        meta.join(" ")
       end
     end
   end

data/lib/browser/meta/ios.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   module Meta
     class IOS < Base

data/lib/browser/meta/mobile.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   module Meta
     class Mobile < Base

data/lib/browser/meta/modern.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   module Meta
     class Modern < Base

data/lib/browser/meta/platform.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   module Meta
     class Platform < Base

data/lib/browser/meta/proxy.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   module Meta
     class Proxy < Base

data/lib/browser/meta/safari.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   module Meta
     class Safari < Base

data/lib/browser/meta/tablet.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   module Meta
     class Tablet < Base

data/lib/browser/meta/webkit.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   module Meta
     class Webkit < Base

data/lib/browser/middleware.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "uri"
 
 module Browser

data/lib/browser/middleware/context.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Middleware
     class Context

data/lib/browser/middleware/context/additions.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "browser/middleware/context/url_methods"
 
 module Browser

data/lib/browser/middleware/context/url_methods.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Middleware
     class Context

data/lib/browser/nokia.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Nokia < Base
     def id

data/lib/browser/opera.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Opera < Base
     def id

data/lib/browser/phantom_js.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class PhantomJS < Base
     def id

data/lib/browser/platform.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Platform
     include DetectVersion
@@ -105,40 +106,40 @@ module Browser
 
     # http://msdn.microsoft.com/fr-FR/library/ms537503.aspx#PltToken
     def windows_xp?
-      windows? && !!(ua =~ /Windows NT 5\.[12]/)
+      windows? && ua =~ /Windows NT 5\.[12]/
     end
 
     def windows_vista?
-      windows? && !!(ua =~ /Windows NT 6\.0/)
+      windows? && ua =~ /Windows NT 6\.0/
     end
 
     def windows7?
-      windows? && !!(ua =~ /Windows NT 6\.1/)
+      windows? && ua =~ /Windows NT 6\.1/
     end
 
     def windows8?
-      windows? && !!(ua =~ /Windows NT 6\.[2-3]/)
+      windows? && ua =~ /Windows NT 6\.[2-3]/
     end
 
     def windows8_1?
-      windows? && !!(ua =~ /Windows NT 6\.3/)
+      windows? && ua =~ /Windows NT 6\.3/
     end
 
     def windows10?
-      windows? && !!(ua =~ /Windows NT 10/)
+      windows? && ua =~ /Windows NT 10/
     end
 
     def windows_rt?
-      windows8? && !!(ua =~ /ARM/)
+      windows8? && ua =~ /ARM/
     end
 
     # Detect if current platform is Windows in 64-bit architecture.
     def windows_x64?
-      !!(windows? && ua =~ /(Win64|x64|Windows NT 5\.2)/)
+      windows? && ua =~ /(Win64|x64|Windows NT 5\.2)/
     end
 
     def windows_wow64?
-      windows? && !!(ua =~ /WOW64/i)
+      windows? && ua =~ /WOW64/i
     end
 
     def windows_x64_inclusive?
@@ -146,7 +147,7 @@ module Browser
     end
 
     def windows_touchscreen_desktop?
-      windows? && !!(ua =~ /Touch/)
+      windows? && ua =~ /Touch/
     end
   end
 end

data/lib/browser/platform/adobe_air.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Platform
     class AdobeAir < Base

data/lib/browser/platform/android.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Platform
     class Android < Base

data/lib/browser/platform/base.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Platform
     class Base

data/lib/browser/platform/blackberry.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Platform
     class BlackBerry < Base

data/lib/browser/platform/chrome_os.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Platform
     class ChromeOS < Base

data/lib/browser/platform/firefox_os.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Platform
     class FirefoxOS < Base

data/lib/browser/platform/ios.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Platform
     class IOS < Base

data/lib/browser/platform/linux.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Platform
     class Linux < Base

data/lib/browser/platform/mac.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Platform
     class Mac < Base

data/lib/browser/platform/other.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Platform
     class Other < Base

data/lib/browser/platform/windows.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Platform
     class Windows < Base

data/lib/browser/platform/windows_mobile.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Platform
     class WindowsMobile < Base

data/lib/browser/platform/windows_phone.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Platform
     class WindowsPhone < Base

data/lib/browser/rails.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "rails/railtie"
 require "browser/action_controller"
 require "browser/middleware/context/additions"

data/lib/browser/safari.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class Safari < Base
     def id
@@ -16,7 +17,7 @@ module Browser
     end
 
     def match?
-      !!(ua =~ /Safari/ && ua !~ /Chrome|CriOS|PhantomJS|FxiOS/)
+      ua =~ /Safari/ && ua !~ /Chrome|CriOS|PhantomJS|FxiOS/
     end
   end
 end

data/lib/browser/testing.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   def self.user_agents
     @user_agents ||= browser_user_agents

data/lib/browser/uc_browser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
   class UCBrowser < Base
     def id

data/lib/browser/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Browser
-  VERSION = "2.0.0.rc1"
+  VERSION = "2.0.1"
 end

data/test/browser_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class BrowserTest < Minitest::Test

data/test/middleware_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 require "browser/rails"
 require "sample_app"

data/test/rails_test.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+require "test_helper"
+require "browser/rails"
+require "sample_app"
+
+class RailsTest < Minitest::Test
+  include Rack::Test::Methods
+
+  def app
+    Rails.application
+  end
+
+  test "renders page" do
+    get "/home", {}, "HTTP_USER_AGENT" => Browser["CHROME"],
+                     "HTTP_ACCEPT" => "text/html",
+                     "HTTP_ACCEPT_LANGUAGE" => "en-US;q=0.8"
+
+    assert_equal 200, last_response.status
+    assert_equal "Chrome:en-US", last_response.body
+  end
+end

data/test/sample_app.rb

@@ -1,6 +1,13 @@
+# frozen_string_literal: true
 require "rails"
 require "browser"
 
+class PagesController < ActionController::Base
+  def home
+    render text: "#{browser.name}:#{browser.accept_language.first.full}"
+  end
+end
+
 class SampleApp < Rails::Application
   config.secret_token = "99f19f08db7a37bdcb9d6701f54dca"
   config.secret_key_base = "99f19f08db7a37bdcb9d6701f54dca"
@@ -19,6 +26,8 @@ class SampleApp < Rails::Application
     get "/asset", to: proc {
       [200, {"Content-Type" => "image/png"}, []]
     }
+
+    get "/home", to: "pages#home"
   end
 
   config.middleware.use Browser::Middleware do

data/test/test_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
 require "bundler/setup"
 require "minitest/autorun"

data/test/ua.yml

@@ -72,6 +72,7 @@ NINTENDO_WIIU: 'Mozilla/5.0 (Nintendo WiiU) AppleWebKit/534.52 (KHTML, like Geck
 NOKIA: 'Mozilla/5.0 (Series40; NokiaX3-02/le6.32; Profile/MIDP-2.1 Configuration/CLDC-1.1) Gecko/20100401 S40OviBrowser/2.0.2.62.10'
 NOOK: 'Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; NOOK BNTV250A Build/GINGERBREAD 1.4.3) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Safari/533.1'
 OPERA: 'Opera/9.80 (Macintosh; Intel Mac OS X 10.7.4; U; en) Presto/2.10.229 Version/11.64'
+OPERA_ANDROID: 'Mozill/5.0 (Linux; Android 4.4.2; A1-810 Build/KOT49H) Apple/WebKit/537.36 (KHTML, like Gecko) Chrome/48.0.25 64.99 Safari/537.36 OPR/35.0.2070.100283'
 OPERA_MINI: 'Opera/9.80 (Android; Opera Mini/7.029952/28.2359;u; fr) Presto/2.8.119 Version/11.10'
 OPERA_MOBI: 'Opera/9.8 (Android 2.3.5; Linux; Opera Mobi/ADR-1205181138; U; en) Presto/2.10.254 Version/12.00'
 OPERA_NEXT: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.37 Safari/537.36 OPR/15.0.1147.44 (Edition Next)'

data/test/unit/accept_language_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class AcceptLanguageTest < Minitest::Test

data/test/unit/adobe_air_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class AdobeAirTest < Minitest::Test

data/test/unit/android_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class AndroidTest < Minitest::Test

data/test/unit/blackberry_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class BlackberryTest < Minitest::Test

data/test/unit/bots_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class BotsTest < Minitest::Test

data/test/unit/chrome_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class ChromeTest < Minitest::Test

data/test/unit/console_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class ConsoleTest < Minitest::Test

data/test/unit/device_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class DeviceTest < Minitest::Test

data/test/unit/firefox_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class FirefoxTest < Minitest::Test

data/test/unit/ie_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class IeTest < Minitest::Test

data/test/unit/ios_app_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class IosAppTest < Minitest::Test

data/test/unit/ios_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class IosTest < Minitest::Test

data/test/unit/kindle_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class KindleTest < Minitest::Test

data/test/unit/nokia_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class NokiaTest < Minitest::Test

data/test/unit/opera_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class OperaTest < Minitest::Test
@@ -33,4 +34,9 @@ class OperaTest < Minitest::Test
     browser = Browser.new(Browser["OPERA_MOBI"])
     assert browser.opera?
   end
+
+  test "detects opera running in Android" do
+    browser = Browser.new(Browser["OPERA_ANDROID"])
+    assert browser.platform.android?
+  end
 end

data/test/unit/platform_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class PlatformTest < Minitest::Test

data/test/unit/proxy_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class ProxyTest < Minitest::Test

data/test/unit/safari_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class SafariTest < Minitest::Test

data/test/unit/uc_browser_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class UcBrowserTest < Minitest::Test

data/test/unit/windows_phone_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class WindowPhoneTest < Minitest::Test

data/test/unit/windows_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class WindowsTest < Minitest::Test

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: browser
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.1
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,12 +130,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".bundle/config"
+- ".github/ISSUE_TEMPLATE.md"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
-- CONTRIBUTING.md
 - Gemfile
 - README.md
 - Rakefile
@@ -219,6 +219,7 @@ files:
 - search_engines.yml
 - test/browser_test.rb
 - test/middleware_test.rb
+- test/rails_test.rb
 - test/sample_app.rb
 - test/test_helper.rb
 - test/ua.yml
@@ -260,9 +261,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1
@@ -272,6 +273,7 @@ summary: Do some browser detection with Ruby.
 test_files:
 - test/browser_test.rb
 - test/middleware_test.rb
+- test/rails_test.rb
 - test/sample_app.rb
 - test/test_helper.rb
 - test/ua.yml

data/CONTRIBUTING.md

@@ -1,44 +0,0 @@
-# Contributing
-
-## Issues
-
-If you want to request a feature or report a bug, please use the following template.
-
-```markdown
-## Description
-
-[Add feature/bug description here]
-
-## How to reproduce
-
-[Add steps on how to reproduce this issue]
-
-## What do you expect
-
-[Describe what do you expect to happen]
-
-## What happened instead
-
-[Describe the actual results]
-
-## Gem version:
-
-Browser version: [Add browser gem version here]
-
-## Report
-
-Visit <http://user-agent.herokuapp.com> and paste the URL here.
-```
-
-## Writing code
-
-Once you've made your great commits (include tests, please):
-
-1. [Fork](http://help.github.com/forking/) browser
-2. Create a topic branch - `git checkout -b my_branch`
-3. Push to your branch - `git push origin my_branch`
-4. [Create an Issue](http://github.com/fnando/browser/issues) with a link to your branch
-5. That's it!
-
-Please respect the indentation rules and code style.
-And use 2 spaces, not tabs. And don't touch the versioning thing.