dossier 2.12.1 → 2.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38e25b35de73b25b62fd2532e6a75a40ca1ada9c
-  data.tar.gz: c14577c20f96aca152a179ca827bcae2753b5062
+  metadata.gz: 2e46d866c27e0bcc065d6fd0e0912ed6b1ecbb72
+  data.tar.gz: a76bd7e9487ae6de1114b5b9aa2ac32d616d11cd
 SHA512:
-  metadata.gz: 6b3b33eaff2f0a2f82839a672ddd68cf6852be5524052e88ae7511071b003fff3451c6399601d8f7a75f53760b9e9f25108698adaab9c11ab158e8a7c4bc4c2a
-  data.tar.gz: cffa2da9c307d3e78e479785839b210568ed066f9641c03fd1109b93129db9df8f00a5e946744c8c1f3b6385870b69fb3948544076660e09b990c89c3e342002
+  metadata.gz: 1a333bec0fa762f56180e6d2e6916dbd2043ee8d0dbc634d114a74a178702558e8d30afb22e22292fa46cdd3ec97fa98e25f3d7915487d6fb9e5216b0695fef4
+  data.tar.gz: 7ac2295c362089079c2010b20dea42c600f0c23dc8208a1d7040fd0d9d2308bc6646b17dc8e0340228054314a2639d6d98498fd7d129000e5cc90c947ae7fba0

data/lib/dossier/connection_url.rb

@@ -1,5 +1,5 @@
-require 'cgi'
 require 'uri'
+require 'rack/utils'
 
 module Dossier
   class ConnectionUrl
@@ -9,20 +9,27 @@ module Dossier
     def initialize(url = nil)
       @uri = URI.parse(url || ENV.fetch('DATABASE_URL'))
     end
-  
+
     def to_hash
-      query = CGI.parse(uri.query) if uri.query
-      adapter = uri.scheme == "postgres" ? "postgresql" : uri.scheme
       {
         adapter:  adapter,
+        username: uri.user,
+        password: uri.password,
         host:     uri.host,
-        database: File.basename(uri.path),
         port:     uri.port,
-        user:     uri.user,
-        password: uri.password,
-        encoding: query && query['encoding'] ? query['encoding'][0] : nil,
-        pool: (query && query['pool'] && query['pool'][0]) ? query['pool'][0].to_i : nil
-      }.delete_if{|k,v| v.nil? }
+        database: File.basename(uri.path)
+      }.merge(params).reject { |k,v| v.nil? }
+    end
+
+    private
+
+    def adapter
+      uri.scheme == "postgres" ? "postgresql" : uri.scheme
+    end
+
+    def params
+      return {} unless uri.query
+      Rack::Utils.parse_nested_query(uri.query).symbolize_keys
     end
 
   end

data/lib/dossier/report.rb

@@ -21,7 +21,7 @@ module Dossier
     end
 
     def self.filename
-      "#{report_name.parameterize}-report_#{Time.now.strftime('%m-%d-%Y_%H-%M-%S')}"
+      "#{report_name.parameterize}-report_#{Time.now.strftime('%Y-%m-%d_%H-%M-%S-%Z')}"
     end
     
     def initialize(options = {})

data/lib/dossier/version.rb

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

data/spec/dossier/connection_url_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 
 describe Dossier::ConnectionUrl do
 
-  let(:database_url) { "mysql2://root:password@127.0.0.1/myapp_development?encoding=utf8" }   
-  
   it "parses the url provided into a hash" do
+    database_url = "mysql2://root:password@127.0.0.1/myapp_development?encoding=utf8"
+
     connection_options = described_class.new(database_url).to_hash
-    expected_options = { adapter: "mysql2",   database: "myapp_development",user:"root",
+    expected_options = { adapter: "mysql2",   database: "myapp_development", username:"root",
                          password:"password", encoding:"utf8", host: "127.0.0.1"}
     expect(connection_options).to eq(expected_options)
   end
@@ -20,4 +20,26 @@ describe Dossier::ConnectionUrl do
     ENV["DATABASE_URL"] = old_db_url
   end
 
+  it "translates postgres" do
+    database_url  = "postgres://user:secret@localhost/mydatabase"
+    connection_options = described_class.new(database_url).to_hash
+
+    expect(connection_options[:adapter]).to eq("postgresql")
+  end
+
+  it "supports additional options" do
+    database_url  = "postgresql://user:secret@remotehost.example.org:3133/mydatabase?encoding=utf8&random_key=blah"
+    connection_options = described_class.new(database_url).to_hash
+
+    expect(connection_options[:encoding]).to eq("utf8")
+    expect(connection_options[:random_key]).to eq("blah")
+    expect(connection_options[:port]).to eq(3133)
+  end
+
+  it "drops empty values" do
+    database_url  = "postgresql://localhost/mydatabase"
+    connection_options = described_class.new(database_url).to_hash
+    expect(connection_options.slice(:username, :password, :port)).to be_empty
+  end
+
 end

data/spec/dummy/log/test.log

@@ -705,3 +705,193 @@ Processing by SiteController#report as HTML
 SELECT * FROM employees WHERE 1=1
  ORDER BY name ASC
 Completed 200 OK in 5ms (Views: 2.8ms | ActiveRecord: 0.2ms)
+  ActiveRecord::SchemaMigration Load (41.4ms)  SELECT `schema_migrations`.* FROM `schema_migrations`
+  FACTORY (6.4ms)  CREATE DATABASE IF NOT EXISTS `dossier_test`
+  FACTORY (22.1ms)  DROP TABLE IF EXISTS `employees`
+  FACTORY (42.2ms)            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 (165.1ms)  TRUNCATE `employees`
+  FACTORY (2.8ms)            INSERT INTO 
+            `employees` (`name`, `hired_on`, `suspended`, `division`, `salary`) 
+          VALUES ('Moustafa McMann', '2010-10-02', false, 'Zany Inventions', 30000);
+
+  FACTORY (1.5ms)            INSERT INTO 
+            `employees` (`name`, `hired_on`, `suspended`, `division`, `salary`) 
+          VALUES ('Jimmy Jackalope, Jr.', '2013-01-11', true, 'Tedious Toiling', 20000);
+
+  FACTORY (1.5ms)            INSERT INTO 
+            `employees` (`name`, `hired_on`, `suspended`, `division`, `salary`) 
+          VALUES ('Elise Elderberry', '2013-01-11', false, 'Corporate Malfeasance', 99000);
+
+  FACTORY (2.2ms)  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.6ms)  DELETE FROM `employees`
+  FACTORY (0.8ms)            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.9ms)            INSERT INTO 
+            `employees` (`name`, `hired_on`, `suspended`, `division`, `salary`) 
+          VALUES ('ELISE ELDERBERRY', '2013-01-11', 0, 'Corporate Malfeasance', 99000);
+
+  EmployeeReport (4.1ms)  
+SELECT * FROM employees WHERE 1=1
+ ORDER BY name ASC
+Started GET "/employee_report_custom_controller" for 127.0.0.1 at 2014-12-15 09:54:47 -0500
+Processing by SiteController#report as HTML
+  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 (18.2ms)
+Completed 200 OK in 29ms (Views: 26.6ms | ActiveRecord: 0.2ms)
+Started GET "/reports/employee_with_custom_client" for 127.0.0.1 at 2014-12-15 09:54:47 -0500
+Processing by Dossier::ReportsController#show as HTML
+  Parameters: {"report"=>"employee_with_custom_client"}
+  EmployeeWithCustomClientReport (0.2ms)  
+SELECT * FROM `employees`
+  Rendered /Users/adamhunter/Studio/github/dossier/app/views/dossier/reports/show.html.haml (2.0ms)
+Completed 200 OK in 5ms (Views: 2.4ms | ActiveRecord: 0.2ms)
+Started GET "/reports/cats/are/super_fun" for 127.0.0.1 at 2014-12-15 09:54:47 -0500
+Processing by Dossier::ReportsController#show as HTML
+  Parameters: {"report"=>"cats/are/super_fun"}
+  Cats::Are::SuperFunReport (0.1ms)  
+select 'cats', 'are', 'super', 'fun'
+  Rendered /Users/adamhunter/Studio/github/dossier/app/views/dossier/reports/show.html.haml (3.3ms)
+Completed 200 OK in 7ms (Views: 3.4ms | ActiveRecord: 0.1ms)
+Started GET "/reports/employee.xls" for 127.0.0.1 at 2014-12-15 09:54:47 -0500
+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 4ms (ActiveRecord: 0.3ms)
+Started GET "/reports/employee.csv" for 127.0.0.1 at 2014-12-15 09:54:47 -0500
+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 4ms (ActiveRecord: 0.2ms)
+Started GET "/reports/employee" for 127.0.0.1 at 2014-12-15 09:54:47 -0500
+Processing by Dossier::ReportsController#show as HTML
+  Parameters: {"report"=>"employee"}
+  EmployeeReport (6.0ms)  
+SELECT * FROM employees WHERE 1=1
+ ORDER BY name ASC
+  Rendered /Users/adamhunter/Studio/github/dossier/app/views/dossier/reports/show.html.haml (10.4ms)
+Completed 200 OK in 12ms (Views: 4.8ms | ActiveRecord: 6.0ms)
+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-12-15 09:54:47 -0500
+Processing by Dossier::ReportsController#show as HTML
+  Parameters: {"options"=>{"divisions"=>["Tedious Toiling"], "names"=>["Jimmy Jackalope", "Moustafa McMann"], "order"=>"desc", "salary"=>"true"}, "report"=>"employee"}
+  EmployeeReport (3.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
+  Rendered /Users/adamhunter/Studio/github/dossier/app/views/dossier/reports/show.html.haml (7.8ms)
+Completed 200 OK in 9ms (Views: 4.6ms | ActiveRecord: 3.5ms)
+Started GET "/reports/employee?options[footer]=1" for 127.0.0.1 at 2014-12-15 09:54:47 -0500
+Processing by Dossier::ReportsController#show as HTML
+  Parameters: {"options"=>{"footer"=>"1"}, "report"=>"employee"}
+  EmployeeReport (0.3ms)  
+SELECT * FROM employees WHERE 1=1
+ ORDER BY name ASC
+  Rendered /Users/adamhunter/Studio/github/dossier/app/views/dossier/reports/show.html.haml (6.2ms)
+Completed 200 OK in 7ms (Views: 6.2ms | ActiveRecord: 0.3ms)
+Started GET "/reports/employee_with_custom_view" for 127.0.0.1 at 2014-12-15 09:54:47 -0500
+Processing by Dossier::ReportsController#show as HTML
+  Parameters: {"report"=>"employee_with_custom_view"}
+  Rendered dossier/reports/employee_with_custom_view/_options.html.haml (5.1ms)
+  EmployeeWithCustomViewReport (0.2ms)  
+SELECT * FROM employees WHERE suspended = true
+  Rendered dossier/reports/employee_with_custom_view.html.haml (10.3ms)
+Completed 200 OK in 12ms (Views: 11.2ms | ActiveRecord: 0.2ms)
+Started GET "/reports/employee_with_custom_view" for 127.0.0.1 at 2014-12-15 09:54:47 -0500
+Processing by Dossier::ReportsController#show as HTML
+  Parameters: {"report"=>"employee_with_custom_view"}
+  Rendered dossier/reports/employee_with_custom_view/_options.html.haml (1.7ms)
+  EmployeeWithCustomViewReport (0.3ms)  
+SELECT * FROM employees WHERE suspended = true
+  Rendered dossier/reports/employee_with_custom_view.html.haml (6.3ms)
+Completed 200 OK in 8ms (Views: 6.4ms | ActiveRecord: 0.3ms)
+Started GET "/reports/employee" for 127.0.0.1 at 2014-12-15 09:54:47 -0500
+Processing by Dossier::ReportsController#show as HTML
+  Parameters: {"report"=>"employee"}
+  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 (5.0ms)
+Completed 200 OK in 6ms (Views: 5.1ms | ActiveRecord: 0.2ms)
+Started GET "/multi/reports/combination" for 127.0.0.1 at 2014-12-15 09:54:47 -0500
+Processing by Dossier::ReportsController#multi as HTML
+  Parameters: {"report"=>"combination"}
+  Rendered dossier/reports/combination/_options.html.haml (3.6ms)
+  EmployeeReport (0.4ms)  
+SELECT * FROM employees WHERE 1=1
+ ORDER BY name ASC
+  Rendered /Users/adamhunter/Studio/github/dossier/app/views/dossier/reports/show.html.haml (17.0ms)
+  EmployeeWithCustomViewReport (0.2ms)  
+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 (39.9ms)
+Completed 200 OK in 42ms (Views: 40.6ms | ActiveRecord: 0.6ms)
+Started GET "/multi/reports/combination" for 127.0.0.1 at 2014-12-15 09:54:48 -0500
+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.9ms)
+  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.4ms)
+Started GET "/multi/reports/combination" for 127.0.0.1 at 2014-12-15 09:54:48 -0500
+Processing by Dossier::ReportsController#multi as HTML
+  Parameters: {"report"=>"combination"}
+  Rendered dossier/reports/combination/_options.html.haml (1.0ms)
+  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 (5.0ms)
+  EmployeeWithCustomViewReport (0.3ms)  
+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 (8.5ms)
+Completed 200 OK in 10ms (Views: 8.3ms | ActiveRecord: 0.5ms)
+Started GET "/multi/reports/combination.csv" for 127.0.0.1 at 2014-12-15 09:54:48 -0500
+Processing by Dossier::ReportsController#multi as CSV
+  Parameters: {"report"=>"combination"}
+Completed 500 Internal Server Error in 1ms
+  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 within dossier/layouts/application (8.4ms)
+  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 within dossier/layouts/application (3.6ms)
+  Rendered dossier/reports/employee_with_custom_view/_options.html.haml (3.2ms)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dossier
 version: !ruby/object:Gem::Version
-  version: 2.12.1
+  version: 2.12.2
 platform: ruby
 authors:
 - Adam Hunter
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-05 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
@@ -221,7 +221,6 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/assets/javascripts/dossier/application.js
 - app/assets/stylesheets/dossier/application.css
 - app/controllers/dossier/application_controller.rb
 - app/controllers/dossier/reports_controller.rb

data/app/assets/javascripts/dossier/application.js

@@ -1,15 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
-//
-//= require jquery
-//= require jquery_ujs
-//= require_tree .