skiima 0.3.4 → 0.3.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/lib/skiima.rb +2 -1
  3. data/lib/skiima/loader.rb +3 -1
  4. data/lib/skiima/version.rb +1 -1
  5. data/spec/skiima/loader_spec.rb +3 -1
  6. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: be39a56c70833bdbd1bdc22740ff7f2f8ed76f45
4
- data.tar.gz: 21850fd9ef5d303b22951ed4547dadcceec952ec
3
+ metadata.gz: fd2ba32c873540eba4ee776558d8a9066a488eca
4
+ data.tar.gz: 5c10d406ae0a8229d715e5e9e9b1db40d9aed7e5
5
5
  SHA512:
6
- metadata.gz: 330708f192ea2ddac8b431d1c3cf7a0b29963067e513ab2a99cfca2a0b5071136890267a2a67011ce250fa045db40ae5a7a837fbcb87643cfa84fbb2eae2f7ea
7
- data.tar.gz: 25ecd6670ac5fb55b442a1cb059dd27ccc28883b05886b7808db027da971fdc9727bce09160571be855232a9e07e44e1e56336eda3c0d626e5a8c8033a7f0830
6
+ metadata.gz: 3f19fe3f8e99a7f620bc5e302ecdaab50c4f1e44edb48011235276f1b728d6c1ebfb60f4338589ae003a2979ead7267deb8d7054913d4c18ac7f283a4ff4b2ca
7
+ data.tar.gz: 09cc1d6451009d430747cdd3a743ef19fecf10822a4a0e766c42f1079e2171dc0d5a40c5bedd914d8e78fd6d9ccf760a9436f486c0206b8fcc0bae0a8619fca2
data/lib/skiima.rb CHANGED
@@ -47,7 +47,8 @@ module Skiima
47
47
  interpolator: '&',
48
48
  locale: :en,
49
49
  logging_out: 'STDOUT',
50
- logging_level: '3' }
50
+ logging_level: '3',
51
+ vars: {} }
51
52
  end
52
53
 
53
54
  def self.up(env, *args)
data/lib/skiima/loader.rb CHANGED
@@ -86,7 +86,9 @@ module Skiima
86
86
  end
87
87
 
88
88
  def interpolation_vars
89
- { :database => db['database'] }.merge(config[:vars] || {})
89
+ { :database => db['database'] }.
90
+ merge(defaults[:vars]).
91
+ merge(config[:vars] || {})
90
92
  end
91
93
 
92
94
  def get_config(opts)
data/lib/skiima/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  # encoding: utf-8
2
2
  module Skiima
3
- VERSION = "0.3.4"
3
+ VERSION = "0.3.5"
4
4
  end
data/spec/skiima/loader_spec.rb CHANGED
@@ -36,7 +36,9 @@ describe Skiima::Loader do
36
36
  end
37
37
 
38
38
  describe "#interpolation_vars" do
39
-
39
+ it 'always includes the current database'
40
+ it 'retrieves defaults in Skiima#setup'
41
+ it 'can override the defaults in Skiima#setup'
40
42
  end
41
43
 
42
44
  describe "#log_message" do
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: skiima
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.4
4
+ version: 0.3.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - David Conner