mercury 0.7.5 → 0.8.1

data/docs/views/about.haml

@@ -0,0 +1,6 @@
+= sass :default
+= haml :header
+= haml :navigation
+#content.container_12  
+  = markdown :about
+= haml :footer

data/docs/views/about.md

@@ -0,0 +1,25 @@
+# About Mercury
+
+Mercury is a gem that makes it simple to work with haml, sass, jquery and other tools and technologies without the hassle.
+
+<pre><code>
+$ gem install mercury
+
+$ mercury {your project}
+
+$ cd {your project}
+
+$ mate views
+
+# Start writing your haml
+
+# default.haml
+
+%h1 Hello World
+
+----
+
+# Run
+
+$ mercury
+</code></pre>

data/docs/views/default.sass

@@ -0,0 +1,35 @@
+=nav_a
+  border: 1px solid gray
+  padding: 10px
+  text-decoration: none
+  color: #004080
+
+#header-wrapper
+  background-color: orange
+  color: white
+
+#navigation
+  text-align: center
+  ul  
+    list-style: none
+
+    li
+      display: inline      
+      a
+        +nav_a
+        
+      a:hover
+        background-color: orange
+        color: white
+      
+      a:visited 
+        +nav_a
+        
+#home-content
+  p
+    font-size: 2em
+  
+pre
+  background-color: black
+  color: white
+  padding: 10px

data/docs/views/footer.haml

@@ -0,0 +1,2 @@
+#footer.container_12
+  Mercury Documentation Site

data/docs/views/header.haml

@@ -0,0 +1,3 @@
+#header-wrapper
+  #header.container_16
+    %h1 Mercury Docs

data/docs/views/home.haml

@@ -0,0 +1,12 @@
+= sass :default
+= haml :header
+= haml :navigation
+#home-content.container_12  
+  .grid_7.prefix_2.suffix_3
+    = markdown :home
+        
+      
+  .clear
+  
+     
+= haml :footer

data/docs/views/home.md

@@ -0,0 +1,21 @@
+Mercury is a gem that makes it simple to work with haml, sass, jquery and other tools and technologies without the hassle.
+
+## Installation
+
+<pre><code>
+$ gem install mercury
+</code></pre>
+
+## Create a Mercury Project
+
+<pre><code>
+$ mercury project_awesome
+</code></pre>
+
+## Run your Mercury Project
+
+<pre><code>
+$ cd project_awesome
+$ mercury
+</code></pre>
+

data/docs/views/navigation.haml

@@ -0,0 +1,10 @@
+#navigation.container_16
+  %ul
+    %li 
+      %a{:href => '/home'} Home
+    %li
+      %a{:href => '/video'} Video
+    %li
+      %a{:href => '/resources'} Resources
+    %li
+      %a{:href => '/log'} Change Log

data/docs/views/resources.haml

@@ -0,0 +1,12 @@
+= sass :default
+= haml :header
+= haml :navigation
+#content.container_12  
+  .grid_7.prefix_2.suffix_3
+    = markdown :resources
+        
+      
+  .clear
+  
+     
+= haml :footer

data/docs/views/resources.md

@@ -0,0 +1,7 @@
+## Mercury allows you to easily use the following list of technologies:
+
+* [Haml](http://www.haml-lang.com)
+* [Sass](http://www.sass-lang.com)
+* [JQuery](http://www.jquery.com)
+* [JQueryUI](http://www.jqueryui.com)
+* [Markdown](http://daringfireball.net/projects/markdown/)

data/lib/mercury.rb

@@ -4,38 +4,58 @@ require 'sass'
 require 'fileutils'
 require 'faker'
 
+begin
+  require 'rdiscount'
+  # ^^ that sets a Markdown constant
+rescue LoadError
+  require 'bluecloth'
+  Markdown = BlueCloth
+end
+
+# Core Sinatra application to run mercury apps
 class Mercury < Sinatra::Application
   SASS = 'sass'
   JS = 'js'
+  MARKDOWN = 'md'
   
   set :root,  FileUtils.pwd.gsub("\n",'')
   set :public, File.dirname(__FILE__) + '/public'
 
   get '/*' do
-    vf = params["splat"][0]
-    vd = File.join(File.dirname(__FILE__),'views')
-    layout_template = open(File.join(vd,'layout.haml'),'r').read
-
-    view_file = vf.empty? ? open(File.join(vd,'index.haml'),'r').read : vf.to_sym
-
-    haml view_file, :layout => layout_template
+    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')
   end
 
   def sass(sassfile)
     ["<style type='text/css'>",
-      Sass::Engine.new(open(find_file(sassfile, SASS), 'r').read).render, 
+      Sass::Engine.new(open_file(find_file(sassfile, SASS))).render, 
       "</style>\n"].join("\n")
   end
   
   def javascript(jsfile)
     ["<script type='text/javascript'>", 
-      open(find_file(jsfile, JS), 'r').read, 
+      open_file(find_file(jsfile, JS)), 
       "</script>\n"].join("\n")
   end
   
+  def markdown(mdfile)
+    Markdown.new(open_file(find_file(mdfile, MARKDOWN))).to_html
+  end
+  
+  
 private  
   def find_file(filename, ext)
-    Dir.glob(File.join(options.views, "**/*.#{ext}")).select { |f| f =~ /#{filename}.#{ext}$/ }.first
+    Dir.glob(File.join(options.views, "**/*.#{ext}")).select { |extfile| extfile =~ /#{filename}.#{ext}$/ }.first
+  end
+  
+  def open_file(full_path_and_filename)
+    open(full_path_and_filename,'r').read  
+  end
+    
+  def get_view(filename)
+    view_directory = File.join(File.dirname(__FILE__),'views')
+    open_file File.join(view_directory,filename) 
   end
   
+    
 end

data/lib/views/layout.haml

@@ -2,7 +2,7 @@
 %html{ :xmlns => "http://www.w3.org/1999/xhtml", :lang => "en", 'xml:lang' => "en" }
   %head
     %title Mercury
-    - ['reset','text','960','smoothness/jquery-ui-1.8rc3.custom', 'app'].each do |css|
+    - ['reset','text','960','smoothness/jquery-ui-1.8rc3.custom','app'].each do |css|
       %link{ :href => "/stylesheets/#{css}.css", :rel => "stylesheet", :type => "text/css", :media => "screen", :charset => "utf-8" }
   %body
     - ['jquery-1.4.2.min', 'jquery-ui-1.8rc3.custom.min'].each do |js|

data/spec/mercury_spec.rb

@@ -16,5 +16,17 @@ describe "mercury index" do
     get '/'
     last_response.body.should =~ /Mercury/
   end
+
+  it "should contain mercury" do
+    get '/'
+    last_response.body.should =~ /Jack Russell Software/
+  end
+  
+  # it "should return error" do
+  #   app.stub!(:haml).and_return("<h1>test</h1>")
+  #   get '/test'
+  #   puts last_response.body
+  # end
+  
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mercury
 version: !ruby/object:Gem::Version 
-  version: 0.7.5
+  version: 0.8.1
 platform: ruby
 authors: 
 - Tom Wilson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-06 00:00:00 -05:00
+date: 2010-03-07 00:00:00 -05:00
 default_executable: mercury
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,6 +42,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: bluecloth
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Mercury allows you to create web sites/apps/mockups using haml, sass, and jquery.
 email: thing2@jackhq.com
 executables: 
@@ -60,6 +70,18 @@ files:
 - Rakefile
 - VERSION
 - bin/mercury
+- docs/config.ru
+- docs/mercury.log
+- docs/views/about.haml
+- docs/views/about.md
+- docs/views/default.sass
+- docs/views/footer.haml
+- docs/views/header.haml
+- docs/views/home.haml
+- docs/views/home.md
+- docs/views/navigation.haml
+- docs/views/resources.haml
+- docs/views/resources.md
 - lib/mercury.rb
 - lib/public/favicon.ico
 - lib/public/images/bk_gradient.png