worlddb 1.4.0 → 1.5.0

data/Rakefile

@@ -71,7 +71,7 @@ namespace :dev do
   end
   
   task :import => :env do
-    WorldDB.read_all( '../world.db' )  # populate world tables
+    WorldDB.read_setup( 'setups/sport.db.admin', '../world.db', { skip_tags: true } )  # populate world tables
     WorldDB.stats
   end
 

data/lib/worlddb/reader.rb

@@ -12,7 +12,19 @@ class Reader
   ## required first arg in ctor!!!
   ## cleanup load_   and remove include_path
 
-  def initialize
+  def initialize( opts = {} )
+    ## option: do NOT generate/add any tags for countries/regions/cities
+    @skip_tags =  opts[:skip_tags].present? ? true : false
+    ## option: for now issue warning on update, that is, if key/record (country,region,city) already exists
+    @strict    =  opts[:strict].present? ? true : false
+  end
+
+  def skip_tags?
+    @skip_tags == true
+  end
+
+  def strict?
+    @strict == true
   end
 
 
@@ -517,19 +529,23 @@ private
       ## add taggings 
 
       if value_tag_keys.size > 0
+        
+        if skip_tags?
+          logger.debug "   skipping add taggings (flag skip_tag)"
+        else
+          value_tag_keys.uniq!  # remove duplicates
+          logger.debug "   adding #{value_tag_keys.size} taggings: >>#{value_tag_keys.join('|')}<<..."
 
-        value_tag_keys.uniq!  # remove duplicates
-        logger.debug "   adding #{value_tag_keys.size} taggings: >>#{value_tag_keys.join('|')}<<..."
-
-        ### fix/todo: check tag_ids and only update diff (add/remove ids)
+          ### fix/todo: check tag_ids and only update diff (add/remove ids)
 
-        value_tag_keys.each do |key|
-          tag = Tag.find_by_key( key )
-          if tag.nil?  # create tag if it doesn't exit
-            logger.debug "   creating tag >#{key}<"
-            tag = Tag.create!( key: key )
+          value_tag_keys.each do |key|
+            tag = Tag.find_by_key( key )
+            if tag.nil?  # create tag if it doesn't exit
+              logger.debug "   creating tag >#{key}<"
+              tag = Tag.create!( key: key )
+            end
+            rec.tags << tag
           end
-          rec.tags << tag
         end
       end
 

data/lib/worlddb/version.rb

@@ -1,4 +1,4 @@
 
 module WorldDB
-  VERSION = '1.4.0'  # sync version w/ sport.db - why? why not?
+  VERSION = '1.5.0'  # sync version w/ sport.db - why? why not?
 end

data/lib/worlddb.rb

@@ -70,13 +70,13 @@ module WorldDB
   end
 
 
-  def self.read_setup( setup, include_path )
-    reader = Reader.new
+  def self.read_setup( setup, include_path, opts={} )
+    reader = Reader.new( opts )
     reader.load_setup( setup, include_path )
   end
 
-  def self.read_all( include_path )  # load all builtins (using plain text reader); helper for convenience
-    read_setup( 'setups/all', include_path )
+  def self.read_all( include_path, opts={} )  # load all builtins (using plain text reader); helper for convenience
+    read_setup( 'setups/all', include_path, opts )
   end # method read_all
 
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: worlddb
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &73513430 !ruby/object:Gem::Requirement
+  requirement: &79173230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *73513430
+  version_requirements: *79173230
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &73513210 !ruby/object:Gem::Requirement
+  requirement: &79173010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *73513210
+  version_requirements: *79173010
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &73513000 !ruby/object:Gem::Requirement
+  requirement: &79172800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *73513000
+  version_requirements: *79172800
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &73512780 !ruby/object:Gem::Requirement
+  requirement: &79172580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *73512780
+  version_requirements: *79172580
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &73512560 !ruby/object:Gem::Requirement
+  requirement: &79172360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *73512560
+  version_requirements: *79172360
 description: worlddb - world.db command line tool
 email: opensport@googlegroups.com
 executables: