cncflora_commons 0.0.30 → 0.0.31

data/lib/cncflora_commons.rb

@@ -81,23 +81,30 @@ def setup(file)
 
     config.each {|ck,cv|
       ENV.each {|ek,ev|
-        config[ck] = cv.gsub("${#{ek}}",ev)
+        if cv =~ /\$#{ek}/ then
+          config[ck] = cv.gsub(/\$#{ek}/,ev)
+        end
       }
     }
 
     ENV.each {|k,v| config[k]=v }
 
-    config.each {|k,v| set k.to_sym,v }
+    if config["lang"] then
+        config["strings"] = JSON.parse(File.read("src/locales/#{config["lang"]}.json", :encoding => "BINARY"))
+    end
 
-    use Rack::Session::Pool
+    if defined? settings then
+      config.each {|k,v| set k.to_sym,v }
 
-    set :session_secret, '1flora2'
-    set :views, 'src/views'
+      use Rack::Session::Pool
 
-    if settings.lang then
-        settings.strings = JSON.parse(File.read("src/locales/#{settings.lang}.json", :encoding => "BINARY"))
+      set :session_secret, '1flora2'
+      set :views, 'src/views'
     end
 
     puts "Config loaded"
+    puts config
+
+    config
 end
 

metadata

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