worlddb 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7c9137d81e29c751381a6a489626e295cea4619
-  data.tar.gz: c8fb56e5b4f5bcf7e8364c67c4f795a01d464053
+  metadata.gz: f834f636b29a1231453e74665621584e008559d3
+  data.tar.gz: ac4fa3099c8d7862b87ee474fe5e942e4679a93a
 SHA512:
-  metadata.gz: e338f8332bad32c4e567f4fe7c754e9f90a0ee0fa3d790b9ad59ca856dfcb28d6e2a0bcad0c74ed8ab10245b498b4d4d70dfb17ce971288a717b8573e417b065
-  data.tar.gz: 86ad1f3b50b857a9540320b339a1ef4ee4bcebd2c2d9aa9ff3b71384e638c748003cfba65cf9f7e042dc23c8c8cacd71b9aecab7d9e70320ab92159bfb23d881
+  metadata.gz: d616d30efdda6a37fe07dc07e39e3fabc97b769839fb2eaf294dd4708afda4981fac8968a16b0c33c2dc43daedc796b10572966ab4510e1e20c7aa57cbdba5d4
+  data.tar.gz: 9d8bce8fb4ad6eac3a65b7daa0697b11ccb1276464d9758a291d4b00e50ccbe65d0b976d726f66ec4e220eb007a99c76a01164fdb594828d1d972f8a50bac80b

data/Manifest.txt

@@ -37,7 +37,6 @@ lib/worlddb/readers/region.rb
 lib/worlddb/readers/usage.rb
 lib/worlddb/schema.rb
 lib/worlddb/stats.rb
-lib/worlddb/stats_comp.rb
 lib/worlddb/version.rb
 test/helper.rb
 test/test_fixture_matchers.rb

data/lib/worlddb/cli/main.rb

@@ -64,17 +64,10 @@ def connect_to_db( options )
 
   puts "working directory: #{Dir.pwd}"
 
-  db_config = {
-    :adapter  => 'sqlite3',
-    :database => "#{options.db_path}/#{options.db_name}"
-  }
+  WorldDb.connect( adapter:  'sqlite3',
+                   database: "#{options.db_path}/#{options.db_name}" )
 
-  puts "Connecting to db using settings: "
-  pp db_config
-
-  ActiveRecord::Base.establish_connection( db_config )
-  
-  LogDb.setup  # turn on logging to db
+  LogDb.setup  # turn on logging to db (that is, log to logs table in db)
 end
 
 
@@ -84,10 +77,7 @@ command [:create] do |c|
     
     connect_to_db( opts )
     
-    LogDb.create
-    ConfDb.create
-    TagDb.create
-    WorldDb.create
+    WorldDb.create_all
 
     puts 'Done.'
   end # action
@@ -110,10 +100,7 @@ command [:setup,:s] do |c|
     ## todo: document optional setup profile arg (defaults to all)
     setup = args[0] || 'all'
     
-    LogDb.create
-    ConfDb.create
-    TagDb.create
-    WorldDb.create
+    WorldDb.create_all
 
     WorldDb.read_setup( "setups/#{setup}", opts.data_path )
 
@@ -202,7 +189,7 @@ command :props do |c|
     connect_to_db( opts )
     
     ### fix: use ConfDb.dump or similar  (for reuse) !!!
-    WorldDb.props
+    ## WorldDb.props
 
     puts 'Done.'
   end

data/lib/worlddb/stats.rb

@@ -3,7 +3,7 @@
 module WorldDb
 
   class Stats
-    include WorldDb::Models
+    include Models
 
     def tables
       puts "Stats:"

data/lib/worlddb/version.rb

@@ -4,7 +4,7 @@ module WorldDb
   # sync version w/ sport.db n friends - why? why not?
   MAJOR = 2 ## todo: namespace inside version or something - why? why not??
   MINOR = 0
-  PATCH = 8
+  PATCH = 9
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/lib/worlddb.rb

@@ -17,7 +17,7 @@ require 'yaml'
 
 # 3rd party gems / libs
 
-require 'zip'
+require 'zip'       ## rubyzip gem
 
 require 'active_record'   ## todo: add sqlite3? etc.
 
@@ -69,7 +69,6 @@ require 'worlddb/reader_file'
 require 'worlddb/reader_zip'
 require 'worlddb/deleter'
 require 'worlddb/stats'
-require 'worlddb/stats_comp'
 
 
 module WorldDb
@@ -84,6 +83,13 @@ module WorldDb
     ConfDb::Model::Prop.create!( key: 'db.schema.world.version', value: VERSION )
   end
 
+  def self.create_all
+    LogDb.create    # add logs table
+    ConfDb.create   # add props table
+    TagDb.create    # add tags, taggings table
+    WorldDb.create
+  end
+
 
   def self.read( ary, include_path )
     reader = Reader.new( include_path )
@@ -115,23 +121,82 @@ module WorldDb
     Deleter.new.run
   end # method delete!
 
+  def self.delete_all!( opts={} )
+    LogDb.delete!
+    ConfDb.delete!
+    TagDb.delete!
+    WorldDb.delete!
+  end
+
+
  ####
  ## todo: remove stats ??? why? why not? better use .tables
   def self.stats
-    stats = Stats.new
-    stats.tables
-    ### stats.props
+    Stats.new.tables
   end
 
   def self.tables
     Stats.new.tables
   end
 
-  def self.props
-    ### fix: use ConfDb.props delegate or similar !!!
-    Stats.new.props
+
+  def self.connect( db_config={} )
+
+    if db_config.empty?
+      puts "ENV['DATBASE_URL'] - >#{ENV['DATABASE_URL']}<"
+
+      ### change default to ./sport.db ?? why? why not?
+      db = URI.parse( ENV['DATABASE_URL'] || 'sqlite3:///world.db' )
+
+      if db.scheme == 'postgres'
+        config = {
+          adapter: 'postgresql',
+          host: db.host,
+          port: db.port,
+          username: db.user,
+          password: db.password,
+          database: db.path[1..-1],
+          encoding: 'utf8'
+        }
+      else # assume sqlite3
+       config = {
+         adapter: db.scheme, # sqlite3
+         database: db.path[1..-1] # world.db (NB: cut off leading /, thus 1..-1)
+      }
+      end
+    else
+      config = db_config  # use passed in config hash
+    end
+
+    ## todo/check: use if defined?( JRUBY_VERSION ) instead ??
+    if RUBY_PLATFORM =~ /java/ && config[:adapter] == 'sqlite3' 
+      # quick hack for JRuby sqlite3 support via jdbc
+      puts "jruby quick hack - adding jdbc libs for jruby sqlite3 database support"
+      require 'jdbc/sqlite3'
+      require 'active_record/connection_adapters/jdbc_adapter'
+      require 'active_record/connection_adapters/jdbcsqlite3_adapter'
+    end
+
+    puts "Connecting to db using settings: "
+    pp config
+    ActiveRecord::Base.establish_connection( config )
+    # ActiveRecord::Base.logger = Logger.new( STDOUT )
   end
 
+
+  def self.setup_in_memory_db
+
+    # Database Setup & Config
+    ActiveRecord::Base.logger = Logger.new( STDOUT )
+    ## ActiveRecord::Base.colorize_logging = false  - no longer exists - check new api/config setting?
+
+    self.connect( adapter:  'sqlite3',
+                  database: ':memory:' )
+
+    ## build schema
+    WorldDb.create_all
+  end # setup_in_memory_db (using SQLite :memory:)
+
 end  # module WorldDb
 
 

data/test/helper.rb

@@ -24,31 +24,6 @@ Lang      = WorldDb::Model::Lang
 Usage     = WorldDb::Model::Usage
 
 
-def setup_in_memory_db
-  # Database Setup & Config
 
-  db_config = {
-    adapter:  'sqlite3',
-    database: ':memory:'
-  }
+WorldDb.setup_in_memory_db
 
-  pp db_config
-
-  ActiveRecord::Base.logger = Logger.new( STDOUT )
-  ## ActiveRecord::Base.colorize_logging = false  - no longer exists - check new api/config setting?
-
-  ## NB: every connect will create a new empty in memory db
-  ActiveRecord::Base.establish_connection( db_config )
-
-
-  ## build schema
-
-  LogDb.create
-  ConfDb.create
-
-  TagDb.create
-  WorldDb.create
-end
-
-
-setup_in_memory_db()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worlddb
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
@@ -186,7 +186,6 @@ files:
 - lib/worlddb/readers/usage.rb
 - lib/worlddb/schema.rb
 - lib/worlddb/stats.rb
-- lib/worlddb/stats_comp.rb
 - lib/worlddb/version.rb
 - test/helper.rb
 - test/test_fixture_matchers.rb

data/lib/worlddb/stats_comp.rb

@@ -1,21 +0,0 @@
-# encoding: utf-8
-
-module WorldDb
-
-  class Stats
-
-#
-# fix: move to ConfDb for (re)use - do not use - use Props.dump or similar!!!!!
-
-    def props
-      puts "deprecated API - WorldDb::Stats.props  -- use Props.dump or similar"
-      
-      puts "Props:"
-      Prop.order( 'created_at asc' ).all.each do |prop|
-        puts "  #{prop.key} / #{prop.value} || #{prop.created_at}"
-      end
-    end
-  end # class Stats
-
-
-end # module WorldDb