In that case... Here is another patch with your suggestions. Thanks for taking the time to point out all that..! I'll be sure to keep it all in mind if I submit something else later.
On Wed, Aug 12, 2015 at 11:21 AM, Kyle Meyer <k...@kyleam.com> wrote: > Matthew MacLean <archen...@gmail.com> writes: > > > Alright, done. Is this acceptable? (Provided that tests don't count > towards > > line count, of course) > > Thanks. A few minor comments on the commit message. > > > Subject: [PATCH] ob-ruby: Fix double-escaping > > > > * lisp/ob-ruby.el: Remove second call to > > `org-babel-ruby-table-or-string' in `org-babel-ruby-evaluate'. > > Please add the name of the changed function in parentheses after the > file name rather than putting it in the description body. > > > * testing/lisp/test-ob-ruby.el: Add test to verify > > `org-babel-execute:ruby' can evaluate Ruby code. (What the > > double-escape prevented) > > Same here for the test name. "Add test." for description would do. > > > I removed the escaping from `org-babel-ruby-evaluate', because the only > > place `org-babel-ruby-evaluate' is ever called is in > > `org-babel-execute:ruby'. > > > > In this function, its result either escaped (Where the double escape > > previously occurred) or passed in as the "scalar-form" of > > `org-babel-result-cond', which handles the "pp" and "code" parameters. > > (A place that doesn't need escaping.) > > I think the above two paragraphs could be replaced by a link to this ML > post. > > Thanks for working on this. > > -- > Kyle >
From 17447319eee53fbfcc6123c384842dd7fd04e3b8 Mon Sep 17 00:00:00 2001 From: Archenoth <archen...@gmail.com> Date: Tue, 11 Aug 2015 23:59:25 -0600 Subject: [PATCH] ob-ruby: Fix double-escaping * lisp/ob-ruby.el (org-babel-ruby-evaluate): Remove second call to `org-babel-ruby-table-or-string'. * testing/lisp/test-ob-ruby.el (org-babel-ruby-evaluate): Add test. <http://permalink.gmane.org/gmane.emacs.orgmode/99888> TINYCHANGE --- lisp/ob-ruby.el | 6 +----- testing/lisp/test-ob-ruby.el | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/lisp/ob-ruby.el b/lisp/ob-ruby.el index 9b01dbf..0ff460e 100644 --- a/lisp/ob-ruby.el +++ b/lisp/ob-ruby.el @@ -201,11 +201,7 @@ return the value of the last statement in BODY, as elisp." org-babel-ruby-pp-wrapper-method org-babel-ruby-wrapper-method) body (org-babel-process-file-name tmp-file 'noquote))) - (let ((raw (org-babel-eval-read-file tmp-file))) - (if (or (member "code" result-params) - (member "pp" result-params)) - raw - (org-babel-ruby-table-or-string raw)))))) + (org-babel-eval-read-file tmp-file)))) ;; comint session evaluation (case result-type (output diff --git a/testing/lisp/test-ob-ruby.el b/testing/lisp/test-ob-ruby.el index eb5233b..576cb13 100644 --- a/testing/lisp/test-ob-ruby.el +++ b/testing/lisp/test-ob-ruby.el @@ -21,6 +21,23 @@ (unless (featurep 'ob-ruby) (signal 'missing-test-dependency "Support for Ruby code blocks")) +(ert-deftest test-ob-ruby/basic-evaluation () + "Test that basic evaluation works." + (should (equal (org-test-with-temp-text "#+begin_src ruby + 2 + 2 +#+end_src" + (org-babel-execute-maybe) + (substring-no-properties + (buffer-string))) + "#+begin_src ruby + 2 + 2 +#+end_src + +#+RESULTS: +: 4 + +"))) + (ert-deftest test-ob-ruby/session-output-1 () (should (equal (org-test-with-temp-text "#+begin_src ruby :session :results output s = \"1\" -- 2.5.0
