wurfl_client 0.5.3 → 0.5.4

data/README

@@ -34,17 +34,26 @@ WURFL gem (http://github.com/pwim/wurfl): Handset, UserAgentMatcher, WURFL Loade
 == Setup
 
 To setup the environment, you have to execute following steps:
-1.) download and extract the latest WURFL file
+1.) download and extract the latest WURFL file to wurfl-latest.xml
 
     curl -L -o wurfl-latest.xml.gz 
     gunzip wurfl-latest.xml.gz
 
-2.) minimize the WURFL XML file. You can adapt wurfl_minimize.yml to your needs, see http://wurfl.sourceforge.net/help_doc.php for a list of available capabilities)
+2.) configure wurfl_minimize.rb by writing a wurfl_minimize.yml like so:
+
+input_file: wurfl-latest.xml
+output_file: wurfl-custom.xml
+capabilities: [brand_name, model_name, max_image_width, max_image_height, wta_voice_call]
+
+NOTE: You can adapt wurfl_minimize.yml capabilities to your needs. See http://wurfl.sourceforge.net/help_doc.php for a list of available capabilities.
+
+3.) minimize the WURFL XML file. 
 
     wurfl_minimize.rb 
- 
-3.) prepare the lookup tables (builds them into ./lookup directory by default). This will take some time!
 
+4.) prepare the lookup tables (builds them into ./lookup directory by default). This will take some time!
+
+		mkdir lookup
     wurfl_prepare_lookup.rb 
 
 Now, you are ready for device detection. If you make an automated script to do this update regularly, you must not forget to clear the lookup directory first. 
@@ -54,7 +63,7 @@ new data after the update is complete.
 Here is an example automatic update script:
 
     #!/bin/sh
-    curl -L -o wurfl-latest.xml.gz 
+    curl -L -o wurfl-latest.xml.gz http://sourceforge.net/projects/wurfl/files/WURFL/latest/wurfl-latest.xml.gz/download
     gunzip wurfl-latest.xml.gz
     wurfl_minimize.rb 
     rm lookup/*

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.4

data/bin/wurfl_minimize.rb

@@ -6,7 +6,7 @@ require "yaml"
 # This can reduce the lookup store size considerably!
 
 default_config = {
-  'input_file' => 'wurfl-test.xml',
+  'input_file' => 'wurfl-latest.xml',
   'output_file' => 'wurfl-default.xml',
   'capabilities' => ['brand_name', 'model_name', 'max_image_width', 'max_image_height', 'wta_voice_call']
 }

data/lib/wurfl_client/ua_device_detector.rb

@@ -6,20 +6,28 @@ module WurflClient
   class UserAgentDeviceDetector
   
     def self.detect(ua_string)
-      detectIphone(ua_string) || detectOtherMozilla(ua_string) || detectGeneric(ua_string) || DeviceProfile.new(:desktop)
+      detectAppleDevices(ua_string) || detectOtherMozilla(ua_string) || detectGeneric(ua_string) || DeviceProfile.new(:desktop)
     end
 
-    private
-    
-    def self.detectIphone(ua_string)
+    def self.detectAppleDevices(ua_string)
+    	dev_context = nil
+    	prefix = ''
       case ua_string
+      when /iPad/
+      	dev_context = 'ipad'
+      	prefix = 'ipad'
       when /iPod/
-        return DeviceProfile.new('iphone', 'iphone_ipod')
+      	dev_context = 'iphone'
+      	prefix = 'ipod'
       when /iPhone/
+      	dev_context = 'iphone'
+      	prefix = 'iphone'
+			end
+			if dev_context
+				# detect OS version
         os_ver = ua_string[/OS ([0-9_]+)/]
-        prefix = 'iphone'
-        prefix += "_#{os_ver[$1]}" if os_ver
-        return DeviceProfile.new('iphone', prefix)
+        prefix += "-OS#{os_ver[$1]}" if os_ver
+				return DeviceProfile.new(dev_context, prefix)
       end
     end
     

data/wurfl_client.gemspec

@@ -1,56 +1,47 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{wurfl_client}
-  s.version = "0.5.3"
+  s.version = "0.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Guido Pinkas"]
-  s.date = %q{2010-09-28}
+  s.authors = [%q{Guido Pinkas}]
+  s.date = %q{2011-05-12}
   s.description = %q{WURFL Client is a library to do WURFL (http://wurfl.sourceforge.net/) mobile device detection for web applications. Included are tools to keep the WURFL file up to date automatically and to prepare a customized lookup tables, which allow a fast device detection.}
   s.email = %q{guido.pinkas@bindertrittenwein.com}
-  s.executables = ["wurfl_minimize.rb", "wurfl_prepare_lookup.rb"]
+  s.executables = [%q{wurfl_minimize.rb}, %q{wurfl_prepare_lookup.rb}]
   s.extra_rdoc_files = [
     "README"
   ]
   s.files = [
-    ".gitignore",
-     "README",
-     "Rakefile",
-     "VERSION",
-     "bin/wurfl_minimize.rb",
-     "bin/wurfl_prepare_lookup.rb",
-     "examples/config.ru",
-     "lib/wurfl_client.rb",
-     "lib/wurfl_client/device_profile.rb",
-     "lib/wurfl_client/lookup_helper.rb",
-     "lib/wurfl_client/lookup_preparer.rb",
-     "lib/wurfl_client/ua_device_detector.rb",
-     "test/data/iphone.pstore",
-     "test/data/wurfl-test.xml",
-     "test/device_profile_test.rb",
-     "test/lookup_helper_test.rb",
-     "test/ua_device_detector_test.rb",
-     "test/wurfl_client_test.rb",
-     "wurfl_client.gemspec"
+    "README",
+    "Rakefile",
+    "VERSION",
+    "bin/wurfl_minimize.rb",
+    "bin/wurfl_prepare_lookup.rb",
+    "examples/config.ru",
+    "lib/wurfl_client.rb",
+    "lib/wurfl_client/device_profile.rb",
+    "lib/wurfl_client/lookup_helper.rb",
+    "lib/wurfl_client/lookup_preparer.rb",
+    "lib/wurfl_client/ua_device_detector.rb",
+    "test/data/iphone.pstore",
+    "test/data/wurfl-test.xml",
+    "test/device_profile_test.rb",
+    "test/lookup_helper_test.rb",
+    "test/ua_device_detector_test.rb",
+    "test/wurfl_client_test.rb",
+    "wurfl_client.gemspec"
   ]
   s.homepage = %q{http://github.com/bluecat76/wurfl_client}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.2}
   s.summary = %q{Fast WURFL mobile device detection}
-  s.test_files = [
-    "test/lookup_helper_test.rb",
-     "test/device_profile_test.rb",
-     "test/wurfl_client_test.rb",
-     "test/ua_device_detector_test.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: wurfl_client
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  - 3
-  version: 0.5.3
+  prerelease: 
+  version: 0.5.4
 platform: ruby
 authors: 
 - Guido Pinkas
@@ -14,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-28 00:00:00 +02:00
-default_executable: 
+date: 2011-05-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: wurfl
@@ -25,10 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 6
         version: 1.3.6
   type: :runtime
   version_requirements: *id001
@@ -42,7 +33,6 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- .gitignore
 - README
 - Rakefile
 - VERSION
@@ -61,13 +51,12 @@ files:
 - test/ua_device_detector_test.rb
 - test/wurfl_client_test.rb
 - wurfl_client.gemspec
-has_rdoc: true
 homepage: http://github.com/bluecat76/wurfl_client
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -75,26 +64,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: Fast WURFL mobile device detection
-test_files: 
-- test/lookup_helper_test.rb
-- test/device_profile_test.rb
-- test/wurfl_client_test.rb
-- test/ua_device_detector_test.rb
+test_files: []
+

data/.gitignore

@@ -1,3 +0,0 @@
-run
-pkg
-rdoc