skiima 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be39a56c70833bdbd1bdc22740ff7f2f8ed76f45
-  data.tar.gz: 21850fd9ef5d303b22951ed4547dadcceec952ec
+  metadata.gz: fd2ba32c873540eba4ee776558d8a9066a488eca
+  data.tar.gz: 5c10d406ae0a8229d715e5e9e9b1db40d9aed7e5
 SHA512:
-  metadata.gz: 330708f192ea2ddac8b431d1c3cf7a0b29963067e513ab2a99cfca2a0b5071136890267a2a67011ce250fa045db40ae5a7a837fbcb87643cfa84fbb2eae2f7ea
-  data.tar.gz: 25ecd6670ac5fb55b442a1cb059dd27ccc28883b05886b7808db027da971fdc9727bce09160571be855232a9e07e44e1e56336eda3c0d626e5a8c8033a7f0830
+  metadata.gz: 3f19fe3f8e99a7f620bc5e302ecdaab50c4f1e44edb48011235276f1b728d6c1ebfb60f4338589ae003a2979ead7267deb8d7054913d4c18ac7f283a4ff4b2ca
+  data.tar.gz: 09cc1d6451009d430747cdd3a743ef19fecf10822a4a0e766c42f1079e2171dc0d5a40c5bedd914d8e78fd6d9ccf760a9436f486c0206b8fcc0bae0a8619fca2

data/lib/skiima.rb

@@ -47,7 +47,8 @@ module Skiima
       interpolator: '&',
       locale: :en,
       logging_out: 'STDOUT',
-      logging_level: '3' }
+      logging_level: '3',
+      vars: {} }
   end
 
   def self.up(env, *args)

data/lib/skiima/loader.rb

@@ -86,7 +86,9 @@ module Skiima
     end
 
     def interpolation_vars
-      { :database => db['database'] }.merge(config[:vars] || {})
+      { :database => db['database'] }.
+          merge(defaults[:vars]).
+          merge(config[:vars] || {})
     end
 
     def get_config(opts)

data/lib/skiima/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Skiima
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/spec/skiima/loader_spec.rb

@@ -36,7 +36,9 @@ describe Skiima::Loader do
   end
 
   describe "#interpolation_vars" do
-
+    it 'always includes the current database'
+    it 'retrieves defaults in Skiima#setup'
+    it 'can override the defaults in Skiima#setup'
   end
 
   describe "#log_message" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skiima
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - David Conner