report_card 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5822cdf7b89f25ec936afa256af2e700a4d29739
-  data.tar.gz: 7dc99f1424fde5c78c894a744e4b0576101f54c6
+  metadata.gz: c6cda23ee0f23eed670cc68f5a6e3746645c37d4
+  data.tar.gz: 4681b0afd0731b14e7bc2a25e84692a0216d1529
 SHA512:
-  metadata.gz: c394db0e2fc9cd8a4f396ee2fd235dae06fbe3c6ac37b524522ffa4edc3db61b5c9cc1070d0680988695e366f1216a7880b138ebd367e250e500672bcf6fc37b
-  data.tar.gz: badc5f22e1caedd6f399db6c419fd1ef502f7f9205c6dc94e0be40c0027ec0ef6aca6c709b6ce208b5369dbddc6560184a5bb4f5e36bfe4e164d39450a8df737
+  metadata.gz: eace107781ddb632f40f1f04406bd5fb7c6b83cb677965a3aebbb5873953905c0f318603f4d7901b5afaf8d2c0e5011e590f06d4709cfb95ba6591c2141c777f
+  data.tar.gz: 15c5ec29812edd3c7b976adf5aedee497a634746d6b7181db1c0a97e00074bc928363482af71d21114e9a3d4f0469354bd80092f07febd80fe38b1c3469b7f9d

data/app/controllers/report_card/reports_controller.rb

@@ -6,11 +6,17 @@ module ReportCard
 
     def create
       if ReportCard::Report.exists?(params[:report_name])
-        email = instance_eval(&ReportCard.recipient_email)
-        ReportCard::Runner.perform_async(params[:report_name], email)
-        redirect_to report_card_reports_path, flash: { success: 'Generating report. It will be emailed to you.' }
+
+        unless params.key?(:email_options)
+          params[:email_options] = {}
+          params[:email_options][:recipient_email] = instance_eval(&ReportCard.recipient_email)
+        end
+
+        flash_success = params[:flash_success] || instance_eval(&ReportCard.flash_success)
+        ReportCard::Runner.perform_async(params)
+        redirect_to :back, flash: { success: flash_success }
       else
-        redirect_to report_card_reports_path, flash: { error: 'Could not find report' }
+        redirect_to :back, flash: { error: 'Could not find report' }
       end
     end
   end

data/app/mailers/report_card/mailer.rb

@@ -1,11 +1,13 @@
 module ReportCard
   class Mailer < ActionMailer::Base
-    def report(url, email)
+    def report(url, email_options)
       @url = url
-
-      mail to: email,
-           from: ReportCard.from_email,
-           subject: 'Your report is ready'
+      @body = email_options['body'] || ReportCard.body
+      # email_options['recipient_email'] doesn't have default option here
+      # because it is a proc that is evaluated in ReportsController.
+      mail to: email_options['recipient_email'],
+           from: email_options['from_email'] || ReportCard.from_email,
+           subject: email_options['subject'] || ReportCard.subject
     end
   end
 end

data/app/views/report_card/mailer/report.html.erb

@@ -1 +1 @@
-Download your report: <%= link_to @url, @url %>
+<%= @body %> <%= link_to @url, @url %>

data/app/workers/report_card/runner.rb

@@ -4,8 +4,9 @@ module ReportCard
   class Runner
     include Sidekiq::Worker
 
-    def perform(klass_name, recipient_email)
-      report = ReportCard::Report.find(klass_name).new
+    def perform(params)
+      report = ReportCard::Report.find(params['report_name']).new(params)
+      email_options = params['email_options']
 
       tempfile = Tempfile.new(['report_card', '.csv'])
       csv = CSV.open(tempfile, 'wb')
@@ -15,7 +16,7 @@ module ReportCard
       uploader = ReportCard::Uploader.new
       uploader.store!(csv)
 
-      ReportCard::Mailer.report(uploader.url, recipient_email).deliver
+      ReportCard::Mailer.report(uploader.url, email_options).deliver
     end
   end
 end

data/lib/report_card.rb

@@ -7,8 +7,18 @@ module ReportCard
   self.parent_controller = 'ApplicationController'
 
   mattr_accessor :recipient_email
-  self.recipient_email = -> { 'change-me@example.com' }
+  self.recipient_email = proc { 'change-me@example.com' }
 
   mattr_accessor :from_email
   self.from_email = 'change-me@example.com'
+
+  mattr_accessor :subject
+  self.subject = 'Your report is ready'
+
+  mattr_accessor :body
+  self.body = 'Download your report: '
+
+  mattr_accessor :flash_success
+  self.flash_success = proc { 'Generating report. It will be emailed to you.' }
+
 end

data/lib/report_card/engine.rb

@@ -1,3 +1,5 @@
+require 'carrierwave'
+
 module ReportCard
   class Engine < ::Rails::Engine
     initializer 'report_card.load_reports_in_development' do |app|

data/lib/report_card/report.rb

@@ -1,5 +1,7 @@
 module ReportCard
   class Report
+    attr_accessor :params
+
     class ReportNotFound < StandardError; end
 
     def self.all
@@ -18,5 +20,9 @@ module ReportCard
     def self.exists?(name)
       all.any? { |r| r.name == name }
     end
+
+    def initialize(params)
+      self.params = params
+    end
   end
 end

data/lib/report_card/version.rb

@@ -1,3 +1,3 @@
 module ReportCard
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/test/dummy/log/test.log

@@ -0,0 +1,15 @@
+   (0.1ms)  begin transaction
+--------------------------
+ReportCardTest: test_truth
+--------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+--------------------------
+ReportCardTest: test_truth
+--------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+--------------------------
+ReportCardTest: test_truth
+--------------------------
+   (0.0ms)  rollback transaction

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: report_card
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Nick Giancola
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-05 00:00:00.000000000 Z
+date: 2015-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -123,7 +123,8 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
-- test/dummy/log/development.log
+- test/dummy/db/test.sqlite3
+- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
@@ -151,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Write your domain-specific reporting code and let Report Card take care of
@@ -184,7 +185,8 @@ test_files:
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
 - test/dummy/config.ru
-- test/dummy/log/development.log
+- test/dummy/db/test.sqlite3
+- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html