wurfl 1.3.5 → 1.3.6

data/Rakefile

@@ -1,13 +1,14 @@
 require 'rake/rdoctask'
 require 'rake/testtask'
-require 'rubygems'
+require 'rubygems' if RUBY_VERSION < "1.9"
 require 'shoulda/tasks'
 
 task :default => ['test']
 
 Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/*_test.rb']
-  t.ruby_opts = ['-rubygems'] if defined? Gem
+  t.ruby_opts = ['-I"."']
+  t.ruby_opts = ['-rubygems'] if RUBY_VERSION < "1.9" && defined? Gem
 end
 
 begin

data/VERSION

@@ -1 +1 @@
-1.3.5
+1.3.6

data/lib/wurfl/user_agent_matcher.rb

@@ -28,6 +28,10 @@ class Wurfl::UserAgentMatcher
       hand.user_agent.length > m ? hand.user_agent.length : m
     end
     @d=(0..@longest_user_agent_length).to_a
+    @unpack_rule = 'C*'
+    if RUBY_VERSION < "1.9"
+      @unpack_rule = ($KCODE =~ /^U/i) ? 'U*' : 'C*'
+    end
   end
 
   # A method to retrieve a list of the uamatcher's handsets that match
@@ -41,7 +45,7 @@ class Wurfl::UserAgentMatcher
   def match_handsets(user_agent)
     rez = []
     shortest_distance = [user_agent.length, @longest_user_agent_length].max
-    s = user_agent.unpack(unpack_rule)
+    s = user_agent.unpack(@unpack_rule)
 
     @handsets.values.each do |hand|    
       distance = levenshtein_distance(user_agent, hand.user_agent, shortest_distance, s)
@@ -87,7 +91,7 @@ class Wurfl::UserAgentMatcher
     diff = (str1.length - str2.length).abs
     return 0 if diff == 0 && str1 == str2
     return diff if diff > min
-    t = str2.unpack(unpack_rule)
+    t = str2.unpack(@unpack_rule)
     distance(s, t, min)
   end
 
@@ -135,8 +139,4 @@ class Wurfl::UserAgentMatcher
     end
     x
   end
-
-  def unpack_rule
-    $KCODE =~ /^U/i ? 'U*' : 'C*'
-  end
 end

data/wurfl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wurfl}
-  s.version = "1.3.5"
+  s.version = "1.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul McMahon", "Zev Blut"]
-  s.date = %q{2010-03-18}
+  s.date = %q{2010-09-24}
   s.default_executable = %q{wurfltools.rb}
   s.description = %q{Library and tools for manipulating the WURFL}
   s.email = %q{info@mobalean.com}
@@ -54,7 +54,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{wurfl}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Library and tools for manipulating the WURFL}
   s.test_files = [
     "test/benchmark.rb",
@@ -69,7 +69,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<libxml-ruby>, [">= 0"])
     else
       s.add_dependency(%q<libxml-ruby>, [">= 0"])

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wurfl
 version: !ruby/object:Gem::Version 
-  version: 1.3.5
+  hash: 23
+  prerelease: false
+  segments: 
+  - 1
+  - 3
+  - 6
+  version: 1.3.6
 platform: ruby
 authors: 
 - Paul McMahon
@@ -10,19 +16,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-18 00:00:00 +09:00
+date: 2010-09-24 00:00:00 +09:00
 default_executable: wurfltools.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: libxml-ruby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: Library and tools for manipulating the WURFL
 email: info@mobalean.com
 executables: 
@@ -73,21 +83,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: wurfl
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Library and tools for manipulating the WURFL