keydown 0.5.2 → 0.7.0

data/.rvmrc

@@ -1 +1 @@
-rvm use default@keydown
+rvm use default@keydown --create

data/keydown.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'thor', '>= 0.14.0'
   s.add_dependency 'rdiscount', '>= 1.6.8'
-  s.add_dependency 'albino'
+  s.add_dependency 'coderay', '~> 0.9.8'
 
   s.add_development_dependency "rspec", ">= 2.5.0"
   s.add_development_dependency "fuubar"

data/lib/keydown/lib/slide.rb

@@ -1,5 +1,4 @@
 require 'digest/sha1'
-require 'albino'
 
 module Keydown
   class Slide
@@ -24,7 +23,7 @@ module Keydown
       extract_content!
       extract_code!
       extract_background_image!
-      pygmentize_code!
+      highlight_code!
     end
 
     def classnames
@@ -109,15 +108,19 @@ module Keydown
       end
     end
 
-    def pygmentize_code!
-      @codemap.each do |id, spec|
-        lang = spec[:lang]
-        code = spec[:code]
+    require "coderay"
+
+    def highlight_code!
+      @codemap.each do |id, code_block|
+        lang = code_block[:lang]
+        code = code_block[:code]
         if code.all? { |line| line =~ /\A\r?\n\Z/ || line =~ /^(  |\t)/ }
           code.gsub!(/^(  |\t)/m, '')
         end
 
-        @content.gsub!(id, Albino.new(code, lang).colorize)
+        tokens = CodeRay.scan code, lang.to_sym
+
+        @content.gsub!(id, tokens.html.div)
       end
     end
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Keydown
-  VERSION = "0.5.2"
+  VERSION = "0.7.0"
 end

data/spec/lib/slide_spec.rb

@@ -47,9 +47,9 @@ describe Keydown::Slide do
     end
   end
 
-  shared_examples_for "Pygmentizing code fragments" do
+  shared_examples_for "syntax highlighting" do
     it "should colorize the code fragments" do
-      @doc.css('.highlight').length.should == 1
+      @doc.css('.CodeRay').length.should == 1
     end
   end
 
@@ -204,7 +204,7 @@ a simple note
 
         it_should_behave_like "generating HTML"
 
-        it_should_behave_like "Pygmentizing code fragments"
+        it_should_behave_like "syntax highlighting"
       end
     end
 
@@ -239,7 +239,7 @@ a simple note
         end
 
         it_should_behave_like "generating HTML"
-        it_should_behave_like "Pygmentizing code fragments"
+        it_should_behave_like "syntax highlighting"
       end
     end
   end

data/spec/tasks/generate_spec.rb

@@ -26,7 +26,7 @@ describe Keydown do
 
     it "should generate a sample Markdown file" do
       Dir.chdir "#{@tmp_dir}/sample" do
-        File.exist?("sample.md").should be_true
+        File.exist?("slides.md").should be_true
       end
     end
 

data/templates/generate/css/syntax_highlighting.css

@@ -0,0 +1,135 @@
+/*
+  CSS extraction & comments via http://thoughtsincomputation.com/posts/coderay-stylesheet-classes
+*/
+
+.CodeRay {
+  background-color: #f8f8f8;
+  border: 1px solid silver;
+  font-family: 'Courier New', 'Terminal', monospace;
+  color: #000;
+}
+.CodeRay pre { margin: 0px }
+
+div.CodeRay { }
+
+span.CodeRay { white-space: pre; border: 0px; padding: 2px }
+
+table.CodeRay { border-collapse: collapse; width: 100%; padding: 2px }
+table.CodeRay td { padding: 2px 4px; vertical-align: top }
+
+.CodeRay .line_numbers,
+.CodeRay .no {
+  background-color: #def;
+  color: gray;
+  text-align: right;
+}
+.CodeRay .line_numbers tt { font-weight: bold }
+.CodeRay .line_numbers .highlighted { color: red }
+.CodeRay .no { padding: 0px 4px }                  /*    (don't know) */
+.CodeRay .code { width: 100% }                     /*    (don't know) */
+
+ol.CodeRay { font-size: 10pt }
+ol.CodeRay li { white-space: pre }
+
+.CodeRay .code pre { overflow: auto }
+
+.CodeRay .debug { color:white ! important; background:blue ! important; } /*    (don't know) */
+
+.CodeRay .af { color:#00C }                        /* attribute_name_fat */
+.CodeRay .an { color:#007 }                        /*  attribute_name */
+.CodeRay .at { color:#f08 }                        /*      annotation */
+.CodeRay .av { color:#700 }                        /* attribute_value */
+.CodeRay .aw { color:#C00 }                        /* attribute_value_fat */
+.CodeRay .bi { color:#509; font-weight:bold }      /*             bin */
+.CodeRay .c { color:#888; }                        /*         comment */
+
+.CodeRay .ch { color:#04D }                        /*            char */
+.CodeRay .ch .k { color:#04D }
+.CodeRay .ch .dl { color:#039 }
+
+.CodeRay .cl { color:#B06; font-weight:bold }      /*           class */
+.CodeRay .cm { color:#A08; font-weight:bold }      /*       imaginary */
+.CodeRay .co { color:#036; font-weight:bold }      /*        constant */
+.CodeRay .cr { color:#0A0 }                        /*           color */
+.CodeRay .cv { color:#369 }                        /*  class_variable */
+.CodeRay .de { color:#B0B; }                       /*       decorator */
+.CodeRay .df { color:#099; font-weight:bold }      /*      definition */
+.CodeRay .di { color:#088; font-weight:bold }      /*       directive */
+.CodeRay .dl { color:black }                       /*           close */
+.CodeRay .do { color:#970 }                        /*             doc */
+.CodeRay .dt { color:#34b }                        /*         doctype */
+.CodeRay .ds { color:#D42; font-weight:bold }      /*      doc_string */
+.CodeRay .e { color:#666; font-weight:bold }       /*    (don't know) */
+.CodeRay .en { color:#800; font-weight:bold }      /*          entity */
+.CodeRay .er { color:#F00; background-color:#FAA } /*           error */
+.CodeRay .ex { color:#C00; font-weight:bold }      /*       exception */
+.CodeRay .fl { color:#60E; font-weight:bold }      /*           float */
+.CodeRay .fu { color:#06B; font-weight:bold }      /*          method */
+.CodeRay .gv { color:#d70; font-weight:bold }      /* global_variable */
+.CodeRay .hx { color:#058; font-weight:bold }      /*             hex */
+.CodeRay .i { color:#00D; font-weight:bold }       /*         integer */
+.CodeRay .ic { color:#B44; font-weight:bold }      /*         include */
+
+.CodeRay .il { background: #ddd; color: black }    /*          inline */
+.CodeRay .il .il { background: #ccc }
+.CodeRay .il .il .il { background: #bbb }
+.CodeRay .il .idl { background: #ddd; font-weight: bold; color: #666 }
+.CodeRay .idl { background-color: #bbb; font-weight: bold; color: #666; } /* inline_delimiter */
+
+.CodeRay .im { color:#f00; }                       /*       important */
+.CodeRay .in { color:#B2B; font-weight:bold }      /*     interpreted */
+.CodeRay .iv { color:#33B }                        /* instance_variable */
+.CodeRay .la { color:#970; font-weight:bold }      /*           label */
+.CodeRay .lv { color:#963 }                        /*  local_variable */
+.CodeRay .oc { color:#40E; font-weight:bold }      /*             oct */
+.CodeRay .of { color:#000; font-weight:bold }      /*    operator_fat */
+.CodeRay .op { }                                   /*    (don't know) */
+.CodeRay .pc { color:#038; font-weight:bold }      /*    pre_constant */
+.CodeRay .pd { color:#369; font-weight:bold }      /*      predefined */
+.CodeRay .pp { color:#579; }                       /*    preprocessor */
+.CodeRay .ps { color:#00C; font-weight:bold }      /*    pseudo_class */
+.CodeRay .pt { color:#074; font-weight:bold }      /*        pre_type */
+.CodeRay .r, .kw  { color:#080; font-weight:bold }
+
+.CodeRay .ke { color: #808; }                      /*             key */
+.CodeRay .ke .dl { color: #606; }
+.CodeRay .ke .ch { color: #80f; }
+.CodeRay .vl { color: #088; }                      /*           value */
+
+.CodeRay .rx { background-color:#fff0ff }          /*          regexp */
+.CodeRay .rx .k { color:#808 }
+.CodeRay .rx .dl { color:#404 }
+.CodeRay .rx .mod { color:#C2C }
+.CodeRay .rx .fu  { color:#404; font-weight: bold }
+
+.CodeRay .s { background-color:#fff0f0; color: #D20; } /*          string */
+.CodeRay .s .s { background-color:#ffe0e0 }
+.CodeRay .s .s  .s { background-color:#ffd0d0 }
+.CodeRay .s .k { }
+.CodeRay .s .ch { color: #b0b; }
+.CodeRay .s .dl { color: #710; }
+
+.CodeRay .sh { background-color:#f0fff0; color:#2B2 } /*           shell */
+.CodeRay .sh .k { }
+.CodeRay .sh .dl { color:#161 }
+
+.CodeRay .sy { color:#A60 }                        /*          symbol */
+.CodeRay .sy .k { color:#A60 }
+.CodeRay .sy .dl { color:#630 }
+
+.CodeRay .ta { color:#070 }                        /*             tag */
+.CodeRay .tf { color:#070; font-weight:bold }      /*         tag_fat */
+.CodeRay .ts { color:#D70; font-weight:bold }      /*     tag_special */
+.CodeRay .ty { color:#339; font-weight:bold }      /*            type */
+.CodeRay .v { color:#036 }                         /*        variable */
+.CodeRay .xt { color:#444 }                        /*        xml_text */
+
+.CodeRay .ins { background: #afa; }                /*          insert */
+.CodeRay .del { background: #faa; }                /*          delete */
+.CodeRay .chg { color: #aaf; background: #007; }   /*          change */
+.CodeRay .head { color: #f8f; background: #505 }   /*            head */
+
+.CodeRay .ins .ins { color: #080; font-weight:bold }
+.CodeRay .del .del { color: #800; font-weight:bold }
+.CodeRay .chg .chg { color: #66f; }
+.CodeRay .head .head { color: #f4f; }

data/templates/keydown.css.erb

@@ -40,65 +40,3 @@ section.bulleted ul {
 .hidden {
   display: none;
 }
-
-/* - Pygments sytles for code fragments - */
-pre { background: none; }
-pre .c { color: #999988; font-style: italic } /* Comment */
-pre .err { color: #a61717; background-color: #e3d2d2 } /* Error */
-pre .k { font-weight: bold } /* Keyword */
-pre .o { font-weight: bold } /* Operator */
-pre .cm { color: #999988; font-style: italic } /* Comment.Multiline */
-pre .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
-pre .c1 { color: #999988; font-style: italic } /* Comment.Single */
-pre .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
-pre .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
-pre .gd .x { color: #000000; background-color: #ffaaaa } /* Generic.Deleted.Specific */
-pre .ge { font-style: italic } /* Generic.Emph */
-pre .gr { color: #aa0000 } /* Generic.Error */
-pre .gh { color: #999999 } /* Generic.Heading */
-pre .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
-pre .gi .x { color: #000000; background-color: #aaffaa } /* Generic.Inserted.Specific */
-pre .go { color: #888888 } /* Generic.Output */
-pre .gp { color: #555555 } /* Generic.Prompt */
-pre .gs { font-weight: bold } /* Generic.Strong */
-pre .gu { color: #aaaaaa } /* Generic.Subheading */
-pre .gt { color: #aa0000 } /* Generic.Traceback */
-pre .kc { font-weight: bold } /* Keyword.Constant */
-pre .kd { font-weight: bold } /* Keyword.Declaration */
-pre .kp { font-weight: bold } /* Keyword.Pseudo */
-pre .kr { font-weight: bold } /* Keyword.Reserved */
-pre .kt { color: #445588; font-weight: bold } /* Keyword.Type */
-pre .m { color: #009999 } /* Literal.Number */
-pre .s { color: #d14 } /* Literal.String */
-pre .na { color: #008080 } /* Name.Attribute */
-pre .nb { color: #0086B3 } /* Name.Builtin */
-pre .nc { color: #445588; font-weight: bold } /* Name.Class */
-pre .no { color: #008080 } /* Name.Constant */
-pre .ni { color: #800080 } /* Name.Entity */
-pre .ne { color: #990000; font-weight: bold } /* Name.Exception */
-pre .nf { color: #990000; font-weight: bold } /* Name.Function */
-pre .nn { color: #555555 } /* Name.Namespace */
-pre .nt { color: #000080 } /* Name.Tag */
-pre .nv { color: #008080 } /* Name.Variable */
-pre .ow { font-weight: bold } /* Operator.Word */
-pre .w { color: #bbbbbb } /* Text.Whitespace */
-pre .mf { color: #009999 } /* Literal.Number.Float */
-pre .mh { color: #009999 } /* Literal.Number.Hex */
-pre .mi { color: #009999 } /* Literal.Number.Integer */
-pre .mo { color: #009999 } /* Literal.Number.Oct */
-pre .sb { color: #d14 } /* Literal.String.Backtick */
-pre .sc { color: #d14 } /* Literal.String.Char */
-pre .sd { color: #d14 } /* Literal.String.Doc */
-pre .s2 { color: #d14 } /* Literal.String.Double */
-pre .se { color: #d14 } /* Literal.String.Escape */
-pre .sh { color: #d14 } /* Literal.String.Heredoc */
-pre .si { color: #d14 } /* Literal.String.Interpol */
-pre .sx { color: #d14 } /* Literal.String.Other */
-pre .sr { color: #009926 } /* Literal.String.Regex */
-pre .s1 { color: #d14 } /* Literal.String.Single */
-pre .ss { color: #990073 } /* Literal.String.Symbol */
-pre .bp { color: #999999 } /* Name.Builtin.Pseudo */
-pre .vc { color: #008080 } /* Name.Variable.Class */
-pre .vg { color: #008080 } /* Name.Variable.Global */
-pre .vi { color: #008080 } /* Name.Variable.Instance */
-pre .il { color: #009999 } /* Literal.Number.Integer.Long */

data/templates/rocks/index.rhtml

@@ -36,7 +36,7 @@
 
   <meta charset="utf-8"/>
   <title><%= title %></title>
-  <link href="http://fonts.googleapis.com/css?family=Droid+Sans|Droid+Sans+Mono" rel="stylesheet" type="text/css"/>
+  <link href="http://fonts.googleapis.com/css?family=Droid+Sans|Droid+Sans+Mono|Permanent+Marker|Lobster|Ruslan+Display" rel="stylesheet" type="text/css"/>
 
   <!--
     Original HTML5 Rocks CSS extracted for readability

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: keydown
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 3
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 2
-  version: 0.5.2
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Davis W. Frank
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-02 00:00:00 -07:00
+date: 2011-06-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,17 +51,19 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: albino
+  name: coderay
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 43
         segments: 
         - 0
-        version: "0"
+        - 9
+        - 8
+        version: 0.9.8
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -161,13 +163,14 @@ files:
 - spec/spec_helper.rb
 - spec/tasks/generate_spec.rb
 - spec/tasks/slides_spec.rb
-- templates/generate/%presentation_name%.md.tt
 - templates/generate/css/%presentation_name%.css
 - templates/generate/css/rocks.css
+- templates/generate/css/syntax_highlighting.css
 - templates/generate/images/cc.large.png
 - templates/generate/images/flickr.png
 - templates/generate/js/%presentation_name%.js
 - templates/generate/js/rocks.js
+- templates/generate/slides.md.tt
 - templates/keydown.css.erb
 - templates/rocks/index.rhtml
 - templates/rocks/slide.rhtml