ledger_web 1.4.9 → 1.4.10

data/lib/ledger_web/app.rb

@@ -6,16 +6,17 @@ require 'sinatra/session'
 module LedgerWeb
   class Application < Sinatra::Base
     register Sinatra::Session
+
     set :session_secret, LedgerWeb::Config.instance.get(:session_secret)
     set :session_expire, LedgerWeb::Config.instance.get(:session_expire)
-    set :views, LedgerWeb::Config.instance.get(:report_directories) + [File.join(File.dirname(__FILE__), 'views')]
     set :reload_templates, true
 
     helpers Sinatra::Capture
     helpers LedgerWeb::Helpers
 
     def find_template(views, name, engine, &block)
-      Array(views).each { |v| super(v, name, engine, &block) }
+      _views = LedgerWeb::Config.instance.get(:report_directories) + [File.join(File.dirname(__FILE__), 'views')]
+      Array(_views).each { |v| super(v, name, engine, &block) }
     end
 
     before do

data/lib/ledger_web/config.rb

@@ -73,10 +73,6 @@ module LedgerWeb
           self.set :user_migrate_dir, "#{user_dir}/migrate"
         end
 
-        if File.directory? "#{user_dir}/reports"
-          self.set :user_reports_dir, "#{user_dir}/reports"
-        end
-
         if File.exists? "#{user_dir}/config.rb"
           self.override_with(LedgerWeb::Config.from_file("#{user_dir}/config.rb"))
         end

data/lib/ledger_web/db.rb

@@ -22,7 +22,7 @@ module LedgerWeb
     def self.run_migrations
       Sequel::Migrator.apply(@@db, File.join(File.dirname(__FILE__), "db/migrate"))
 
-      user_migrations = LedgerWeb::Config.instance.get :user_migrate_directory
+      user_migrations = LedgerWeb::Config.instance.get :user_migrate_dir
       if not user_migrations.nil?
         Sequel::Migrator.run(@@db, user_migrations, :table => "user_schema_changes")
       end

data/lib/ledger_web/report.rb

@@ -172,10 +172,7 @@ module LedgerWeb
 end
 
 def find_all_reports
-  directories = [
-    File.join(File.dirname(__FILE__), "reports"),
-    LedgerWeb::Config.instance.get(:user_report_dir)
-  ]
+  directories = LedgerWeb::Config.instance.get :report_directories
 
   reports = {}
 

data/lib/ledger_web/version.rb

@@ -1,3 +1,3 @@
 module LedgerWeb
-  VERSION = '1.4.9'
+  VERSION = '1.4.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ledger_web
 version: !ruby/object:Gem::Version
-  version: 1.4.9
+  version: 1.4.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-18 00:00:00.000000000Z
+date: 2012-06-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg