wurfl 1.2.0 → 1.3.0

data/test/data/wurfl.reverse.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wurfl>
+  <version>
+    <ver>Test Version</ver>
+  </version>
+  <devices>
+  <device id="apple_generic" user_agent="Mozilla/5.0 (iPhone;" fall_back="generic_xhtml">
+    <group id="display">
+      <capability name="columns" value="20"/>
+      <capability name="max_image_width" value="300"/>
+      <capability name="rows" value="20"/>
+      <capability name="resolution_width" value="300"/>
+      <capability name="resolution_height" value="300"/>
+      <capability name="max_image_height" value="300"/>
+    </group>
+  </device>
+  <device id="generic_xhtml" user_agent="Mozz" fall_back="generic">
+    <group id="display">
+      <capability name="max_image_width" value="120"/>
+      <capability name="resolution_height" value="92"/>
+      <capability name="resolution_width" value="128"/>
+      <capability name="max_image_height" value="92"/>
+    </group>
+  </device>
+  <device id="generic" user_agent="" fall_back="root">
+    <group id="display">
+      <capability name="physical_screen_height" value="27"/>
+      <capability name="columns" value="11"/>
+      <capability name="physical_screen_width" value="27"/>
+      <capability name="rows" value="6"/>
+      <capability name="max_image_width" value="90"/>
+      <capability name="resolution_height" value="40"/>
+      <capability name="resolution_width" value="90"/>
+      <capability name="max_image_height" value="35"/>
+    </group>
+  </device>
+</devices>
+</wurfl>

data/test/loader_test.rb

@@ -9,7 +9,7 @@ class TestLoader < Test::Unit::TestCase
   end
 
   def test_load_wurfl
-    handsets, fallbacks = @loader.load_wurfl(File.join(File.dirname(__FILE__), "data", "wurfl.simple.xml"))
+    handsets = @loader.load_wurfl(File.join(File.dirname(__FILE__), "data", "wurfl.simple.xml"))
     assert_equal("20", handsets["apple_generic"]["columns"])
     assert_equal("11", handsets["generic_xhtml"]["columns"])
     assert_equal("11", handsets["generic"]["columns"])
@@ -17,12 +17,26 @@ class TestLoader < Test::Unit::TestCase
     assert_equal("300", handsets["apple_generic"]["max_image_height"])
     assert_equal("92", handsets["generic_xhtml"]["max_image_height"])
     assert_equal("35", handsets["generic"]["max_image_height"])
+
+    assert_equal("", handsets["generic"].user_agent)
   end
 
-  def test_load_wurfl_from_string
-    s = File.read(File.join(File.dirname(__FILE__), "data", "wurfl.simple.xml"))
-    handsets, fallbacks = @loader.parse_xml(s)
-    assert_equal("300", handsets["apple_generic"]["max_image_height"])
+  def test_patched_generic
+    @loader.load_wurfl(File.join(File.dirname(__FILE__), "data", "wurfl.simple.xml"))
+    handsets = @loader.load_wurfl(File.join(File.dirname(__FILE__), "data", "wurfl.generic.patch.xml"))
+    assert_equal("200", handsets["generic"]["columns"])
+    assert_equal("6", handsets["generic"]["rows"])
+  end
+
+  def test_load_reverse_wurfl
+    handsets = @loader.load_wurfl(File.join(File.dirname(__FILE__), "data", "wurfl.reverse.xml"))
+    assert_equal("27", handsets["apple_generic"]["physical_screen_height"])
+    assert_equal("27", handsets["generic_xhtml"]["physical_screen_height"])
+    assert_equal("27", handsets["generic"]["physical_screen_height"])
+
+    assert_equal("Mozilla/5.0 (iPhone;", handsets["apple_generic"].user_agent)
+    assert_equal("Mozz", handsets["generic_xhtml"].user_agent)
+    assert_equal("", handsets["generic"].user_agent)
   end
 
 end

data/test/user_agent_matcher_test.rb

@@ -6,21 +6,21 @@ require 'test/unit'
 class UserAgentMatcherTest < Test::Unit::TestCase
   def setup
     loader = Wurfl::Loader.new
-    handsets, fallbacks = loader.load_wurfl(File.join(File.dirname(__FILE__), "data", "wurfl.simple.xml"))
+    handsets = loader.load_wurfl(File.join(File.dirname(__FILE__), "data", "wurfl.simple.xml"))
     @matcher = Wurfl::UserAgentMatcher.new(handsets)
   end
 
   def test_empty_user_agent
     a, shortest_distance = @matcher.match_handsets("")
     assert_equal 1, a.size
-    assert_equal "generic_xhtml", a.first.wurfl_id
-    assert_equal 4, shortest_distance
+    assert_equal "generic", a.first.wurfl_id
+    assert_equal 0, shortest_distance
   end
 
   def test_matching_user_agent
-    a, shortest_distance = @matcher.match_handsets("generic")
+    a, shortest_distance = @matcher.match_handsets("Mozz")
     assert_equal 1, a.size
-    assert_equal "generic", a.first.wurfl_id
+    assert_equal "generic_xhtml", a.first.wurfl_id
     assert_equal 0, shortest_distance
   end
 

data/test/utils_test.rb

@@ -9,12 +9,11 @@ class TestLoader < Test::Unit::TestCase
 
   def test_save_and_load_wurfl_pstore
     loader = Wurfl::Loader.new
-    handsets, fallbacks = loader.load_wurfl(File.join(File.dirname(__FILE__), "data", "wurfl.simple.xml"))
+    handsets = loader.load_wurfl(File.join(File.dirname(__FILE__), "data", "wurfl.simple.xml"))
     tempfile = Tempfile.new("wurfl.pstore").path
-    save_wurfl_pstore(tempfile,handsets,fallbacks)
-    loaded_handsets, loaded_fallbacks = load_wurfl_pstore(tempfile)
+    save_wurfl_pstore(tempfile,handsets)
+    loaded_handsets = load_wurfl_pstore(tempfile)
     assert_equal handsets, loaded_handsets
-    assert_equal fallbacks, loaded_fallbacks
   end
 
 end

data/wurfl.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wurfl}
-  s.version = "1.2.0"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul McMahon", "Zev Blut"]
-  s.date = %q{2009-07-22}
+  s.date = %q{2009-07-23}
   s.default_executable = %q{wurfltools.rb}
   s.description = %q{TODO}
   s.email = %q{info@mobalean.com}
@@ -34,6 +34,10 @@ Gem::Specification.new do |s|
      "lib/wurfl/uaproftowurfl.rb",
      "lib/wurfl/user_agent_matcher.rb",
      "lib/wurfl/utils.rb",
+     "test/benchmark.rb",
+     "test/data/wurfl.generic.patch.xml",
+     "test/data/wurfl.large.xml",
+     "test/data/wurfl.reverse.xml",
      "test/data/wurfl.simple.xml",
      "test/handset_test.rb",
      "test/loader_test.rb",
@@ -52,7 +56,8 @@ Gem::Specification.new do |s|
     "test/loader_test.rb",
      "test/handset_test.rb",
      "test/utils_test.rb",
-     "test/user_agent_matcher_test.rb"
+     "test/user_agent_matcher_test.rb",
+     "test/benchmark.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wurfl
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Paul McMahon
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-22 00:00:00 +09:00
+date: 2009-07-23 00:00:00 +09:00
 default_executable: wurfltools.rb
 dependencies: []
 
@@ -42,6 +42,10 @@ files:
 - lib/wurfl/uaproftowurfl.rb
 - lib/wurfl/user_agent_matcher.rb
 - lib/wurfl/utils.rb
+- test/benchmark.rb
+- test/data/wurfl.generic.patch.xml
+- test/data/wurfl.large.xml
+- test/data/wurfl.reverse.xml
 - test/data/wurfl.simple.xml
 - test/handset_test.rb
 - test/loader_test.rb
@@ -79,3 +83,4 @@ test_files:
 - test/handset_test.rb
 - test/utils_test.rb
 - test/user_agent_matcher_test.rb
+- test/benchmark.rb