dossier 2.9.0 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 654b5bc958cd0b8226eb0f4048c88540fa3024db
-  data.tar.gz: 4dd0180bd6e67e797fc003342b13c9fbc093d138
+  metadata.gz: de2a8ead8c9e8a812cb212d5d3f0cf079b6d5396
+  data.tar.gz: 575a2d5aef49c98a73b02ad097b742a2f53b9096
 SHA512:
-  metadata.gz: 5b53a3128c5e0042ee01621f49dc931c1f9cd5480b1b3e7a66517f8fa6b05b97797accded6927604da3e8e28ed7c3b2650b15fbab33ea120ae37c60f166985f6
-  data.tar.gz: a92771615847f0460bdb3fdca9e43730e9d14ccfa440b51fc73379f97964f0cf380a714620da2324a2547e11e77f0c214799397455169722e19a940a90ca3f6b
+  metadata.gz: 41a8a58bb79bcb253e6d82719f9fe38a59045d38824d97a7af32e91c6b3fff132fd41d445a343892f1b596baaa550c845d823d2bcc25c4bc8cee410b376d8891
+  data.tar.gz: 0bd542e8ccf1ba695bb09171a4bf43a62a57e5a015e488b09133e17639063491393cc602586ac80fd9e5dac9bee48300f59119e26a1261fd70890f94926f6997

data/lib/dossier/result.rb

@@ -9,8 +9,12 @@ module Dossier
       self.report          = report
     end
 
+    def raw_headers
+      @raw_headers ||= adapter_results.headers
+    end
+
     def headers
-      @headers ||= adapter_results.headers
+      raise NotImplementedError.new("#{self.class.name} must implement `headers', use `raw_headers' for adapter headers")
     end
 
     def body
@@ -34,20 +38,20 @@ module Dossier
       @hashes = rows.map { |row| row_hash(row) }
     end
 
+    # this is the method that creates the individual hash entry
+    # hashes should always use raw headers
     def row_hash(row)
-      Hash[headers.zip(row)].with_indifferent_access
+      Hash[raw_headers.zip(row)].with_indifferent_access
     end
 
     def each
-      raise NotImplementedError, "#{self.class.name} must define `each`"
+      raise NotImplementedError.new("#{self.class.name} must define `each`")
     end
 
     class Formatted < Result
 
-      alias :raw_headers :headers
-
       def headers
-        @formatted_headers ||= super.map { |h| report.format_header(h) }
+        @formatted_headers ||= raw_headers.map { |h| report.format_header(h) }
       end
 
       def each
@@ -79,6 +83,10 @@ module Dossier
       def each
         adapter_results.rows.each { |row| yield row }
       end
+
+      def headers
+        raw_headers
+      end
     end
 
   end

data/lib/dossier/version.rb

@@ -1,3 +1,3 @@
 module Dossier
-  VERSION = "2.9.0"
+  VERSION = "2.9.1"
 end

data/spec/dossier/result_spec.rb

@@ -2,22 +2,31 @@ require 'spec_helper'
 
 describe Dossier::Result do
 
-  module EachStubber
+  module AbstractStub
     def each
       adapter_results.rows.each do |row|
         yield row
       end
     end
+
+    def headers
+      raw_headers
+    end
   end
 
   let(:report)         { TestReport.new }
   let(:result_row)     { {'mascot' => 'platapus', 'cheese' => 'bleu'} }
   let(:adapter_result) { double(:adapter_result, rows: [result_row.values], headers: result_row.keys) }
-  let(:result)         { Dossier::Result.new(adapter_result, report).tap { |r| r.extend(EachStubber) } }
+  let(:result_class)   { Class.new(described_class) { include AbstractStub } }
+  let(:result)         { result_class.new(adapter_result, report) }
 
   it "requires each to be overridden" do
     expect { described_class.new(adapter_result, report).each }.to raise_error(NotImplementedError, /result must define/i)
   end
+  
+  it "requires headers to be overridden" do
+    expect { described_class.new(adapter_result, report).headers }.to raise_error(NotImplementedError, /headers/i)
+  end
 
   describe "initialization with an adapter result object" do
 
@@ -63,6 +72,13 @@ describe Dossier::Result do
         end
       end
 
+      describe "hashing" do
+        it "does not format the keys of the hash" do
+          hash = result.hashes.first
+          expect(hash.keys).to eq %w[mascot cheese]
+        end
+      end
+
       describe "each" do
 
         it "calls :each on on its adapter's results" do

data/spec/dummy/config/database.yml

@@ -3,7 +3,7 @@ defaults: &defaults
   database: dossier_test
   host: localhost
   username: root
-  password: rubyr3d!
+  password:
   
 development:
   <<: *defaults
@@ -11,3 +11,4 @@ test:
   <<: *defaults
 production:
   <<: *defaults
+