browser 0.1.5 → 0.1.6

data/Gemfile.lock

@@ -1,52 +1,63 @@
 PATH
   remote: .
   specs:
-    browser (0.1.5)
+    browser (0.1.6)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    actionpack (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
-    activesupport (3.2.8)
+    activesupport (3.2.11)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     awesome_print (1.1.0)
-    builder (3.0.3)
-    coderay (1.0.7)
+    builder (3.0.4)
+    coderay (1.0.8)
     erubis (2.7.0)
     hike (1.2.1)
     i18n (0.6.1)
     journey (1.0.4)
-    json (1.7.5)
-    method_source (0.8)
-    multi_json (1.3.6)
-    pry (0.9.10)
+    json (1.7.6)
+    method_source (0.8.1)
+    multi_json (1.5.0)
+    pry (0.9.11.4)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
-      slop (~> 3.3.1)
-    rack (1.4.1)
+      slop (~> 3.4)
+    pry-meta (0.0.5)
+      awesome_print
+      pry
+      pry-nav
+      pry-remote
+    pry-nav (0.2.3)
+      pry (~> 0.9.10)
+    pry-remote (0.1.6)
+      pry (~> 0.9)
+      slop (~> 3.0)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    rake (10.0.3)
+    rdoc (3.12.1)
       json (~> 1.4)
-    slop (3.3.3)
-    sprockets (2.1.3)
+    slop (3.4.3)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     tilt (1.3.3)
@@ -58,6 +69,6 @@ DEPENDENCIES
   actionpack
   awesome_print
   browser!
-  pry
+  pry-meta
   rake
   rdoc

data/browser.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "actionpack"
   s.add_development_dependency "rake"
   s.add_development_dependency "rdoc"
-  s.add_development_dependency "pry"
+  s.add_development_dependency "pry-meta"
   s.add_development_dependency "awesome_print"
 end

data/lib/browser.rb

@@ -1,3 +1,5 @@
+require "set"
+
 class Browser
   # Add Rails helper if ActionController::Base is available
   require "browser/action_controller" if defined?(ActionController::Base)
@@ -29,7 +31,7 @@ class Browser
   }
 
   VERSIONS = {
-    :default => /(?:Version|MSIE|Firefox|Chrome|QuickTime|BlackBerry[^\/]+|CoreMedia v)[\/ ]?([a-z0-9.]+)/i,
+    :default => /(?:Version|MSIE|Firefox|Chrome|CriOS|QuickTime|BlackBerry[^\/]+|CoreMedia v)[\/ ]?([a-z0-9.]+)/i,
     :opera => /Opera\/.*? Version\/([\d.]+)/
   }
 
@@ -270,7 +272,7 @@ class Browser
 
   # Detect if browser is Safari.
   def safari?
-    ua =~ /Safari/ && ua !~ /Chrome/
+    ua =~ /Safari/ && ua !~ /Chrome|CriOS/
   end
 
   # Detect if browser is Firefox.
@@ -280,7 +282,7 @@ class Browser
 
   # Detect if browser is Chrome.
   def chrome?
-    !!(ua =~ /Chrome/)
+    !!(ua =~ /Chrome|CriOS/)
   end
 
   # Detect if browser is Internet Explorer.
@@ -361,20 +363,24 @@ class Browser
 
   # Return a meta info about this browser.
   def meta
-    Array.new.tap do |m|
-      m << id
+    set = Set.new.tap do |m|
+      m << id.to_s
       m << "webkit" if webkit?
       m << "ios" if ios?
-      m << "safari safari#{version}" if safari?
+      m.merge(%W[safari safari#{version}]) if safari?
       m << "#{id}#{version}" unless safari? || chrome?
-      m << platform
+      m << platform.to_s
       m << "capable" if capable?
       m << "mobile" if mobile?
     end
+
+    set.to_a
   end
 
+  alias_method :to_a, :meta
+
   # Return meta representation as string.
   def to_s
-    meta.join(" ")
+    meta.to_a.join(" ")
   end
 end

data/lib/browser/version.rb

@@ -2,7 +2,7 @@ class Browser
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 5
+    PATCH = 6
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
-end
+end

data/test/browser_test.rb

@@ -15,6 +15,7 @@ class BrowserTest < Test::Unit::TestCase
   OPERA         = "Opera/9.80 (Macintosh; Intel Mac OS X 10.7.4; U; en) Presto/2.10.229 Version/11.64"
   FIREFOX       = "Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) Gecko/20121223 Ubuntu/9.25 (jaunty) Firefox/3.8"
   CHROME        = "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_4; en-US) AppleWebKit/533.4 (KHTML, like Gecko) Chrome/5.0.375.99 Safari/533.4"
+  MOBILE_CHROME = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 5_1_1 like Mac OS X; en) AppleWebKit/534.46.0 (KHTML, like Gecko) CriOS/19.0.1084.60 Mobile/9B206 Safari/7534.48.3"
   ANDROID       = "Android SDK 1.5r3: Mozilla/5.0 (Linux; U; Android 1.5; de-; sdk Build/CUPCAKE) AppleWebkit/528.5+ (KHTML, like Gecko) Version/3.1.2 Mobile Safari/525.20.1"
   TABLOID       = "Mozilla/5.0 (Linux; U; Android 3.0; en-us; Xoom Build/HRI39) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13"
   BLACKBERRY    = "BlackBerry7100i/4.1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 VendorID/103"
@@ -224,6 +225,18 @@ class BrowserTest < Test::Unit::TestCase
     assert_equal "5", @browser.version
   end
 
+  def test_detect_mobile_chrome
+    @browser.ua = MOBILE_CHROME
+
+    assert_equal "Chrome", @browser.name
+    assert @browser.chrome?
+    assert !@browser.safari?
+    assert @browser.webkit?
+    assert @browser.capable?
+    assert_equal "19.0.1084.60", @browser.full_version
+    assert_equal "19", @browser.version
+  end
+
   def test_detect_android
     @browser.ua = ANDROID
 
@@ -430,4 +443,14 @@ class BrowserTest < Test::Unit::TestCase
     assert @browser.kindle?
     assert @browser.webkit?
   end
+
+  def test_remove_duplicate_items
+    @browser.ua = SAFARI
+    assert_equal ["safari"], @browser.meta.select {|item| item == "safari" }
+  end
+
+  def test_meta_aliased_as_to_a
+    @browser.ua = SAFARI
+    assert_equal @browser.meta, @browser.to_a
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browser
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-13 00:00:00.000000000 Z
+date: 2013-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: pry-meta
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Do some browser detection with Ruby.