browscapper 0.0.1 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ede4118b2f3bcec3b30148e6bac3265215ca7c31
+  data.tar.gz: aa5ba1d31e8fae077eb4dd933f21e96d71d6ebb3
+SHA512:
+  metadata.gz: d943570726015c59daf03b4fb53e3addfe266350bf4802827eee56bf01f1df472c33bc9b831fea74bbb6b65eba03e70df30292989f700f56ceafc683e07b6252
+  data.tar.gz: ceece896924cd926fd69aa2943060d421374728688e85a91a250786ce7b4939171dd8008c4d67621c0e657af3d778574e753a7b071c99fdb853ff7a543127211

data/.gitignore

@@ -10,3 +10,5 @@ Thumbs.db
 pkg/
 doc/
 Gemfile.lock
+Gemfile.local
+Guardfile.local

data/Gemfile

@@ -1,3 +1,20 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem "rdoc", "~> 3.12"
+gem "rake", "~> 10.0"
+gem "minitest"
+gem "minitest-reporters"
+gem "guard-minitest"
+gem "simplecov"
+
+if RbConfig::CONFIG['host_os'] =~ /^darwin/
+  gem "rb-fsevent"
+  gem "growl"
+end
+
+if File.exists?('Gemfile.local')
+  instance_eval File.read('Gemfile.local')
+end
+

data/Guardfile

@@ -0,0 +1,17 @@
+
+guard 'minitest', :test_folders => 'test', :test_file_patterns => '*_tests.rb' do
+  watch(%r|^test/(.+)_tests\.rb|)
+
+  watch(%r|^lib/(.+)\.rb$|) do |m|
+    "test/#{m[1]}_tests.rb"
+  end
+
+  watch(%r|^test/test_helper\.rb|) do
+    "test"
+  end
+end
+
+if File.exists?('Guardfile.local')
+  instance_eval File.read('Guardfile.local')
+end
+

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 J Smith <dark.panda@gmail.com>
+Copyright (c) 2014 J Smith <dark.panda@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -38,6 +38,10 @@ rake task thusly:
 
   rake browscapper:dump IN=browscap.ini OUT=browscap.dump
 
+You can also convert between formats using the `browscapper:convert` task:
+
+  rake browscapper:convert IN=browscap.dump OUT=browscap.yml
+
 == License
 
 See the MIT-LICENSE file for details.

data/Rakefile

@@ -1,23 +1,16 @@
 # -*- ruby -*-
 
 require 'rubygems'
-
-gem 'rdoc', '~> 3.12'
-
 require 'rubygems/package_task'
 require 'rake/testtask'
 require 'rdoc/task'
 require 'bundler/gem_tasks'
 
-if RUBY_VERSION >= '1.9'
-  begin
-    gem 'psych'
-  rescue Exception => e
-    # it's okay, fall back on the bundled psych
-  end
-end
+$:.push File.expand_path(File.dirname(__FILE__), 'lib')
 
-$:.push 'lib'
+FileList['lib/tasks/*.rake'].each do |task|
+  import task
+end
 
 version = Browscapper::VERSION
 
@@ -36,20 +29,3 @@ Rake::RDocTask.new do |t|
   t.rdoc_files.include('README.rdoc', 'MIT-LICENSE', 'lib/**/*.rb')
 end
 
-desc "Converts a browscap file to another format"
-task "browscapper:dump" do
-  require File.join(File.dirname(__FILE__), %w{ lib browscapper })
-
-  if !ENV['IN'] || !ENV['OUT']
-    puts "Usage: IN=browscap OUT=browscap.dump"
-    puts
-    puts "Converts a browscap file to a ruby Marshal'd format. These files"
-    puts "are much quicker to load than CSV or INI files."
-    exit
-  end
-
-  Browscapper.load(ENV['IN'])
-  File.open(ENV['OUT'], 'wb') do |fp|
-    fp.write(Marshal.dump(Browscapper.entries))
-  end
-end

data/browscapper.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.description = "A browscap file parser and matcher."
   s.summary = s.description
   s.email = "dark.panda@gmail.com"
+  s.license = "MIT"
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
@@ -20,9 +21,6 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/dark-panda/browscapper"
   s.require_paths = ["lib"]
 
-  s.add_dependency("rdoc")
-  s.add_dependency("rake", ["~> 0.9"])
-  s.add_dependency("minitest")
   s.add_dependency("inifile")
 end
 

data/lib/browscapper.rb

@@ -1,5 +1,7 @@
 # encoding: BINARY
 
+require 'browscapper/version'
+
 module Browscapper
   autoload :UserAgent,  'browscapper/user_agent'
   autoload :Reader,     'browscapper/reader'
@@ -30,6 +32,7 @@ module Browscapper
 
       @file = file
       @entries = reader.load(file)
+      clear_cache
       self
     end
 

data/lib/browscapper/reader.rb

@@ -10,9 +10,9 @@ module Browscapper
       end
 
       pattern.downcase!
-      pattern.gsub!(/([\^\$\(\)\[\]\.\-])/, "\\\\\\1")
+      pattern.gsub!(/([\^\$\(\)\[\]\.\-\+])/, "\\\\\\1")
       pattern.gsub!('?', '.')
-      pattern.gsub!('*', '.*?')
+      pattern.gsub!(/\*+/, '.*?')
 
       Regexp.new("^#{pattern}$")
     end

data/lib/browscapper/reader/csv_reader.rb

@@ -47,7 +47,7 @@ module Browscapper
             entry.browser
           end
 
-          entry.pattern = pattern_to_regexp(entry.user_agent.to_s)
+          entry.pattern = pattern_to_regexp(entry.property_name.to_s)
 
           if entries[entry.parent]
             entry.merge!(entries[entry.parent])

data/lib/browscapper/user_agent.rb

@@ -8,7 +8,7 @@ module Browscapper
       :parent, :user_agent, :comment, :browser, :version, :major_version,
       :minor_version, :platform, :platform_version, :alpha, :beta, :win16, :win32, :win64,
       :frames, :iframes, :tables, :cookies, :background_sounds, :vbscript,
-      :javascript, :java_applets, :activex_controls, :banned, :mobile_device,
+      :javascript, :java_applets, :activex_controls, :banned, :mobile_device, :tablet,
       :syndication_reader, :crawler, :css_version, :aol_version, :user_agent_id,
       :css, :cdf, :aol, :device_name, :device_maker, :rendering_engine_name,
       :rendering_engine_version, :rendering_engine_description
@@ -23,6 +23,7 @@ module Browscapper
     attr_accessor :pattern
 
     MAP = {
+      'propertyname'         => :property_name,
       'useragent'            => :user_agent,
       'version'              => :version,
       'majorver'             => :major_version,
@@ -43,7 +44,8 @@ module Browscapper
       'supportscss'          => :css,
       'renderingengine_name' => :rendering_engine_name,
       'renderingengine_version' => :rendering_engine_version,
-      'renderingengine_description' => :rendering_engine_description
+      'renderingengine_description' => :rendering_engine_description,
+      'istablet'             => :tablet
     }
 
     def initialize(hash = {})

data/lib/browscapper/version.rb

@@ -1,6 +1,6 @@
 # encoding: BINARY
 
 module Browscapper
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end
 

data/lib/tasks/dump.rake

@@ -0,0 +1,60 @@
+
+desc "Converts a browscap file to the Marshal format"
+task "browscapper:dump" do
+  require 'browscapper'
+
+  if !ENV['IN'] || !ENV['OUT']
+    puts "Usage: IN=browscap OUT=browscap.dump"
+    puts
+    puts "Converts a browscap file to a ruby Marshal'd format. These files"
+    puts "are much quicker to load than CSV or INI files."
+    exit
+  end
+
+  Browscapper.load(ENV['IN'])
+  File.open(ENV['OUT'], 'wb') do |fp|
+    fp.write(Marshal.dump(Browscapper.entries))
+  end
+end
+
+desc "Converts a browscap file to another format"
+task "browscapper:convert" do
+  require 'browscapper'
+
+  if !ENV['IN'] || !ENV['OUT']
+    puts "Usage: IN=browscap OUT=output.ext"
+    puts
+    puts "Converts a browscap file to another format. The output format"
+    puts "is based on the output extension, which can be one of yml, yaml,"
+    puts "csv, ini or dump. The \"dump\" extension uses the Marshal format."
+    exit
+  end
+
+  Browscapper.load(ENV['IN'])
+
+  case ENV['OUT']
+    when /\.dump$/i
+      File.open(ENV['OUT'], 'wb:BINARY') do |fp|
+        fp.write(Marshal.dump(Browscapper.entries))
+      end
+
+    when /\.ya?ml$/i
+      File.open(ENV['OUT'], 'wb:BINARY') do |fp|
+        fp.write(YAML.dump(Browscaper.entries))
+      end
+
+    when /\.csv$/i
+      Browscapper.load(ENV['IN'])
+      Browscapper::CSVReader::CSV_ENGINE.open(ENV['OUT'], 'wb:BINARY') do |csv|
+        keys = Browscapper.entries['DefaultProperties'].to_hash.keys
+        csv << keys
+        Browscapper.entries.each do |k, v|
+          hash = v.to_hash
+
+          csv << keys.collect { |kk|
+            hash[kk]
+          }
+        end
+      end
+  end
+end

data/test/browscapper/reader_tests.rb

@@ -0,0 +1,52 @@
+
+# encoding: BINARY
+
+$: << File.dirname(__FILE__)
+require 'test_helper'
+require 'benchmark'
+
+class Browscapper::ReaderTests < MiniTest::Unit::TestCase
+  include Browscapper::Reader
+
+  def test_pattern_to_regexp
+    assert_equal(
+      /^mozilla\/5\.0 \(foo.*?\) \+http:\/\/example\.com chrome.*?\/..$/,
+      pattern_to_regexp("Mozilla/5.0 (Foo*) +http://example.com Chrome*/??")
+    )
+  end
+
+  if ENV['BENCH']
+    def test_csv
+      Benchmark.bmbm do |bmbm|
+        bmbm.report('csv') do
+          Browscapper.load('vendor/browscap.csv')
+        end
+      end
+    end
+
+    def test_yaml
+      Benchmark.bmbm do |bmbm|
+        bmbm.report('yaml') do
+          Browscapper.load('vendor/browscap.yml')
+        end
+      end
+    end
+
+    def test_ini
+      Benchmark.bmbm do |bmbm|
+        bmbm.report('ini') do
+          Browscapper.load('vendor/browscap.ini')
+        end
+      end
+    end
+
+    def test_marshal
+      Benchmark.bmbm do |bmbm|
+        bmbm.report('marshal') do
+          Browscapper.load('vendor/browscap.dump')
+        end
+      end
+    end
+  end
+end
+

data/test/browscapper_tests.rb

@@ -1,10 +1,7 @@
 # encoding: BINARY
 
-$: << './lib'
-
-require 'rubygems'
-require 'minitest/autorun'
-require './lib/browscapper'
+$: << File.dirname(__FILE__)
+require 'test_helper'
 
 class BrowscapperTest < MiniTest::Unit::TestCase
   FIREFOX_ON_OSX = Browscapper::UserAgent.new({
@@ -18,8 +15,8 @@ class BrowscapperTest < MiniTest::Unit::TestCase
     :cookies => true,
     :crawler => false,
     :css_version => 3,
-    :device_name => "unknown",
-    :device_maker => "unknown",
+    :device_name => "Macintosh",
+    :device_maker => "Apple Inc",
     :frames => true,
     :iframes => true,
     :java_applets => true,
@@ -29,16 +26,17 @@ class BrowscapperTest < MiniTest::Unit::TestCase
     :mobile_device => false,
     :parent => "Firefox 3.6",
     :platform => "MacOSX",
-    :platform_version => "unknown",
+    :platform_version => 10.6,
     :rendering_engine_name => "Gecko",
-    :rendering_engine_version => "unknown",
+    :rendering_engine_version => "1.9.2",
     :rendering_engine_description => "For Firefox, Camino, K-Meleon, SeaMonkey, Netscape, and other Gecko-based browsers.",
     :syndication_reader => false,
     :tables => true,
-    :user_agent => "Mozilla/5.0 (Macintosh; *; *Mac OS X*; *; rv:1.9.2*) Gecko/* Firefox/3.6*",
+    :tablet => false,
+    :user_agent => "Mozilla/5.0 (*Mac OS X 10.6*) Gecko/* Firefox/3.6*",
     :user_agent_id => nil,
     :vbscript => false,
-    :version => "3.6",
+    :version => 3.6,
     :win16 => false,
     :win32 => false,
     :win64 => false,
@@ -47,7 +45,7 @@ class BrowscapperTest < MiniTest::Unit::TestCase
   FIREFOX_ON_OSX.pattern = /^mozilla\/5\.0 \(macintosh; .*; .*mac os x.*; .*; rv:1\.9\.2.*\) gecko\/.* firefox\/3\.6.*$/
 
   def test_browscap_ini
-    Browscapper.load(File.join('vendor', 'browscap.dump'))
+    Browscapper.load(File.join('vendor', 'browscap.ini'))
     match = Browscapper.match('Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.8) Gecko/20100722 Firefox/3.6.8')
 
     FIREFOX_ON_OSX.each do |k, v|

data/test/test_helper.rb

@@ -0,0 +1,26 @@
+
+# encoding: BINARY
+
+if RUBY_VERSION >= '1.9'
+  require 'simplecov'
+
+  SimpleCov.command_name('Unit Tests')
+  SimpleCov.start do
+    add_filter '/test/'
+  end
+end
+
+require 'rubygems'
+require 'minitest/autorun'
+
+if RUBY_VERSION >= '1.9'
+  require 'minitest/reporters'
+end
+
+require File.join(File.dirname(__FILE__), *%w{ .. lib browscapper })
+
+if RUBY_VERSION >= '1.9'
+  MiniTest::Reporters.use!(MiniTest::Reporters::SpecReporter.new)
+end
+
+

data/vendor/browscap.ini

@@ -0,0 +1,106 @@
+;;; Provided courtesy of http://browscap.org/
+;;; Created on Wednesday, November 19, 2014 at 09:12 PM UTC
+;;; Keep up with the latest goings-on with the project:
+;;; Follow us on Twitter <https://twitter.com/browscap>, or...
+;;; Like us on Facebook <https://facebook.com/browscap>, or...
+;;; Collaborate on GitHub <https://github.com/browscap>, or...
+;;; Discuss on Google Groups <https://groups.google.com/forum/#!forum/browscap>.
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Browscap Version
+
+[GJK_Browscap_Version]
+Version=5036
+Released=Wed, 19 Nov 2014 21:12:38 +0000
+Format=php
+Type=FULL
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; DefaultProperties
+
+[DefaultProperties]
+Comment="DefaultProperties"
+Browser="DefaultProperties"
+Browser_Type=unknown
+Browser_Bits=0
+Browser_Maker="unknown"
+Browser_Modus="unknown"
+Version=0.0
+MajorVer=0
+MinorVer=0
+Platform="unknown"
+Platform_Version=unknown
+Platform_Description="unknown"
+Platform_Bits=0
+Platform_Maker="unknown"
+Alpha=false
+Beta=false
+Win16=false
+Win32=false
+Win64=false
+Frames=false
+IFrames=false
+Tables=false
+Cookies=false
+BackgroundSounds=false
+JavaScript=false
+VBScript=false
+JavaApplets=false
+ActiveXControls=false
+isMobileDevice=false
+isTablet=false
+isSyndicationReader=false
+Crawler=false
+CssVersion=0
+AolVersion=0
+Device_Name="unknown"
+Device_Maker="unknown"
+Device_Type=unknown
+Device_Pointing_Method=unknown
+Device_Code_Name="unknown"
+Device_Brand_Name="unknown"
+RenderingEngine_Name="unknown"
+RenderingEngine_Version=unknown
+RenderingEngine_Description="unknown"
+RenderingEngine_Maker="unknown"
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Firefox 3.6
+
+[Firefox 3.6]
+Parent="DefaultProperties"
+Comment="Firefox 3.6"
+Browser="Firefox"
+Browser_Type=Browser
+Browser_Maker="Mozilla Foundation"
+Version=3.6
+MajorVer=3
+MinorVer=6
+Win32=true
+Frames=true
+IFrames=true
+Tables=true
+Cookies=true
+JavaScript=true
+JavaApplets=true
+CssVersion=3
+Device_Name="PC"
+Device_Maker="Various"
+Device_Type=Desktop
+Device_Pointing_Method=mouse
+RenderingEngine_Name="Gecko"
+RenderingEngine_Version=1.9.2
+RenderingEngine_Description="For Firefox, Camino, K-Meleon, SeaMonkey, Netscape, and other Gecko-based browsers."
+RenderingEngine_Maker="Mozilla Foundation"
+
+[Mozilla/5.0 (*Mac OS X 10.6*) Gecko/* Firefox/3.6*]
+Parent="Firefox 3.6"
+Browser_Bits=32
+Platform="MacOSX"
+Platform_Version=10.6
+Platform_Description="Mac OS X"
+Platform_Bits=32
+Platform_Maker="Apple Inc"
+Win32=false
+Device_Name="Macintosh"
+Device_Maker="Apple Inc"
+Device_Code_Name="Macintosh"
+Device_Brand_Name="Apple"
+

metadata

@@ -1,79 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: browscapper
 version: !ruby/object:Gem::Version
-  version: !binary |-
-    MC4wLjE=
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - J Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-29 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A browscap file parser and matcher.
@@ -83,8 +31,9 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
+- Guardfile
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
@@ -97,32 +46,36 @@ files:
 - lib/browscapper/reader/yaml_reader.rb
 - lib/browscapper/user_agent.rb
 - lib/browscapper/version.rb
+- lib/tasks/dump.rake
+- test/browscapper/reader_tests.rb
 - test/browscapper_tests.rb
-- test/reader_tests.rb
+- test/test_helper.rb
+- vendor/browscap.ini
 homepage: http://github.com/dark-panda/browscapper
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A browscap file parser and matcher.
 test_files:
+- test/browscapper/reader_tests.rb
 - test/browscapper_tests.rb
-- test/reader_tests.rb
+- test/test_helper.rb

data/test/reader_tests.rb

@@ -1,37 +0,0 @@
-
-# encoding: BINARY
-
-$: << './lib'
-
-require 'rubygems'
-require 'minitest/autorun'
-require 'minitest/benchmark' if ENV['BENCH']
-require './lib/browscapper'
-require 'benchmark'
-
-class ReaderTests < MiniTest::Unit::TestCase
-  def bench_csv
-    assert_performance_constant do |n|
-      Browscapper.load('vendor/browscap.csv')
-    end
-  end
-
-  def bench_yaml
-    assert_performance_constant do |n|
-      Browscapper.load('vendor/browscap.yml')
-    end
-  end
-
-  def bench_ini
-    assert_performance_constant do |n|
-      Browscapper.load('vendor/browscap.ini')
-    end
-  end
-
-  def bench_marshal
-    assert_performance_constant do |n|
-      Browscapper.load('vendor/browscap.dump')
-    end
-  end
-end
-