dossier 2.12.0 → 2.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8855e257499ae951a04b45a6a56f7732fb25497
-  data.tar.gz: 5aec70129f40c196dc72dde3167e0fcda6557a45
+  metadata.gz: 38e25b35de73b25b62fd2532e6a75a40ca1ada9c
+  data.tar.gz: c14577c20f96aca152a179ca827bcae2753b5062
 SHA512:
-  metadata.gz: 856da45da19795e27559e2ba32a5016295f2460eb3f056f15dfe74b8120ffae2c8f82e7329c12c835c5ebb684da9dbf7c8da35f2b0246766b04ff90957b76c00
-  data.tar.gz: 600e84681a3592155a59e4a3c523e880934e76e2848ad1e1ba6e762d1c89abd1134cec52077bef355aaf48083260312275f9413f349b1e98753ba4f6e33f2215
+  metadata.gz: 6b3b33eaff2f0a2f82839a672ddd68cf6852be5524052e88ae7511071b003fff3451c6399601d8f7a75f53760b9e9f25108698adaab9c11ab158e8a7c4bc4c2a
+  data.tar.gz: cffa2da9c307d3e78e479785839b210568ed066f9641c03fd1109b93129db9df8f00a5e946744c8c1f3b6385870b69fb3948544076660e09b990c89c3e342002

data/lib/dossier/formatter.rb

@@ -9,13 +9,13 @@ module Dossier
     end
 
     def number_to_dollars(value)
-      "$#{commafy_number(value, 2)}"
+      commafy_number(value, 2).sub(/(\d)/, '$\1')
     end
 
     def commafy_number(value, precision = nil)
       whole, fraction = value.to_s.split('.')
       fraction = "%.#{precision}d" % (BigDecimal.new("0.#{fraction}").round(precision) * 10**precision).to_i if precision
-      [whole.to_i.to_s.gsub(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1,"), fraction].compact.join('.')
+      [whole.gsub(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1,"), fraction].compact.join('.')
     end
 
     def url_formatter

data/lib/dossier/version.rb

@@ -1,3 +1,3 @@
 module Dossier
-  VERSION = "2.12.0"
+  VERSION = "2.12.1"
 end

data/spec/dossier/formatter_spec.rb

@@ -68,7 +68,9 @@ describe Dossier::Formatter do
         10_000            => '$10,000.00',
         10_000.00         => '$10,000.00',
         1_000_000_000.000 => '$1,000,000,000.00',
-        '12345.6788'      => '$12,345.68'
+        '12345.6788'      => '$12,345.68',
+        0.01              => '$0.01',
+        -0.01             => '-$0.01'
       }.each { |base, formatted|
         it "formats #{base} as #{formatted}" do
           expect(formatter.number_to_dollars(base)).to eq formatted

data/spec/dummy/log/test.log

@@ -526,3 +526,182 @@ Processing by Dossier::ReportsController#show as HTML
   EmployeeWithCustomClientReport (0.2ms)  
 SELECT * FROM `employees`
 Completed 200 OK in 4ms (Views: 2.1ms | ActiveRecord: 0.2ms)
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT `schema_migrations`.* FROM `schema_migrations`
+  FACTORY (0.1ms)  CREATE DATABASE IF NOT EXISTS `dossier_test`
+  FACTORY (12.4ms)  DROP TABLE IF EXISTS `employees`
+  FACTORY (9.8ms)            CREATE TABLE `employees` (
+            `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+            `name` varchar(255) NOT NULL,
+            `division` varchar(255) NOT NULL,
+            `salary` int(11) NOT NULL,
+            `suspended` tinyint(1) NOT NULL DEFAULT 0,
+            `hired_on` date NOT NULL,
+            PRIMARY KEY (`id`)
+          ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+  FACTORY (2.9ms)  TRUNCATE `employees`
+  FACTORY (0.3ms)            INSERT INTO 
+            `employees` (`name`, `hired_on`, `suspended`, `division`, `salary`) 
+          VALUES ('Moustafa McMann', '2010-10-02', false, 'Zany Inventions', 30000);
+
+  FACTORY (0.2ms)            INSERT INTO 
+            `employees` (`name`, `hired_on`, `suspended`, `division`, `salary`) 
+          VALUES ('Jimmy Jackalope, Jr.', '2013-01-11', true, 'Tedious Toiling', 20000);
+
+  FACTORY (0.4ms)            INSERT INTO 
+            `employees` (`name`, `hired_on`, `suspended`, `division`, `salary`) 
+          VALUES ('Elise Elderberry', '2013-01-11', false, 'Corporate Malfeasance', 99000);
+
+  FACTORY (1.7ms)  DROP TABLE IF EXISTS `employees`
+  FACTORY (0.8ms)            CREATE TABLE `employees` (
+            `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+            `name` TEXT NOT NULL,
+            `division` TEXT NOT NULL,
+            `salary` INTEGER NOT NULL,
+            `suspended` TINYINT NOT NULL DEFAULT 0,
+            `hired_on` DATE NOT NULL
+          );
+
+  FACTORY (0.7ms)  DELETE FROM `employees`
+  FACTORY (0.7ms)            INSERT INTO 
+            `employees` (`name`, `hired_on`, `suspended`, `division`, `salary`) 
+          VALUES ('MOUSTAFA MCMANN', '2010-10-02', 0, 'Zany Inventions', 30000);
+
+  FACTORY (0.7ms)            INSERT INTO 
+            `employees` (`name`, `hired_on`, `suspended`, `division`, `salary`) 
+          VALUES ('JIMMY JACKALOPE, JR.', '2013-01-11', 1, 'Tedious Toiling', 20000);
+
+  FACTORY (0.7ms)            INSERT INTO 
+            `employees` (`name`, `hired_on`, `suspended`, `division`, `salary`) 
+          VALUES ('ELISE ELDERBERRY', '2013-01-11', 0, 'Corporate Malfeasance', 99000);
+
+Started GET "/multi/reports/combination.csv" for 127.0.0.1 at 2014-06-05 15:55:50 -0400
+Processing by Dossier::ReportsController#multi as CSV
+  Parameters: {"report"=>"combination"}
+Completed 500 Internal Server Error in 4ms
+Started GET "/multi/reports/combination" for 127.0.0.1 at 2014-06-05 15:55:50 -0400
+Processing by Dossier::ReportsController#multi as HTML
+  Parameters: {"report"=>"combination"}
+  Rendered dossier/reports/combination/_options.html.haml (7.5ms)
+  EmployeeReport (0.2ms)  
+SELECT * FROM employees WHERE 1=1
+ ORDER BY name ASC
+  Rendered /Users/adamhunter/Studio/github/dossier/app/views/dossier/reports/show.html.haml (8.6ms)
+  EmployeeWithCustomViewReport (0.3ms)  
+SELECT * FROM employees WHERE suspended = true
+  Rendered dossier/reports/employee_with_custom_view.html.haml (2.3ms)
+  Rendered /Users/adamhunter/Studio/github/dossier/app/views/dossier/reports/multi.html.haml (35.4ms)
+Completed 200 OK in 40ms (Views: 39.6ms | ActiveRecord: 0.5ms)
+Started GET "/multi/reports/combination" for 127.0.0.1 at 2014-06-05 15:55:50 -0400
+Processing by Dossier::ReportsController#multi as HTML
+  Parameters: {"report"=>"combination"}
+  Rendered dossier/reports/combination/_options.html.haml (0.9ms)
+  EmployeeReport (0.2ms)  
+SELECT * FROM employees WHERE 1=1
+ ORDER BY name ASC
+  Rendered /Users/adamhunter/Studio/github/dossier/app/views/dossier/reports/show.html.haml (3.6ms)
+  EmployeeWithCustomViewReport (0.2ms)  
+SELECT * FROM employees WHERE suspended = true
+  Rendered dossier/reports/employee_with_custom_view.html.haml (1.2ms)
+  Rendered /Users/adamhunter/Studio/github/dossier/app/views/dossier/reports/multi.html.haml (6.9ms)
+Completed 200 OK in 8ms (Views: 6.9ms | ActiveRecord: 0.4ms)
+Started GET "/multi/reports/combination" for 127.0.0.1 at 2014-06-05 15:55:50 -0400
+Processing by Dossier::ReportsController#multi as HTML
+  Parameters: {"report"=>"combination"}
+  Rendered dossier/reports/combination/_options.html.haml (0.8ms)
+  EmployeeReport (0.2ms)  
+SELECT * FROM employees WHERE 1=1
+ ORDER BY name ASC
+  Rendered /Users/adamhunter/Studio/github/dossier/app/views/dossier/reports/show.html.haml (3.8ms)
+  EmployeeWithCustomViewReport (0.2ms)  
+SELECT * FROM employees WHERE suspended = true
+  Rendered dossier/reports/employee_with_custom_view.html.haml (1.3ms)
+  Rendered /Users/adamhunter/Studio/github/dossier/app/views/dossier/reports/multi.html.haml (7.1ms)
+Completed 200 OK in 8ms (Views: 7.0ms | ActiveRecord: 0.5ms)
+  Rendered dossier/reports/employee_with_custom_view/_options.html.haml (3.8ms)
+Started GET "/reports/employee_with_custom_client" for 127.0.0.1 at 2014-06-05 15:55:50 -0400
+Processing by Dossier::ReportsController#show as HTML
+  Parameters: {"report"=>"employee_with_custom_client"}
+  EmployeeWithCustomClientReport (0.3ms)  
+SELECT * FROM `employees`
+Completed 200 OK in 7ms (Views: 5.4ms | ActiveRecord: 0.3ms)
+Started GET "/reports/employee.xls" for 127.0.0.1 at 2014-06-05 15:55:50 -0400
+Processing by Dossier::ReportsController#show as XLS
+  Parameters: {"report"=>"employee"}
+  EmployeeReport (0.2ms)  
+SELECT * FROM employees WHERE 1=1
+ ORDER BY name ASC
+Completed 200 OK in 68ms (ActiveRecord: 0.2ms)
+Started GET "/reports/employee.csv" for 127.0.0.1 at 2014-06-05 15:55:50 -0400
+Processing by Dossier::ReportsController#show as CSV
+  Parameters: {"report"=>"employee"}
+  EmployeeReport (0.2ms)  
+SELECT * FROM employees WHERE 1=1
+ ORDER BY name ASC
+Completed 200 OK in 3ms (ActiveRecord: 0.2ms)
+Started GET "/reports/employee" for 127.0.0.1 at 2014-06-05 15:55:50 -0400
+Processing by Dossier::ReportsController#show as HTML
+  Parameters: {"report"=>"employee"}
+  EmployeeReport (0.2ms)  
+SELECT * FROM employees WHERE 1=1
+ ORDER BY name ASC
+Completed 200 OK in 6ms (Views: 4.2ms | ActiveRecord: 0.2ms)
+Started GET "/reports/employee?options[footer]=1" for 127.0.0.1 at 2014-06-05 15:55:50 -0400
+Processing by Dossier::ReportsController#show as HTML
+  Parameters: {"options"=>{"footer"=>"1"}, "report"=>"employee"}
+  EmployeeReport (0.2ms)  
+SELECT * FROM employees WHERE 1=1
+ ORDER BY name ASC
+Completed 200 OK in 5ms (Views: 4.0ms | ActiveRecord: 0.2ms)
+Started GET "/reports/employee?options[divisions][]=Tedious+Toiling&options[names][]=Jimmy+Jackalope&options[names][]=Moustafa+McMann&options[order]=desc&options[salary]=true" for 127.0.0.1 at 2014-06-05 15:55:50 -0400
+Processing by Dossier::ReportsController#show as HTML
+  Parameters: {"options"=>{"divisions"=>["Tedious Toiling"], "names"=>["Jimmy Jackalope", "Moustafa McMann"], "order"=>"desc", "salary"=>"true"}, "report"=>"employee"}
+  EmployeeReport (0.3ms)  
+SELECT * FROM employees WHERE 1=1
+ AND division in (('Tedious Toiling'))
+ AND salary > 10000
+ AND (name like '%Moustafa McMann%' or name like '%Jimmy Jackalope%')
+ ORDER BY name DESC
+Completed 200 OK in 5ms (Views: 4.0ms | ActiveRecord: 0.3ms)
+Started GET "/reports/employee_with_custom_view" for 127.0.0.1 at 2014-06-05 15:55:50 -0400
+Processing by Dossier::ReportsController#show as HTML
+  Parameters: {"report"=>"employee_with_custom_view"}
+  Rendered dossier/reports/employee_with_custom_view/_options.html.haml (2.4ms)
+  EmployeeWithCustomViewReport (0.2ms)  
+SELECT * FROM employees WHERE suspended = true
+Completed 200 OK in 8ms (Views: 7.5ms | ActiveRecord: 0.2ms)
+Started GET "/reports/employee_with_custom_view" for 127.0.0.1 at 2014-06-05 15:55:50 -0400
+Processing by Dossier::ReportsController#show as HTML
+  Parameters: {"report"=>"employee_with_custom_view"}
+  Rendered dossier/reports/employee_with_custom_view/_options.html.haml (1.6ms)
+  EmployeeWithCustomViewReport (0.2ms)  
+SELECT * FROM employees WHERE suspended = true
+Completed 200 OK in 6ms (Views: 5.1ms | ActiveRecord: 0.2ms)
+Started GET "/reports/employee" for 127.0.0.1 at 2014-06-05 15:55:50 -0400
+Processing by Dossier::ReportsController#show as HTML
+  Parameters: {"report"=>"employee"}
+  EmployeeReport (0.3ms)  
+SELECT * FROM employees WHERE 1=1
+ ORDER BY name ASC
+Completed 200 OK in 5ms (Views: 4.1ms | ActiveRecord: 0.3ms)
+  EmployeeReport (0.2ms)  
+SELECT * FROM employees WHERE 1=1
+ ORDER BY name ASC
+  EmployeeReport (0.3ms)  
+SELECT * FROM employees WHERE 1=1
+ ORDER BY name ASC
+  EmployeeReport (0.2ms)  
+SELECT * FROM employees WHERE 1=1
+ ORDER BY name ASC
+Started GET "/reports/cats/are/super_fun" for 127.0.0.1 at 2014-06-05 15:55:50 -0400
+Processing by Dossier::ReportsController#show as HTML
+  Parameters: {"report"=>"cats/are/super_fun"}
+  Cats::Are::SuperFunReport (0.1ms)  
+select 'cats', 'are', 'super', 'fun'
+Completed 200 OK in 8ms (Views: 3.9ms | ActiveRecord: 0.1ms)
+Started GET "/employee_report_custom_controller" for 127.0.0.1 at 2014-06-05 15:55:50 -0400
+Processing by SiteController#report as HTML
+  EmployeeReport (0.2ms)  
+SELECT * FROM employees WHERE 1=1
+ ORDER BY name ASC
+Completed 200 OK in 5ms (Views: 2.8ms | ActiveRecord: 0.2ms)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dossier
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.12.1
 platform: ruby
 authors:
 - Adam Hunter