ristretto 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c95f889dfdc094fa94194bcbd842b410a1cbd446
-  data.tar.gz: d2ab58bc836f180ced4d782618f50df1a83b02a8
+  metadata.gz: eaeeaea9a3cdae764b9dd7d0ccb82228ac92c24d
+  data.tar.gz: 56109bf00339872fbf2b55e0739c1c89c9829f78
 SHA512:
-  metadata.gz: 6a74c86902a0e75d60c81d8cb3e98fec4bd8493dc30ccfb1b36b982931855e4ffad59f6509aa9c6e366abffcaf400646c8c13fbd249cac6454dbf7740d8320b0
-  data.tar.gz: a79da61e8d67ff1d60f6a1f59a91e07ff8ba3dca370999e5ccea5cec053cc52dfb72b199d815ebb9f1af4994e8a9989221e75f67e4ec40ad4e0ec4e283bd8945
+  metadata.gz: 2aed50ca43f6b7e5496a3c560dad5eb2f22a6701d3c9c703781156ef3fcfeee4c20ddae5809672b9ce668bdcb5aa6d67f0eea3ca6bbddc524f11c5190585e7e3
+  data.tar.gz: 609e648df4b517d8c5df4dc85d2ea9ff70df67ace62350ff305629d3f2de7b8a10e62353017d9784188b9af71c60049f4acc38bc3014e0bd6c675d131ec89c56

data/lib/ristretto.rb

@@ -3,13 +3,13 @@ require "ristretto/version"
 module Ristretto
   def self.parse(file)
     ruby = ''
-    File.read(file).gsub /^    (.*)/ do |match|
+    File.read(file).gsub /^    ([^-+*$].*?)$/ do |match|
       ruby << $1 << "\n"
     end
     ruby.strip
   end
 
   def self.execute(source)
-    eval source
+    instance_eval source
   end
 end

data/lib/ristretto/version.rb

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

data/specs/ristretto_spec.rb

@@ -3,17 +3,25 @@ require 'minitest/autorun'
 
 describe Ristretto do
 
-  let(:indented_codeblocks) { Ristretto.parse('specs/markdown/indented_codeblocks.md') }
+  let(:parsed_markdown) { Ristretto.parse('specs/specification.md') }
 
   describe "#execute" do
-    it "executes parsed ruby code" do
-      Ristretto.execute(indented_codeblocks).must_equal "Hello, Ristretto!"
+    it "executes simple ruby code" do
+      Ristretto.execute(parsed_markdown).must_equal "Hello, Ristretto!"
     end
+
+    it "can cope with unbound methods"
+
+    it "parsed required ristretto files"
   end
 
   describe "#parse" do
-    it "parses markdown indented codeblocks" do
-      indented_codeblocks.must_equal "welcome = \"Hello, Ristretto!\"\n# comments\nwelcome"
+    it "parses markdown according to the Ristretto specification" do
+      parsed_markdown.must_equal "welcome = \"Hello, Ristretto!\"\n# comments\nwelcome"
     end
+
+    it "groks tabbed indents"
+
+    it "parses backticked codeblocks"
   end
 end

data/specs/specification.md

@@ -0,0 +1,42 @@
+# The Ristretto Specification
+
+This specification doubles the code test for the Ristretto gem.
+
+## Indented Codeblocks
+
+Ristretto should parse indented code blocks.  By default, anything inside them will be treated like ruby.
+
+    welcome = "Hello, Ristretto!"
+
+## Multiple Codeblocks
+
+Multiple blocks should be parsed into a single string with the line termination `\n` character appended after each block.
+
+    # comments
+    welcome
+
+The last resulting code string should be stripped of trailing whitespace.
+
+## Tabbed Codelocks
+
+TODO 
+
+## Fenced Codeblocks
+
+TODO
+
+## Lists
+
+One thing Ristretto shouldn't do is parse indented lists.
+
+  - List like these
+    - but with sublists 4 or more spaces in.
+    + starting with any of the markdown list markers `-`, `+`, or `*`.
+
+    * and even those with a preceding blank line.        
+
+## Non Ruby Code
+
+Somethimes, you might need to include more than just Ruby in a codeblock.  As such, Ristretto should ignore specific types of code such as shell or bash indicated by `$`
+
+    $ youknown -? like this

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ristretto
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Dave Kinkead
@@ -54,9 +54,10 @@ files:
 - lib/ristretto.rb
 - lib/ristretto/version.rb
 - readme.md
+- ristretto-0.0.1.gem
 - ristretto.gemspec
-- specs/markdown/indented_codeblocks.md
 - specs/ristretto_spec.rb
+- specs/specification.md
 homepage: https://github.com/davekinkead/ristretto
 licenses:
 - MIT
@@ -82,5 +83,5 @@ signing_key:
 specification_version: 4
 summary: Literate Ruby inspired by Coffeescript
 test_files:
-- specs/markdown/indented_codeblocks.md
 - specs/ristretto_spec.rb
+- specs/specification.md

data/specs/markdown/indented_codeblocks.md

@@ -1,10 +0,0 @@
-# Indented Codeblocks
-
-Ristretto should parse indented code blocks.
-
-    welcome = "Hello, Ristretto!"
-
-And concatinate multiple blocks
-
-    # comments
-    welcome