Skip to content

Commit

Permalink
Included explicit require of module Mime due to dependency load chang…
Browse files Browse the repository at this point in the history
…es in ActionPack 4.1.1
  • Loading branch information
sahithya committed Jun 2, 2014
1 parent caf5b80 commit 0224c3e
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 2 deletions.
3 changes: 3 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
=== Release 0.10.2 / 2014-6-2
* Included explicit require of module Mime due to dependency load changes in ActionPack 4.1.1

=== Release 0.10.1 / 2014-4-7
* Included handling for unknown files
* Removed unused code
Expand Down
1 change: 0 additions & 1 deletion features/step_definitions/report_steps.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
require 'fileutils'


When /^I have a logo file in the correct location$/ do
FileUtils.cp "features/support/logo.png", "features/support/pretty_face/"
end
Expand Down
4 changes: 4 additions & 0 deletions lib/pretty_face/formatter/html.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
require File.join(File.dirname(__FILE__), 'view_helper')
require File.join(File.dirname(__FILE__), 'report')

# Starting with ActionPack 4.1.1, the module Mime doesn't get initialized before it's needed by PrettyFace and so
# it would blow up with errors about uninitialized constants. We need to explicitly load it to prevent this problem.
require 'action_dispatch/http/mime_type'

module PrettyFace
module Formatter

Expand Down
2 changes: 1 addition & 1 deletion lib/pretty_face/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module PrettyFace
VERSION = "0.10.1"
VERSION = "0.10.2"
end

1 comment on commit 0224c3e

@shekss
Copy link

@shekss shekss commented on 0224c3e Jun 4, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hi sahithya

can you please look into the issue i reported :
#29

how can i embed images which i put in a folder other than the root directory to pretty_face report?

i tried following the adam solution , but didnt run as well.
#16

Please sign in to comment.