cncflora_commons 0.0.28 → 0.0.29

data/lib/cncflora_commons.rb

@@ -1,6 +1,7 @@
 require 'uri'
 require 'json'
 require 'net/http'
+require 'yaml'
 
 def http_get(uri)
     JSON.parse(Net::HTTP.get(URI(uri)))
@@ -74,9 +75,13 @@ def search(db,index,query)
 end
 
 def setup(file)
-    config_file file
+    #config_file file
 
-    ENV.each {|k,v| set k.to_sym, v}
+    config = YAML.load_file(file)[ENV['RACK_ENV'] || 'development']
+
+    ENV.each {|k,v| config[k]=v }
+
+    config.each {|k,v| set k.to_sym,v }
 
     use Rack::Session::Pool
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cncflora_commons
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
   prerelease: 
 platform: ruby
 authors: