icu_tournament 1.2.3 → 1.2.4

data/README.rdoc

@@ -9,8 +9,8 @@ For ruby 1.9.2 (version 1.1.2 was the last compatible with ruby 1.8.7).
 
   gem install icu_tournament
 
-For name canonicalisation, _icu_name_ is required.
-For handling SwissPerfect files the _dbf_, _inifile_ and _rubyzip_ gems are required.
+For name canonicalisation, the _icu_name_ gem is required and
+for handling SwissPerfect files the _dbf_ and _rubyzip_ gems are needed.
 
 == Usage
 

data/lib/icu_tournament/tournament_sp.rb

@@ -1,4 +1,3 @@
-require 'inifile'
 require 'dbf'
 require 'zip/zipfilesystem'
 require 'tempfile'
@@ -222,28 +221,30 @@ module ICU
 
       def parse_ini(file)
         begin
-          ini = IniFile.load(file)
+          ini = ICU::Util.load_ini(file)
         rescue
-          raise "invalid INI file"
+          raise "non-existant INI file (#{file})"
         end
-        raise "invalid INI file (no sections)" if ini.sections.size == 0
+        raise "invalid INI file (no sections)" if ini.size == 0
         %w(name arbiter rounds).each do |key|
-          val = (ini['Tournament Info'][key.capitalize] || '').squeeze(" ").strip
+          val = (ini['Tournament Info'][key.capitalize] || '').squeeze(" ")
           @t.send("#{key}=", val) if val.size > 0
         end
-        @t.tie_breaks = ini['Standings']['Tie Breaks'].to_s.split(/,/).map do |tbid|
-          case tbid.to_i              # tie break name in SwissPerfect
-          when 1217 then :buchholz    # Buchholz
-          when 1218 then :harkness    # Median Buchholz
-          when 1219 then :progressive # cumulative
-          when 1220 then :neustadtl   # Berger
-          when 1221 then :ratings     # rating sum
-          when 1222 then :wins        # number of wins
-          when 1223 then nil          # minor scores - not applicable
-          when 1226 then nil          # Brightwell   - not applicable
-          else nil
-          end
-        end.find_all { |tb| tb }
+        if ini['Standings'] && ini['Standings']['Tie Breaks']
+          @t.tie_breaks = ini['Standings']['Tie Breaks'].to_s.split(/,/).map do |tbid|
+            case tbid.to_i              # tie break name in SwissPerfect
+            when 1217 then :buchholz    # Buchholz
+            when 1218 then :harkness    # Median Buchholz
+            when 1219 then :progressive # cumulative
+            when 1220 then :neustadtl   # Berger
+            when 1221 then :ratings     # rating sum
+            when 1222 then :wins        # number of wins
+            when 1223 then nil          # minor scores - not applicable
+            when 1226 then nil          # Brightwell   - not applicable
+            else nil
+            end
+          end.find_all { |tb| tb }
+        end
       end
 
       def parse_trn(file, arg={})

data/lib/icu_tournament/util.rb

@@ -21,6 +21,51 @@ module ICU
         nil
       end
     end
+  
+    # Decide if a string is valid UTF-8 or not, returning true or false.
+    def self.is_utf8(str)
+      dup = str.dup
+      dup.force_encoding("UTF-8")
+      dup.valid_encoding?
+    end
+    
+    # Try to convert any string to UTF-8.
+    def self.to_utf8(str)
+      utf8 = is_utf8(str)
+      dup = str.dup
+      return dup.force_encoding("UTF-8") if utf8
+      dup.force_encoding("Windows-1252") if dup.encoding.name.match(/^(ASCII-8BIT|UTF-8)$/)
+      dup.encode("UTF-8")
+    end
+    
+    # Read UTF data from a file.
+    def self.read_utf8(name)
+      File.open(name, "r:ASCII-8BIT") do |f|
+        data = f.read
+        to_utf8(data)
+      end
+    end
+
+    # Load an INI file and convert to a hash.
+    def self.load_ini(name)
+      text = read_utf8(name)
+      data = Hash.new
+      header = nil
+      text.split(/\n/).each do |line|
+        if line.match(/^\s*\[([^\]]+)\]\s*$/)
+          header = $1.strip
+          header = nil if header == ""
+        elsif header && line.match(/^([^=]+)=(.*)$/)
+          key = $1.strip
+          val = $2.strip
+          unless key == ""
+            data[header] ||= Hash.new
+            data[header][key] = val
+          end
+        end
+      end
+      data
+    end
   end
 
   #

data/lib/icu_tournament/version.rb

@@ -2,6 +2,6 @@
 
 module ICU
   class Tournament
-    VERSION = "1.2.3"
+    VERSION = "1.2.4"
   end
 end

data/spec/federation_spec.rb

@@ -182,7 +182,6 @@ module ICU
         codes = Federation.codes
         codes.should have(@total).items
         all = codes.join(',')
-        puts all
         all.index('AFG').should == 0
         all.index('INA,IND,IRI,IRL,IRQ,ISL,ISR,ISV,ITA,IVB').should_not be_nil
       end

data/spec/util_spec.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 module ICU
@@ -33,6 +34,111 @@ module ICU
         Util.parsedate('16th June 1986').should == '1986-06-16'
       end
     end
+
+    context "#is_utf8" do
+      it "should recognise US-ASCII as a special case of UTF-8" do
+        Util.is_utf8("Resume".encode("US-ASCII")).should be_true
+      end
+
+      it "should recognise UTF-8" do
+        Util.is_utf8("Résumé").should be_true
+        Util.is_utf8("δog").should be_true
+      end
+
+      it "should recognize other encodings as not being UTF-8" do
+        Util.is_utf8("Résumé".encode("ISO-8859-1")).should be_false
+        Util.is_utf8("€50".encode("Windows-1252")).should be_false
+        Util.is_utf8("ひらがな".encode("Shift_JIS")).should be_false
+        Util.is_utf8("\xa3").should be_false
+      end
+    end
+
+    context "#to_utf8" do
+      it "should convert to UTF-8" do
+        Util.to_utf8("Resume").should == "Resume"
+        Util.to_utf8("Resume".force_encoding("US-ASCII")).encoding.name.should == "UTF-8"
+        Util.to_utf8("Résumé".encode("ISO-8859-1")).should == "Résumé"
+        Util.to_utf8("Résumé".encode("Windows-1252")).should == "Résumé"
+        Util.to_utf8("€50".encode("Windows-1252")).should == "€50"
+        Util.to_utf8("\xa350".force_encoding("ASCII-8BIT")).should == "£50"
+        Util.to_utf8("\xa350").should == "£50"
+        Util.to_utf8("ひらがな".encode("Shift_JIS")).should == "ひらがな"
+      end
+    end
+
+    context "#read_utf8" do
+      before(:all) do
+        @s = File.dirname(__FILE__) + '/samples/file'
+      end
+
+      it "should read ASCII" do
+        Util.read_utf8("#{@s}/ascii.txt").should == "Resume\nResume\n"
+      end
+
+      it "should read Latin-1" do
+        Util.read_utf8("#{@s}/latin1.txt").should == "Résumé\nRésumé\n"
+      end
+
+      it "should read Windows CP1252" do
+        Util.read_utf8("#{@s}/cp1252.txt").should == "€3\n£7\n¥1\n"
+      end
+
+      it "should read UTF-8" do
+        Util.read_utf8("#{@s}/utf8.txt").should == "ヒラガナ\nヒラガナ\n"
+      end
+
+      it "should thow an exception for a non-existant file" do
+        lambda { Util.read_utf8("#{@s}/no_such_file.txt") }.should raise_error
+      end
+    end
+
+    context "#load_ini" do
+      before(:all) do
+        @s = File.dirname(__FILE__) + '/samples/ini'
+      end
+
+      it "should read ASCII" do
+        data = Util.load_ini("#{@s}/ascii.ini")
+        data.should be_an_instance_of(Hash)
+        data["Pairing"]["UseRating"].should == "0"
+        data["NoKeys"] == nil
+        data["Tournament Info"]["Arbiter"].should == "Herbert Scarry"
+        data["Tournament Info"]["DrawSymbol"].should == "D"
+      end
+
+      it "should read Latin1" do
+        data = Util.load_ini("#{@s}/latin1.ini")
+        data.should be_an_instance_of(Hash)
+        data["Tournament Info"]["Arbiter"].should == "Gearóidín"
+        data["Tournament Info"]["DrawSymbol"].should == "½"
+      end
+
+      it "should read Windows-1252" do
+        data = Util.load_ini("#{@s}/cp1252.ini")
+        data.should be_an_instance_of(Hash)
+        data["Tournament Info"]["Entry Fee"].should == "€50"
+      end
+
+      it "should read UTF8" do
+        data = Util.load_ini("#{@s}/utf8.ini")
+        data.should be_an_instance_of(Hash)
+        data["Tournament Info"]["Entry Fee"].should == "€50"
+        data["Tournament Info"]["Arbiter"].should == "ヒラガナ"
+        data["Tournament Info"]["DrawSymbol"].should == "½"
+      end
+
+      it "should handle untidily formatted files" do
+        data = Util.load_ini("#{@s}/untidy.ini")
+        data.should be_an_instance_of(Hash)
+        data["Tournament Info"]["Entry Fee"].should == "€50"
+        data["Tournament Info"]["DrawSymbol"].should == "½"
+        data["Pairing"]["Use  Rating"].should == "0"
+      end
+
+      it "should thow an exception for a non-existant file" do
+        lambda { Util.read_utf8("#{@s}/no_such_file.ini") }.should raise_error
+      end
+    end
   end
 
   describe Accessor do
@@ -117,7 +223,7 @@ module ICU
         @obj.respond_to?(:hisint=).should be_true
       end
     end
-    
+
     context "#attr_integer_or_nil" do
       before(:each) do
         @class = Class.new
@@ -182,7 +288,7 @@ module ICU
         @obj.respond_to?(:theirpos=).should be_true
       end
     end
-    
+
     context "#attr_positive_or_nil" do
       before(:each) do
         @class = Class.new
@@ -219,7 +325,7 @@ module ICU
         @obj.respond_to?(:theirpon=).should be_true
       end
     end
-    
+
     context "#attr_date" do
       before(:each) do
         @class = Class.new
@@ -251,7 +357,7 @@ module ICU
         @obj.respond_to?(:theirdate=).should be_true
       end
     end
-    
+
     context "#attr_date_or_nil" do
       before(:each) do
         @class = Class.new
@@ -283,7 +389,7 @@ module ICU
         @obj.respond_to?(:theirdate=).should be_true
       end
     end
-    
+
     context "#attr_string" do
       before(:each) do
         @class = Class.new
@@ -317,7 +423,7 @@ module ICU
         @obj.respond_to?(:theirstring).should be_true
       end
     end
-    
+
     context "#attr_string_or_nil" do
       before(:each) do
         @class = Class.new

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 3
-  version: 1.2.3
+  - 4
+  version: 1.2.4
 platform: ruby
 authors: 
 - Mark Orr
@@ -14,28 +14,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-09 00:00:00 +00:00
+date: 2011-01-14 00:00:00 +00:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: inifile
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 0
-        version: 0.3.0
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: dbf
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -46,11 +31,11 @@ dependencies:
         - 5
         version: 1.2.5
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rubyzip
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -61,11 +46,11 @@ dependencies:
         - 4
         version: 0.9.4
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: icu_name
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -73,14 +58,14 @@ dependencies:
         segments: 
         - 0
         - 0
-        - 2
-        version: 0.0.2
+        - 3
+        version: 0.0.3
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -91,7 +76,7 @@ dependencies:
         - 0
         version: 2.3.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id004
 description: Convert files of chess tournament data in different formats to ruby classes and vice-versa.
 email: mark.j.l.orr@googlemail.com
 executables: []