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

Stop extending into ERB the t and textilize #19

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

Stop extending into ERB the t and textilize #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
85b3dc8
Stop extending into ERB the `t` and `textilize`
dmitry Jan 25, 2015
50049da
Remove `t` alias from ERB, can conflict with I18n
dmitry Apr 30, 2016
cdd02b0
Change `t` to `textile` in spec
dmitry Apr 30, 2016
a12a118
Require erb extension in spec for textile helper
dmitry Apr 30, 2016
f58e1a1
Remove `t` alias from ERB, can conflict with I18n
dmitry Apr 30, 2016
a25fa78
Fix to `textilize`
dmitry Jun 15, 2017
a262b5b
Remove `t` alias from ERB, can conflict with I18n
dmitry Apr 30, 2016
7c47155
Change `t` to `textile` in spec
dmitry Apr 30, 2016
0b4bcc6
try to fix
dmitry Jun 20, 2017
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: 0 additions & 7 deletions lib/redcloth.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,3 @@ def self.include(*args)
end

end

begin
require 'erb'
require 'redcloth/erb_extension'
include ERB::Util
Copy link

Choose a reason for hiding this comment

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

This like also includes ERB::Util in the Object class. Even that t method is not removed I think this line should be removed.

Copy link
Author

Choose a reason for hiding this comment

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

Isn't it removed in the commit?

rescue LoadError
end
5 changes: 0 additions & 5 deletions lib/redcloth/erb_extension.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
class ERB
module Util

#
# A utility method for transforming Textile in _s_ to HTML.
#
Expand All @@ -18,10 +17,6 @@ def textilize( s )
RedCloth.new( s.to_s ).to_html
end
end

alias t textilize
module_function :t
module_function :textilize

end
end
15 changes: 12 additions & 3 deletions spec/erb_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
require File.dirname(__FILE__) + '/spec_helper'
require 'redcloth/erb_extension'
Copy link

Choose a reason for hiding this comment

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

Requiring this here requires it globally. Not just for this test. Better would be to create a test class and include it in there.

Copy link
Author

Choose a reason for hiding this comment

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

Any idea how to do that? To preserve the same functionality (auto-inclustion to the ERB helpers), I believe it's impossible to do. This could be changed to use another module, include it into a ERB::Utils and then remove module later when test unit is completed. Let me know your thoughts.


describe "ERB helper" do
it "should add a textile tag to ERB" do
template = %{<%=t "This new ERB tag makes is so _easy_ to use *RedCloth*" %>}
erb_class = Class.new do
include ERB::Util

def main
input = %{<%= textilize "This new ERB tag makes is so _easy_ to use *RedCloth*" %>}
ERB.new(input).result(binding)
end
end

expected = %{<p>This new <span class="caps">ERB</span> tag makes is so <em>easy</em> to use <strong>RedCloth</strong></p>}

ERB.new(template).result.should == expected
erb_class.new.main.should == expected
end
end
end