flannel 0.2.10 → 0.2.11

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 2
-:patch: 10
+:patch: 11
 :build: 

data/flannel.gemspec

@@ -5,13 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flannel}
-  s.version = "0.2.10"
+  s.version = "0.2.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jamal Hansen"]
-  s.date = %q{2010-02-23}
+  s.date = %q{2010-02-24}
+  s.default_executable = %q{quilt-it}
   s.email = %q{jamal.hansen@gmail.com}
-  s.executables = ["quilt-it~", "quilt-it"]
+  s.executables = ["quilt-it"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -62,6 +63,7 @@ Gem::Specification.new do |s|
      "test/base_block_html_generation_test.rb",
      "test/base_block_test.rb",
      "test/block_cutter_test.rb",
+     "test/block_parser_styles_test.rb",
      "test/block_parser_test.rb",
      "test/feed_parser_test.rb",
      "test/file_cache_test.rb",
@@ -73,7 +75,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{flannel}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A soft comfortable worn in markup language for Ruby}
   s.test_files = [
     "test/html_formatter_test.rb",
@@ -81,6 +83,7 @@ Gem::Specification.new do |s|
      "test/test_helper.rb",
      "test/file_cache_test.rb",
      "test/base_block_test.rb",
+     "test/block_parser_styles_test.rb",
      "test/block_parser_test.rb",
      "test/feed_parser_test.rb",
      "test/flannel_test.rb",

data/lib/flannel/block.treetop

@@ -16,7 +16,7 @@ grammar Block
   end
 
   rule block_header
-     block_start block_type block_id parent_id? attribute_list? [\n]*  {
+     block_start block_type block_id? parent_id? attribute_list? [\n]*  {
       def content
         elements.map{ |element| element.respond_to?(:content) ? element.content : nil}.compact
       end
@@ -40,7 +40,7 @@ grammar Block
   end
  
   rule block_type
-    ( paragraph / feed / preformatted / list / header ) {
+    ( paragraph / feed / preformatted / list / header / blockquote ) {
       def content
         [:block_type, text_value.to_sym ]
       end
@@ -79,7 +79,9 @@ grammar Block
     "header_six" { def content; text_value; end }
   end
 
-
+  rule blockquote
+    "blockquote" { def content; text_value; end }
+  end
 
   rule feed
     "feed" { def content; text_value; end }

data/test/block_cutter_test.rb

@@ -18,6 +18,16 @@ class BlockCutterTest < Test::Unit::TestCase
       assert_equal "baz", blocks[1].id
 
     end
+    
+    should "accept a block without an id" do
+      markup = ":paragraph\n some text"
+
+      blocks = @block_cutter.cut markup
+      assert_equal 1, blocks.length
+ 
+      assert_equal :paragraph, blocks[0].type
+      assert_nil blocks[0].id
+    end
 
     should "not split preformatted text based on blank lines" do
       markup = ":preformatted my_preformatted\n foo\n\nbar\n"
@@ -52,5 +62,23 @@ class BlockCutterTest < Test::Unit::TestCase
       blocks = @block_cutter.cut markup
       assert_equal :feed, blocks[0].type
     end
+    
+    should "parse a paragraph with a simple wiki link" do
+      markup = ":paragraph\n-ravioli>"
+
+      blocks = @block_cutter.cut markup
+      assert_equal :paragraph, blocks[0].type
+      assert_nil blocks[0].id
+      assert_equal '-ravioli>', blocks[0].text
+    end
+    
+    should "parse a simple paragraph" do
+      markup = ":paragraph\nbar bar\n"
+
+      blocks = @block_cutter.cut markup
+      assert_equal :paragraph, blocks[0].type
+      assert_nil blocks[0].id
+      assert_equal "bar bar", blocks[0].text
+    end
   end
 end

data/test/block_parser_styles_test.rb

@@ -0,0 +1,75 @@
+require 'test_helper'
+
+class BlockParserStylesTest < Test::Unit::TestCase
+  def setup
+    @parser = BlockParser.new
+  end
+  
+  def test_paragraph
+    doc = @parser.parse(":paragraph\ntext")
+    
+    assert_doc doc, :paragraph, nil, "text"
+  end
+  
+  def test_list
+    doc = @parser.parse(":list\ntext")
+    
+    assert_doc doc, :list, nil, "text"
+  end
+  
+  def test_feed
+    doc = @parser.parse(":feed\ntext")
+    
+    assert_doc doc, :feed, nil, "text"
+  end
+  
+  def test_blockquote
+    doc = @parser.parse(":blockquote\ntext")
+    
+    assert_doc doc, :blockquote, nil, "text"
+  end
+  
+  def test_preformatted
+    doc = @parser.parse(":preformatted\ntext")
+    
+    assert_doc doc, :preformatted, nil, "text"
+  end
+  
+  def test_header_one
+    doc = @parser.parse(":header_one\ntext")
+    
+    assert_doc doc, :header_one, nil, "text"
+  end
+  
+  def test_header_two
+    doc = @parser.parse(":header_two\ntext")
+    
+    assert_doc doc, :header_two, nil, "text"
+  end
+  
+  def test_header_three
+    doc = @parser.parse(":header_three\ntext")
+    
+    assert_doc doc, :header_three, nil, "text"
+  end
+  
+  def test_header_four
+    doc = @parser.parse(":header_four\ntext")
+    
+    assert_doc doc, :header_four, nil, "text"
+  end
+  
+  def test_header_five
+    doc = @parser.parse(":header_five\ntext")
+    
+    assert_doc doc, :header_five, nil, "text"
+  end
+  
+  def test_header_six
+    doc = @parser.parse(":header_six\ntext")
+    
+    assert_doc doc, :header_six, nil, "text"
+  end
+  
+end
+

data/test/block_parser_test.rb

@@ -16,6 +16,12 @@ class BlockParserTest < Test::Unit::TestCase
     assert_doc doc, :paragraph, "wonki", "text"
   end
   
+  def test_parser_returns_simple_block_without_id
+    doc = @parser.parse(":paragraph\ntext")
+    
+    assert_doc doc, :paragraph, nil, "text"
+  end
+  
   def test_parser_returns_block_with_dashed_block_id
     doc = @parser.parse(":paragraph wonki-donki\ntext")
 

data/test/file_cache_test.rb

@@ -5,19 +5,19 @@ class FileCacheTest < Test::Unit::TestCase
   context "Creating File cache" do
     should "require a location" do
       begin
-	cache = Flannel::FileCache.new
-	assert_fail "should have raised ArgumentError"
+        cache = Flannel::FileCache.new
+        assert_fail "should have raised ArgumentError"
       rescue ArgumentError => e
-	assert true
+        assert true
       end
     end
     
     should "require a valid location" do
       begin
-	cache = Flannel::FileCache.new "foo/bar"
-	assert_fail "should have raised Flannel::CacheLocationDoesNotExistError"
+        cache = Flannel::FileCache.new "foo/bar"
+        assert_fail "should have raised Flannel::CacheLocationDoesNotExistError"
       rescue Flannel::CacheLocationDoesNotExistError => e
-	assert true
+        assert true
       end
     end
   end
@@ -29,10 +29,10 @@ class FileCacheTest < Test::Unit::TestCase
     
     should "be private" do
       begin
-	key = @cache.generate_key "http://example.com"
-	assert_fail "generate_key should be private"
+        key = @cache.generate_key "http://example.com"
+        assert_fail "generate_key should be private"
       rescue NoMethodError => e
-	assert true
+        assert true
       end
     end
     

data/test/flannel_test.rb

@@ -17,6 +17,12 @@ class FlannelTest < Test::Unit::TestCase
   end
   
   context "basic behavior" do
+    
+    should "parse a block without an id" do
+      markup = ":paragraph\n this is my paragraph"
+      assert_equal "<p>this is my paragraph</p>",  Flannel.quilt(markup)
+    end
+    
     should "strip and convert underscores to pre tags" do
       markup = ":preformatted foo\nfoo\n\n   bar\n"
       assert_equal "<pre id='foo'>foo\n\n   bar\n</pre>",  Flannel.quilt(markup)
@@ -53,4 +59,13 @@ class FlannelTest < Test::Unit::TestCase
       assert_equal result, Flannel.quilt(markup)
     end
   end
+  
+  context "bug fixes" do
+    should "parse a simple paragraph" do
+      markup = ":paragraph\nbar bar\n"
+      result = "<p>bar bar</p>"
+
+      assert_equal result, Flannel.quilt(markup)
+    end
+  end
 end

data/test/html_formatter_test.rb

@@ -12,72 +12,72 @@ class HtmlFormatterTest < Test::Unit::TestCase
     
     context "subdirectories" do
       should "handle subdirectories and not display directory info" do
-	result = @formatter.do("I think it -cheese/tastes good>.", :paragraph)
-	assert_equal '<p>I think it <a href="cheese/tastes-good">tastes good</a>.</p>', result
+        result = @formatter.do("I think it -cheese/tastes good>.", :paragraph)
+        assert_equal '<p>I think it <a href="cheese/tastes-good">tastes good</a>.</p>', result
       end
     end
       
     context "blockquotes" do
       should "wrap a blockquoted block in blockquotes" do
-	result = @formatter.do("Ruby is #1", :blockquote)
-	assert_equal '<blockquote>Ruby is #1</blockquote>', result
+        result = @formatter.do("Ruby is #1", :blockquote)
+        assert_equal '<blockquote>Ruby is #1</blockquote>', result
       end
     end
 
     context "links" do
       should "output the link" do
-	assert_equal '<p><a href="cheese">cheese</a></p>', @formatter.do("-cheese>", :paragraph)
+        assert_equal '<p><a href="cheese">cheese</a></p>', @formatter.do("-cheese>", :paragraph)
       end
       
       should "hyphenate words" do
-	result = @formatter.do("-cheese is good>", :paragraph)
-	assert_equal '<p><a href="cheese-is-good">cheese is good</a></p>', result
+        result = @formatter.do("-cheese is good>", :paragraph)
+        assert_equal '<p><a href="cheese-is-good">cheese is good</a></p>', result
       end
 
       should "replace text surrounded by - and > with a wiki link" do
-	result = @formatter.do("red, -green>, refactor", :paragraph)
-	assert_equal '<p>red, <a href="green">green</a>, refactor</p>',result
+        result = @formatter.do("red, -green>, refactor", :paragraph)
+        assert_equal '<p>red, <a href="green">green</a>, refactor</p>',result
       end
 
       should "not replace text surrounded by - and > with a wiki link if spaced" do
-	result = @formatter.do("red, - green >, refactor", :paragraph)
-	assert_equal '<p>red, - green >, refactor</p>', result
+        result = @formatter.do("red, - green >, refactor", :paragraph)
+        assert_equal '<p>red, - green >, refactor</p>', result
       end
 
       should "not replace text surrounded by - and > with a wiki link if spaced on right" do
-	result = @formatter.do("red, -green >, refactor", :paragraph)
-	assert_equal '<p>red, -green >, refactor</p>', result
+        result = @formatter.do("red, -green >, refactor", :paragraph)
+        assert_equal '<p>red, -green >, refactor</p>', result
       end
 
       should "not replace surrounded by - and > with a wiki link if spaced on left" do
-	result = @formatter.do("red, - green>, refactor", :paragraph)
-	assert_equal '<p>red, - green>, refactor</p>', result
+        result = @formatter.do("red, - green>, refactor", :paragraph)
+        assert_equal '<p>red, - green>, refactor</p>', result
       end
     end
 
     context "preformatted text" do
       should "html escape preformatted text" do
-	result = @formatter.do("<p>& foo</p>", :preformatted)
-	assert_equal "<pre>&lt;p&gt;&amp; foo&lt;/p&gt;</pre>", result
+        result = @formatter.do("<p>& foo</p>", :preformatted)
+        assert_equal "<pre>&lt;p&gt;&amp; foo&lt;/p&gt;</pre>", result
       end
     end
 
     context "making permalinks" do
       should "replace spaces with dashes" do
-	assert_equal "get-the-box", @formatter.permalink("get the box")
+        assert_equal "get-the-box", @formatter.permalink("get the box")
       end
 
       should "replace multiple spaces with single dashes" do
-	assert_equal "get-the-box", @formatter.permalink("get    the box")
+        assert_equal "get-the-box", @formatter.permalink("get    the box")
       end
 
       should "replace odd characters with dashes" do
-	assert_equal "get-the-box", @formatter.permalink("get the @#)(* box")
+        assert_equal "get-the-box", @formatter.permalink("get the @#)(* box")
       end
       
       should "not be greedy in matching" do
-	result = @formatter.do "a -foo> and a -bar>.", :paragraph
-	assert_equal '<p>a <a href="foo">foo</a> and a <a href="bar">bar</a>.</p>', result
+        result = @formatter.do "a -foo> and a -bar>.", :paragraph
+        assert_equal '<p>a <a href="foo">foo</a> and a <a href="bar">bar</a>.</p>', result
       end
     end
   end

data/test/test_helper.rb

@@ -40,10 +40,12 @@ class Test::Unit::TestCase
     assert_equal :block_type, type[0]
     assert_equal expected_type, type[1]   
     
-    id = header.shift
-    assert_equal 2, id.length
-    assert_equal :block_id, id[0]
-    assert_equal expected_id, id[1] 
+    if expected_id
+      id = header.shift
+      assert_equal 2, id.length
+      assert_equal :block_id, id[0]
+      assert_equal expected_id, id[1] 
+    end
     
     if expected_parent_id
       parent_id = header.shift

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: flannel
 version: !ruby/object:Gem::Version 
-  version: 0.2.10
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 11
+  version: 0.2.11
 platform: ruby
 authors: 
 - Jamal Hansen
@@ -9,53 +14,60 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-23 00:00:00 -06:00
-default_executable: 
+date: 2010-02-24 00:00:00 -06:00
+default_executable: quilt-it
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: treetop
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: polyglot
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id004
 description: 
 email: jamal.hansen@gmail.com
 executables: 
-- quilt-it~
 - quilt-it
 extensions: []
 
@@ -108,6 +120,7 @@ files:
 - test/base_block_html_generation_test.rb
 - test/base_block_test.rb
 - test/block_cutter_test.rb
+- test/block_parser_styles_test.rb
 - test/block_parser_test.rb
 - test/feed_parser_test.rb
 - test/file_cache_test.rb
@@ -127,18 +140,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: flannel
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A soft comfortable worn in markup language for Ruby
@@ -148,6 +163,7 @@ test_files:
 - test/test_helper.rb
 - test/file_cache_test.rb
 - test/base_block_test.rb
+- test/block_parser_styles_test.rb
 - test/block_parser_test.rb
 - test/feed_parser_test.rb
 - test/flannel_test.rb