wurfl-lite 1.1.4 → 1.1.5

data/lib/wurfl-lite.rb

@@ -1,6 +1,6 @@
 require 'open-uri'
 require 'zlib'
-require 'hpricot'
+require 'nokogiri'
 require 'amatch'
 
 class WURFL
@@ -51,18 +51,18 @@ class WURFL
       data = Zlib::GzipReader.new(StringIO.new(data.to_s)).read
     rescue Zlib::GzipFile::Error
     end
-    doc = Hpricot( data )
+    doc = Nokogiri::XML( data )
 
     keys_added = []
 
-    (doc/'devices'/'device').each do |device_element|
+    doc.xpath("//devices/device").each do |device_element|
       device = Hash.new
       %w|id user_agent fall_back|.each do |attribute|
-        device[ attribute.to_sym ] = device_element.attributes[ attribute ]
+        device[ attribute.to_sym ] = device_element[ attribute ].to_s
       end
-      (device_element/'capability').each do |capability|
-        name = capability.attributes[ 'name' ].to_sym
-        value = capability.attributes[ 'value' ]
+      device_element.xpath("*/capability").each do |capability|
+        name = capability[ 'name' ].to_sym
+        value = capability[ 'value' ].to_s
         next if value.empty?
         if value.to_i.to_s == value.strip
           value = value.to_i
@@ -76,11 +76,11 @@ class WURFL
       @devices[ device[ :user_agent ] ] = device
       @devices_by_id[ device[ :id ] ] = device
     end
-
+    
     keys_added.each do |key|
       @devices[ key ][ :fall_back ] = @devices_by_id[ @devices[ key ][ :fall_back ] ]
     end
-
+    
   end
 
   def []( user_agent )

data/lib/wurfl-lite/version.rb

@@ -1,3 +1,3 @@
 class WURFL
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
 end

data/wurfl-lite.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.summary     = %q{Simple Ruby usage of the WURFL device capabilities and features database}
   s.description = %q{Simple Ruby usage of the WURFL device capabilities and features database}
 
-  s.add_dependency "hpricot", ">= 0.8.2", "!= 0.8.3"
+  s.add_dependency "nokogiri", ">= 1.5.5"
   s.add_dependency "amatch", ">= 0.2.5"
 
   s.add_development_dependency "bundler", ">= 1.0.0"

metadata

@@ -2,7 +2,7 @@
 name: wurfl-lite
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors: 
 - Clive Crous
@@ -10,19 +10,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-28 00:00:00 Z
+date: 2012-07-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hpricot
+  name: nokogiri
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.2
-    - - "!="
-      - !ruby/object:Gem::Version 
-        version: 0.8.3
+        version: 1.5.5
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -89,7 +86,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 741124909
+      hash: -917679183
       segments: 
       - 0
       version: "0"
@@ -98,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 741124909
+      hash: -917679183
       segments: 
       - 0
       version: "0"