Merge remote branch 'cbuben/master'

kennethkalmer · Jan 25, 2011 · cf6d95b · cf6d95b
2 parents 94b7de0 + b144943
commit cf6d95b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/ruote-kit/helpers/misc_helpers.rb b/lib/ruote-kit/helpers/misc_helpers.rb
@@ -27,7 +27,7 @@ def sample_process
 
       def sample_process_tree
 
-        Rufus::Json.encode(Ruote::Parser.parse(sample_process))
+        Rufus::Json.encode(Ruote::Reader.read(sample_process))
       end
     end
   end

diff --git a/lib/ruote-kit/views/expression.html.haml b/lib/ruote-kit/views/expression.html.haml
@@ -41,7 +41,7 @@
         %td
           original tree
         %td
-          - ruby = Ruote::Parser.to_ruby(@expression.original_tree)
+          - ruby = Ruote::Reader.to_ruby(@expression.original_tree)
           - rubyline = ruby.split("\n").first
           - json = Rufus::Json.pretty_encode(@expression.original_tree)
           %pre.pdef{ :onclick => 'Rk.toggleNext(this);' } #{rubyline}
@@ -51,7 +51,7 @@
       %td
         tree
       %td
-        - ruby = Ruote::Parser.to_ruby(@expression.tree)
+        - ruby = Ruote::Reader.to_ruby(@expression.tree)
         - rubyline = ruby.split("\n").first
         - json = Rufus::Json.pretty_encode(@expression.tree)
         %pre.pdef{ :onclick => 'Rk.toggleNext(this);' } #{rubyline}