RubyGems - guide-em-up - Versions diffs - 0.2.0 → 0.3.0 - Mend

guide-em-up 0.2.0 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

data/README.md CHANGED Viewed

@@ -15,6 +15,9 @@ It's really simple:
 3. Launch `guide-em-up` and open http://localhost:9000 in your browser
 4. Select your guide and enjoy :-)
+You must also install [pygments](http://pygments.org/) if you want syntax
+highlighting.
 Issues or Suggestions
 ---------------------

data/data/themes/pochtron.erb CHANGED Viewed

@@ -6,6 +6,8 @@
     <link href='http://fonts.googleapis.com/css?family=Ubuntu&v2' rel='stylesheet' type='text/css'>
     <link href='http://fonts.googleapis.com/css?family=Droid+Sans+Mono&v2' rel='stylesheet' type='text/css'>
     <style>
+      section, article { display: block; }
       #container {
         margin: 0 auto;
         max-width: 920px;
@@ -31,10 +33,7 @@
   </head>
   <body>
     <section id="container">
-      <header>
-        <h1><%= title %></h1>
-        <h2><%= Date.today.strftime "%d/%m/%Y" %></h2>
-      </header>
+      <h1><%= title %> &ndash; <%= Date.today.strftime "%d/%m/%Y" %></h1>
       <article>
         <%= content %>
       </article>

data/lib/guide-em-up/browser.rb CHANGED Viewed

@@ -18,7 +18,7 @@ module GuideEmUp
       filename  = File.join(@root, path_info)
       datafile  = File.join(@data, path_info)
       if File.file?(filename)
-        serve_guide(filename)
+        serve_file(filename)
       elsif filename.include? ".."
         unauthorized_access
       elsif File.directory?(filename)
@@ -35,6 +35,15 @@ module GuideEmUp
   protected
+    def serve_file(filename)
+      mime = Rack::Mime.mime_type(File.extname filename)
+      if mime =~ /^(audio|image|video)\//
+        serve_data(filename, mime)
+      else
+        serve_guide(filename)
+      end
+    end
     def serve_guide(filename)
       body = Guide.new(filename, @theme.template).html
       [200, {
@@ -51,11 +60,12 @@ module GuideEmUp
       }, [body] ]
     end
-    def serve_data(filename)
+    def serve_data(filename, mime=nil)
       if File.exists?(filename)
-        body = File.read(filename)
+        body   = File.read(filename)
+        mime ||= Rack::Mime.mime_type(File.extname filename)
         [200, {
-          "Content-Type"   => Rack::Mime.mime_type(File.extname filename),
+          "Content-Type"   => mime,
           "Content-Length" => Rack::Utils.bytesize(body).to_s,
         }, [body] ]
       else

data/lib/guide-em-up/guide.rb CHANGED Viewed

@@ -6,11 +6,12 @@ require "yajl"
 module GuideEmUp
-  class Guide < Struct.new(:filename, :title, :template)
+  class Guide < Struct.new(:filename, :directory, :title, :template)
     def initialize(filename, template)
-      self.filename = filename
-      self.title    = File.basename(filename)
-      self.template = template
+      self.filename  = filename
+      self.directory = File.dirname(filename)
+      self.title     = File.basename(filename)
+      self.template  = template
       @codemap = {}
     end
@@ -27,11 +28,20 @@ module GuideEmUp
     def content
       raw = File.read(filename)
-      tmp = extract_code(raw)
-      red = Redcarpet.new(tmp, :autolink, :generate_toc, :smart, :strikethrough, :tables)
+      tmp = extract_code(insert_include raw, directory)
+      ext = [:autolink, :generate_toc, :no_intraemphasis, :smart, :strikethrough, :tables]
+      red = Redcarpet.new(tmp, *ext)
       process_code red.to_html
     end
+    def insert_include(md, dir)
+      md.gsub(/!INCLUDE (\S+)/) do
+        file = File.join(dir, $1)
+        idir = File.dirname(file)
+        insert_include File.read(file), idir
+      end
+    end
     # Code taken from gollum (http://github.com/github/gollum)
     def extract_code(md)
       md.gsub(/^``` ?(.+?)\r?\n(.+?)\r?\n```\r?$/m) do

data/lib/guide-em-up/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module GuideEmUp
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guide-em-up
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease:
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-08-23 00:00:00.000000000Z
+date: 2011-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: goliath
-  requirement: &74069870 !ruby/object:Gem::Requirement
+  requirement: &76805740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *74069870
+  version_requirements: *76805740
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &74069400 !ruby/object:Gem::Requirement
+  requirement: &76805410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.17'
   type: :runtime
   prerelease: false
-  version_requirements: *74069400
+  version_requirements: *76805410
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &74068770 !ruby/object:Gem::Requirement
+  requirement: &76805140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.7'
   type: :runtime
   prerelease: false
-  version_requirements: *74068770
+  version_requirements: *76805140
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &74068390 !ruby/object:Gem::Requirement
+  requirement: &76804850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *74068390
+  version_requirements: *76804850
 - !ruby/object:Gem::Dependency
   name: albino
-  requirement: &74068030 !ruby/object:Gem::Requirement
+  requirement: &76804560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *74068030
+  version_requirements: *76804560
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &74067710 !ruby/object:Gem::Requirement
+  requirement: &76804290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: '2.3'
   type: :development
   prerelease: false
-  version_requirements: *74067710
+  version_requirements: *76804290
 description: Slide'em up is a tool for writing guides in markdown
 email: bruno.michel@af83.com
 executables:
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.5
+rubygems_version: 1.8.9
 signing_key:
 specification_version: 3
 summary: Slide'em up is a tool for writing guides in markdown and generates one-page