wurfl-lite 1.0.2 → 1.1.0

data/lib/wurfl-lite.rb

@@ -5,6 +5,23 @@ require 'amatch'
 
 class WURFL
 
+  LATEST = 'http://downloads.sourceforge.net/project/wurfl/WURFL/latest/wurfl-latest.xml.gz'
+  BROWSER_PATCH = 'http://wurfl.sourceforge.net/web_browsers_patch.xml'
+
+  attr_accessor :insertion, :substitution, :deletion
+  attr_accessor :match_threshold
+
+  def initialize( filenames = [ LATEST, BROWSER_PATCH ] )
+    clear!
+    [filenames].flatten.each do |filename|
+      process_xml!( filename )
+    end
+    @insertion = 2
+    @substitution = 1
+    @deletion = 1.5
+    @match_threshold = 0.15
+  end
+
   class Hash < ::Hash
     def method_missing( method )
       has_key?( method ) ? self[ method ] : ( self[ :fall_back ] ? self[ :fall_back ].send( method ) : nil )
@@ -14,9 +31,19 @@ class WURFL
   def clear!
     @devices = Hash.new
     @devices_by_id = {}
+    @files = []
+  end
+
+  def reset!
+    files = @files
+    clear!
+    files.each do |filename|
+      process_xml!( filename )
+    end
   end
 
   def process_xml!( filename )
+    @files << filename
     data = open( filename ).read
     begin # Try decompress it, in case it's a compressed file
       # XXX Yes, this does seem ugly, but is there another way?
@@ -55,20 +82,33 @@ class WURFL
 
   end
 
-  def initialize( filename = 'http://downloads.sourceforge.net/project/wurfl/WURFL/latest/wurfl-latest.xml.gz' )
-    clear!
-    process_xml!( filename )
-    process_xml!( 'http://wurfl.sourceforge.net/web_browsers_patch.xml' )
-  end
-
   def []( user_agent )
     device = @devices[ user_agent ]
-    return device if device
+    if device
+      device[ :wurfl_match ] = { :distance => 0, :distance_normalized => 0 }
+      return device
+    end
     match = Amatch::Sellers.new( user_agent )
+    match.insertion = @insertion
+    match.substitution = @substitution
+    match.deletion = @deletion
     keys = @devices.keys
     distances = match.match( keys )
-    use_key = keys.zip( distances ).sort{|a,b|a.last<=>b.last}.first.first
-    @devices[ user_agent ] = @devices[ use_key ]
+    sorted_list = keys.zip( distances ).sort{|a,b|a.last<=>b.last}
+    use_key = sorted_list.first.first
+    device = @devices[ use_key ]
+    distance = sorted_list.first.last
+    distance_normalised = distance/(user_agent.length+1)
+
+    if distance_normalised > @match_threshold
+      nil
+    else
+      device[ :wurfl_match ] = {
+        :distance => distance,
+        :distance_normalised => distance_normalised
+      }
+      @devices[ user_agent ] = device
+    end
   end
 
 end

data/lib/wurfl-lite/version.rb

@@ -1,3 +1,3 @@
 class WURFL
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 2
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors: 
 - Clive Crous
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 +02:00
+date: 2011-02-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -114,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 602051377
+      hash: 660134675
       segments: 
       - 0
       version: "0"
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 602051377
+      hash: 660134675
       segments: 
       - 0
       version: "0"