dossier 2.12.2 → 2.13.1

data/spec/features/employee_spec.rb

@@ -12,6 +12,13 @@ describe "employee report" do
       end
     end
 
+    context "hiding columns" do
+      it "does not display hidden columns" do
+        visit '/reports/employee'
+        expect(page).to_not have_content('Id')
+      end
+    end
+
     context "when a custom view exists for the report" do
 
       it "uses the custom view" do
@@ -46,7 +53,7 @@ describe "employee report" do
         it "uses any options provided" do
           visit path
           expect(page).to have_selector("table tbody tr", count: 1)
-          expect(page).to have_selector("td", text: 'Employee Jimmy Jackalope, Jr.')
+          expect(page).to have_selector("td", text: %r(Employee Jimmy Jackalope, Jr.)i)
         end
       end
 
@@ -55,7 +62,7 @@ describe "employee report" do
 
         it "moves the specified number of rows into the footer" do
           visit path
-          expect(page).to have_selector("table tfoot tr th", text: 'Employee Moustafa McMann')
+          expect(page).to have_selector("table tfoot tr th", text: %r(Employee Moustafa McMann)i)
         end
       end
 
@@ -67,7 +74,8 @@ describe "employee report" do
 
     it "creates a standard CSV report" do
       visit '/reports/employee.csv'
-      expect(page.body).to eq(File.read('spec/fixtures/reports/employee.csv'))
+      expect(page.body.downcase).to(
+        eq(File.read('spec/fixtures/reports/employee.csv').downcase))
     end
 
   end
@@ -76,7 +84,8 @@ describe "employee report" do
 
     it "creates a standard XLS report" do
       visit '/reports/employee.xls'
-      expect(page.body).to eq(File.read('spec/fixtures/reports/employee.xls'))
+      expect(page.body.downcase).to(
+        eq(File.read('spec/fixtures/reports/employee.xls').downcase))
     end
 
   end

data/spec/fixtures/db/postgresql.yml

@@ -0,0 +1,4 @@
+adapter: postgresql
+database: dossier_test
+host: localhost
+username: adamhunter

data/spec/fixtures/db/postgresql.yml.example

@@ -0,0 +1,5 @@
+adapter: postgresql
+database: dossier_test
+host: localhost
+username: your_user_name
+password: 

data/spec/fixtures/db/postgresql.yml.travis

@@ -0,0 +1,4 @@
+adapter: postgresql
+database: dossier_test
+host: localhost
+username: postgres

data/spec/fixtures/db/sqlite3.yml

@@ -1,2 +1,2 @@
 adapter: sqlite3
-database: db/test.sqlite3
+database: db/dossier_test.sqlite3

data/spec/fixtures/reports/employee.csv

@@ -1,4 +1,4 @@
 Id,Name,Division,Salary,Suspended,Hired On
-3,Elise Elderberry,Corporate Malfeasance,99000,0,2013-01-11
-2,"Jimmy Jackalope, Jr.",Tedious Toiling,20000,1,2013-01-11
-1,Moustafa McMann,Zany Inventions,30000,0,2010-10-02
+3,Elise Elderberry,Corporate Malfeasance,99000,no,2013-01-11
+2,"Jimmy Jackalope, Jr.",Tedious Toiling,20000,yes,2013-01-11
+1,Moustafa McMann,Zany Inventions,30000,no,2010-10-02

data/spec/fixtures/reports/employee.xls

@@ -15,7 +15,7 @@
 <Cell><Data ss:Type="String">Elise Elderberry</Data></Cell>
 <Cell><Data ss:Type="String">Corporate Malfeasance</Data></Cell>
 <Cell><Data ss:Type="String">99000</Data></Cell>
-<Cell><Data ss:Type="String">0</Data></Cell>
+<Cell><Data ss:Type="String">no</Data></Cell>
 <Cell><Data ss:Type="String">2013-01-11</Data></Cell>
 </Row>
 <Row>
@@ -23,7 +23,7 @@
 <Cell><Data ss:Type="String">Jimmy Jackalope, Jr.</Data></Cell>
 <Cell><Data ss:Type="String">Tedious Toiling</Data></Cell>
 <Cell><Data ss:Type="String">20000</Data></Cell>
-<Cell><Data ss:Type="String">1</Data></Cell>
+<Cell><Data ss:Type="String">yes</Data></Cell>
 <Cell><Data ss:Type="String">2013-01-11</Data></Cell>
 </Row>
 <Row>
@@ -31,7 +31,7 @@
 <Cell><Data ss:Type="String">Moustafa McMann</Data></Cell>
 <Cell><Data ss:Type="String">Zany Inventions</Data></Cell>
 <Cell><Data ss:Type="String">30000</Data></Cell>
-<Cell><Data ss:Type="String">0</Data></Cell>
+<Cell><Data ss:Type="String">no</Data></Cell>
 <Cell><Data ss:Type="String">2010-10-02</Data></Cell>
 </Row>
 </Table>

data/spec/generators/dossier/views/views_spec.rb

@@ -1,25 +1,32 @@
 require 'spec_helper'
 
-describe 'dossier:views' do
+require 'generators/dossier/views/views_generator'
+
+describe Dossier::ViewsGenerator, type: :generator  do
+  after(:each)  { cleanup }
+
+  let(:path) { Rails.root.join(*%w[app views dossier reports]) }
+  let(:file) { raise 'implement in nested context/describe' }
+  let(:file_path) { path.join(file) }
+  let(:cleanup)   { FileUtils.rm_f file_path }
+
   context "with no arguments or options" do
+    let(:file) { 'show.html.haml' }
 
-    before :each do
-      FileUtils.rm_rf("spec/dummy/app/views/dossier/reports/show.html.haml")
-    end
+    before(:each) { run_generator }
 
     it "should generate a view file" do
-      FileTest.exists?(Rails.root.join("app" "views" "dossier" "show.html.haml"))
+      expect(FileTest.exists? file_path).to be true
     end
   end
 
-  with_args "account_tracker" do
+  context "with_args: account_tracker" do
+    let(:file) { 'account_tracker.html.haml' }
 
-    before :each do
-      FileUtils.rm_rf("spec/dummy/app/views/dossier/reports/account_tracker.html.haml")
-    end
+    before(:each) { run_generator %w[account_tracker] }
 
     it "should generate a edit_account form" do
-      FileTest.exists?(Rails.root.join("app" "views" "dossier" "account_tracker.html.haml"))
+      expect(FileTest.exists? file_path).to be true
     end 
   end
 end

data/spec/routing/dossier_routes_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "routing to dossier" do
   it "routes /dossier/reports/:report to dossier/reports#show" do
-    {:get => '/reports/employee'}.should route_to(
+    expect(:get => '/reports/employee').to route_to(
       :controller => 'dossier/reports',
       :action     => 'show',
       :report     => 'employee'

data/spec/spec_helper.rb

@@ -1,12 +1,10 @@
-require 'rails/all'
-require 'dummy/application'
-require 'active_model'
+ENV['RAILS_ENV']   = 'test'
 require 'simplecov'
 require 'coveralls'
 
 # not sure why I need to do this now, its after I added dummy-application
-ApplicationController.helper Dossier::ApplicationHelper
-SiteController.helper Dossier::ApplicationHelper
+# ApplicationController.helper Dossier::ApplicationHelper
+# SiteController.helper Dossier::ApplicationHelper
 
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
   SimpleCov::Formatter::HTMLFormatter,
@@ -15,18 +13,16 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
 SimpleCov.start
 Coveralls.wear!('rails')
 
-require "rails/test_help"
+require File.expand_path("../dummy/config/application.rb",  __FILE__)
 require 'rspec/rails'
 require 'pry'
-require 'genspec'
+require 'generator_spec'
 require 'capybara/rspec'
 
-Rails.backtrace_cleaner.remove_silencers!
-
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
-DB_CONFIG = [:mysql2, :sqlite3].reduce({}) do |config, adapter_name|
+DB_CONFIG = [:mysql2, :sqlite3, :postgresql].reduce({}) do |config, adapter_name|
   config.tap do |hash|
     path = "spec/fixtures/db/#{adapter_name}.yml"
     hash[adapter_name] = YAML.load_file(path).symbolize_keys if File.exist?(path)
@@ -34,6 +30,7 @@ DB_CONFIG = [:mysql2, :sqlite3].reduce({}) do |config, adapter_name|
 end.freeze
 
 RSpec.configure do |config|
+  config.infer_spec_type_from_file_location!
   config.mock_with :rspec
 
   config.before :suite do

data/spec/support/factory.rb

@@ -17,6 +17,10 @@ module Dossier
       @sqlite3_client ||= Dossier::Client.new(DB_CONFIG.fetch(:sqlite3))
     end
 
+    def postgresql_client
+      @postgres_client ||= Dossier::Client.new(DB_CONFIG.fetch(:postgresql))
+    end
+
     def mysql2_connection
       mysql2_client.adapter.connection
     end
@@ -25,6 +29,10 @@ module Dossier
       sqlite3_client.adapter.connection
     end
 
+    def postgresql_connection
+      postgresql_client.adapter.connection
+    end
+
     def mysql2_create_employees
       mysql2_connection.execute('CREATE DATABASE IF NOT EXISTS `dossier_test`', 'FACTORY')
       mysql2_connection.execute('DROP TABLE IF EXISTS `employees`', 'FACTORY')
@@ -59,6 +67,24 @@ module Dossier
       )
     end
 
+    def postgresql_create_employees
+      # database must be created by hand (as far as I can tell), create
+      # `dossier_test'
+      postgresql_connection.execute('DROP TABLE IF EXISTS employees', 'FACTORY')
+      postgresql_connection.execute(
+        <<-SQL, 'FACTORY'
+          CREATE TABLE employees (
+            id serial PRIMARY KEY,
+            name varchar(255) NOT NULL,
+            division varchar(255) NOT NULL,
+            salary integer NOT NULL,
+            suspended boolean NOT NULL DEFAULT false,
+            hired_on date NOT NULL
+          ) 
+        SQL
+      )
+    end
+
     def mysql2_seed_employees
       mysql2_connection.execute('TRUNCATE `employees`', 'FACTORY')
       employees.each do |employee|
@@ -82,5 +108,17 @@ module Dossier
         sqlite3_connection.execute(query, 'FACTORY')
       end
     end
+
+    def postgresql_seed_employees
+      postgresql_connection.execute('TRUNCATE employees', 'FACTORY')
+      employees.each do |employee|
+        query = <<-QUERY
+          INSERT INTO 
+            employees (name, hired_on, suspended, division, salary) 
+          VALUES ('#{employee[:name]}', '#{employee[:hired_on]}', #{employee[:suspended]}, '#{employee[:division]}', #{employee[:salary]});
+        QUERY
+        postgresql_connection.execute(query, 'FACTORY')
+      end
+    end
   end
 end

metadata

@@ -1,16 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dossier
 version: !ruby/object:Gem::Version
-  version: 2.12.2
+  version: 2.13.1
 platform: ruby
 authors:
-- Adam Hunter
-- Nathan Long
-- Rodney Turnham
+- TMA IT
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
@@ -96,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: responders
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -130,90 +142,74 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.10
+        version: 0.10.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.10
+        version: 0.10.1
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.3.3
 - !ruby/object:Gem::Dependency
-  name: genspec
+  name: generator_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.9.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.9.3
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.4.4
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
-- !ruby/object:Gem::Dependency
-  name: dummy-application
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
 description: Easy SQL based report generation with the ability to accept request parameters
   and render multiple formats.
 email:
-- adamhunter@me.com
-- nathanmlong@gmail.com
-- rodney.turnham@tma1.com
+- developer@tma1.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -221,6 +217,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- VERSION
 - app/assets/stylesheets/dossier/application.css
 - app/controllers/dossier/application_controller.rb
 - app/controllers/dossier/reports_controller.rb
@@ -238,8 +235,8 @@ files:
 - lib/dossier/connection_url.rb
 - lib/dossier/engine.rb
 - lib/dossier/formatter.rb
+- lib/dossier/model.rb
 - lib/dossier/multi_report.rb
-- lib/dossier/naming.rb
 - lib/dossier/query.rb
 - lib/dossier/renderer.rb
 - lib/dossier/report.rb
@@ -258,15 +255,18 @@ files:
 - spec/dossier/configuration_spec.rb
 - spec/dossier/connection_url_spec.rb
 - spec/dossier/formatter_spec.rb
+- spec/dossier/model_spec.rb
 - spec/dossier/multi_report_spec.rb
-- spec/dossier/naming_spec.rb
 - spec/dossier/query_spec.rb
 - spec/dossier/renderer_spec.rb
 - spec/dossier/report_spec.rb
 - spec/dossier/responder_spec.rb
 - spec/dossier/result_spec.rb
 - spec/dossier/stream_csv_spec.rb
+- spec/dossier/version_spec.rb
 - spec/dossier_spec.rb
+- spec/dummy/Rakefile
+- spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/site_controller.rb
 - spec/dummy/app/reports/cats/are/super_fun_report.rb
 - spec/dummy/app/reports/combination_report.rb
@@ -279,13 +279,15 @@ files:
 - spec/dummy/app/views/dossier/reports/employee_with_custom_view.html.haml
 - spec/dummy/app/views/dossier/reports/employee_with_custom_view/_options.html.haml
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/bin/rails
+- spec/dummy/bin/rake
 - spec/dummy/config.ru
+- spec/dummy/config/application.rb
 - spec/dummy/config/database.yml
-- spec/dummy/config/database.yml.example
-- spec/dummy/config/database.yml.travis
 - spec/dummy/config/routes.rb
+- spec/dummy/db/dossier_test.sqlite3
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
+- spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/features/combination_report_spec.rb
 - spec/features/employee_spec.rb
@@ -295,6 +297,9 @@ files:
 - spec/fixtures/db/mysql2.yml
 - spec/fixtures/db/mysql2.yml.example
 - spec/fixtures/db/mysql2.yml.travis
+- spec/fixtures/db/postgresql.yml
+- spec/fixtures/db/postgresql.yml.example
+- spec/fixtures/db/postgresql.yml.travis
 - spec/fixtures/db/sqlite3.yml
 - spec/fixtures/db/sqlite3.yml.example
 - spec/fixtures/db/sqlite3.yml.travis
@@ -305,7 +310,7 @@ files:
 - spec/routing/dossier_routes_spec.rb
 - spec/spec_helper.rb
 - spec/support/factory.rb
-homepage: https://github.com/adamhunter/dossier
+homepage: https://github.com/tma1/dossier
 licenses:
 - MIT
 metadata: {}
@@ -325,7 +330,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: SQL based report generation.
@@ -336,15 +341,17 @@ test_files:
 - spec/dossier/configuration_spec.rb
 - spec/dossier/connection_url_spec.rb
 - spec/dossier/formatter_spec.rb
+- spec/dossier/model_spec.rb
 - spec/dossier/multi_report_spec.rb
-- spec/dossier/naming_spec.rb
 - spec/dossier/query_spec.rb
 - spec/dossier/renderer_spec.rb
 - spec/dossier/report_spec.rb
 - spec/dossier/responder_spec.rb
 - spec/dossier/result_spec.rb
 - spec/dossier/stream_csv_spec.rb
+- spec/dossier/version_spec.rb
 - spec/dossier_spec.rb
+- spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/site_controller.rb
 - spec/dummy/app/reports/cats/are/super_fun_report.rb
 - spec/dummy/app/reports/combination_report.rb
@@ -357,14 +364,17 @@ test_files:
 - spec/dummy/app/views/dossier/reports/employee_with_custom_view/_options.html.haml
 - spec/dummy/app/views/dossier/reports/employee_with_custom_view.html.haml
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/bin/rails
+- spec/dummy/bin/rake
+- spec/dummy/config/application.rb
 - spec/dummy/config/database.yml
-- spec/dummy/config/database.yml.example
-- spec/dummy/config/database.yml.travis
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
+- spec/dummy/db/dossier_test.sqlite3
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
+- spec/dummy/log/development.log
 - spec/dummy/log/test.log
+- spec/dummy/Rakefile
 - spec/features/combination_report_spec.rb
 - spec/features/employee_spec.rb
 - spec/features/employee_with_custom_client_spec.rb
@@ -373,6 +383,9 @@ test_files:
 - spec/fixtures/db/mysql2.yml
 - spec/fixtures/db/mysql2.yml.example
 - spec/fixtures/db/mysql2.yml.travis
+- spec/fixtures/db/postgresql.yml
+- spec/fixtures/db/postgresql.yml.example
+- spec/fixtures/db/postgresql.yml.travis
 - spec/fixtures/db/sqlite3.yml
 - spec/fixtures/db/sqlite3.yml.example
 - spec/fixtures/db/sqlite3.yml.travis