Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rails 5.1 compatibility #29

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Rails 5.1 compatibility #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14d410c
Rails 5.1 compatibility
msxavi Mar 11, 2019
d6e7a8d
Merge pull request #1 from msxavi/release-1.5
msxavi Mar 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
wisepdf (1.3.1)
wisepdf (1.5.0)

GEM
remote: http://rubygems.org/
Expand Down Expand Up @@ -152,7 +152,7 @@ DEPENDENCIES
coffee-rails
coveralls
faker
rails (~> 3.2.13)
rails (>= 3.2.13)
rake
rspec
shoulda
Expand All @@ -161,3 +161,6 @@ DEPENDENCIES
webmock (~> 1.9.0)
wisepdf!
wkhtmltopdf-binary

BUNDLED WITH
1.17.3
9 changes: 6 additions & 3 deletions lib/wisepdf/render.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@ module Wisepdf
module Render
def self.included(base)
base.class_eval do
alias_method_chain :render, :wisepdf
alias_method_chain :render_to_string, :wisepdf
after_filter :clean_temp_files
alias_method :render_without_wisepdf, :render
alias_method :render, :render_with_wisepdf
alias_method :render_to_string_without_wisepdf, :render_to_string
alias_method :render_to_string, :render_to_string_with_wisepdf

after_action :clean_temp_files
end
end

Expand Down
4 changes: 2 additions & 2 deletions lib/wisepdf/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
module Wisepdf
module Version
MAJOR = 1
MINOR = 4
MINOR = 5
PATCH = 0
BUILD = nil

STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
end
end
end
4 changes: 2 additions & 2 deletions wisepdf.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ Gem::Specification.new do |gem|
gem.add_development_dependency 'faker'
gem.add_development_dependency 'capybara'

gem.add_development_dependency 'rails', '~> 3.2.13'
gem.add_development_dependency 'rails', '>= 3.2.13'
gem.add_development_dependency 'coffee-rails'

gem.add_development_dependency 'wkhtmltopdf-binary'
end
end