double_agent 0.2.3 → 1.0.0

data/lib/double_agent/{resources.rb → resource.rb}

@@ -1,78 +1,71 @@
 module DoubleAgent
-  # 
   # Any class with a "user_agent" method returning a User Agent string
   # may include this module to easily parse out Browser and OS info.
-  # 
   module Resource
-    # Return's this object's browser name
+    # Return's this object's browser name and version
     def browser
-      _browser_parser.browser(user_agent)
+      browser_parser.browser(user_agent)
     end
 
-    # Return's this object's browser symbol name
-    def browser_sym
-      _browser_parser.sym
+    # Return's this object's browser name
+    def browser_name
+      browser_parser.name
+    end
+
+    # Return's this object's browser version (if any)
+    def browser_version
+      browser_parser.version(user_agent)
     end
 
-    # Return's this object's browser icon name
-    def browser_icon
-      _browser_parser.icon
+    # Return's this object's browser symbol name
+    def browser_sym
+      browser_parser.sym
     end
 
     # Return's this object's browser family name
     def browser_family
-      _browser_parser.family.browser
+      browser_parser.family.browser
     end
 
     # Return's this object's browser family symbol name
     def browser_family_sym
-      _browser_parser.family_sym
-    end
-
-    # Return's this object's browser family icon name
-    def browser_family_icon
-      _browser_parser.family.icon
+      browser_parser.family_sym
     end
 
     # Return's this object's OS name
     def os
-      _os_parser.os
+      os_parser.os
     end
 
     # Return's this object's OS symbol name
     def os_sym
-      _os_parser.sym
-    end
-
-    # Return's this object's OS icon name
-    def os_icon
-      _os_parser.icon
+      os_parser.sym
     end
 
     # Return's this object's OS family name
     def os_family
-      _os_parser.family.os
+      os_parser.family.os
     end
 
     # Return's this object's OS family symbol name
     def os_family_sym
-      _os_parser.family_sym
+      os_parser.family_sym
     end
 
-    # Return's this object's OS family icon name
-    def os_family_icon
-      _os_parser.family.icon
+    # Returs true if the browser appears to be on a mobile device, false if not
+    def mobile?
+      os_parser.mobile?
     end
 
     private
 
     # Returns and caches a BrowserParser for this object
-    def _browser_parser
+    def browser_parser
       @browser_parser ||= DoubleAgent.browser_parser(user_agent)
     end
 
     # Returns and caches an OSParser for this object
-    def _os_parser
+    def os_parser
       @os_parser ||= DoubleAgent.os_parser(user_agent)
     end
   end

data/lib/double_agent/user_agent.rb

@@ -0,0 +1,14 @@
+module DoubleAgent
+  # A class representing a browser's user agent string. Various member methods parse and return browser and OS details.
+  class UserAgent
+    include DoubleAgent::Resource
+
+    # The user agent string
+    attr_reader :user_agent
+
+    # Instantiate a new UserAgent object
+    def initialize(user_agent_string)
+      @user_agent = user_agent_string
+    end
+  end
+end

data/lib/double_agent/version.rb

@@ -1,4 +1,4 @@
 module DoubleAgent
   # Version number
-  VERSION = '0.2.3'
+  VERSION = '1.0.0'
 end

data/lib/double_agent.rb

@@ -1,3 +1,9 @@
+require 'psych'
 require 'double_agent/version'
 require 'double_agent/parser'
-require 'double_agent/resources'
+require 'double_agent/resource'
+require 'double_agent/user_agent'
+require 'double_agent/double_agent'
+
+DoubleAgent.load_browsers!
+DoubleAgent.load_oses!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: double_agent
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,9 +9,9 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-01 00:00:00.000000000 Z
+date: 2012-11-10 00:00:00.000000000 Z
 dependencies: []
-description: Browser User Agent string parser with resources, stats, and a log reader
+description: Browser User Agent string parser
 email: jordan@jordanhollinger.com
 executables: []
 extensions: []
@@ -20,25 +20,17 @@ extra_rdoc_files:
 - CHANGELOG
 files:
 - lib/double_agent.rb
-- lib/double_agent/all.rb
-- lib/double_agent/resources.rb
+- lib/double_agent/double_agent.rb
+- lib/double_agent/resource.rb
+- lib/double_agent/user_agent.rb
 - lib/double_agent/version.rb
-- lib/double_agent/logs.rb
 - lib/double_agent/parser.rb
-- lib/double_agent/stats.rb
 - data/browsers.yml
 - data/oses.yml
-- spec/resources_spec.rb
-- spec/data_spec.rb
-- spec/spec_helper.rb
-- spec/parser_spec.rb
-- spec/stats_spec.rb
-- spec/data/httpd.access.log.1.gz
-- spec/data/httpd.access.log
 - README.rdoc
 - LICENSE
 - CHANGELOG
-homepage: http://github.com/jhollinger/double_agent
+homepage: https://github.com/jhollinger/double_agent
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -58,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Browser User Agent string parser

data/lib/double_agent/all.rb

@@ -1,5 +0,0 @@
-require 'double_agent/version'
-require 'double_agent/parser'
-require 'double_agent/resources'
-require 'double_agent/stats'
-require 'double_agent/logs'

data/lib/double_agent/logs.rb

@@ -1,110 +0,0 @@
-require 'date'
-
-module DoubleAgent
-  # 
-  # The Logs module contains methods and classes for parsing user agent strings
-  # from Apache-style logs (includes default Nginx log format). Gzipped logs 
-  # are also supported.
-  # 
-  module Logs
-    begin
-      require 'zlib'
-      ZLIB = true
-    rescue LoadError
-      $stderr.puts "Zlib not available for DoubleAgent::Logs; gzipped log files will be skipped."
-      ZLIB = false
-    end
-
-    # This class represents a line in an Apache or Nginx access log.
-    # The user agent string is parsed out and available through the
-    # user_agent attribute, making it available to the mixed-in DoubleAgent::Resource methods.
-    # Datestamps and Timestamps may also be retrieved for each instance, using the #on and #at methods, respectively.
-
-    class Entry
-      include DoubleAgent::Resource 
-      # Returns the user agent string
-      attr_reader :user_agent, :line
-
-      # Regular expression for pulling a user agent string out of a log entry. It is rather imprecise
-      # only for efficiency's sake.
-      USER_AGENT_REGEXP = /" ".+$/
-
-      # Regexp for parsing an IP address
-      IP_REGEXP = /^[0-9a-z\.:]+/
-
-      # Regex for parsing the date out of the log line
-      DATESTAMP_REGEXP = %r{[0-9]+/[a-z]+/[0-9]+:}i
-      # Regex for parsing DATESTAMP_REGEXP into a Date object
-      DATESTAMP_FORMAT = '%d/%B/%Y:'
-
-      # Regex for parsing the datetime out of the log line
-      TIMESTAMP_REGEXP = %r{[0-9]+/[a-z]+/[0-9]+:[0-9]+:[0-9]+:[0-9]+ (-|\+)[0-9]+}i
-      # Regex for parsing TIMESTAMP_REGEXP into a DateTime object
-      TIMESTAMP_FORMAT = '%d/%B/%Y:%H:%M:%S %z'
-
-      # Initializes a new Entry object. An Apache or Nginx log line should be
-      # passed to it.
-      def initialize(line)
-        @line = line
-        @user_agent = line.slice(USER_AGENT_REGEXP)
-      end
-
-      # Returns the IP address the hit originated from
-      def ip
-        @line.slice(IP_REGEXP)
-      end
-
-      # Returns the Date the hit occurred on
-      def on
-        date_str = @line.slice(DATESTAMP_REGEXP)
-        date_str ? Date.strptime(date_str, DATESTAMP_FORMAT) : nil
-      end
-
-      # Returns the DateTime the hit occurred at
-      def at
-        datetime_str = @line.slice(TIMESTAMP_REGEXP)
-        datetime_str ? DateTime.strptime(datetime_str, TIMESTAMP_FORMAT) : nil
-      end
-    end
-
-    # Accepts a glob path like /var/logs/apache/my-site.access.log*,
-    # parses all matching files into an array of Entry objects, and returns them.
-    # Gzipped log files are parsed by Zlib.
-    #
-    # Options:
-    # 
-    # :match A regular expression. Only lines which match this will be returned.
-    # :ignore A regular expression. Any lines which match this will be ignored.
-    def self.entries(glob_str, options={})
-      match, ignore = options[:match], options[:ignore]
-      entries = []
-
-      # Define the parse lambda
-      parse = if match or ignore
-        lambda { |line|
-          begin
-            entries << Entry.new(line) unless (match and line !~ match) or (ignore and line =~ ignore)
-          rescue ArgumentError => e
-            $stderr.puts "#{e.message}: #{line}"
-          end
-        }
-      else
-        lambda { |line| entries << Entry.new(line) }
-      end
-
-      # Define the read lambda
-      read = lambda do |f|
-        zipped = f =~ /\.gz\Z/i
-        return unless ZLIB or not zipped
-        File.open(f, 'r:UTF-8') do |file|
-          handle = zipped ? Zlib::GzipReader.new(file) : file
-          #handle.each_line &parse # A little slower, but may be more memory efficient
-          handle.readlines.each &parse
-        end
-      end
-
-      Dir.glob(glob_str).each &read
-      entries
-    end
-  end
-end

data/lib/double_agent/stats.rb

@@ -1,65 +0,0 @@
-module DoubleAgent
-  # 
-  # The Stats module provides methods for determining browser and/or OS share
-  # for large numbers of DoubleAgent::Resource objects.
-  # 
-  module Stats
-    # True if running under less than Ruby 1.9
-    BAD_RUBY = RUBY_VERSION < '1.9.0'
-
-    if BAD_RUBY
-      require 'bigdecimal'
-      # If BAD_RUBY, this is used in lieu of the native round method
-      def self.better_round(f, n)
-        d = BigDecimal.new f.to_s
-        d.round(n).to_f
-      end
-    end
-
-    # For the given "things", returns the share of the group that each attr has.
-    # 
-    # "things" is an array of objects who's classes mix-in DoubleAgent::Resource.
-    # 
-    # "args" is one or more method symbols from DoubleAgent::Resource.
-    # 
-    # "args" may have, as it's last member, :threshold => n, where n is the number of the lowest
-    # percentage you want returned.
-    # 
-    # Returns an array of [attribute(s), percent of total, number of total]
-    # 
-    # Example, Browser Family share:
-    # 
-    # DoubleAgent::Stats.percentages_for(logins, :browser_family)
-    #   [['Firefox', 50.4, 5040], ['Chrome', 19.6, 1960], ['Internet Explorer', 15, 1500], ['Safari', 10, 1000], ['Unknown', 5, 500]]
-    # 
-    # Example, Browser/OS share, asking for symbols back:
-    # 
-    # DoubleAgent::Stats.percentages_for(server_log_entries, :browser_sym, :os_sym)
-    #   [[:firefox, :windows_7, 50.4, 5040], [:chrome, :osx, 19.6, 1960], [:msie, :windows_xp, 15, 1500], [:safari, :osx, 10, 1000], [:other, :other, 5, 100]]
-    def self.percentages_for(things, *args)
-      options = args.last.is_a?(Hash) ? args.pop : {} # Break out options
-      results = {}
-      # Count each instance
-      things.each do |h|
-        syms = args.map { |attr| h.send attr }
-        results[syms] ||= 0
-        results[syms] += 1
-      end
-      size = things.size.to_f
-      results = results.to_a
-      # From the total, calculate the percentage held by each browser, OS, etc.
-      if BAD_RUBY
-        results.collect! { |k,n| [*k.<<(better_round(((n * 100) / size), 2)).<<(n)] }
-      else
-        # Ruby 1.9 syntax that blows up in Ruby 1.8
-        #results.collect! { |k,n| [*k, ((n * 100) / size).round(2), n] }
-        results.collect! { |k,n| [*k.<<(((n * 100) / size).round(2)).<<(n)] }
-      end
-      # Sort in ascending order
-      results.sort! { |a,b| b.last <=> a.last }
-      # Reject percentages below a specified threshold
-      results.reject! { |a| a[-2] < options[:threshold] } if options[:threshold]
-      results
-    end
-  end
-end

data/spec/data/httpd.access.log

@@ -1,20 +0,0 @@
-68.52.99.211 - - [05/May/2011:08:21:04 -0400] "GET / HTTP/1.1" 200 1312 "-" "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.17) Gecko/20110420 Firefox/3.6.17"
-68.52.99.211 - - [05/May/2011:08:25:47 -0400] "POST /entries HTTP/1.1" 200 7889 "http://www.example.com/entries/new" "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.17) Gecko/20110420 Firefox/3.6.17"
-216.84.130.30 - - [04/May/2011:09:45:42 -0400] "GET /dashboard HTTP/1.1" 302 104 "-" "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_2_6 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8E200 Safari/6533.18.5"
-173.190.91.2 - - [04/May/2011:10:51:09 -0400] "GET /images/icons/opera_browser.png?1295928127 HTTP/1.1" 304 0 "http://cur8.cur8.net/sbin/sites/2/page_hit_stats" "Mozilla/5.0 (X11; Linux i686; rv:2.0.1) Gecko/20100101 Firefox/4.0.1"
-173.190.91.2 - - [04/May/2011:10:51:09 -0400] "GET /images/icons/ubuntu_os.png?1295928127 HTTP/1.1" 304 0 "http://cur8.cur8.net/sbin/sites/2/page_hit_stats" "Mozilla/5.0 (X11; Linux i686; rv:2.0.1) Gecko/20100101 Firefox/4.0.1"
-173.190.91.2 - - [04/May/2011:10:52:29 -0400] "GET /sbin/sites/2/login_stats HTTP/1.1" 200 10131 "http://cur8.cur8.net/sbin/sites/2/page_hit_stats" "Mozilla/5.0 (X11; Linux i686; rv:2.0.1) Gecko/20100101 Firefox/4.0.1"
-173.190.91.2 - - [04/May/2011:10:52:34 -0400] "GET /sbin/sites/2/page_hit_stats HTTP/1.1" 200 12460 "http://cur8.cur8.net/sbin/sites/2/login_stats" "Mozilla/5.0 (X11; Linux i686; rv:2.0.1) Gecko/20100101 Firefox/4.0.1"
-bad log line!
-173.190.91.2 - - [04/May/2011:10:53:10 -0400] "GET /sbin/sites/2 HTTP/1.1" 304 0 "http://cur8.cur8.net/sbin/sites/2/page_hit_stats" "Mozilla/5.0 (X11; Linux i686; rv:2.0.1) Gecko/20100101 Firefox/4.0.1"
-216.84.130.30 - - [04/May/2011:11:11:39 -0400] "GET /login HTTP/1.1" 200 1104 "-" "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; .NET CLR 2.0.50727; .NET CLR 3.0.04506.648; .NET CLR 3.5.21022; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729)"
-216.84.130.30 - - [04/May/2011:11:11:39 -0400] "GET /stylesheets/styles.css?1303352447 HTTP/1.1" 304 0 "http://www.example.com/login" "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; .NET CLR 2.0.50727; .NET CLR 3.0.04506.648; .NET CLR 3.5.21022; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729)"
-216.84.130.30 - - [04/May/2011:11:11:39 -0400] "GET /javascripts/lib.js?1303099416 HTTP/1.1" 304 0 "http://www.example.com/login" "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; .NET CLR 2.0.50727; .NET CLR 3.0.04506.648; .NET CLR 3.5.21022; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729)"
-216.84.130.30 - - [04/May/2011:11:11:39 -0400] "GET /stylesheets/print.css?1290464093 HTTP/1.1" 304 0 "http://www.example.com/login" "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; .NET CLR 2.0.50727; .NET CLR 3.0.04506.648; .NET CLR 3.5.21022; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729)"
-bad log line!
-216.84.130.30 - - [04/May/2011:11:11:39 -0400] "GET /javascripts/application.js?1303352447 HTTP/1.1" 304 0 "http://www.example.com/login" "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; .NET CLR 2.0.50727; .NET CLR 3.0.04506.648; .NET CLR 3.5.21022; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729)"
-75.201.10.91 - - [04/May/2011:18:37:10 -0400] "GET /entries/new HTTP/1.1" 302 104 "-" "Mozilla/5.0 (Linux; U; Android 2.2.1; en-us; ADR6400L 4G Build/FRG83D) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1"
-75.201.10.91 - - [04/May/2011:18:37:10 -0400] "GET /login HTTP/1.1" 200 1107 "-" "Mozilla/5.0 (Linux; U; Android 2.2.1; en-us; ADR6400L 4G Build/FRG83D) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1"
-75.201.10.91 - - [04/May/2011:18:43:33 -0400] "GET /dashboard HTTP/1.1" 200 8098 "http://www.example.com/login" "Mozilla/5.0 (Linux; U; Android 2.2.1; en-us; ADR6400L 4G Build/FRG83D) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1"
-75.201.10.91 - - [04/May/2011:18:43:55 -0400] "GET /search HTTP/1.1" 200 4070 "http://www.example.com/dashboard" "Mozilla/5.0 (Linux; U; Android 2.2.1; en-us; ADR6400L 4G Build/FRG83D) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1"
-bad log line!

data/spec/data_spec.rb

@@ -1,105 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-DA = DoubleAgent
-
-describe DoubleAgent do
-  # Internet Explorer
-  it 'should be Internet Explorer 10 on Windows 8' do
-    ua = "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; Win64; x64; Trident/5.0"
-    "#{DA.browser ua} on #{DA.os ua}".should == 'Internet Explorer 10 on Windows 8'
-  end
-
-  it 'should be Internet Explorer 9 on Windows 7' do
-    ua = "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Win64; x64; Trident/5.0"
-    "#{DA.browser ua} on #{DA.os ua}".should == 'Internet Explorer 9 on Windows 7'
-  end
-
-  it 'should be Internet Explorer 8 on Windows Vista' do
-    ua = "Mozilla/5.0 (compatible; MSIE 8.0; Windows NT 6.0; Win64; x64; Trident/5.0"
-    "#{DA.browser ua} on #{DA.os ua}".should == 'Internet Explorer 8 on Windows Vista'
-  end
-
-  it 'should be Internet Explorer 7 on Windows XP' do
-    ua = "Mozilla/5.0 (compatible; MSIE 7.0; Windows NT 5.2; Win64; x64; Trident/5.0"
-    "#{DA.browser ua} on #{DA.os ua}".should == 'Internet Explorer 7 on Windows XP'
-  end
-
-  it 'should be Internet Explorer 7 on Windows XP' do
-    ua = "Mozilla/5.0 (compatible; MSIE 7.0; Windows NT 5.1; Win64; x64; Trident/5.0"
-    "#{DA.browser ua} on #{DA.os ua}".should == 'Internet Explorer 7 on Windows XP'
-  end
-
-  # Chrome
-  it 'should be Chrome 12 on Windows XP' do
-    ua = "Mozilla/5.0 (Windows NT 5.1) AppleWebKit/534.25 (KHTML, like Gecko) Chrome/12.0.706.0 Safari/534.25"
-    "#{DA.browser ua} on #{DA.os ua}".should == 'Chrome 12 on Windows XP'
-  end
-
-  # Chromium
-  it 'should be Chrome 12 on Ubuntu' do
-    ua = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/534.24 (KHTML, like Gecko) Ubuntu/10.10 Chromium/12.0.703.0 Chrome/12.0.703.0 Safari/534.24"
-    "#{DA.browser ua} on #{DA.os ua}".should == 'Chrome 12 on Ubuntu'
-  end
-
-  # Android
-  it 'should be Android 2.3 on Android' do
-    ua = "Mozilla/5.0 (Linux; U; Android 2.3.3; zh-tw; HTC_Pyramid Build/GRI40) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1"
-    "#{DA.browser ua} on #{DA.os ua}".should == 'Android 2.3 on Android'
-  end
-
-  # Safari
-  it 'should be Safari 5 on OS X' do
-    ua = "Mozilla/5.0 (Macintosh; U; PPC Mac OS X 10_5_8; zh-cn) AppleWebKit/533.20.25 (KHTML, like Gecko) Version/5.0.4 Safari/533.20.27"
-    "#{DA.browser ua} on #{DA.os ua}".should == 'Safari 5 on OS X'
-  end
-
-  # Opera
-  it 'should be Opera 11 on GNU/Linux' do
-    ua = "Opera/9.80 (X11; Linux x86_64; U; pl) Presto/2.7.62 Version/11.00"
-    "#{DA.browser ua} on #{DA.os ua}".should == 'Opera 11 on GNU/Linux'
-  end
-
-  it 'should be Opera 11 on Windows 7' do
-    ua = "Mozilla/5.0 (Windows NT 6.1; U; nl; rv:1.9.1.6) Gecko/20091201 Firefox/3.5.6 Opera 11.01"
-    "#{DA.browser ua} on #{DA.os ua}".should == 'Opera 11 on Windows 7'
-  end
-
-  # Firefox
-  it 'should be Firefox 4 on GNU/Linux' do
-    ua = "Mozilla/5.0 (X11; U; Linux x86_64; pl-PL; rv:2.0) Gecko/20110307 Firefox/4.0"
-    "#{DA.browser ua} on #{DA.os ua}".should == 'Firefox 4 on GNU/Linux'
-  end
-
-  it 'should be Firefox 7 on Android' do
-    ua = "Mozilla/5.0 (Android; Linux armv7l; rv:7.0.1) Gecko/20110928 Firefox/7.0.1 Fennec/7.0.1"
-    "#{DA.browser ua} on #{DA.os ua}".should == 'Firefox 7 on Android'
-  end
-
-  # Epiphany
-  it 'should be Epiphany on GNU/Linux' do
-    ua = "Mozilla/5.0 (X11; U; Linux x86_64; fr-FR) AppleWebKit/534.7 (KHTML, like Gecko) Epiphany/2.30.6 Safari/534.7"
-    "#{DA.browser ua} on #{DA.os ua}".should == 'Epiphany on GNU/Linux'
-  end
-
-  # Konqueror
-  it 'should be Konqueror on FreeBSD' do
-    ua = "Mozilla/5.0 (compatible; Konqueror/4.5; FreeBSD) KHTML/4.5.4 (like Gecko)"
-    "#{DA.browser ua} on #{DA.os ua}".should == 'Konqueror on FreeBSD'
-  end
-
-  it 'should be Konqueror on Fedora' do
-    ua = "Mozilla/5.0 (compatible; Konqueror/4.4; Linux) KHTML/4.4.1 (like Gecko) Fedora/4.4.1-1.fc12"
-    "#{DA.browser ua} on #{DA.os ua}".should == 'Konqueror on Fedora'
-  end
-
-  it 'should be Konqueror on Slackware' do
-    ua = "Mozilla/5.0 (compatible; Konqueror/4.2; Linux) KHTML/4.2.4 (like Gecko) Slackware/13.0"
-    "#{DA.browser ua} on #{DA.os ua}".should == 'Konqueror on Slackware'
-  end
-
-  # BlackBerry
-  it 'should be BlackBerry on BlackBerry' do
-    ua = "Mozilla/5.0 (BlackBerry; U; BlackBerry 9800; zh-TW) AppleWebKit/534.8+ (KHTML, like Gecko) Version/6.0.0.448 Mobile Safari/534.8+"
-    "#{DA.browser ua} on #{DA.os ua}".should == 'BlackBerry on BlackBerry'
-  end
-end