beerdb-models 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e0814546ffaf1bdce1f0a10a33183cb5d3642c4
-  data.tar.gz: 95860781d2554c27001e6db34eb1b926bba44473
+  metadata.gz: 7a3214a36bec05faea115c2cb1bcb5dd3dff5526
+  data.tar.gz: c98220129e209b2f6c7d2a89227eb2d721771200
 SHA512:
-  metadata.gz: b0190214a599104891fe8620f3fd04b33001cbcc4c4651a93e8111ac6aacf782f471f336a50bd56a82aa1a87bd68c260d8c3005e0f4122c996c15651542282bb
-  data.tar.gz: 7f26566ee130d0a570f8bdd5abe363ebd496ef6ff11bbe8878a6704564a08c3c5ddc72b0aedefcdd125c4146cc57e2bb73cc3c0b2b0eaa0af3fb77ac5d77b4a7
+  metadata.gz: c5319080d890054876e3cbae262b1e869a2c2aa24d1c29e76dab2337652f71333f9b9a24ebda39ef2eecf9f15e56a96d3ad0d4f4008a39289d44b3412cbe1b4b
+  data.tar.gz: 65fe65c742cf7aa322962e4f7197408f35fda43d6851a01630155c0ac60a90536dc178815f34e74c5ea01f29945806622c24b8c84b6084b79573f39c9153ffd3

data/lib/beerdb/models.rb

@@ -99,6 +99,73 @@ module BeerDb
   end
 
 
+  def self.connect( config={} )
+
+    if config.empty?
+      puts "ENV['DATBASE_URL'] - >#{ENV['DATABASE_URL']}<"
+
+      db = URI.parse( ENV['DATABASE_URL'] || 'sqlite3:///beer.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] # beer.db (Note: cut off leading /, thus 1..-1)
+      }
+      end
+    end
+
+    puts "Connecting to db using settings: "
+    pp config
+    ActiveRecord::Base.establish_connection( config )
+    # ActiveRecord::Base.logger = Logger.new( STDOUT )
+
+
+    ## if sqlite3 add (use) some pragmas for speedups
+    if config[:adapter] == 'sqlite3'
+      if config[:database] == ':memory:'
+        ## do nothing for in memory database; no pragmas needed
+        puts "sqlite3 - no pragmas; using in memory database"
+      else
+        puts "sqlite3 - pragmas for speedup"
+        con = ActiveRecord::Base.connection
+        con.execute( 'PRAGMA synchronous=OFF;' )
+        con.execute( 'PRAGMA journal_mode=OFF;' )
+        con.execute( 'PRAGMA temp_store=MEMORY;' )
+      end
+    end
+  end  # method connect
+
+
+  def self.setup_in_memory_db
+    # Database Setup & Config
+
+    config = {
+      adapter:  'sqlite3',
+      database: ':memory:'
+    }
+
+    pp config
+
+    ActiveRecord::Base.logger = Logger.new( STDOUT )
+    ## ActiveRecord::Base.colorize_logging = false  - no longer exists - check new api/config setting?
+
+    ## Note: every connect will create a new empty in memory db
+    ActiveRecord::Base.establish_connection( config )
+
+    ## build schema
+    BeerDb.create_all
+  end
+
 end  # module BeerDb
 
 

data/lib/beerdb/version.rb

@@ -3,7 +3,7 @@
 module BeerDb
   MAJOR = 1 ## todo: namespace inside version or something - why? why not??
   MINOR = 1
-  PATCH = 0
+  PATCH = 1
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/test/helper.rb

@@ -20,44 +20,11 @@ Brand   = BeerDb::Model::Brand
 Brewery = BeerDb::Model::Brewery
 
 
-def setup_in_memory_db
-  # Database Setup & Config
+BeerDb.setup_in_memory_db()
 
-  db_config = {
-    adapter:  'sqlite3',
-    database: ':memory:'
-  }
+## add some counties
+AT = Country.create!( key: 'at', title: 'Austria', code: 'AUT', pop: 0, area: 0 )
+W  = State.create!( key: 'w', title: 'Wien', country_id: AT.id )
 
-  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
-  BeerDb.create_all
-end
-
-
-def fillup_in_memory_db
-  ## add some counties
-
-  at = Country.create!( key: 'at', title: 'Austria', code: 'AUT', pop: 0, area: 0 )
-  State.create!( key: 'w', title: 'Wien', country_id: at.id )
-
-  de = Country.create!( key: 'de', title: 'Germany', code: 'DEU', pop: 0, area: 0 )
-  State.create!( key: 'by', title: 'Bayern', country_id: de.id )
-
-end
-
-setup_in_memory_db()
-fillup_in_memory_db()
-
-AT   =  Country.find_by!( key: 'at' )
-W    =  State.find_by!( key: 'w' )
-
-DE   =  Country.find_by!( key: 'de' )
-BY   =  State.find_by!( key: 'by' )
+DE = Country.create!( key: 'de', title: 'Germany', code: 'DEU', pop: 0, area: 0 )
+BY = State.create!( key: 'by', title: 'Bayern', country_id: DE.id )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beerdb-models
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Gerald Bauer