datastory 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa61e11b6d796a4492f4a3245328a44504080358
-  data.tar.gz: 7c8d49b6fb6c6297aa5017ce1e6ee0d72438a24c
+  metadata.gz: 08a71919d602181417d23cb9e32cc6ea6db5b234
+  data.tar.gz: 2c9ba177faac33e62bfaae6ec340254289142ebe
 SHA512:
-  metadata.gz: 9bcb0fffae195e371304c45fd36f6115d7dda2665d6b892d5a5efd985a3b9e982abaaa30f5632d1ffa8fda724311a0867a263994d915dc70abf698abb1f012d1
-  data.tar.gz: d0011f9eaaafe5fafe43e956b0ba5bcd67114f38647bf15d9ca0b98c9e5580cdd094ed61757030142a441e135e3a44b7ed378bd1e44db31c6e6455ad146be592
+  metadata.gz: 33cf0f2ca6ce97e2c5f3ca554a69d1a09193a0ff7e4d5d966a79812f4738d573a2068582b52475cceeca91691ae1d3a2b42528b35cdb18fdf188f3e0192b38b7
+  data.tar.gz: 884b128831cc442c95e06beadf575533e99b4d6e673d0aa2aec898e67435166fbbf104277d6584900721ea76f435c1da02db3cf0dce4f24766175758ea4e4a2c

data/datastory.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "redcarpet", "~> 3.0.0"
-
+  spec.add_dependency "erubis", "~> 2.7.0"
+  
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 end

data/lib/datastory/eval_context.rb

@@ -1,11 +1,10 @@
+require "erubis"
+
 module DataStory
   class EvalContext
     
-    # Returns the binding for this context.
+    # Public: Evaluates the passed code in this context.
     def self.evaluate(code)
-      @binding ||= binding
-      @append = ""
-      
       prev_stdout = $stdout
       #prev_stderr = $stderr
       
@@ -13,21 +12,22 @@ module DataStory
       $stdout = out
       #$stderr = out
       
-      eval(code, @binding)
+      eval(code, eval_binding)
       
       $stdout = prev_stdout
       #$stderr = prev_stderr
       
-      to_return = [out.string, @append.clone]
-      @append = nil
-      
-      to_return
+      out.string
+    end
+    
+    # Public: Evaluates some ERb in this context.
+    def self.evaluate_erb(code)
+      erb = Erubis::EscapedEruby.new(code)
+      erb.result(eval_binding)
     end
     
-    # Public: Appends html to the document.
-    def self.append(content)
-      @append ||= ""
-      @append << content
+    def self.eval_binding
+      @binding ||= eval("binding")
     end
   end
 end

data/lib/datastory/markdown_renderer.rb

@@ -3,24 +3,23 @@ require "cgi"
 
 module DataStory 
   class MarkdownRenderer < Redcarpet::Render::HTML
-    def initialize
-      @binding = eval("binding;")
-      super
-    end
-    
     def block_code(code, language)
-      output = <<-EOF
-        <pre><code class="#{language}">#{CGI.escapeHTML(code)}</code></pre>
-      EOF
+      output = ""
+      
+      unless language == "ruby-datastory-erb"
+        output += <<-EOF
+          <pre><code class="#{language}">#{CGI.escapeHTML(code)}</code></pre>
+        EOF
+      end
         
-      if language == "ruby-datastory" || language == "ruby-datastory-silent"
-        eval_output, append = EvalContext.evaluate(code)
+      if language == "ruby-datastory"
+        eval_output = EvalContext.evaluate(code)
         
-        if eval_output.length > 0 && language != "ruby-datastory-silent"
+        if eval_output.length > 0
           output += "<p>Output:</p><pre>#{CGI.escapeHTML(eval_output)}</pre>"
         end
-        
-        output += append
+      elsif language == "ruby-datastory-erb"
+        output += EvalContext.evaluate_erb(code)
       end
       
       output

data/lib/datastory/version.rb

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

data/lib/datastory.rb

@@ -53,6 +53,25 @@ module DataStory
               font-size: .8rem;
               border-top: 2px solid #eee;
             }
+                      
+            table {
+              width: 100%;
+              overflow: scroll;
+              border-collapse: collapse;
+              margin: 1rem 0;
+              font-size: .8rem
+            }
+            table caption {
+              margin-bottom: .5rem;
+              font-size: 1rem;
+            }
+            td, th {
+              border: 1px solid #ccc;
+              padding: 3px;
+            }
+            th {
+              background: #eee;
+            }
             
             .content {
               width: 80%;

data/samples/test.md

@@ -52,17 +52,18 @@ end
 
 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>"
+``` ruby-datastory-erb
+<table>
+  <caption>Some random numbers.</caption>
+  <tr>
+    <% 6.times do |i| %>
+      <th><%= i %></th>
+    <% end %>
+  </tr>
+  <tr>
+    <% 6.times do %>
+      <td><%= rand %></td>
+    <% end %>
+  </tr>
+</table>
 ```

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datastory
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Alan Johnson
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement