waistband 0.9.8 → 0.9.9

data/lib/waistband/configuration.rb

@@ -23,13 +23,24 @@ module Waistband
       raise "Please define a valid `config_dir` configuration variable!"  unless config_dir
       raise "Couldn't find configuration directory #{config_dir}"         unless File.exist?(config_dir)
 
-      @env        ||= ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
-      @yml_config   = YAML.load_file("#{config_dir}/waistband.yml")[@env].with_indifferent_access
+      @env ||= ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
+      if defined?(ERB)
+        yml = YAML.load(ERB.new(File.read("#{config_dir}/waistband.yml")).result)
+      else
+        yml = YAML.load_file("#{config_dir}/waistband.yml")
+      end
+      @yml_config   = yml[@env].with_indifferent_access
       @adapter      = @yml_config.delete('adapter')
     end
 
     def index(name)
-      @indexes[name] ||= YAML.load_file("#{config_dir}/waistband_#{name}.yml")[@env].with_indifferent_access
+      return @indexes[name] if @indexes[name]
+      if defined?(ERB)
+        yml = YAML.load(ERB.new(File.read("#{config_dir}/waistband_#{name}.yml")).result)
+      else
+        yml = YAML.load_file("#{config_dir}/waistband_#{name}.yml")
+      end
+      @indexes[name] = yml[@env].with_indifferent_access
     end
 
     def method_missing(method_name, *args, &block)

data/lib/waistband/version.rb

@@ -1,3 +1,3 @@
 module Waistband
-  VERSION = "0.9.8"
+  VERSION = "0.9.9"
 end

data/spec/lib/configuration_spec.rb

@@ -28,7 +28,7 @@ describe Waistband::Configuration do
 
     expect(::Waistband.config.instance_variable_get('@adapter')).to be_nil
 
-    YAML.stub(:load_file).and_return({'test' => original_config.merge({'adapter' => :net_http})})
+    YAML.stub(:load).and_return({'test' => original_config.merge({'adapter' => :net_http})})
     ::Waistband.config.setup
     expect(::Waistband.config.instance_variable_get('@adapter')).to eql :net_http
     expect(::Waistband.client.transport.options[:adapter]).to eql :net_http

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: waistband
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
+  prerelease: 
 platform: ruby
 authors:
 - David Jairala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -120,26 +131,27 @@ files:
 homepage: https://github.com/taskrabbit/waistband
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Configuration and sensible defaults for ElasticSearch on Ruby
 test_files:
 - spec/config/waistband/waistband.yml

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YTBiNmFlNjY5YzRjYjdhZGQwYWJmNjAxNTAwODdiYTZiYjIyYjI1Mw==
-  data.tar.gz: !binary |-
-    NDQ3MzMzMGVmNjNlNzFlYTMwNWRhNjU0YmYwYzU4ODFkMDU5NDY1Zg==
-SHA512:
-  metadata.gz: !binary |-
-    ZWM1NjdmNDMwY2JkMmRlYzczNDM1MzM5NDIwN2M2MzRiYTc1MDRjNmY4MmQz
-    NGE0NWQxNzFkZjcyYjM1M2I2MTNjNmQ2ZjVkYWM1NTdmNWJlMjVmYjNkMWI5
-    YWExNmM0ZmYzMDEzMDkzYjBkZDkzN2Q2NGZlMGQ5Nzc3MjY1ZDY=
-  data.tar.gz: !binary |-
-    MjJhZjYyODBlM2ZhNzJiZDliMTBkOTRkZDg2ODVlMzk5ZjRkYjdmOTFmYTJh
-    NWRjZTc4OWQ3YTczMDhlNmE3YWE1ZjFkZDJmOTc4ODc5NWI1MDAxYzA4NzJk
-    MWU4ZjU1NTFmOWQ1NjUwZjcwYjUwODcyNTczNjk5MmUwN2M0MzM=