ledger_web 1.3 → 1.4

data/ledger_web.gemspec

@@ -16,10 +16,12 @@ Gem::Specification.new do |s|
   s.add_dependency("pg")
   s.add_dependency("sequel")
   s.add_dependency("directory_watcher")
+  s.add_dependency("rack", ">= 1.3.6")
   s.add_dependency("sinatra")
   s.add_dependency("sinatra-session")
   s.add_dependency("sinatra-contrib")
 
+  s.bindir        = 'bin'
   s.files         = `git ls-files`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]

data/lib/ledger_web/config.rb

@@ -34,8 +34,8 @@ module LedgerWeb
         @hooks[phase].each do |hook|
           hook.call(data)
         end
-        return data
       end
+      return data
     end
 
     def override_with(config)

data/lib/ledger_web/helpers.rb

@@ -1,6 +1,11 @@
+require 'rack/utils'
+require 'cgi'
+
 module LedgerWeb
   module Helpers
 
+    include Rack::Utils
+
     def partial (template, locals = {})
       erb(template, :layout => false, :locals => locals)
     end
@@ -41,12 +46,16 @@ module LedgerWeb
         if key.match(value[1].title.to_s)
           url = String.new(links[key])
           row.each_with_index do |v,i|
-            url.gsub!(":#{i}", v[0].to_s)
+            url.gsub!(":#{i}", CGI.escape(v[0].to_s))
           end
   
-          url.gsub!(':title', value[1].title.to_s)
-          display_value = "<a href='#{url}'>#{display_value}</a>"
+          url.gsub!(':title', CGI.escape(value[1].title.to_s))
+          url.gsub!(':now', CGI.escape(DateTime.now.strftime('%Y-%m-%d')))
+          display_value = "<a href='#{url}'>#{escape_html(display_value)}</a>"
+        else
+          display_value = escape_html(display_value)
         end
+
       end
       display_value
     end

data/lib/ledger_web/reports/savings_rate.erb

@@ -20,7 +20,7 @@
            income,
            expenses,
            income - expenses as savings, 
-           round((income - expenses) / income * 100, 2) as rate 
+           round(case when income = 0 then null else (income - expenses) / income * 100 end, 2) as rate
          from (
            select
              date_trunc('month', xtn_date)::date as month, 

data/lib/ledger_web/version.rb

@@ -1,3 +1,3 @@
 module LedgerWeb
-  VERSION = 1.3
+  VERSION = 1.4
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ledger_web
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.4'
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &2153029640 !ruby/object:Gem::Requirement
+  requirement: &2152794860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153029640
+  version_requirements: *2152794860
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &2153019180 !ruby/object:Gem::Requirement
+  requirement: &2152794320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153019180
+  version_requirements: *2152794320
 - !ruby/object:Gem::Dependency
   name: directory_watcher
-  requirement: &2153018000 !ruby/object:Gem::Requirement
+  requirement: &2152793840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153018000
+  version_requirements: *2152793840
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &2152792900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.6
+  type: :runtime
+  prerelease: false
+  version_requirements: *2152792900
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2153015920 !ruby/object:Gem::Requirement
+  requirement: &2152791800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153015920
+  version_requirements: *2152791800
 - !ruby/object:Gem::Dependency
   name: sinatra-session
-  requirement: &2153014380 !ruby/object:Gem::Requirement
+  requirement: &2152790420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153014380
+  version_requirements: *2152790420
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
-  requirement: &2153013360 !ruby/object:Gem::Requirement
+  requirement: &2152789480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153013360
+  version_requirements: *2152789480
 description: Allows arbitrary reporting on your ledger using easy-to-write SQL queries
 email:
 - pete@bugsplat.info