Skip to content

Commit

Permalink
Merge branch 'release-0.9.10'
Browse files Browse the repository at this point in the history
  • Loading branch information
wallyqs committed Dec 9, 2014
2 parents 37749b2 + e7e1b77 commit fd57a6d
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 3 deletions.
4 changes: 4 additions & 0 deletions History.org
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
#+title: Changelog
#+startup: showeverything

* 0.9.10 / 2014-12-09

- Add option to disable Rubypants

* 0.9.9 / 2014-08-30

- Bugfix for comment regex
Expand Down
4 changes: 3 additions & 1 deletion lib/org-ruby/parser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,9 @@ def to_html
end
output << "\n"

rp = RubyPants.new(output)
return output if @parser_options[:skip_rubypants_pass]

rp = RubyPants.new(output)
rp.to_html
end

Expand Down
2 changes: 1 addition & 1 deletion lib/org-ruby/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module OrgRuby
VERSION = '0.9.9'
VERSION = '0.9.10'
end
2 changes: 1 addition & 1 deletion org/releasing.org
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#+begin_src ruby :tangle lib/org-ruby/version.rb
module OrgRuby
VERSION = '0.9.9'
VERSION = '0.9.10'
end
#+end_src

Expand Down
9 changes: 9 additions & 0 deletions spec/parser_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,15 @@
end
end

describe "Make it possible to disable rubypants pass" do
it "should allow the raw dash" do
org = "This is a dash -- that will remain as is."
parser = Orgmode::Parser.new(org, { :skip_rubypants_pass => true })
expected = "<p>#{org}</p>\n"
expect(expected).to eq(parser.to_html)
end
end

describe "Export to HTML test cases" do
# Dynamic generation of examples from each *.org file in html_examples.
# Each of these files is convertable to HTML.
Expand Down

0 comments on commit fd57a6d

Please sign in to comment.