dossier 2.5.0 → 2.5.1

data/lib/dossier/query.rb

@@ -15,7 +15,7 @@ module Dossier
     private
 
     def compile
-      string.gsub(/\w*\:[a-z]+/) { |match| escape(report.public_send(match[1..-1])) }
+      string.gsub(/\w*\:[a-z]{1}\w*/) { |match| escape(report.public_send(match[1..-1])) }
     end
 
     def escape(value)

data/lib/dossier/version.rb

@@ -1,3 +1,3 @@
 module Dossier
-  VERSION = "2.5.0"
+  VERSION = "2.5.1"
 end

data/spec/dossier/query_spec.rb

@@ -17,21 +17,21 @@ describe Dossier::Query do
       context "when the methods return single values" do
 
         before :each do
-          report.stub(:sql).and_return("SELECT * FROM employees WHERE id = :id OR girth < :girth OR name = :name")
+          report.stub(:sql).and_return("SELECT * FROM employees WHERE id = :id OR girth < :girth OR hired_on = :hired_on")
           report.stub(:id).and_return(92)
           report.stub(:girth).and_return(3.14)
-          report.stub(:name).and_return('Jimmy')
+          report.stub(:hired_on).and_return('2013-03-29')
         end
 
         it "escapes the values" do
           query.should_receive(:escape).with(92)
           query.should_receive(:escape).with(3.14)
-          query.should_receive(:escape).with('Jimmy')
+          query.should_receive(:escape).with('2013-03-29')
           query.to_s
         end
 
         it "inserts the values" do
-          expect(query.to_s).to eq("SELECT * FROM employees WHERE id = 92 OR girth < 3.14 OR name = 'Jimmy'")
+          expect(query.to_s).to eq("SELECT * FROM employees WHERE id = 92 OR girth < 3.14 OR hired_on = '2013-03-29'")
         end
 
       end

data/spec/dummy/log/test.log

@@ -2118,3 +2118,103 @@ Processing by Dossier::ReportsController#show as XLS
 Completed 200 OK in 5ms (ActiveRecord: 0.4ms)
   EmployeeReport (0.3ms)  SELECT * FROM employees WHERE 1=1
  ORDER BY name ASC
+Connecting to database specified by database.yml
+  FACTORY (0.9ms)  CREATE DATABASE IF NOT EXISTS `dossier_test`
+  FACTORY (68.6ms)  DROP TABLE IF EXISTS `employees`
+  FACTORY (28.9ms)   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 (1.6ms)  TRUNCATE `employees`
+  FACTORY (1.0ms)   INSERT INTO 
+ `employees` (`name`, `hired_on`, `suspended`, `division`, `salary`) 
+ VALUES ('Moustafa McMann', '2010-10-02', false, 'Zany Inventions', 30000);
+
+  FACTORY (0.9ms)   INSERT INTO 
+ `employees` (`name`, `hired_on`, `suspended`, `division`, `salary`) 
+ VALUES ('Jimmy Jackalope, Jr.', '2013-01-11', true, 'Tedious Toiling', 20000);
+
+  FACTORY (0.9ms)   INSERT INTO 
+ `employees` (`name`, `hired_on`, `suspended`, `division`, `salary`) 
+ VALUES ('Elise Elderberry', '2013-01-11', false, 'Corporate Malfeasance', 99000);
+
+  FACTORY (8.8ms)  DROP TABLE IF EXISTS `employees`
+  FACTORY (1.0ms)   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.9ms)  DELETE FROM `employees`
+  FACTORY (0.9ms)   INSERT INTO 
+ `employees` (`name`, `hired_on`, `suspended`, `division`, `salary`) 
+ VALUES ('MOUSTAFA MCMANN', '2010-10-02', 0, 'Zany Inventions', 30000);
+
+  FACTORY (1.0ms)   INSERT INTO 
+ `employees` (`name`, `hired_on`, `suspended`, `division`, `salary`) 
+ VALUES ('JIMMY JACKALOPE, JR.', '2013-01-11', 1, 'Tedious Toiling', 20000);
+
+  FACTORY (1.0ms)   INSERT INTO 
+ `employees` (`name`, `hired_on`, `suspended`, `division`, `salary`) 
+ VALUES ('ELISE ELDERBERRY', '2013-01-11', 0, 'Corporate Malfeasance', 99000);
+
+Started GET "/reports/employee_with_custom_client" for 127.0.0.1 at 2013-05-06 11:38:23 -0400
+Processing by Dossier::ReportsController#show as HTML
+  Parameters: {"report"=>"employee_with_custom_client"}
+  EmployeeWithCustomClientReport (3.0ms)  SELECT * FROM `employees`
+  Rendered /Users/adamhunter/Studio/adamhunter/dossier/app/views/dossier/reports/show.html.haml within layouts/application (7.3ms)
+Completed 200 OK in 35ms (Views: 13.2ms | ActiveRecord: 0.0ms)
+Started GET "/reports/employee.xls" for 127.0.0.1 at 2013-05-06 11:38:23 -0400
+Processing by Dossier::ReportsController#show as XLS
+  Parameters: {"report"=>"employee"}
+  EmployeeReport (0.3ms)  SELECT * FROM employees WHERE 1=1
+ ORDER BY name ASC
+Completed 200 OK in 31ms (ActiveRecord: 0.3ms)
+Started GET "/reports/employee.csv" for 127.0.0.1 at 2013-05-06 11:38:23 -0400
+Processing by Dossier::ReportsController#show as CSV
+  Parameters: {"report"=>"employee"}
+  EmployeeReport (0.3ms)  SELECT * FROM employees WHERE 1=1
+ ORDER BY name ASC
+Completed 200 OK in 5ms (ActiveRecord: 0.3ms)
+Started GET "/reports/employee_with_custom_view" for 127.0.0.1 at 2013-05-06 11:38:23 -0400
+Processing by Dossier::ReportsController#show as HTML
+  Parameters: {"report"=>"employee_with_custom_view"}
+  EmployeeWithCustomViewReport (0.2ms)  SELECT * FROM employees WHERE suspended = true
+Completed 200 OK in 9ms (Views: 3.9ms | ActiveRecord: 0.2ms)
+Started GET "/reports/employee?options[footer]=1" for 127.0.0.1 at 2013-05-06 11:38:23 -0400
+Processing by Dossier::ReportsController#show as HTML
+  Parameters: {"options"=>{"footer"=>"1"}, "report"=>"employee"}
+  EmployeeReport (0.4ms)  SELECT * FROM employees WHERE 1=1
+ ORDER BY name ASC
+Completed 200 OK in 18ms (Views: 12.0ms | ActiveRecord: 0.0ms)
+Started GET "/reports/employee?options[salary]=true&options[order]=desc&options[names][]=Jimmy+Jackalope&options[names][]=Moustafa+McMann&options[divisions][]=Tedious+Toiling" for 127.0.0.1 at 2013-05-06 11:38:23 -0400
+Processing by Dossier::ReportsController#show as HTML
+  Parameters: {"options"=>{"salary"=>"true", "order"=>"desc", "names"=>["Jimmy Jackalope", "Moustafa McMann"], "divisions"=>["Tedious Toiling"]}, "report"=>"employee"}
+  EmployeeReport (0.5ms)  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 16ms (Views: 3.6ms | ActiveRecord: 0.0ms)
+Started GET "/reports/employee" for 127.0.0.1 at 2013-05-06 11:38:23 -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 10ms (Views: 4.6ms | ActiveRecord: 0.0ms)
+Started GET "/employee_report_custom_controller" for 127.0.0.1 at 2013-05-06 11:38:23 -0400
+Processing by SiteController#report as HTML
+  EmployeeReport (0.4ms)  SELECT * FROM employees WHERE 1=1
+ ORDER BY name ASC
+Completed 200 OK in 9ms (Views: 4.6ms | ActiveRecord: 0.4ms)
+  EmployeeReport (0.3ms)  SELECT * FROM employees WHERE 1=1
+ ORDER BY name ASC

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dossier
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -98,17 +98,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.6
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.6
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -319,7 +319,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2711006704364315577
+      hash: 4524173527556927315
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -328,7 +328,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2711006704364315577
+      hash: 4524173527556927315
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23