icu_tournament 1.8.1 → 1.9.0

data/lib/icu_tournament/player.rb

@@ -142,7 +142,7 @@ module ICU
 
     # Federation. Is either unknown (nil) or a string containing at least three letters.
     def fed=(fed)
-      obj = Federation.find(fed)
+      obj = ICU::Federation.find(fed)
       @fed = obj ? obj.code : nil
       raise "invalid federation (#{fed})" if @fed.nil? && fed.to_s.strip.length > 0
     end

data/lib/icu_tournament/tournament.rb

@@ -216,7 +216,7 @@ module ICU
 
     # Set the tournament federation. Can be _nil_.
     def fed=(fed)
-      obj = Federation.find(fed)
+      obj = ICU::Federation.find(fed)
       @fed = obj ? obj.code : nil
       raise "invalid tournament federation (#{fed})" if @fed.nil? && fed.to_s.strip.length > 0
     end

data/lib/icu_tournament/version.rb

@@ -2,6 +2,6 @@
 
 module ICU
   class Tournament
-    VERSION = "1.8.1"
+    VERSION = "1.9.0"
   end
 end

data/lib/icu_tournament.rb

@@ -1,9 +1,10 @@
 # :enddoc:
 
 require 'icu_name'
+require 'icu_utils'
 
 icu_tournament_files = Array.new
-icu_tournament_files.concat %w{util federation tie_break}
+icu_tournament_files.concat %w{util tie_break}
 icu_tournament_files.concat %w{player result team tournament}
 icu_tournament_files.concat %w{fcsv krause sp spx}.map{ |f| "tournament_#{f}"}
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: icu_tournament
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-23 00:00:00.000000000 Z
+date: 2013-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dbf
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: icu_utils
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -132,7 +148,6 @@ extra_rdoc_files:
 - LICENCE
 - README.rdoc
 files:
-- lib/icu_tournament/federation.rb
 - lib/icu_tournament/player.rb
 - lib/icu_tournament/result.rb
 - lib/icu_tournament/team.rb
@@ -145,7 +160,6 @@ files:
 - lib/icu_tournament/util.rb
 - lib/icu_tournament/version.rb
 - lib/icu_tournament.rb
-- spec/federation_spec.rb
 - spec/player_spec.rb
 - spec/result_spec.rb
 - spec/spec_helper.rb
@@ -174,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1308265844914950327
+      hash: 3282717942212095260
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -183,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1308265844914950327
+      hash: 3282717942212095260
 requirements: []
 rubyforge_project: icu_tournament
 rubygems_version: 1.8.23
@@ -191,7 +205,6 @@ signing_key:
 specification_version: 3
 summary: For reading and writing files of chess tournament data.
 test_files:
-- spec/federation_spec.rb
 - spec/player_spec.rb
 - spec/result_spec.rb
 - spec/spec_helper.rb

data/lib/icu_tournament/federation.rb

@@ -1,309 +0,0 @@
-module ICU
-  #
-  # This class can be used to map a string into an object representing a chess federation.
-  # In FIDE, chess federations are generally either referred to by their full names such as
-  # _Ireland_ or _Russia_ or by three letter codes such as _IRL_ or _RUS_. The three letter
-  # codes are mostly the same as those found in the international standard known as
-  # {ISO 3166-1 alpha-3}[http://en.wikipedia.org/wiki/ISO_3166-1_alpha-3], but with
-  # some differences (e.g. for England, Scotland and Wales).
-  #
-  # You cannot directly create instances of this class using _new_. Instead, you supply
-  # a string to the class method _find_ and, if the string supplied uniguely identifies a
-  # federation, an instance is returned which responds to _name_ and _code_.
-  #
-  #   fed = ICU::Federation.find('IRL')
-  #   fed.name                                           # => "Ireland"
-  #   fed.code                                           # => "IRL"
-  #
-  # If the string is not sufficient to identify a federation, the _find_ method returns _nil_.
-  #
-  #   fed = ICU::Federation.find('ZYX')                  # => nil
-  #
-  # If the string is three letters long and matches (case insenstively) one of the unique
-  # federation codes, then the instance corresponding to that federation is returned.
-  #
-  #   ICU::Federation.find('rUs').code                   # => "RUS"
-  #
-  # If the string is more than three letters long and if it is a substring (case insensitive)
-  # of exactly one federation name, then that federation is returned.
-  #
-  #   ICU::Federation.find('ongoli').name                # => "Mongolia"
-  #
-  # In all other cases, nil is returned. In the following example, the string matches more than one federation.
-  #
-  #   ICU::Federation.find('land')                       # => nil
-  #
-  # The method is not fooled by irrelevant white space.
-  #
-  #   ICU::Federation.find('  united   states   ').code  # => 'USA'
-  #
-  # The class method _menu_ will return an array of two-element arrays each of which contain a name
-  # and a code.
-  #
-  #   ICU::Federation.menu                               # => [['Afghanistan', 'AFG'], ['Albania', 'ALB], ...]
-  #
-  # Such an array could be used, for example, as the basis of a selection menu in a web application.
-  # Various options are available to alter the array returned. Use the _:order_ option to order by code
-  # instead of the default (by country name).
-  #
-  #   ICU::Federation.menu(:order => 'code')             # => [..., ['Ireland', 'IRL'], ['Iraq', 'IRQ], ...]
-  #
-  # To put one country at the top (followed by the rest, in order) supply the country's code with the _:top_ option:
-  #
-  #   ICU::Federation.menu(:top => 'IRL')                # => [['Ireland', 'IRL'], ['Afghanistan', 'AFG], ...]
-  #
-  # To supply an extra "None" item at the top, specify its label with the _:none_ option:
-  #
-  #   ICU::Federation.menu(:none => 'None')              # => [['None', ''], ['Afghanistan', 'AFG], ...]
-  #
-  # The "None" option's code is the empty string and it comes above the "top" option if both are specified.
-  #
-  class Federation
-    attr_reader :code, :name
-    private_class_method :new
-
-    # Given a code, name or part of a name, return the corresponding federation instance.
-    # If there is no match or more than one match, _nil_ is returned.
-    def self.find(str=nil)
-      return nil unless str
-      str = str.to_s
-      return nil if str.length < 3
-      compile
-      str = str.strip.squeeze(' ').downcase
-      return @@codes[str] if str.length == 3
-      return @@names[str] if @@names[str]
-      matches = Array.new
-      @@names.each_key do |name|
-        matches << @@names[name] if name.index(str)
-      end
-      matches.uniq!
-      return nil unless matches.length == 1
-      matches[0]
-    end
-
-    # Return an array of codes and names suitable for creating a federation menu in Rails.
-    #   ICU::Federation.menu(:order => 'code')     # order federations by code (instead of by name)
-    #   ICU::Federation.menu(:top => 'IRL')        # make this federation come first
-    #   ICU::Federation.menu(:none => 'None')      # add a dummy top entry with name "None" and blank code
-    def self.menu(opts = {})
-      compile
-      top, menu = nil, []
-      @@objects.each {|o| opts[:top] == o.code ? top = [o.name, o.code] : menu.push([o.name, o.code]) }
-      opts[:order] == 'code' ? menu.sort!{|a,b| a.last <=> b.last} : menu.sort!{|a,b| a.first <=> b.first}
-      menu.unshift(top) if top
-      menu.unshift([opts[:none], '']) if opts[:none]
-      menu
-    end
-    
-    # Return an array of sorted federation codes.
-    def self.codes
-      compile
-      @@objects.map(&:code).sort
-    end
-
-    def initialize(code, name) # :nodoc: because new is private
-      @code = code
-      @name = name
-    end
-
-    # :enddoc:
-    private
-
-    def self.compile
-      return if @@objects
-      @@names = Hash.new
-      @@codes = Hash.new
-      @@objects = Array.new
-      @@data.each do |d|
-        object = new(d[0], d[1])
-        @@objects << object
-        @@codes[d[0].downcase] = object
-        (1..d.length-1).each do |i|
-          @@names[d[i].downcase] = object
-        end
-      end
-    end
-
-    # The data structures compiled.
-    @@objects, @@codes, @@names = nil, nil, nil
-
-    # An array of data that gets compiled into other data structures.
-    @@data =
-    [
-      ['AFG', 'Afghanistan'],
-      ['ALB', 'Albania'],
-      ['ALG', 'Algeria'],
-      ['AND', 'Andorra'],
-      ['ANG', 'Angola'],
-      ['ANT', 'Antigua'],
-      ['ARG', 'Argentina'],
-      ['ARM', 'Armenia'],
-      ['ARU', 'Aruba'],
-      ['AUS', 'Australia'],
-      ['AUT', 'Austria'],
-      ['AZE', 'Azerbaijan'],
-      ['BAH', 'Bahamas'],
-      ['BRN', 'Bahrain'],
-      ['BAN', 'Bangladesh'],
-      ['BAR', 'Barbados'],
-      ['BLR', 'Belarus'],
-      ['BEL', 'Belgium'],
-      ['BIZ', 'Belize'],
-      ['BEN', 'Benin Republic'],
-      ['BER', 'Bermuda'],
-      ['BHU', 'Bhutan'],
-      ['BOL', 'Bolivia'],
-      ['BIH', 'Bosnia and Herzegovina'],
-      ['BOT', 'Botswana'],
-      ['BRA', 'Brazil'],
-      ['IVB', 'British Virgin Islands'],
-      ['BRU', 'Brunei Darussalam'],
-      ['BUL', 'Bulgaria'],
-      ['BUR', 'Burkina Faso'],
-      ['BDI', 'Burundi'],
-      ['CAM', 'Cambodia'],
-      ['CMR', 'Cameroon'],
-      ['CAN', 'Canada'],
-      ['CHA', 'Chad'],
-      ['CHI', 'Chile'],
-      ['CHN', 'China'],
-      ['TPE', 'Chinese Taipei'],
-      ['COL', 'Colombia'],
-      ['CRC', 'Costa Rica'],
-      ['CRO', 'Croatia'],
-      ['CUB', 'Cuba'],
-      ['CYP', 'Cyprus'],
-      ['CZE', 'Czech Republic'],
-      ['DEN', 'Denmark'],
-      ['DJI', 'Djibouti'],
-      ['DOM', 'Dominican Republic'],
-      ['ECU', 'Ecuador'],
-      ['EGY', 'Egypt'],
-      ['ESA', 'El Salvador'],
-      ['ENG', 'England'],
-      ['EST', 'Estonia'],
-      ['ETH', 'Ethiopia'],
-      ['FAI', 'Faroe Islands'],
-      ['FIJ', 'Fiji'],
-      ['FIN', 'Finland'],
-      ['FRA', 'France'],
-      ['GAB', 'Gabon'],
-      ['GAM', 'Gambia'],
-      ['GEO', 'Georgia'],
-      ['GER', 'Germany'],
-      ['GHA', 'Ghana'],
-      ['GRE', 'Greece'],
-      ['GUA', 'Guatemala'],
-      ['GCI', 'Guernsey'],
-      ['GUY', 'Guyana'],
-      ['HAI', 'Haiti'],
-      ['HON', 'Honduras'],
-      ['HKG', 'Hong Kong'],
-      ['HUN', 'Hungary'],
-      ['ISL', 'Iceland'],
-      ['IND', 'India'],
-      ['INA', 'Indonesia'],
-      ['IRI', 'Iran'],
-      ['IRQ', 'Iraq'],
-      ['IRL', 'Ireland'],
-      ['ISR', 'Israel'],
-      ['ITA', 'Italy'],
-      ['CIV', 'Ivory Coast'],
-      ['JAM', 'Jamaica'],
-      ['JPN', 'Japan'],
-      ['JCI', 'Jersey'],
-      ['JOR', 'Jordan'],
-      ['KAZ', 'Kazakhstan'],
-      ['KEN', 'Kenya'],
-      ['KUW', 'Kuwait'],
-      ['KGZ', 'Kyrgyzstan'],
-      ['LAT', 'Latvia'],
-      ['LIB', 'Lebanon'],
-      ['LBA', 'Libya'],
-      ['LIE', 'Liechtenstein'],
-      ['LTU', 'Lithuania'],
-      ['LUX', 'Luxembourg'],
-      ['MAC', 'Macau'],
-      ['MKD', 'Macedonia', 'Former YUG Rep of Macedonia', 'Former Yugoslav Republic of Macedonia', 'FYROM'],
-      ['MAD', 'Madagascar'],
-      ['MAW', 'Malawi'],
-      ['MAS', 'Malaysia'],
-      ['MDV', 'Maldives'],
-      ['MLI', 'Mali'],
-      ['MLT', 'Malta'],
-      ['MAU', 'Mauritania'],
-      ['MRI', 'Mauritius'],
-      ['MEX', 'Mexico'],
-      ['MDA', 'Moldova'],
-      ['MNC', 'Monaco'],
-      ['MGL', 'Mongolia'],
-      ['MNE', 'Montenegro'],
-      ['MAR', 'Morocco'],
-      ['MOZ', 'Mozambique'],
-      ['MYA', 'Myanmar'],
-      ['NAM', 'Namibia'],
-      ['NEP', 'Nepal'],
-      ['NED', 'Netherlands'],
-      ['AHO', 'Netherlands Antilles'],
-      ['NZL', 'New Zealand'],
-      ['NCA', 'Nicaragua'],
-      ['NGR', 'Nigeria'],
-      ['NOR', 'Norway'],
-      ['PAK', 'Pakistan'],
-      ['PLW', 'Palau'],
-      ['PLE', 'Palestine'],
-      ['PAN', 'Panama'],
-      ['PNG', 'Papua New Guinea'],
-      ['PAR', 'Paraguay'],
-      ['PER', 'Peru'],
-      ['PHI', 'Philippines'],
-      ['POL', 'Poland'],
-      ['POR', 'Portugal'],
-      ['PUR', 'Puerto Rico'],
-      ['QAT', 'Qatar'],
-      ['ROU', 'Romania'],
-      ['RUS', 'Russia'],
-      ['RWA', 'Rwanda'],
-      ['SMR', 'San Marino'],
-      ['STP', 'Sao Tome and Principe'],
-      ['SCO', 'Scotland'],
-      ['SEN', 'Senegal'],
-      ['SRB', 'Serbia'],
-      ['SEY', 'Seychelles'],
-      ['SLE', 'Siera Leone'],
-      ['SIN', 'Singapore'],
-      ['SVK', 'Slovakia'],
-      ['SLO', 'Slovenia'],
-      ['SOM', 'Somalia'],
-      ['RSA', 'South Africa'],
-      ['KOR', 'South Korea'],
-      ['ESP', 'Spain'],
-      ['SRI', 'Sri Lanka'],
-      ['SUD', 'Sudan'],
-      ['SUR', 'Surinam'],
-      ['SWE', 'Sweden'],
-      ['SUI', 'Switzerland'],
-      ['SYR', 'Syria'],
-      ['TJK', 'Tajikistan'],
-      ['TAN', 'Tanzania'],
-      ['THA', 'Thailand'],
-      ['TRI', 'Trinidad and Tobago'],
-      ['TUN', 'Tunisia'],
-      ['TUR', 'Turkey'],
-      ['TKM', 'Turkmenistan'],
-      ['UGA', 'Uganda'],
-      ['UKR', 'Ukraine'],
-      ['UAE', 'United Arab Emirates'],
-      ['USA', 'United States of America'],
-      ['URU', 'Uruguay'],
-      ['ISV', 'US Virgin Islands'],
-      ['UZB', 'Uzbekistan'],
-      ['VEN', 'Venezuela'],
-      ['VIE', 'Vietnam'],
-      ['WLS', 'Wales'],
-      ['YEM', 'Yemen'],
-      ['ZAM', 'Zambia'],
-      ['ZIM', 'Zimbabwe'],
-    ]
-  end
-end

data/spec/federation_spec.rb

@@ -1,190 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-module ICU
-  describe Federation do
-    context "#find using codes" do
-      it "should find a federation given a valid code" do
-        fed = Federation.find('IRL')
-        fed.code.should == 'IRL'
-        fed.name.should == 'Ireland'
-      end
-
-      it "should find a federation from code case insensitively" do
-        fed = Federation.find('rUs')
-        fed.code.should == 'RUS'
-        fed.name.should == 'Russia'
-      end
-
-      it "should find a federation despite irrelevant whitespace" do
-        fed = Federation.find('  mex    ')
-        fed.code.should == 'MEX'
-        fed.name.should == 'Mexico'
-      end
-
-      it "should return nil for an invalid code" do
-        Federation.find('XYZ').should be_nil
-      end
-    end
-
-    context "#find using names" do
-      it "should find a federation given a valid name" do
-        fed = Federation.find('England')
-        fed.code.should == 'ENG'
-        fed.name.should == 'England'
-      end
-
-      it "should find a federation from name case insensitively" do
-        fed = Federation.find('franCE')
-        fed.code.should == 'FRA'
-        fed.name.should == 'France'
-      end
-
-      it "should not be fooled by irrelevant whitespace" do
-        fed = Federation.find(' united  states  of  america ')
-        fed.code.should == 'USA'
-        fed.name.should == 'United States of America'
-      end
-
-      it "should return nil for an invalid name" do
-        Federation.find('Mordor').should be_nil
-      end
-    end
-
-    context "#find using parts of names" do
-      it "should find a federation given a substring which is unique and at least 4 characters" do
-        fed = Federation.find('bosni')
-        fed.code.should == 'BIH'
-        fed.name.should == 'Bosnia and Herzegovina'
-      end
-
-      it "should not be fooled by irrelevant whitespace" do
-        fed = Federation.find('  arab    EMIRATES   ')
-        fed.code.should == 'UAE'
-        fed.name.should == 'United Arab Emirates'
-      end
-
-      it "should not find a federation if the substring matches more than one" do
-        Federation.find('land').should be_nil
-      end
-
-      it "should return nil for any string smaller in length than 3" do
-        Federation.find('ze').should be_nil
-      end
-    end
-
-    context "#find federations with alternative names" do
-      it "should find Macedonia multiple ways" do
-        Federation.find('MKD').name.should == 'Macedonia'
-        Federation.find('FYROM').name.should == 'Macedonia'
-        Federation.find('macedoni').name.should == 'Macedonia'
-        Federation.find('Macedonia').name.should == 'Macedonia'
-        Federation.find('former YUG Rep').name.should == 'Macedonia'
-        Federation.find('Republic of Macedonia').name.should == 'Macedonia'
-        Federation.find('former yugoslav republic').name.should == 'Macedonia'
-      end
-    end
-
-    context "#find with alternative inputs" do
-      it "should behave robustly with completely invalid inputs" do
-        Federation.find().should be_nil
-        Federation.find(nil).should be_nil
-        Federation.find('').should be_nil
-        Federation.find(1).should be_nil
-      end
-    end
-
-    context "#new is private" do
-      it "#new cannot be called directly" do
-        lambda { Federation.new('IRL', 'Ireland') }.should raise_error(/private method/)
-      end
-    end
-
-    context "documentation examples" do
-      it "should all be correct for valid input" do
-        Federation.find('IRL').name.should == 'Ireland'
-        Federation.find('IRL').code.should == 'IRL'
-        Federation.find('rUs').code.should == 'RUS'
-        Federation.find('ongoli').name.should == 'Mongolia'
-        Federation.find('  united   states   ').code.should == 'USA'
-      end
-
-      it "should return nil for invalid input" do
-        Federation.find('ZYX').should be_nil
-        Federation.find('land').should be_nil
-      end
-    end
-
-    context "#menu" do
-      before(:all) do
-        @total = 174
-      end
-
-      it "should return array of name-code pairs in order of name by default" do
-        menu = Federation.menu
-        menu.should have(@total).items
-        names = menu.map{|m| m.first}.join(',')
-        codes = menu.map{|m| m.last}.join(',')
-        names.index('Afghanistan').should == 0
-        names.index('Iraq,Ireland,Israel').should_not be_nil
-        codes.index('AFG').should == 0
-        codes.index('IRQ,IRL,ISR').should_not be_nil
-      end
-
-      it "should be configuarble to order the list by codes" do
-        menu = Federation.menu(:order => "code")
-        menu.should have(@total).items
-        names = menu.map{|m| m.first}.join(',')
-        codes = menu.map{|m| m.last}.join(',')
-        names.index('Afghanistan').should == 0
-        names.index('Ireland,Iraq,Iceland').should_not be_nil
-        codes.index('AFG').should == 0
-        codes.index('IRL,IRQ,ISL').should_not be_nil
-      end
-
-      it "should be configuarble to have a selected country at the top" do
-        menu = Federation.menu(:top => 'IRL')
-        menu.should have(@total).items
-        names = menu.map{|m| m.first}.join(',')
-        codes = menu.map{|m| m.last}.join(',')
-        names.index('Ireland,Afghanistan').should == 0
-        names.index('Iraq,Israel').should_not be_nil
-        codes.index('IRL,AFG').should == 0
-        codes.index('IRQ,ISR').should_not be_nil
-      end
-
-      it "should be configuarble to have 'None' entry at the top" do
-        menu = Federation.menu(:none => 'None')
-        menu.should have(@total + 1).items
-        names = menu.map{|m| m.first}.join(',')
-        codes = menu.map{|m| m.last}.join(',')
-        names.index('None,Afghanistan').should == 0
-        codes.index(',AFG').should == 0
-      end
-
-      it "should be able to handle multiple configuarations" do
-        menu = Federation.menu(:top => 'IRL', :order => 'code', :none => 'None')
-        menu.should have(@total + 1).items
-        names = menu.map{|m| m.first}.join(',')
-        codes = menu.map{|m| m.last}.join(',')
-        names.index('None,Ireland,Afghanistan').should == 0
-        names.index('Iraq,Iceland').should_not be_nil
-        codes.index(',IRL,AFG').should == 0
-        codes.index('IRQ,ISL').should_not be_nil
-      end
-    end
-
-    context "#codes" do
-      before(:all) do
-        @total = 174
-      end
-
-      it "should return array of codes ordered alphabetically" do
-        codes = Federation.codes
-        codes.should have(@total).items
-        all = codes.join(',')
-        all.index('AFG').should == 0
-        all.index('INA,IND,IRI,IRL,IRQ,ISL,ISR,ISV,ITA,IVB').should_not be_nil
-      end
-    end
-  end
-end