nanoc3 3.2.2 → 3.2.3

data/NEWS.md

@@ -1,5 +1,12 @@
 # nanoc news
 
+## 3.2.3 (2011-10-31)
+
+* Made syntax colorizer only strip trailing blank lines instead of all blanks
+* Improved Ruby 1.9.x compatibility
+* Made default rakefile require rubygems if necessary
+* Made filename/content argument of `Nanoc3::Item#initialize` mandatory
+
 ## 3.2.2 (2011-09-04)
 
 * Fixed command usage printing

data/README.md

@@ -99,6 +99,7 @@ may be interested in the development dependencies:
 * Eric Sunshine
 * Dennis Sutch
 * Matthias Vallentin
+* Ruben Verborgh
 * Toon Willems
 
 ## Contact

data/lib/nanoc3/base/source_data/item.rb

@@ -70,6 +70,10 @@ module Nanoc3
       params = { :mtime => params } if params.is_a?(Time)
       params[:binary] = false unless params.has_key?(:binary)
 
+      if raw_content_or_raw_filename.nil?
+        raise "attempted to create an item with no content/filename (identifier #{identifier})"
+      end
+
       # Get type and raw content or raw filename
       @is_binary = params[:binary]
       if @is_binary

data/lib/nanoc3/cli/commands/create_site.rb

@@ -281,6 +281,15 @@ EOS
     </div>
   </body>
 </html>
+EOS
+
+    DEFAULT_RAKEFILE = <<EOS
+begin
+  require 'nanoc3/tasks'
+rescue LoadError
+  require 'rubygems'
+  require 'nanoc3/tasks'
+end
 EOS
 
     def run
@@ -336,7 +345,7 @@ EOS
 
       # Create rakefile
       File.open('Rakefile', 'w') do |io|
-        io.write "require 'nanoc3/tasks'"
+        io.write DEFAULT_RAKEFILE.make_compatible_with_env
       end
       Nanoc3::NotificationCenter.post(:file_created, 'Rakefile')
 

data/lib/nanoc3/cli/error_handler.rb

@@ -169,10 +169,9 @@ module Nanoc3::CLI
       case error
       when LoadError
         # Get gem name
-        matches = error.message.match(/no such file to load -- ([^\s]+)/)
-        return nil if matches.size == 0
-        lib_name = matches[1]
-        gem_name = GEM_NAMES[$1]
+        matches = error.message.match(/(no such file to load|cannot load such file) -- ([^\s]+)/)
+        return nil if matches.nil?
+        gem_name = GEM_NAMES[matches[2]]
 
         # Build message
         if gem_name

data/lib/nanoc3/filters/colorize_syntax.rb

@@ -111,8 +111,9 @@ module Nanoc3::Filters
         next if language.nil?
 
         # Highlight
-        highlighted_code = highlight(element.inner_text.strip, language, params)
-        element.inner_html = highlighted_code.strip
+        raw = strip(element.inner_text)
+        highlighted_code = highlight(raw, language, params)
+        element.inner_html = strip(highlighted_code)
 
         # Add class
         unless has_class
@@ -131,6 +132,11 @@ module Nanoc3::Filters
 
     KNOWN_COLORIZERS = [ :coderay, :dummy, :pygmentize, :simon_highlight ]
 
+    # Removes the first blank lines and any whitespace at the end.
+    def strip(s)
+      s.lines.drop_while { |line| line.strip.empty? }.join.rstrip
+    end
+
     def highlight(code, language, params={})
       colorizer = @colorizers[language.to_sym]
       if KNOWN_COLORIZERS.include?(colorizer)

data/lib/nanoc3.rb

@@ -3,7 +3,7 @@
 module Nanoc3
 
   # The current nanoc version.
-  VERSION = '3.2.2'
+  VERSION = '3.2.3'
 
 end
 

data/test/base/test_item.rb

@@ -25,7 +25,7 @@ class Nanoc3::ItemTest < MiniTest::Unit::TestCase
       item.identifier.chop!
     rescue => error
       raised = true
-      assert_equal "can't modify frozen string", error.message
+      assert_match /^can't modify frozen [Ss]tring$/, error.message
     end
     assert raised, 'Should have raised when trying to modify a frozen string'
   end

data/test/base/test_layout.rb

@@ -22,7 +22,7 @@ class Nanoc3::LayoutTest < MiniTest::Unit::TestCase
       layout.identifier.chop!
     rescue => error
       raised = true
-      assert_equal "can't modify frozen string", error.message
+      assert_match /^can't modify frozen [Ss]tring$/, error.message
     end
     assert raised, 'Should have raised when trying to modify a frozen string'
   end

data/test/data_sources/test_filesystem_unified.rb

@@ -27,8 +27,8 @@ class Nanoc3::DataSources::FilesystemUnifiedTest < MiniTest::Unit::TestCase
     assert File.file?('foobar/asdf.html')
 
     # Check file content
-    expected = "--- \nfoo: bar\n---\n\ncontent here"
-    assert_equal expected, File.read('foobar/asdf.html')
+    expected = /^--- ?\nfoo: bar\n---\n\ncontent here$/
+    assert_match expected, File.read('foobar/asdf.html')
   end
 
   def test_create_object_at_root
@@ -43,8 +43,8 @@ class Nanoc3::DataSources::FilesystemUnifiedTest < MiniTest::Unit::TestCase
     assert File.file?('foobar/index.html')
 
     # Check file content
-    expected = "--- \nfoo: bar\n---\n\ncontent here"
-    assert_equal expected, File.read('foobar/index.html')
+    expected = /^--- ?\nfoo: bar\n---\n\ncontent here$/
+    assert_match expected, File.read('foobar/index.html')
   end
 
   def test_load_objects

data/test/filters/test_coderay.rb

@@ -25,7 +25,7 @@ class Nanoc3::Filters::CodeRayTest < MiniTest::Unit::TestCase
       # Run filter
       code = "def some_function ; x = blah.foo ; x.bar 'xyzzy' ; end"
       result = filter.run(code, :language => 'ruby')
-      assert_match %r{^<span class="r">def</span> <span class="fu">some_function</span>}, result
+      assert_match %r{^<span class="keyword">def</span> <span class="function">some_function</span>}, result
     end
   end
 

data/test/filters/test_colorize_syntax.rb

@@ -11,7 +11,7 @@ class Nanoc3::Filters::ColorizeSyntaxTest < MiniTest::Unit::TestCase
 
       # Get input and expected output
       input = '<pre title="moo"><code class="language-ruby"># comment</code></pre>'
-      expected_output = '<pre title="moo"><code class="language-ruby"><span class="c"># comment</span></code></pre>'
+      expected_output = '<pre title="moo"><code class="language-ruby"><span class="comment"># comment</span></code></pre>'
 
       # Run filter
       actual_output = filter.run(input)
@@ -26,7 +26,7 @@ class Nanoc3::Filters::ColorizeSyntaxTest < MiniTest::Unit::TestCase
 
       # Get input and expected output
       input = %[<pre title="moo"><code>#!ruby\n# comment</code></pre>]
-      expected_output = '<pre title="moo"><code class="language-ruby"><span class="c"># comment</span></code></pre>'
+      expected_output = '<pre title="moo"><code class="language-ruby"><span class="comment"># comment</span></code></pre>'
 
       # Run filter
       actual_output = filter.run(input)
@@ -41,7 +41,7 @@ class Nanoc3::Filters::ColorizeSyntaxTest < MiniTest::Unit::TestCase
 
       # Get input and expected output
       input = %[<pre title="moo"><code class="language-ruby">#!ruby\n# comment</code></pre>]
-      expected_output = %[<pre title="moo"><code class="language-ruby"><span class="dt">#!ruby</span>\n<span class="c"># comment</span></code></pre>]
+      expected_output = %[<pre title="moo"><code class="language-ruby"><span class="doctype">#!ruby</span>\n<span class="comment"># comment</span></code></pre>]
 
       # Run filter
       actual_output = filter.run(input)
@@ -56,7 +56,7 @@ class Nanoc3::Filters::ColorizeSyntaxTest < MiniTest::Unit::TestCase
 
       # Get input and expected output
       input = '<pre title="moo"><code class="abc language-ruby xyz"># comment</code></pre>'
-      expected_output = '<pre title="moo"><code class="abc language-ruby xyz"><span class="c"># comment</span></code></pre>'
+      expected_output = '<pre title="moo"><code class="abc language-ruby xyz"><span class="comment"># comment</span></code></pre>'
 
       # Run filter
       actual_output = filter.run(input)
@@ -239,8 +239,38 @@ after
 EOS
       expected_output = <<EOS
 before
-<pre><code class=\"language-ruby\"><span class=\"dt\">#!/usr/bin/env ruby</span>
-puts <span class=\"s\"><span class=\"dl\">'</span><span class=\"k\">hi!</span><span class=\"dl\">'</span></span></code></pre>
+<pre><code class=\"language-ruby\"><span class=\"doctype\">#!/usr/bin/env ruby</span>
+puts <span class=\"string\"><span class=\"delimiter\">'</span><span class=\"content\">hi!</span><span class=\"delimiter\">'</span></span></code></pre>
+after
+EOS
+
+      # Run filter
+      actual_output = filter.run(input)
+      assert_equal(expected_output, actual_output)
+    end
+  end
+
+  def test_strip
+    if_have 'coderay', 'nokogiri' do
+      # Create filter
+      filter = ::Nanoc3::Filters::ColorizeSyntax.new
+
+      # Simple test
+      assert_equal "  bar", filter.send(:strip, "\n  bar")
+
+      # Get input and expected output
+      input = <<EOS
+before
+<pre><code class="language-ruby">
+  def foo
+  end
+</code></pre>
+after
+EOS
+      expected_output = <<EOS
+before
+<pre><code class="language-ruby">  <span class=\"keyword\">def</span> <span class=\"function\">foo</span>
+  <span class=\"keyword\">end</span></code></pre>
 after
 EOS
 

data/test/helpers/test_filtering.rb

@@ -81,7 +81,7 @@ class Nanoc3::Helpers::FilteringTest < MiniTest::Unit::TestCase
 
       # Evaluate content
       result = ::ERB.new(content).result(binding)
-      assert_match(%r{<span class="r">def</span> <span class="fu">some_function</span>}, result)
+      assert_match(%r{<span class="keyword">def</span> <span class="function">some_function</span>}, result)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc3
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-04 00:00:00.000000000Z
+date: 2011-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
-  requirement: &70348754969400 !ruby/object:Gem::Requirement
+  requirement: &70345936282400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70348754969400
+  version_requirements: *70345936282400
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70348754968620 !ruby/object:Gem::Requirement
+  requirement: &70345936281900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348754968620
+  version_requirements: *70345936281900
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70348754967200 !ruby/object:Gem::Requirement
+  requirement: &70345936281040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348754967200
+  version_requirements: *70345936281040
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70348754966620 !ruby/object:Gem::Requirement
+  requirement: &70345936280540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348754966620
+  version_requirements: *70345936280540
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70348754965880 !ruby/object:Gem::Requirement
+  requirement: &70345936279920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348754965880
+  version_requirements: *70345936279920
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70348754964820 !ruby/object:Gem::Requirement
+  requirement: &70345936279240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348754964820
+  version_requirements: *70345936279240
 description: nanoc is a simple but very flexible static site generator written in
   Ruby. It operates on local files, and therefore does not run on the server. nanoc
   “compiles” the local source files into HTML (usually), by evaluating eRuby, Markdown,
@@ -354,3 +354,4 @@ specification_version: 3
 summary: a web publishing system written in Ruby for building small to medium-sized
   websites.
 test_files: []
+has_rdoc: