mercury 1.0.1 → 1.0.2

data/README.rdoc

@@ -1,25 +1,21 @@
-= Mercury v 0.9.13
+= Mercury 
 
 === What is it?
 
-It is a command line application that allows you to create and run web sites built using haml, sass, jquery, and coffee-script.  It also has support for markdown, textile, and 960 built right in.  Give it a try, it only takes 5 minutes to get up and running.  
+It is a command line application that allows you to create and run web sites built using haml, sass, jquery, and coffee-script.  It also has support for markdown built right in.  Give it a try, it only takes 5 minutes to get up and running.  
 
 === Technology
 
 * haml
 * sass
-* jquery
-* jquery-ui
 * coffee-script
 * markdown
-* textile
-* /gif|png|jpg|jpeg/ Image Support
+
 
 == Why
 
 At Jack Russell Software, we love haml, jquery, etc and needed to create web mockups or wireframes quickly to get user interface feedback during our storyboarding process.  Mercury was the answer, it allows us to work with the same tools we are familar with and focus on getting the user interface right.
 
-See for you self!  Try Mercury, you will be hooked!
 
 Simply type: 
  

data/lib/mercury.rb

@@ -2,6 +2,7 @@ require 'sinatra'
 require 'haml'
 require 'fileutils'
 require 'faker'
+require File.dirname(__FILE__) + '/mercury_mixins'
 
 %w{ helpers images css js }.each do |lib|
   require File.dirname(__FILE__) + '/mercury/' + lib
@@ -15,20 +16,19 @@ require 'sass/plugin/rack'
 class Mercury < Sinatra::Application
   use Sass::Plugin::Rack
 
+  include MercuryMixins
+
   helpers Sinatra::MercuryHelpers
   register Sinatra::MercuryImages
   register Sinatra::MercuryCss
   register Sinatra::MercuryJs
   
-  
-  
-  
+    
   set :root,  FileUtils.pwd.gsub("\n",'')
   set :public, FileUtils.pwd.gsub("\n",'') + '/wwwroot'
   set :views, FileUtils.pwd.gsub("\n",'') + '/wwwroot'
   
   
-  
   get '/*' do
     view_file_request = params["splat"][0]  
     haml view_file_request.empty? ? view_file = get_view('index.haml') : view_file_request.to_sym, :layout => get_view('layout.haml')

data/lib/mercury/css.rb

@@ -5,9 +5,12 @@ module Sinatra
       # stream images
       app.get %r{(.css)$} do
         content_type 'text/css'
-        File.open(options.views + request.path_info, 'rb') do |file| 
-          file.read
-        end 
+        if File.file?(options.views + request.path_info.sub(/\.css$/,'.sass'))
+          sass_file = options.views + request.path_info.sub(/\.css$/,'.sass')
+          Sass::Engine.new(open_file(sass_file)).render
+        else
+          open_file(options.views + request.path_info)
+        end
       end
     end        
   end

data/lib/mercury/helpers.rb

@@ -69,10 +69,11 @@ module Sinatra
     def find_file(filename, ext)
       Dir.glob(File.join(options.views, "**/*.#{ext}")).select { |extfile| extfile.downcase =~ /\/#{filename.to_s.downcase}.#{ext}$/ }.first
     end
-  
-    def open_file(full_path_and_filename)
-      open(full_path_and_filename,'r') { |file| file.read }  
-    end
+    
+    
+    # def open_file(full_path_and_filename)
+    #   open(full_path_and_filename,'r') { |file| file.read }  
+    # end
   
   end
   

data/lib/mercury/js.rb

@@ -5,9 +5,12 @@ module Sinatra
       # stream images
       app.get %r{(.js)$} do
         content_type 'text/javascript'
-        File.open(options.views + request.path_info, 'rb') do |file| 
-          file.read
-        end 
+        if File.file?(options.views + request.path_info.sub(/\.js$/,'.coffee'))
+          coffee_file = options.views + request.path_info.sub(/\.js$/,'.coffee')
+          brew(coffee_file)
+        else
+          open_file(options.views + request.path_info)
+        end
       end
     end        
   end

data/lib/mercury_mixins.rb

@@ -0,0 +1,11 @@
+module MercuryMixins
+
+  def open_file(full_path_and_filename)
+    open(full_path_and_filename,'r') { |file| file.read }  
+  end
+
+  def brew(coffee)
+    command = ['coffee', '-p', '--no-wrap'].join(' ')
+    IO.popen("#{command} #{coffee}")
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Tom Wilson
@@ -86,6 +86,7 @@ files:
 - lib/mercury/images.rb
 - lib/mercury/js.rb
 - lib/mercury_config.rb
+- lib/mercury_mixins.rb
 - lib/public/favicon.ico
 - lib/public/images/bk_gradient.png
 - lib/public/javascripts/coffee-script.js