dossier 2.10.0 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93987008f6194c281702669957217d7a95c69e58
-  data.tar.gz: 9549de90bae8c4d2e92b0090670bd70a9b4b6b9c
+  metadata.gz: 5750b4e9b45d224d36b0781ac414430996424e5d
+  data.tar.gz: 82b8a612bf19b8b07244a7aa70ea7f7b0369f4ab
 SHA512:
-  metadata.gz: abb7438d57a7d8f724054c371f5dc324773f63eeb783be4de9690206d24435199e24df268bb46b360120fc66f7aaf3f194ed567371f82f8ad0c2ae2d5edc3379
-  data.tar.gz: 3bf60dc6132b439fe35b0f35115a253f20b7f56b7b12f0a4c0a77fee2a66eaea4dbf1983f94c507aed376e0b4f39449051c818dace505827c114cfd542c08b09
+  metadata.gz: cfdb1e481e2f1f3ff757f6a96a4203efc720665b71923ef56d3dae8d4afccc8e0ec9636d81b7a292316f6f4ba76a3d25aa831a3486fdd85b3a74fe9ce23ad56a
+  data.tar.gz: 19a70f10f3d8d60f0df04da43cdb18aa370c0f83961c2845d09f64935bcc2d16e29e31fa9299822ec9590c4dd129279c373d50e4e700bb8a56610090e00fa4bc

data/lib/dossier/responder.rb

@@ -13,12 +13,12 @@ module Dossier
 
     def to_csv
       set_content_disposition!
-      controller.response_body = StreamCSV.new(report.raw_results.arrays)
+      controller.response_body = StreamCSV.new(*collection_and_headers(report.raw_results.arrays))
     end
 
     def to_xls
       set_content_disposition!
-      controller.response_body = Xls.new(report.raw_results.arrays)
+      controller.response_body = Xls.new(*collection_and_headers(report.raw_results.arrays))
     end
 
     def respond
@@ -31,6 +31,11 @@ module Dossier
     def set_content_disposition!
       controller.headers["Content-Disposition"] = %[attachment;filename=#{filename}]
     end
+    
+    def collection_and_headers(collection)
+      headers = collection.shift.map { |header| report.format_header(header) }
+      [collection, headers]
+    end
 
     def filename
       "#{report.class.filename}.#{format}"

data/lib/dossier/stream_csv.rb

@@ -10,7 +10,7 @@ module Dossier
     end
 
     def each
-      yield headers.map { |header| Dossier::Formatter.titleize(header) }.to_csv if headers?
+      yield headers.to_csv if headers?
       collection.each do |record|
         yield record.to_csv
       end

data/lib/dossier/version.rb

@@ -1,3 +1,3 @@
 module Dossier
-  VERSION = "2.10.0"
+  VERSION = "2.11.0"
 end

data/lib/dossier/xls.rb

@@ -11,7 +11,7 @@ module Dossier
 
     def each
       yield HEADER
-      yield headers_as_row
+      yield as_row(@headers)
       @collection.each { |record| yield as_row(record) }
       yield FOOTER
     end
@@ -26,9 +26,5 @@ module Dossier
       my_array = array.map{|a| as_cell(a)}.join("\n")
       "<Row>\n" + my_array + "\n</Row>\n"
     end
-
-    def headers_as_row
-      as_row(@headers.map { |header| Dossier::Formatter.titleize(header) })
-    end
   end
 end

data/spec/dossier/adapter/active_record/result_spec.rb

@@ -10,7 +10,7 @@ describe Dossier::Adapter::ActiveRecord::Result do
     let(:fake_columns) { %[foo bar] }
 
     it "calls `columns` on its connection_results" do
-      ar_connection_results.should_receive(:columns)
+      expect(ar_connection_results).to receive(:columns)
       result.headers
     end
 

data/spec/dossier/adapter/active_record_spec.rb

@@ -11,7 +11,7 @@ describe Dossier::Adapter::ActiveRecord do
     let(:clean_value) { "'Robert\\'); DROP TABLE Students;--'" }
 
     it "delegates to the connection" do
-      ar_connection.should_receive(:quote).with(dirty_value)
+      expect(ar_connection).to receive(:quote).with(dirty_value)
       adapter.escape(dirty_value)
     end
 
@@ -29,13 +29,13 @@ describe Dossier::Adapter::ActiveRecord do
     let(:adapter_result_class) { Dossier::Adapter::ActiveRecord::Result}
 
     it "delegates to the connection" do
-      ar_connection.should_receive(:exec_query).with("\n#{query}")
+      expect(ar_connection).to receive(:exec_query).with("\n#{query}")
       adapter.execute(query)
     end
 
     it "builds an adapter result" do
       ar_connection.stub(:exec_query).and_return(connection_results)
-      adapter_result_class.should_receive(:new).with(connection_results)
+      expect(adapter_result_class).to receive(:new).with(connection_results)
       adapter.execute(:query)
     end
 

data/spec/dossier/client_spec.rb

@@ -31,7 +31,7 @@ describe Dossier::Client do
         end
 
         it "uses an adapter by that name" do
-          Dossier::Adapter::SpecAdapter.should_receive(:new).with(username: 'Timmy')
+          expect(Dossier::Adapter::SpecAdapter).to receive(:new).with(username: 'Timmy')
           described_class.new(dossier_adapter: 'spec_adapter', username: 'Timmy')
         end
 
@@ -48,7 +48,7 @@ describe Dossier::Client do
           end
 
           it "uses that ORM's adapter" do
-            Dossier::Adapter::ActiveRecord.should_receive(:new).with(username: 'Jimmy')
+            expect(Dossier::Adapter::ActiveRecord).to receive(:new).with(username: 'Jimmy')
             described_class.new(username: 'Jimmy')
           end
 
@@ -94,12 +94,12 @@ describe Dossier::Client do
     end
 
     it "delegates `escape` to its adapter" do
-      adapter.should_receive(:escape).with('Bobby Tables')
+      expect(adapter).to receive(:escape).with('Bobby Tables')
       client.escape('Bobby Tables')
     end
 
     it "delegates `execute` to its adapter" do
-      adapter.should_receive(:execute).with('SELECT * FROM `primes`') # It's OK, it's in the cloud!
+      expect(adapter).to receive(:execute).with('SELECT * FROM `primes`') # It's OK, it's in the cloud!
       client.execute('SELECT * FROM `primes`')
     end
 

data/spec/dossier/configuration_spec.rb

@@ -16,7 +16,7 @@ describe Dossier::Configuration do
   describe "client" do
     it "uses config/dossier.yml to setup the client" do
       options = YAML.load_file(Rails.root.join('config', 'dossier.yml'))[Rails.env].symbolize_keys
-      Dossier::Client.should_receive(:new).with(options)
+      expect(Dossier::Client).to receive(:new).with(options)
       Dossier.configure
     end
 

data/spec/dossier/multi_report_spec.rb

@@ -12,7 +12,7 @@ describe Dossier::MultiReport do
 
   it "passes options to the sub reports" do
     combined_report.reports.each do |report|
-      report.should_receive(:new).with(options).and_call_original
+      expect(report).to receive(:new).with(options).and_call_original
     end
 
     report.reports

data/spec/dossier/query_spec.rb

@@ -24,9 +24,9 @@ describe Dossier::Query do
         end
 
         it "escapes the values" do
-          query.should_receive(:escape).with(92)
-          query.should_receive(:escape).with(3.14)
-          query.should_receive(:escape).with('2013-03-29')
+          expect(query).to receive(:escape).with(92)
+          expect(query).to receive(:escape).with(3.14)
+          expect(query).to receive(:escape).with('2013-03-29')
           query.to_s
         end
 
@@ -44,10 +44,10 @@ describe Dossier::Query do
         end
 
         it "escapes each value in the array" do
-          Dossier.client.should_receive(:escape).with(38)
-          Dossier.client.should_receive(:escape).with('blue')
-          Dossier.client.should_receive(:escape).with('mandible')
-          Dossier.client.should_receive(:escape).with(2)
+          expect(Dossier.client).to receive(:escape).with(38)
+          expect(Dossier.client).to receive(:escape).with('blue')
+          expect(Dossier.client).to receive(:escape).with('mandible')
+          expect(Dossier.client).to receive(:escape).with(2)
           query.to_s
         end
 

data/spec/dossier/renderer_spec.rb

@@ -14,7 +14,7 @@ describe Dossier::Renderer do
       let(:template) { report.report_name }
 
       it "renders the custom view" do
-        engine.should_receive(:render).with(options)
+        expect(engine).to receive(:render).with(options)
       end
     end
 
@@ -22,8 +22,8 @@ describe Dossier::Renderer do
       let(:template) { 'show' }
 
       it "renders show" do
-        engine.should_receive(:render).with(options.merge(template: 'dossier/reports/employee')).and_call_original
-        engine.should_receive(:render).with(options)
+        expect(engine).to receive(:render).with(options.merge(template: 'dossier/reports/employee')).and_call_original
+        expect(engine).to receive(:render).with(options)
       end
     end
 

data/spec/dossier/report_spec.rb

@@ -57,14 +57,14 @@ describe Dossier::Report do
     end
 
     it "has callbacks for build_query" do
-      report.should_receive(:before_test_for_build_query)
+      expect(report).to receive(:before_test_for_build_query)
       report.query
     end
 
     it "has callbacks for execute" do
       Dossier.client.stub(:execute).and_return([])
       report.stub(:before_test_for_build_query)
-      report.should_receive(:after_test_for_execute)
+      expect(report).to receive(:after_test_for_execute)
       report.run
     end
 
@@ -79,7 +79,7 @@ describe Dossier::Report do
     describe "run" do
       it "will execute the generated sql query" do
         report = EmployeeReport.new
-        Dossier.client.should_receive(:execute).with(report.query, 'EmployeeReport').and_return([])
+        expect(Dossier.client).to receive(:execute).with(report.query, 'EmployeeReport').and_return([])
         report.run
       end
 
@@ -98,7 +98,7 @@ describe Dossier::Report do
     end
 
     it "delegates render to the renderer" do
-      report.renderer.should_receive(:render)
+      expect(report.renderer).to receive(:render)
       report.render
     end
   end

data/spec/dossier/responder_spec.rb

@@ -9,7 +9,7 @@ describe Dossier::Responder do
     }
   end
 
-  let(:results)    { double(arrays: [[]], hashes: [{}]) }
+  let(:results)    { double(arrays: [%w[hi], %w[there]], hashes: [{hi: 'there'}]) }
   let(:report)     { EmployeeReport.new }
   let(:reports)    { [stub_out_report_results(report)] }
   let(:controller) { 
@@ -19,21 +19,21 @@ describe Dossier::Responder do
 
   describe "to_html" do
     it "calls render on the report" do
-      report.should_receive(:render)
+      expect(report).to receive(:render)
       responder.to_html
     end
   end
 
   describe "to_json" do
     it "renders the report as json" do
-      controller.should_receive(:render).with(json: results.hashes)
+      expect(controller).to receive(:render).with(json: results.hashes)
       responder.to_json
     end
   end
 
   describe "to_csv" do
     it "sets the content disposition" do
-      responder.should_receive(:set_content_disposition!)
+      expect(responder).to receive(:set_content_disposition!)
       responder.to_csv
     end
 
@@ -41,11 +41,16 @@ describe Dossier::Responder do
       responder.to_csv
       expect(responder.controller.response_body).to be_a(Dossier::StreamCSV)
     end
+
+    it "formats the headers that are passed to Dossier::StreamCSV" do
+      expect(report).to receive(:format_header).with('hi')
+      responder.to_csv
+    end
   end
 
   describe "to_xls" do
     it "sets the content disposition" do
-      responder.should_receive(:set_content_disposition!)
+      expect(responder).to receive(:set_content_disposition!)
       responder.to_xls
     end
 
@@ -53,6 +58,11 @@ describe Dossier::Responder do
       responder.to_xls
       expect(responder.controller.response_body).to be_a(Dossier::Xls)
     end
+
+    it "formats the headers that are passed to Dossier::Xls" do
+      expect(report).to receive(:format_header).with('hi')
+      responder.to_csv
+    end
   end
 
 end

data/spec/dossier/result_spec.rb

@@ -35,12 +35,12 @@ describe Dossier::Result do
     end
 
     it "can extract the fields queried" do
-      adapter_result.should_receive(:headers).and_return([])
+      expect(adapter_result).to receive(:headers).and_return([])
       result.headers
     end
 
     it "can extract the values from the adapter results" do
-      result.should_receive(:to_a)
+      expect(result).to receive(:to_a)
       result.rows
     end
 
@@ -67,7 +67,7 @@ describe Dossier::Result do
 
       describe "headers" do
         it "formats the headers by calling format_header" do
-          adapter_result.headers.each { |h| result.report.should_receive(:format_header).with(h) }
+          adapter_result.headers.each { |h| expect(result.report).to receive(:format_header).with(h) }
           result.headers
         end
       end
@@ -82,12 +82,12 @@ describe Dossier::Result do
       describe "each" do
 
         it "calls :each on on its adapter's results" do
-          adapter_result.rows.should_receive(:each)
+          expect(adapter_result.rows).to receive(:each)
           result.each { |result| }
         end
 
         it "formats each of the adapter's results" do
-          result.should_receive(:format).with(result_row.values)
+          expect(result).to receive(:format).with(result_row.values)
           result.each { |result| }
         end
 
@@ -107,12 +107,12 @@ describe Dossier::Result do
         end
 
         it "calls a custom formatter method if available" do
-          result.report.should_receive(:format_mascot).with('platapus')
+          expect(result.report).to receive(:format_mascot).with('platapus')
           result.format(row)
         end
 
         it "calls the default format_column method otherwise" do
-          result.report.should_receive(:format_column).with('cheese', 'bleu')
+          expect(result.report).to receive(:format_column).with('cheese', 'bleu')
           result.format(row)
         end
       end
@@ -152,7 +152,7 @@ describe Dossier::Result do
       describe "each" do
 
         it "calls :each on on its adapter's results" do
-          adapter_result.rows.should_receive(:each)
+          expect(adapter_result.rows).to receive(:each)
           result.each { |result| }
         end
 

data/spec/dossier/stream_csv_spec.rb

@@ -15,10 +15,10 @@ describe Dossier::StreamCSV do
       expect(streamer.headers).to eq headers
     end
 
-    it "formats the headers when streamed" do
+    it "does not format the headers when streamed" do
       formatted = nil
       streamer.each { |r| formatted = r; break }
-      expect(formatted).to eq %w[W1 W2 W3 W4 W5 W6].to_csv
+      expect(formatted).to eq %w[w1 w2 w3 w4 w5 w6].to_csv
     end
 
     describe "using the first element of the collection for headers" do
@@ -50,7 +50,7 @@ describe Dossier::StreamCSV do
   end
 
   it "calls to csv on each member of the collection" do
-    collection.each { |row| row.should_receive(:to_csv) }
+    collection.each { |row| expect(row).to receive(:to_csv) }
     streamer.each {}
   end
 
@@ -68,7 +68,7 @@ describe Dossier::StreamCSV do
     it "provides a simple error if not a local request" do
       Rails.application.config.stub(:consider_all_requests_local).and_return(false)
       streamer.each { |line| output << line }
-      expect(output).to match /something went wrong/
+      expect(output).to match(/something went wrong/)
     end
   end
 

data/spec/dossier_spec.rb

@@ -25,7 +25,7 @@ describe Dossier do
 
   it "exposes the configurations client via Dossier.client" do
     Dossier.configure
-    Dossier.configuration.should_receive(:client)
+    expect(Dossier.configuration).to receive(:client)
     Dossier.client
   end
 end

data/spec/dummy/config/environments/development.rb

@@ -34,4 +34,6 @@ Dummy::Application.configure do
 
   # Expands the lines which load the assets
   config.assets.debug = true
+
+  config.eager_load = false
 end

data/spec/dummy/config/environments/production.rb

@@ -64,4 +64,6 @@ Dummy::Application.configure do
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL)
   # config.active_record.auto_explain_threshold_in_seconds = 0.5
+  
+  config.eager_load = true
 end

data/spec/dummy/config/environments/test.rb

@@ -34,4 +34,6 @@ Dummy::Application.configure do
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+
+  config.eager_load = false
 end