any2html 0.0.4 → 0.0.5

data/any2html.gemspec

@@ -5,7 +5,7 @@ require 'any2html'
 
 Gem::Specification.new do |s|
   s.name        = "any2html"
-  s.version     = '0.0.4'
+  s.version     = '0.0.5'
   s.platform    = Gem::Platform::RUBY
   s.required_ruby_version = '>= 1.9.0'
 

data/bin/any2html

@@ -6,26 +6,31 @@ require 'haml'
 require 'textile_extensions'
 RedCloth.send(:include, RailsGuides::TextileExtensions)
 
-class Any2html < Sinatra::Application
-  map1 = {
-    BlueCloth => %w(md markdown),
-    RedCloth => %w(textile)
-  }
-  map2 = map1.invert.inject ({}) {|m, (k,v)| k.each{|k1| m[k1] = v};m}
-  rootdir = ARGV[0] || '.'
-  # TODO dry this up
-  files = `find #{rootdir} -name '*.md' -o -name '*.markdown' -o -name '*.textile' `.split(/\n/)
-  $sources = files.inject({}) do |m,file|
-    ext = File.extname(file)[1..-1]
-    if (formatter = map2[ext])
-      m[file.sub(/^\./,'')] = { 
-        filepath: file, 
-        formatter: formatter
-      }
-    end
-    m
+map1 = {
+  ->(x){BlueCloth.new(x).to_html} => %w(md markdown),
+  ->(x){ 
+     t = RedCloth.new(x)
+     t.hard_breaks = false
+     t.to_html(:notestuff, :plusplus, :code)
+  } => %w(textile)
+}
+map2 = map1.invert.inject ({}) {|m, (k,v)| k.each{|k1| m[k1] = v};m}
+rootdir = ARGV[0] || '.'
+# TODO dry this up
+files = `find #{rootdir.sub(/\/$/, '')} -name '*.md' -o -name '*.markdown' -o -name '*.textile' `.split(/\n/)
+$sources = files.inject({}) do |m,file|
+  ext = File.extname(file)[1..-1]
+  if (formatter = map2[ext])
+    m[file.sub(/^\./,'')] = { 
+      filepath: file, 
+      formatter: formatter
+    }
   end
+  m
+end
 
+
+class Any2html < Sinatra::Application
   get '/' do
     haml :index
   end
@@ -33,10 +38,14 @@ class Any2html < Sinatra::Application
   get '*' do
     file = params[:splat][0]
     x = $sources[file]
-    x[:html] ||= x[:formatter].new(File.read(x[:filepath])).to_html
+    if x
+      x[:html] ||= x[:formatter].call(File.read(x[:filepath]))
+    else
+      "No content for #{x.inspect}"
+    end
   end
 
-  fork { system('open http://localhost:4567') }
+  fork { system('open http://localhost:4567 &') }
   run!
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: any2html
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors: