zenweb 3.2.0 → 3.3.0

data/History.txt

@@ -1,3 +1,10 @@
+=== 3.3.0 / 2013-10-24
+
+* 2 minor enhancements:
+
+  * Added scheme and elisp extensions to coderay. (just aliass for clojure right now)
+  * Updated to kramdown 1.x.
+
 === 3.2.0 / 2013-08-19
 
 * 3 minor enhancements:

data/Manifest.txt

@@ -32,6 +32,9 @@ example-site/pages/nonblogpage.html.md
 example-site/projects/index.html.erb
 example-site/projects/zenweb.html.erb
 example-site/sitemap.xml.erb
+lib/coderay/scanners/elisp.rb
+lib/coderay/scanners/scheme.rb
+lib/coderay/zenweb_extensions.rb
 lib/zenweb.rb
 lib/zenweb/config.rb
 lib/zenweb/extensions.rb

data/Rakefile

@@ -13,7 +13,7 @@ Hoe.spec 'zenweb' do
   dependency "makerakeworkwell", "~> 1.0"
   dependency "less",             "~> 1.2"
   dependency "coderay",          "~> 1.0"
-  dependency "kramdown",         "~> 0.13"
+  dependency "kramdown",         "~> 1.0"
 end
 
 # vim: syntax=ruby

data/lib/coderay/scanners/elisp.rb

@@ -0,0 +1,11 @@
+module CodeRay
+  module Scanners
+    load :clojure
+
+    class Elisp < Clojure
+
+      register_for :elisp
+      file_extension 'el'
+    end
+  end
+end

data/lib/coderay/scanners/scheme.rb

@@ -0,0 +1,11 @@
+module CodeRay
+  module Scanners
+    load :clojure
+
+    class Scheme < Clojure
+
+      register_for :scheme
+      file_extension 'scm'
+    end
+  end
+end

data/lib/coderay/zenweb_extensions.rb

@@ -0,0 +1,7 @@
+require 'coderay'
+
+require "coderay/scanners/elisp"
+require "coderay/scanners/scheme"
+
+::CodeRay::FileType::TypeFromExt['scm'] = :scheme
+::CodeRay::FileType::TypeFromExt['el']  = :elisp

data/lib/zenweb/plugins/markdown.rb

@@ -30,9 +30,10 @@ class Zenweb::Page
 
   def markdown content, no_line_numbers = false
     require "kramdown"
+    require "coderay/zenweb_extensions"
 
     content = content.
-     gsub(/^\`\`\` *(\w+)/) { "{:lang=\"#$1\"}\n~~~" }.
+     gsub(/^\`\`\` *(\w+)/) { "~~~ #$1" }.
      gsub(/^\`\`\`/, '~~~')
 
     config = KRAMDOWN_CONFIG.dup

data/lib/zenweb.rb

@@ -6,7 +6,7 @@ require "time"
 
 module Zenweb
   # duh
-  VERSION = "3.2.0"
+  VERSION = "3.3.0"
 end
 
 require "zenweb/site"

data/test/helper.rb

@@ -1,3 +1,5 @@
+require "coderay/zenweb_extensions" # lame... force load early before chdir
+
 class Minitest::Test
   def self.ChdirTest path
     Module.new do

data/test/test_zenweb_plugins_markdown.rb

@@ -6,9 +6,7 @@ require "minitest/autorun"
 require "zenweb/site"
 require "test/helper"
 
-class TestZenwebPageMarkdown < Minitest::Test
-  include ChdirTest("example-site")
-
+class MarkdownTest < Minitest::Test
   attr_accessor :site, :page
 
   def setup
@@ -17,6 +15,43 @@ class TestZenwebPageMarkdown < Minitest::Test
     self.site = Zenweb::Site.new
     self.page = Zenweb::Page.new site, "blog/2012-01-02-page1.html.md"
   end
+end
+
+class TestUgh < MarkdownTest
+  def assert_markdown_code lang, line, *exps
+    act = page.markdown "``` #{lang}\n#{line}\n```"
+
+    exps.each do |exp|
+      assert_includes act, exp
+    end
+  end
+
+  def test_coderay_ruby
+    assert_markdown_code("ruby",
+                         "def x\n  42\nend",
+                         '<div><table class="CodeRay"><tr>',
+                         '<span class="keyword">def</span>')
+  end
+
+  def test_coderay_clojure
+    assert_markdown_code("clojure",
+                         "(+ 1 1)",
+                         '<pre>(<span class="keyword">+</span>',
+                         '<span class="integer">1</span>',
+                         '<span class="integer">1</span>)')
+  end
+
+  def test_coderay_elisp
+    assert_markdown_code("elisp",
+                         "(+ 1 1)",
+                         '<pre>(<span class="keyword">+</span>',
+                         '<span class="integer">1</span>',
+                         '<span class="integer">1</span>)')
+  end
+end
+
+class TestZenwebPageMarkdown < MarkdownTest
+  include ChdirTest("example-site")
 
   def test_attr_h
     assert_equal "{:blah=\"42\"}", page.attr("blah" => 42)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zenweb
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 3
-  - 2
+  - 3
   - 0
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -16,9 +16,9 @@ bindir: bin
 cert_chain: 
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBADANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTA5MDMwNjE4NTMxNVoXDTEwMDMwNjE4NTMxNVowRTETMBEGA1UE
+  GRYDY29tMB4XDTEzMDkxNjIzMDQxMloXDTE0MDkxNjIzMDQxMlowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -28,15 +28,15 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
-  AQAY59gYvDxqSqgC92nAP9P8dnGgfZgLxP237xS6XxFGJSghdz/nI6pusfCWKM8m
-  vzjjH2wUMSSf3tNudQ3rCGLf2epkcU13/rguI88wO6MrE0wi4ZqLQX+eZQFskJb/
-  w6x9W1ur8eR01s397LSMexySDBrJOh34cm2AlfKr/jokKCTwcM0OvVZnAutaovC0
-  l1SVZ0ecg88bsWHA0Yhh7NFxK1utWoIhtB6AFC/+trM0FQEB/jZkIS8SaNzn96Rl
-  n0sZEf77FLf5peR8TP/PtmIg7Cyqz23sLM4mCOoTGIy5OcZ8TdyiyINUHtb5ej/T
-  FBHgymkyj/AOSqKRIpXPhjC6
+  AQCFZ7JTzoy1gcG4d8A6dmOJy7ygtO5MFpRIz8HuKCF5566nOvpy7aHhDDzFmQuu
+  FX3zDU6ghx5cQIueDhf2SGOncyBmmJRRYawm3wI0o1MeN6LZJ/3cRaOTjSFy6+S6
+  zqDmHBp8fVA2TGJtO0BLNkbGVrBJjh0UPmSoGzWlRhEVnYC33TpDAbNA+u39UrQI
+  ynwhNN7YbnmSR7+JU2cUjBFv2iPBO+TGuWC+9L2zn3NHjuc6tnmSYipA9y8Hv+As
+  Y4evBVezr3SjXz08vPqRO5YRdO3zfeMT8gBjRqZjWJGMZ2lD4XNfrs7eky74CyZw
+  xx3n58i0lQkBE1EpKE0lFu/y
   -----END CERTIFICATE-----
 
-date: 2013-08-19 00:00:00 Z
+date: 2013-10-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -112,11 +112,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 15
         segments: 
+        - 1
         - 0
-        - 13
-        version: "0.13"
+        version: "1.0"
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -228,6 +228,9 @@ files:
 - example-site/projects/index.html.erb
 - example-site/projects/zenweb.html.erb
 - example-site/sitemap.xml.erb
+- lib/coderay/scanners/elisp.rb
+- lib/coderay/scanners/scheme.rb
+- lib/coderay/zenweb_extensions.rb
 - lib/zenweb.rb
 - lib/zenweb/config.rb
 - lib/zenweb/extensions.rb

metadata.gz.sig

@@ -1,2 +1,2 @@
-��i�Lß�Rv<#�[�ᆝq7�[�F��b��2W<�^?�
-e��uo��/G!<�s
+�񈀫[f[����/�c���0�r���M��2�Gv��U�YA��)����MW_�z�^��@kpϴ���/�}|�U�R&
+!��u32��q