icu_tournament 1.5.8 → 1.5.9

data/lib/icu_tournament/tournament.rb

@@ -406,8 +406,8 @@ module ICU
     # Convenience method to parse a file.
     def self.parse_file!(file, format, opts={})
       type = format.to_s
-      raise "Invalid format" unless type.match(/^(SwissPerfect|SPExport|Krause|ForeignCSV)$/);
-      parser = "ICU::Tournament::#{format}".constantize.new
+      raise "Invalid format" unless klass = factory(format) #type.match(/^(SwissPerfect|SPExport|Krause|ForeignCSV)$/);
+      parser = klass.new
       if type == 'ForeignCSV'
         # Doesn't take options.
         parser.parse_file!(file)
@@ -433,6 +433,17 @@ module ICU
 
     # :enddoc:
     private
+    
+    # Return a class given a format.
+    def self.factory(format)
+      case format
+      when "SwissPerfect" then ICU::Tournament::SwissPerfect
+      when "SPExport"     then ICU::Tournament::SPExport
+      when "Krause"       then ICU::Tournament::Krause
+      when "ForeignCSV"   then ICU::Tournament::ForeignCSV
+      else nil
+      end
+    end
 
     # Check players.
     def check_players
@@ -544,8 +555,8 @@ module ICU
     def check_type(type)
       if type.respond_to?(:validate!)
         type.validate!(self)
-      elsif type.to_s.match(/^(ForeignCSV|Krause|SwissPerfect|SPExport)$/)
-        "ICU::Tournament::#{type.to_s}".constantize.new.validate!(self)
+      elsif klass = self.class.factory(type.to_s)
+        klass.new.validate!(self)
       else
         raise "invalid type supplied for validation check"
       end
@@ -554,7 +565,6 @@ module ICU
     # Return an array of tie break rules and an array of tie break orders (+1 for asc, -1 for desc).
     # The first and most important method is always "score", the last and least important is always "name".
     def tie_break_data
-
       # Construct the arrays and hashes to be returned.
       methods, order, data = Array.new, Hash.new, Hash.new
 

data/lib/icu_tournament/version.rb

@@ -2,6 +2,6 @@
 
 module ICU
   class Tournament
-    VERSION = "1.5.8"
+    VERSION = "1.5.9"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: icu_tournament
 version: !ruby/object:Gem::Version
-  version: 1.5.8
+  version: 1.5.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,44 +9,44 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-08 00:00:00.000000000Z
+date: 2012-03-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dbf
-  requirement: &70317952906900 !ruby/object:Gem::Requirement
+  requirement: &70364479562300 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70317952906900
+  version_requirements: *70364479562300
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70317952906400 !ruby/object:Gem::Requirement
+  requirement: &70364479561540 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70317952906400
+  version_requirements: *70364479561540
 - !ruby/object:Gem::Dependency
   name: icu_name
-  requirement: &70317952905940 !ruby/object:Gem::Requirement
+  requirement: &70364479560720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70317952905940
+  version_requirements: *70364479560720
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70317952905560 !ruby/object:Gem::Requirement
+  requirement: &70364479560020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70317952905560
+  version_requirements: *70364479560020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70317952905100 !ruby/object:Gem::Requirement
+  requirement: &70364479559300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70317952905100
+  version_requirements: *70364479559300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70317952904680 !ruby/object:Gem::Requirement
+  requirement: &70364479558680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,43 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70317952904680
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: &70317952904260 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70317952904260
+  version_requirements: *70364479558680
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70317952903840 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70317952903840
-- !ruby/object:Gem::Dependency
-  name: rb-fsevent
-  requirement: &70317952903380 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70317952903380
-- !ruby/object:Gem::Dependency
-  name: growl
-  requirement: &70317952902960 !ruby/object:Gem::Requirement
+  requirement: &70364479557880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70317952902960
+  version_requirements: *70364479557880
 description: Convert files of chess tournament data in different formats to ruby classes
   and vice-versa.
 email: mark.j.l.orr@googlemail.com
@@ -171,7 +138,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 708722901899167522
+      hash: -3628031802817703572
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -180,10 +147,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 708722901899167522
+      hash: -3628031802817703572
 requirements: []
 rubyforge_project: icu_tournament
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: For reading and writing files of chess tournament data.