Replace ua-parser with uap-core

Handle regex_flag for case-sensitive regexes
Strip device family
Fixed defect where all sub calls were being passed $1

Author: Elliott Fouts

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "vendor/ua-parser"]
-	path = vendor/ua-parser
-	url = https://github.com/tobie/ua-parser.git
+[submodule "vendor/uap-core"]
+	path = vendor/uap-core
+	url = https://github.com/ua-parser/uap-core.git

.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
+  - 2.2.0
   - 2.1.0
   - 2.0.0
   - 1.9.3

Rakefile

@@ -20,21 +20,21 @@ task :families do
   require 'pp'
 
   root = Pathname(__FILE__).dirname
-  path = root.join('vendor', 'ua-parser', 'test_resources')
+  path = root.join('vendor', 'uap-core')
 
   browser_families = paths_to_families([
-    path.join('test_user_agent_parser.yaml'),
-    path.join('firefox_user_agent_strings.yaml'),
-    path.join('pgts_browser_list.yaml'),
+    #path.join('tests', 'test_ua.yaml'),
+    path.join('test_resources', 'firefox_user_agent_strings.yaml'),
+    path.join('test_resources', 'pgts_browser_list.yaml'),
   ])
 
   os_families = paths_to_families([
-    path.join('test_user_agent_parser_os.yaml'),
-    path.join('additional_os_tests.yaml'),
+    #path.join('tests', 'test_os.yaml'),
+    path.join('test_resources', 'additional_os_tests.yaml'),
   ])
 
   device_families = paths_to_families([
-    path.join('test_device.yaml'),
+    #path.join('tests', 'test_device.yaml'),
   ])
 
   puts "\n\nBrowser Families"

Readme.md

@@ -1,6 +1,6 @@
 # UserAgentParser [![Build Status](https://secure.travis-ci.org/ua-parser/uap-ruby.png?branch=master)](http://travis-ci.org/ua-parser/uap-ruby)
 
-UserAgentParser is a simple, comprehensive Ruby gem for parsing user agent strings. It uses [BrowserScope](http://www.browserscope.org/)'s [parsing patterns](https://github.com/tobie/ua-parser).
+UserAgentParser is a simple, comprehensive Ruby gem for parsing user agent strings. It uses [BrowserScope](http://www.browserscope.org/)'s [parsing patterns](https://github.com/ua-parser/uap-core).
 
 ## Supported Rubies
 
@@ -64,7 +64,7 @@ end
 
 ## The pattern database
 
-The [ua-parser database](https://github.com/tobie/ua-parser/blob/master/regexes.yaml) is included via a [git submodule](http://help.github.com/submodules/). To update the database the submodule needs to be updated and the gem re-released (pull requests for this are very welcome!).
+The [ua-parser database](https://github.com/ua-parser/uap-core/blob/master/regexes.yaml) is included via a [git submodule](http://help.github.com/submodules/). To update the database the submodule needs to be updated and the gem re-released (pull requests for this are very welcome!).
 
 You can also specify the path to your own, updated and/or customised `regexes.yaml` file as a second argument to `UserAgentParser.parse`:
 

lib/user_agent_parser.rb

@@ -5,7 +5,7 @@
 require 'user_agent_parser/device'
 
 module UserAgentParser
-  DefaultPatternsPath = File.join(File.dirname(__FILE__), "../vendor/ua-parser/regexes.yaml")
+  DefaultPatternsPath = File.join(File.dirname(__FILE__), "../vendor/uap-core/regexes.yaml")
 
   # Parse the given +user_agent_string+, returning a +UserAgent+
   def self.parse(user_agent_string, options={})

lib/user_agent_parser/parser.rb

@@ -24,7 +24,7 @@ def load_patterns(path)
       # Parse all the regexs
       yml.each_pair do |type, patterns|
         patterns.each do |pattern|
-          pattern["regex"] = Regexp.new(pattern["regex"])
+          pattern["regex"] = Regexp.new(pattern["regex"], pattern["regex_flag"] == 'i')
         end
       end
 
@@ -78,19 +78,19 @@ def user_agent_from_pattern_match(pattern, match, os = nil, device = nil)
       end
 
       if pattern["v1_replacement"]
-        v1 = pattern["v1_replacement"].sub('$1', v1 || '')
+        v1 = pattern["v1_replacement"].sub('$2', v1 || '')
       end
 
       if pattern["v2_replacement"]
-        v2 = pattern["v2_replacement"].sub('$1', v2 || '')
+        v2 = pattern["v2_replacement"].sub('$3', v2 || '')
       end
 
       if pattern["v3_replacement"]
-        v3 = pattern["v3_replacement"].sub('$1', v3 || '')
+        v3 = pattern["v3_replacement"].sub('$4', v3 || '')
       end
 
       if pattern["v4_replacement"]
-        v4 = pattern["v4_replacement"].sub('$1', v4 || '')
+        v4 = pattern["v4_replacement"].sub('$5', v4 || '')
       end
 
       version = version_from_segments(v1, v2, v3, v4)
@@ -106,19 +106,19 @@ def os_from_pattern_match(pattern, match)
       end
 
       if pattern["os_v1_replacement"]
-        v1 = pattern["os_v1_replacement"].sub('$1', v1 || '')
+        v1 = pattern["os_v1_replacement"].sub('$2', v1 || '')
       end
 
       if pattern["os_v2_replacement"]
-        v2 = pattern["os_v2_replacement"].sub('$1', v2 || '')
+        v2 = pattern["os_v2_replacement"].sub('$3', v2 || '')
       end
 
       if pattern["os_v3_replacement"]
-        v3 = pattern["os_v3_replacement"].sub('$1', v3 || '')
+        v3 = pattern["os_v3_replacement"].sub('$4', v3 || '')
       end
 
       if pattern["os_v4_replacement"]
-        v4 = pattern["os_v4_replacement"].sub('$1', v4 || '')
+        v4 = pattern["os_v4_replacement"].sub('$5', v4 || '')
       end
 
       version = version_from_segments(v1, v2, v3, v4)
@@ -127,13 +127,15 @@ def os_from_pattern_match(pattern, match)
     end
 
     def device_from_pattern_match(pattern, match)
-      device = match[1]
+      match = match.to_a.map(&:to_s)
+      family = match[1]
 
       if pattern["device_replacement"]
-        device = pattern["device_replacement"].sub('$1', device || '')
+        family = pattern["device_replacement"]
+        match.each_with_index { |m,i| family = family.sub("$#{i}", m) }
       end
 
-      Device.new(device)
+      Device.new(family.strip)
     end
 
     def version_from_segments(*segments)

spec/parser_spec.rb

@@ -31,23 +31,23 @@ def self.file_to_test_cases(file)
   end
 
   def self.file_to_yaml(resource)
-    test_resource_path = File.expand_path('../../vendor/ua-parser/test_resources', __FILE__)
-    resource_path = File.join(test_resource_path, resource)
+    uap_path = File.expand_path('../../vendor/uap-core', __FILE__)
+    resource_path = File.join(uap_path, resource)
     YAML.load_file(resource_path)
   end
 
   def self.user_agent_test_cases
-    file_to_test_cases("firefox_user_agent_strings.yaml") +
-    file_to_test_cases("test_user_agent_parser.yaml")
+    file_to_test_cases("test_resources/firefox_user_agent_strings.yaml") 
+    file_to_test_cases("tests/test_ua.yaml")
   end
 
   def self.operating_system_test_cases
-    file_to_test_cases("test_user_agent_parser_os.yaml") +
-    file_to_test_cases("additional_os_tests.yaml")
+    file_to_test_cases("tests/test_os.yaml") +
+    file_to_test_cases("test_resources/additional_os_tests.yaml")
   end
 
   def self.device_test_cases
-    file_to_test_cases("test_device.yaml")
+    file_to_test_cases("tests/test_device.yaml")
   end
 
   def custom_patterns_path
@@ -83,7 +83,7 @@ def custom_patterns_path
       ua.device.family.must_equal("Custom device")
     end
   end
-
+  
   describe "#parse" do
     user_agent_test_cases.each do |test_case|
       it "parses UA for #{test_case_to_test_name(test_case)}" do
@@ -133,7 +133,7 @@ def custom_patterns_path
         end
       end
     end
-
+    
     device_test_cases.each do |test_case|
       it "parses device for #{test_case_to_test_name(test_case)}" do
         user_agent = PARSER.parse(test_case['user_agent_string'])

user_agent_parser.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name    = "user_agent_parser"
-  gem.version = "2.2.0"
+  gem.version = "2.3.0"
 
   gem.author      = "Tim Lucas"
   gem.email       = "[email protected]"
@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.license     = "MIT"
   gem.executables = ['user_agent_parser']
 
-  gem.files = %x{ git ls-files }.split("\n").select { |d| d =~ %r{^(MIT-LICENSE|Readme.md|lib|bin/)} } + ['vendor/ua-parser/regexes.yaml']
+  gem.files = %x{ git ls-files }.split("\n").select { |d| d =~ %r{^(MIT-LICENSE|Readme.md|lib|bin/)} } + ['vendor/uap-core/regexes.yaml']
 
   gem.required_ruby_version = '>= 1.8.7'
 end