sportdb 1.8.12 → 1.8.13

data/Manifest.txt

@@ -46,6 +46,7 @@ lib/sportdb/models/world/city.rb
 lib/sportdb/models/world/continent.rb
 lib/sportdb/models/world/country.rb
 lib/sportdb/models/world/region.rb
+lib/sportdb/patterns.rb
 lib/sportdb/reader.rb
 lib/sportdb/readers/event.rb
 lib/sportdb/readers/game.rb

data/lib/sportdb.rb

@@ -29,6 +29,7 @@ require 'fetcher'   # for fetching/downloading fixtures via HTTP/HTTPS etc.
 
 require 'sportdb/version'
 
+require 'sportdb/patterns'
 require 'sportdb/models/forward'
 require 'sportdb/models/world/city'
 require 'sportdb/models/world/country'
@@ -56,7 +57,8 @@ require 'sportdb/models/track'
 
 require 'sportdb/models/utils'   # e.g. GameCursor
 
-## add backwards compatible namespace (delete later!)
+## add backwards compatible n convenience namespace
+###  move to forward.rb ?? - why? why not??
 module SportDb
   Models = Model
 end

data/lib/sportdb/models/team.rb

@@ -16,12 +16,9 @@ class Team < ActiveRecord::Base
   has_many :home_games, class_name: 'Game', foreign_key: 'team1_id'
   has_many :away_games, class_name: 'Game', foreign_key: 'team2_id'
 
-  REGEX_KEY  = /^[a-z]{3,}$/
-  REGEX_CODE = /^[A-Z][A-Z0-9][A-Z0-9_]?$/  # must start w/ letter a-z (2 n 3 can be number or underscore _)
-
   ## todo/fix: must be 3 or more letters (plus allow digits e.g. salzburgii, muenchen1980, etc.) - why? why not??
-  validates :key,  :format => { :with => REGEX_KEY,  :message => 'expected three or more lowercase letters a-z' }
-  validates :code, :format => { :with => REGEX_CODE, :message => 'expected two or three uppercase letters A-Z (and 0-9_; must start with A-Z)' }, :allow_nil => true
+  validates :key,  format: { with: /#{TEAM_KEY_PATTERN}/, message: TEAM_KEY_PATTERN_MESSAGE }
+  validates :code, format: { with: /#{TEAM_CODE_PATTERN}/, message: TEAM_CODE_PATTERN_MESSAGE }, allow_nil: true
 
   has_many :event_teams, class_name: 'EventTeam'  # join table (events+teams)
   has_many :events, :through => :event_teams
@@ -132,7 +129,7 @@ class Team < ActiveRecord::Base
           attr[ :country_id ] = value.id
         elsif value.is_a? City
           attr[ :city_id ] = value.id 
-        elsif value =~ REGEX_CODE   ## assume its three letter code (e.g. ITA or S04 etc.)
+        elsif value =~ /#{TEAM_CODE_PATTERN}/   ## assume its three letter code (e.g. ITA or S04 etc.)
           attr[ :code ] = value
         elsif value =~ /^city:/   ## city:
           value_city_key = value[5..-1]  ## cut off city: prefix

data/lib/sportdb/patterns.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+
+module SportDb
+
+# collection of regex patterns for reuse (SportDb specific)
+
+### todo: add a patterns.md page to  github ??
+##  - add regexper pics??
+
+############
+# about ruby regexps
+#
+# try the rubular - Ruby regular expression editor and tester
+#  -> http://rubular.com
+#   code -> ??  by ??
+#
+#
+# Jeff Avallone's Regexper - Shows State-Automata Diagrams
+#  try -> http://regexper.com
+#    code -> https://github.com/javallone/regexper
+#
+#
+#  Regular Expressions | The Bastards Book of Ruby by Dan Nguyen
+# http://ruby.bastardsbook.com/chapters/regexes/
+#
+# move to notes  regex|patterns on  geraldb.github.io ??
+#
+
+  TEAM_KEY_PATTERN  = '\A[a-z]{3,}\z'
+  TEAM_KEY_PATTERN_MESSAGE = "expected three or more lowercase letters a-z /#{TEAM_KEY_PATTERN}/" 
+
+  # must start w/ letter a-z (2 n 3 can be number or underscore _)
+  TEAM_CODE_PATTERN = '\A[A-Z][A-Z0-9][A-Z0-9_]?\z'
+  TEAM_CODE_PATTERN_MESSAGE = "expected two or three uppercase letters A-Z (and 0-9_; must start with A-Z) /#{TEAM_CODE_PATTERN}/"
+
+end # module SportDb
+

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.8.12'
+  VERSION = '1.8.13'
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.8.12
+  version: 1.8.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &71514400 !ruby/object:Gem::Requirement
+  requirement: &77469600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *71514400
+  version_requirements: *77469600
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &71514010 !ruby/object:Gem::Requirement
+  requirement: &77468760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *71514010
+  version_requirements: *77468760
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &71513170 !ruby/object:Gem::Requirement
+  requirement: &77468390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *71513170
+  version_requirements: *77468390
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &71512840 !ruby/object:Gem::Requirement
+  requirement: &77468000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *71512840
+  version_requirements: *77468000
 - !ruby/object:Gem::Dependency
   name: tagutils
-  requirement: &71512460 !ruby/object:Gem::Requirement
+  requirement: &77467680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *71512460
+  version_requirements: *77467680
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &71512140 !ruby/object:Gem::Requirement
+  requirement: &77467090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *71512140
+  version_requirements: *77467090
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &71511840 !ruby/object:Gem::Requirement
+  requirement: &77466740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *71511840
+  version_requirements: *77466740
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &71511520 !ruby/object:Gem::Requirement
+  requirement: &77466550 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,36 +98,38 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *71511520
+  version_requirements: *77466550
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &71511170 !ruby/object:Gem::Requirement
+  requirement: &77466140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *71511170
+  version_requirements: *77466140
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &71510800 !ruby/object:Gem::Requirement
+  requirement: &77465690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.11'
   type: :development
   prerelease: false
-  version_requirements: *71510800
+  version_requirements: *77465690
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables:
 - sportdb
 extensions: []
 extra_rdoc_files:
+- HISTORY.md
 - Manifest.txt
+- README.md
 files:
 - HISTORY.md
 - Manifest.txt
@@ -177,6 +179,7 @@ files:
 - lib/sportdb/models/world/continent.rb
 - lib/sportdb/models/world/country.rb
 - lib/sportdb/models/world/region.rb
+- lib/sportdb/patterns.rb
 - lib/sportdb/reader.rb
 - lib/sportdb/readers/event.rb
 - lib/sportdb/readers/game.rb
@@ -285,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: sportdb
+rubyforge_project: 
 rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3