backtik-red-herring 0.0.3 → 0.0.5

data/Manifest.txt

@@ -11,6 +11,3 @@ bin/herring
 lib/herring.rb
 lib/herring/herring_rack.rb
 red-herring.gemspec
-script/console
-script/destroy
-script/generate

data/app_generators/herring/templates/config.ru

@@ -1,4 +1,10 @@
 require 'herring'
 
+Rack::Herring::HerringRoot = File.dirname(__FILE__)
+BANNER = <<END
+  ********* Loaded **********
+  Running Red v#{Red::VERSION} on Red Herring v#{Herring::VERSION} in debug mode.
+END
 use Rack::ShowExceptions
 run Rack::Herring.new
+puts BANNER

data/lib/herring.rb

@@ -1,5 +1,5 @@
 module Herring
-  VERSION = '0.0.3'
+  VERSION = '0.0.5'
 end
 
 $:.unshift(File.join(File.dirname(__FILE__), 'herring'))

data/lib/herring/herring_rack.rb

@@ -1,6 +1,7 @@
 require 'rack/request'
 require 'rack/response'
 require 'rubygems' rescue nil
+require 'haml' rescue nil
 require 'sass' rescue nil
 require 'red'
 require 'red/executable'
@@ -11,18 +12,23 @@ include Red
 
 module Rack
   class Herring
-    HerringRoot = ::File.join(::File.dirname(__FILE__),'..')
     def call(env)
-      req = Request.new(env)
-      Red.init(::File.join(HerringRoot,req.path_info))
-      
+      req = Request.new(env)      
       data, headers = case ::File.extname(req.path_info) 
       when '.ajax'
         update_page(req.POST['red']) if req.post?
       when '.red'
-        [translate_to_string_including_ruby(::File.read("#{HerringRoot}#{req.path_info}")), {"Content-Type" => "text/js"}]
+        Red.init(::File.join(HerringRoot,req.path_info))
+        translated_ruby = translate_to_string_including_ruby(::File.read("#{HerringRoot}#{req.path_info}"))
+        [translated_ruby, {"Content-Type" => "text/js"}]
       when '.html'
         [::File.read("#{HerringRoot}#{req.path_info}"), {"Content-Type" => "text/html"}]
+      when /\.(haml|html)/
+        if req.path_info =~ /\.haml(\.html)?$/
+          [Haml::Engine.new(::File.read("#{HerringRoot}#{req.path_info}")).to_html, {"Content-Type" => "text/html"}]
+        else
+          [::File.read("#{HerringRoot}#{req.path_info}"), {"Content-Type" => "text/html"}]
+        end
       when '.js'
         [::File.read("#{HerringRoot}#{req.path_info}"), {"Content-Type" => "text/javascript"}]
       when '.css'

data/red-herring.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{red-herring}
-  s.version = "0.0.3"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Trek Glowacki"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backtik-red-herring
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors: 
 - Trek Glowacki