mercury 0.6.0 → 0.7.3

data/Mercury.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mercury}
-  s.version = "0.6.0"
+  s.version = "0.7.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Wilson"]
-  s.date = %q{2010-03-04}
+  s.date = %q{2010-03-05}
   s.default_executable = %q{mercury}
   s.description = %q{Mercury allows you to create directory and start writting haml, html, css, etc to build wireframes for your user design.}
   s.email = %q{thing2@jackhq.com}
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
      "bin/mercury",
      "lib/mercury.rb",
      "lib/public/favicon.ico",
+     "lib/public/images/bk_gradient.png",
      "lib/public/javascripts/jquery-1.4.2.min.js",
      "lib/public/javascripts/jquery-ui-1.8rc3.custom.min.js",
      "lib/public/stylesheets/960.css",
@@ -51,6 +52,7 @@ Gem::Specification.new do |s|
      "lib/public/stylesheets/text.css",
      "lib/views/index.haml",
      "lib/views/layout.haml",
+     "mercury-0.7.2.gem",
      "spec/mercury_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"

data/README.rdoc

@@ -1,13 +1,16 @@
 = Mercury
 
-Mercury is a command line application that makes it dirt simple to create
-html forms(wireframes) using the following technology:
+Mercury is a prototype builder:
+
+=== Technology
 
 * haml
 * sass
 * jquery
 * jquery-ui
 
+* BluePrint
+
 == Why
 
 Using textmate, haml, sass, and jquery to create slick ui designs is a great and fluid process.  
@@ -27,7 +30,7 @@ So with mercury you use the haml, jquery, jquery-ui, with just a simple command.
     
     mercury [project]
     
-    # Create your erb or haml files
+    # Create your haml files
     
     cd views
     
@@ -86,7 +89,7 @@ So with mercury you use the haml, jquery, jquery-ui, with just a simple command.
     
     # now in your haml file simply 
     
-    = sass '/test.sass'
+    = sass :test
     
 ===Using Javascript
 
@@ -100,7 +103,7 @@ So with mercury you use the haml, jquery, jquery-ui, with just a simple command.
     
     # now in your haml file simply
     
-    = javascript '/test.js'
+    = javascript :test
     
     
     

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.3

data/bin/mercury

@@ -8,10 +8,12 @@ version = ">= 0"
 if ARGV.first
   # Build Directory and add setup files
   FileUtils.mkdir_p ARGV.first
-  FileUtils.mkdir_p ARGV.first + '/views'
-  File.open(ARGV.first + '/config.ru','w').write("require 'mercury'\nrun Mercury\n")
-  
+  FileUtils.mkdir_p File.join(ARGV.first, 'views')
+  config_ru = ["require 'mercury'","log = File.new('mercury.log', 'a+')", $stdout.reopen(log), $stderr.reopen(log), "run Mercury"].join("\n")
+  File.open(File.join(ARGV.first, 'config.ru'),'w').write(config_ru)
 else
+  puts "Running Mercury on port:9292"
+  puts "Press Ctrl-C to exit"
   # try to run in current directory
   gem 'rack', version
   load Gem.bin_path('rack', 'rackup', version)  

data/lib/mercury.rb

@@ -5,24 +5,37 @@ require 'fileutils'
 require 'faker'
 
 class Mercury < Sinatra::Application
+  SASS = 'sass'
+  JS = 'js'
+  
   set :root,  FileUtils.pwd.gsub("\n",'')
   set :public, File.dirname(__FILE__) + '/public'
 
   get '/*' do
-    unless params["splat"][0].empty?
-      haml params["splat"][0].to_sym, :layout => open(File.dirname(__FILE__) + '/views/layout.haml','r').read
-    else
-      haml open(File.dirname(__FILE__) + '/views/index.haml','r').read, :layout => open(File.dirname(__FILE__) + '/views/layout.haml','r').read
-    end
+    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
   end
 
   def sass(sassfile)
-    "<style type='text/css'>\n" + Sass::Engine.new(open(options.views + sassfile, 'r').read).render + "\n</style>\n"
+    ["<style type='text/css'>",
+      Sass::Engine.new(open(find_file(sassfile, SASS), 'r').read).render, 
+      "</style>\n"].join("\n")
   end
   
   def javascript(jsfile)
-    "<script type='text/javascript'>\n" + open(options.views + jsfile, 'r').read + "\n</script>\n"
+    ["<script type='text/javascript'>", 
+      open(find_file(jsfile, JS), 'r').read, 
+      "</script>\n"].join("\n")
   end
   
+private  
+  def find_file(filename, ext)
+    Dir.glob(File.join(options.views, "**/*.#{ext}")).select { |f| f =~ /#{filename}.#{ext}$/ }.first
+  end
   
 end

data/lib/public/stylesheets/app.css

@@ -3,6 +3,12 @@
   color:#4C4C4C;
 }
 
+#tool-footer a {
+	text-decoration:none;
+  color:#4C4C4C;
+	
+}
+
 input.text, input.title, textarea, select {margin:0.5em 0;border:1px solid #bbb;}
 input.text:focus, input.title:focus, textarea:focus, select:focus {border:1px solid #666;}
 input.text, input.title {width:300px;padding:5px;}

data/lib/views/index.haml

@@ -1,6 +1,14 @@
 :erb
   <style type="text/css">
 :sass
+  #header-wrap
+    background: transparent url(/images/bk_gradient.png) repeat-x
+    color: white
+  
+  #header
+    h1
+      margin-left: 15px
+      
   ul#pages
     list-style: none
     li
@@ -14,22 +22,26 @@
 :javascript
   $(function() {
     $('#pages').children().mouseover(function(){
-      $(this).css('background-color','yellow');
+      $(this).css('background-image','url(/images/bk_gradient.png)');
     });
     $('#pages').children().mouseout(function(){
-      $(this).css('background-color','transparent');
+      $(this).css('background-image','none');
     });
     $('#pages').children().click(function(){
       window.location = $(this).attr('data-href');
     });
     
   })
-#wrap.grid_16
-  %h2 Wireframe Mockups
+#header-wrap  
+  #header.container_16
+    %h1 Mercury
+  
+#wrap.container_16
+  %h2 Projects
   %ul#pages
-    - Dir.glob('views/**/*.haml').each do |f|
+    - Dir.glob('views/*/').each do |f|
       - unless f =~ /index/ or f =~ /layout/
-        %li{:'data-href' => f.gsub(/views/,'').match(/(.*).haml$/)[1]}= f.match(/\/(.*).haml$/)[1]
+        %li{:'data-href' => f.gsub(/views/,'').match(/(.*)$/)[1] + 'default'}= f.match(/\/(.*)\/$/)[1]
   
 
 

data/lib/views/layout.haml

@@ -8,12 +8,12 @@
     - ['jquery-1.4.2.min', 'jquery-ui-1.8rc3.custom.min'].each do |js|
       %script{:src => "/javascripts/#{js}.js", :type => 'text/javascript'}
 
-    .container_16
-      = yield
+    = yield
     #tool-footer.container_12
       .grid_8
         %p
-          Mercury
+          %a{:href => '/'} Mercury
       .grid_4
-        %p Jack Russell Software Company, LLC
+        %p 
+          %a{:href => 'http://www.jackhq.com'} Jack Russell Software Company, LLC
       .clear

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mercury
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.7.3
 platform: ruby
 authors: 
 - Tom Wilson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-04 00:00:00 -05:00
+date: 2010-03-05 00:00:00 -05:00
 default_executable: mercury
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,6 +62,7 @@ files:
 - bin/mercury
 - lib/mercury.rb
 - lib/public/favicon.ico
+- lib/public/images/bk_gradient.png
 - lib/public/javascripts/jquery-1.4.2.min.js
 - lib/public/javascripts/jquery-ui-1.8rc3.custom.min.js
 - lib/public/stylesheets/960.css
@@ -84,6 +85,7 @@ files:
 - lib/public/stylesheets/text.css
 - lib/views/index.haml
 - lib/views/layout.haml
+- mercury-0.7.2.gem
 - spec/mercury_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb