datastory 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87dea24700cc2bdc46984ddd4cf9a7567b0b3ebb
-  data.tar.gz: 69aa1f62365fab941aa2c284856f6b5d5f71d74a
+  metadata.gz: fa61e11b6d796a4492f4a3245328a44504080358
+  data.tar.gz: 7c8d49b6fb6c6297aa5017ce1e6ee0d72438a24c
 SHA512:
-  metadata.gz: c314b77af442cbe21b47dec8a654e83eab5e70e60cf977d3d3950621b18aaea1330da3abc2aa0fcf6910f59e37392cc6143f55df81046eee2d9b32a012c74b9e
-  data.tar.gz: b261f9dd9db34c7e2b0444701284115d169fe74c9419210f79ed28c2a91282d949319d04cafae7c4fc3384fa0819a8e79e402d0ff235d30dfadab7dde323e406
+  metadata.gz: 9bcb0fffae195e371304c45fd36f6115d7dda2665d6b892d5a5efd985a3b9e982abaaa30f5632d1ffa8fda724311a0867a263994d915dc70abf698abb1f012d1
+  data.tar.gz: d0011f9eaaafe5fafe43e956b0ba5bcd67114f38647bf15d9ca0b98c9e5580cdd094ed61757030142a441e135e3a44b7ed378bd1e44db31c6e6455ad146be592

data/lib/datastory/eval_context.rb

@@ -0,0 +1,33 @@
+module DataStory
+  class EvalContext
+    
+    # Returns the binding for this context.
+    def self.evaluate(code)
+      @binding ||= binding
+      @append = ""
+      
+      prev_stdout = $stdout
+      #prev_stderr = $stderr
+      
+      out = StringIO.new
+      $stdout = out
+      #$stderr = out
+      
+      eval(code, @binding)
+      
+      $stdout = prev_stdout
+      #$stderr = prev_stderr
+      
+      to_return = [out.string, @append.clone]
+      @append = nil
+      
+      to_return
+    end
+    
+    # Public: Appends html to the document.
+    def self.append(content)
+      @append ||= ""
+      @append << content
+    end
+  end
+end

data/lib/datastory/markdown_renderer.rb

@@ -1,4 +1,5 @@
 require "redcarpet"
+require "cgi"
 
 module DataStory 
   class MarkdownRenderer < Redcarpet::Render::HTML
@@ -9,25 +10,17 @@ module DataStory
     
     def block_code(code, language)
       output = <<-EOF
-        <pre><code class="#{language}">#{code}</code></pre>
+        <pre><code class="#{language}">#{CGI.escapeHTML(code)}</code></pre>
       EOF
         
       if language == "ruby-datastory" || language == "ruby-datastory-silent"
-        prev_stdout = $stdout
-        #prev_stderr = $stderr
+        eval_output, append = EvalContext.evaluate(code)
         
-        out = StringIO.new
-        $stdout = out
-        #$stderr = out
-        
-        eval(code, @binding)
-        
-        $stdout = prev_stdout
-        #$stderr = prev_stderr
-        
-        if out.string.length > 0 && language != "ruby-datastory-silent"
-          output += "<p>Output:</p><pre>#{out.string}</pre>"
+        if eval_output.length > 0 && language != "ruby-datastory-silent"
+          output += "<p>Output:</p><pre>#{CGI.escapeHTML(eval_output)}</pre>"
         end
+        
+        output += append
       end
       
       output

data/lib/datastory/version.rb

@@ -1,3 +1,3 @@
 module DataStory
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/datastory.rb

@@ -1,6 +1,7 @@
 require_relative "datastory/version"
 require_relative "datastory/markdown_renderer"
 require_relative "datastory/data_uri"
+require_relative "datastory/eval_context"
 
 module DataStory
   class Renderer

data/samples/test.md

@@ -48,4 +48,21 @@ Gnuplot.open do |gp|
 end
 ```
 
-![Graph of Stuff](tmp/sin_wave.gif)
+![Graph of Stuff](tmp/sin_wave.gif)
+
+The following code uses the `append` method to append html output to the document.
+
+``` ruby-datastory
+append "<table>"
+append "<tr>"
+12.times do |i|
+  append "<td>#{i}</td>"
+end
+append "</tr>"
+append "<tr>"
+12.times do
+  append "<td>#{rand}</td>"
+end
+append "</tr>"
+append "</table>"
+```

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datastory
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Alan Johnson
@@ -69,6 +69,7 @@ files:
 - datastory.gemspec
 - lib/datastory.rb
 - lib/datastory/data_uri.rb
+- lib/datastory/eval_context.rb
 - lib/datastory/markdown_renderer.rb
 - lib/datastory/version.rb
 - samples/test.md