dossier 2.2.0 → 2.3.0

data/app/controllers/dossier/reports_controller.rb

@@ -7,7 +7,7 @@ module Dossier
       respond_to do |format|
         format.html do
           begin
-            render template: "dossier/reports/#{report.view}", locals: {report: report}
+            render template: "dossier/reports/#{report_class.report_name}", locals: {report: report}
           rescue ActionView::MissingTemplate => e
             render template: 'dossier/reports/show', locals: {report: report}
           end
@@ -18,12 +18,12 @@ module Dossier
         end
 
         format.csv do
-          headers["Content-Disposition"] = %[attachment;filename=#{params[:report]}-report_#{Time.now.strftime('%m-%d-%Y-%H%M%S')}.csv]
+          set_content_disposition!
           self.response_body = StreamCSV.new(report.raw_results.arrays)
         end
 
         format.xls do
-          headers["Content-Disposition"] = %[attachment;filename=#{params[:report]}-report_#{Time.now.strftime('%m-%d-%Y-%H%M%S')}.xls]
+          set_content_disposition!
           self.response_body = Xls.new(report.raw_results.arrays)
         end
       end
@@ -32,7 +32,11 @@ module Dossier
     private
 
     def report_class
-      "#{params[:report].split('_').map(&:capitalize).join}Report".constantize
+      Dossier.name_to_class(params[:report])
+    end
+
+    def set_content_disposition!
+      headers["Content-Disposition"] = %[attachment;filename=#{params[:report]}-report_#{Time.now.strftime('%m-%d-%Y_%H-%M-%S')}.#{params[:format]}]
     end
 
   end

data/app/views/dossier/reports/show.html.haml

@@ -18,4 +18,4 @@
           - row.each do |value|
             %th= value
 
-= link_to 'Download CSV', dossier_report_path(:format => 'csv', :options => params[:options]), :class => 'download-csv'
+= link_to 'Download CSV', dossier_report_path(format: 'csv', options: report.options, report: report.class.report_name), class: 'download-csv'

data/lib/dossier/report.rb

@@ -7,6 +7,10 @@ module Dossier
 
     attr_reader :options
 
+    def self.report_name
+      Dossier.class_to_name(self)
+    end
+
     def initialize(options = {})
       @options = options.dup.with_indifferent_access
     end
@@ -34,10 +38,6 @@ module Dossier
       tap { execute }
     end
 
-    def view
-      self.class.name.sub(/Report\Z/, '').underscore
-    end
-
     def formatter
       Dossier::Formatter
     end

data/lib/dossier/version.rb

@@ -1,3 +1,3 @@
 module Dossier
-  VERSION = "2.2.0"
+  VERSION = "2.3.0"
 end

data/lib/dossier.rb

@@ -2,21 +2,30 @@ require "dossier/engine"
 require "dossier/version"
 
 module Dossier
+  extend self
 
-  def self.configuration
+  def configuration
     @configuration || configure
   end
 
-  def self.configure
+  def configure
     @configuration = Configuration.new
     yield(@configuration) if block_given?
     @configuration
   end
 
-  def self.client
+  def client
     configuration.client
   end
 
+  def class_to_name(klass)
+    klass.name.underscore[0..-8]
+  end
+
+  def name_to_class(name)
+    "#{name.split('_').map(&:capitalize).join}Report".constantize
+  end
+
   class ExecuteError < StandardError; end
 end
 

data/spec/dossier/report_spec.rb

@@ -4,6 +4,10 @@ describe Dossier::Report do
 
   let(:report) { TestReport.new(:foo => 'bar') }
 
+  it "has a report name" do
+    TestReport.report_name.should eq('test')
+  end
+
   describe "report instances" do
     it "takes options when initializing" do
       report = TestReport.new(:foo => 'bar')
@@ -56,12 +60,6 @@ describe Dossier::Report do
       end
     end
 
-    describe "view" do
-      it "will infer its view name from the class name" do
-        EmployeeReport.new.view.should eq("employee")
-      end
-    end
-
   end
 
 end

data/spec/dossier_spec.rb

@@ -5,7 +5,7 @@ describe Dossier do
     Dossier.should be_a(Module)
   end
 
-  it "is configuraable"  do
+  it "is configurable"  do
     Dossier.configure
     Dossier.configuration.should_not be_nil
   end
@@ -28,4 +28,17 @@ describe Dossier do
     Dossier.configuration.should_receive(:client)
     Dossier.client
   end
+
+  describe "report naming" do
+    let(:klass) { HelloMyFriendsReport }
+    let(:name)  { 'hello_my_friends' }
+
+    it "converts a report class to a report name" do
+      expect(Dossier.class_to_name(klass)).to eq(name)
+    end
+
+    it "converting a report name to a report class" do
+      expect(Dossier.name_to_class(name)).to eq(klass)
+    end
+  end
 end

data/spec/dummy/app/controllers/site_controller.rb

@@ -1,5 +1,10 @@
-class SiteController
+class SiteController < ApplicationController
   def index
     render text: 'wooo!'
   end
+
+  def report
+    report = EmployeeReport.new
+    render template: 'dossier/reports/show', locals: {report: report.run}
+  end
 end

data/spec/dummy/config/routes.rb

@@ -1,5 +1,4 @@
 Rails.application.routes.draw do
-  mount Dossier::Engine => "/dossier"
-
   get 'woo' => 'site#index', as: 'woo'
+  get 'employee_report_custom_controller' => 'site#report', as: 'employee_report_custom_controller'
 end

data/spec/dummy/config/setup_load_paths.rb

@@ -1,8 +1,5 @@
 if ENV['MY_RUBY_HOME'] && ENV['MY_RUBY_HOME'].include?('rvm')
   begin
-    rvm_path     = File.dirname(File.dirname(ENV['MY_RUBY_HOME']))
-    rvm_lib_path = File.join(rvm_path, 'lib')
-    $LOAD_PATH.unshift rvm_lib_path
     require 'rvm'
     RVM.use_from_path! File.dirname(File.dirname(__FILE__))
   rescue LoadError