wurfl 1.1.0 → 1.1.1

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/wurfl/command/comparator.rb

@@ -11,6 +11,19 @@ class Wurfl::Command::Comparator < Wurfl::Command
     exit 1
   end
 
+  def display_differences(hand1, hand2)
+    puts "-------------------------------------"
+    puts "Handset: #{hand1.user_agent} :ID: #{hand1.wurfl_id}"
+    hand1.keys.each do |key|
+      v1, v2 = hand1[key], hand2[key]
+      next if v1.nil? || v2.nil? || v1 == v2
+      puts "Key:#{key}"
+      puts "h1>:#{hand1[key]}"
+      puts "h2<:#{hand2[key]}"
+    end
+    puts "-------------------------------------"
+  end
+
   def execute
     if ARGV.size != 2
       usage
@@ -49,7 +62,8 @@ class Wurfl::Command::Comparator < Wurfl::Command
     mwurfl.each do |key,handset|
       if lwurfl.key?(key)
         if handset != lwurfl[key]
-          different<< [handset,lwurfl[key]]
+          different << [handset,lwurfl[key]]
+          display_differences(handset,lwurfl[key])
         end
       else
         notfound<< handset
@@ -68,18 +82,6 @@ class Wurfl::Command::Comparator < Wurfl::Command
     puts "Different handsets: #{different.size}"
     puts "||||||||||||||||||||||||||||||||||||"
     different = different.sort { |x,y| y.first.wurfl_id <=> x.first.wurfl_id }
-    different.each do |hand1,hand2|
-      puts "-------------------------------------"
-      puts "Handset: #{hand1.user_agent} :ID: #{hand1.wurfl_id}"
-      diffkeys = hand1.compare(hand2)
-      diffkeys.each do |key,oval,oid|
-        next if hand1[key].nil? || hand2[key].nil?
-        puts "Key:#{key}"
-        puts "h1>:#{hand1[key]}"
-        puts "h2<:#{hand2[key]}"
-      end
-      puts "-------------------------------------"
-    end
 
     puts "||||||||||||||||||||||||||||||||||||"
   end

data/lib/wurfl/handset.rb

@@ -80,12 +80,10 @@ class Wurfl::Handset
   # false if they are not exactly equal in values, id and user agent.
   # Note: for a more detailed comparison, use the compare method.
   def ==(other)
-    return false unless other.instance_of?(Wurfl::Handset)
-    return false unless self.wurfl_id == other.wurfl_id && self.user_agent == other.user_agent
-    other.each do |key,value|
-      return false if value != self[key]
-    end
-    true
+    other.instance_of?(Wurfl::Handset) && 
+      self.wurfl_id == other.wurfl_id && 
+      self.user_agent == other.user_agent &&
+      other.keys.all? {|key| other[key] == self[key] }
   end
 
   # A method to compare a handset's values against another handset.
@@ -110,6 +108,13 @@ class Wurfl::Handset
 
   class NullHandset
     include Singleton
+
+    # In ruby 1.8.6 and before, this method is not public, and thus prevents
+    # NullHandsets from being deserialized
+    class << self
+      public :_load
+    end
+
     def [](key) nil end
     def get_value_and_owner(key) [ nil, nil ] end
     def keys; [] end

data/test/utils_test.rb

@@ -0,0 +1,20 @@
+$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
+require 'wurfl/utils'
+require 'wurfl/loader'
+require 'test/unit'
+require 'tempfile'
+
+class TestLoader < Test::Unit::TestCase
+  include Wurfl::Utils
+
+  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"))
+    tempfile = Tempfile.new("wurfl.pstore").path
+    save_wurfl_pstore(tempfile,handsets,fallbacks)
+    loaded_handsets, loaded_fallbacks = 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.1.0"
+  s.version = "1.1.1"
 
   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-06-09}
+  s.date = %q{2009-07-11}
   s.default_executable = %q{wurfltools.rb}
   s.description = %q{TODO}
   s.email = %q{info@mobalean.com}
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
      "test/data/wurfl.simple.xml",
      "test/handset_test.rb",
      "test/loader_test.rb",
+     "test/utils_test.rb",
      "wurfl.gemspec"
   ]
   s.has_rdoc = true
@@ -46,7 +47,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.1}
   s.summary = %q{Library and tools for manipulating the WURFL}
   s.test_files = [
-    "test/loader_test.rb",
+    "test/utils_test.rb",
+     "test/loader_test.rb",
      "test/handset_test.rb"
   ]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wurfl
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Paul McMahon
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-09 00:00:00 +09:00
+date: 2009-07-11 00:00:00 +09:00
 default_executable: wurfltools.rb
 dependencies: []
 
@@ -44,6 +44,7 @@ files:
 - test/data/wurfl.simple.xml
 - test/handset_test.rb
 - test/loader_test.rb
+- test/utils_test.rb
 - wurfl.gemspec
 has_rdoc: true
 homepage: http://github.com/pwim/wurfl
@@ -72,5 +73,6 @@ signing_key:
 specification_version: 2
 summary: Library and tools for manipulating the WURFL
 test_files: 
+- test/utils_test.rb
 - test/loader_test.rb
 - test/handset_test.rb