lib/rails_config/integration/sinatra.rb in rails_config-0.4.2 vs lib/rails_config/integration/sinatra.rb in rails_config-0.5.0.beta1

@@ -16,20 +16,11 @@
       if defined?(Padrino)
         env = Padrino.env
         root = Padrino.root
       end
 
-      RailsConfig.load_and_set_settings(
-        File.join(root.to_s, "config", "settings.yml").to_s,
-        File.join(root.to_s, "config", "settings", "#{env}.yml").to_s,
-        File.join(root.to_s, "config", "environments", "#{env}.yml").to_s,
+      RailsConfig.load_and_set_settings(RailsConfig.setting_files(File.join(root, 'config'), env))
 
-        File.join(root.to_s, "config", "settings.local.yml").to_s,
-        File.join(root.to_s, "config", "settings", "#{env}.local.yml").to_s,
-        File.join(root.to_s, "config", "environments", "#{env}.local.yml").to_s
-      )
-
       inner_app.use(::RailsConfig::Rack::Reloader) if inner_app.development?
     end
   end
-
-end
\ No newline at end of file
+end