mercury 0.2.0 → 0.2.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. data/Mercury.gemspec +4 -2
  2. data/README.rdoc +3 -45
  3. data/VERSION +1 -1
  4. data/lib/mercury.rb +2 -41
  5. data/lib/public/favicon.ico +0 -0
  6. data/lib/views/index.haml +11 -0
  7. data/lib/views/layout.haml +24 -0
  8. metadata +4 -2
  9. data/lib/public/images/sixhour.png +0 -0
data/Mercury.gemspec CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{mercury}
8
- s.version = "0.2.0"
8
+ s.version = "0.2.4"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Tom Wilson"]
@@ -25,12 +25,14 @@ Gem::Specification.new do |s|
25
25
  "Rakefile",
26
26
  "VERSION",
27
27
  "lib/mercury.rb",
28
- "lib/public/images/sixhour.png",
28
+ "lib/public/favicon.ico",
29
29
  "lib/public/javascripts/jquery-1.4.2.min.js",
30
30
  "lib/public/stylesheets/960.css",
31
31
  "lib/public/stylesheets/app.css",
32
32
  "lib/public/stylesheets/reset.css",
33
33
  "lib/public/stylesheets/text.css",
34
+ "lib/views/index.haml",
35
+ "lib/views/layout.haml",
34
36
  "spec/mercury_spec.rb",
35
37
  "spec/spec.opts",
36
38
  "spec/spec_helper.rb"
data/README.rdoc CHANGED
@@ -31,50 +31,8 @@ Mercury is a gem that create a small web application that makes it very easy for
31
31
 
32
32
  cd views
33
33
 
34
- touch layout.haml
35
-
36
- ===
37
-
38
- !!!
39
- %html{ :xmlns => "http://www.w3.org/1999/xhtml", :lang => "en", 'xml:lang' => "en" }
40
- %head
41
- %title Mercury
42
- - ['reset','text','960','app'].each do |css|
43
- %link{ :href => "/stylesheets/#{css}.css", :rel => "stylesheet", :type => "text/css", :media => "screen", :charset => "utf-8" }
44
- %body
45
- #header
46
- .container_12
47
- %small{:style => 'font-style:italic;float:right;'} WireFrame Tool
48
- %h1{:style => 'margin:0;padding:0;'}
49
- %a{:href => '/', :style => 'color:white;text-decoration:none;'} Mercury
50
-
51
- #wrap
52
- .container_16
53
- = yield
54
- .clear
55
- #footer
56
- .container_12
57
- .grid_4.prefix_8
58
- %p Jack Russell Software Company, LLC
59
-
60
- - ['jquery-1.4.2.min'].each do |js|
61
- %script{:src => "/javascripts/#{js}.js", :type => 'text/javascript'}
62
-
63
- ===
64
-
65
- touch index.haml
66
-
67
- ===
68
-
69
- .grid_16
70
- %p Welcome
34
+ touch test.haml
71
35
 
72
- %ul
73
- - Dir.glob('views/**/*.haml').each do |f|
74
- - unless f =~ /index/ or f =~ /layout/
75
- %li
76
- %a{:href => f.gsub(/views/,'').match(/(.*).haml$/)[1]}= f.match(/\/(.*).haml$/)[1]
77
-
78
36
  ===
79
37
 
80
38
  # then create a wire frame
@@ -83,7 +41,7 @@ Mercury is a gem that create a small web application that makes it very easy for
83
41
 
84
42
  ===
85
43
 
86
- %h1 Family History
44
+ %h1 Test Form
87
45
  %br
88
46
  %input{:type => 'checkbox'} Unable to assess;
89
47
  reason
@@ -91,7 +49,7 @@ Mercury is a gem that create a small web application that makes it very easy for
91
49
  %hr
92
50
  %table
93
51
  %tr
94
- %td{:style => 'vertical-align:top;'} Psyschiatric
52
+ %td{:style => 'vertical-align:top;'} Psychiatric
95
53
  %td
96
54
  %textarea{:style => 'height:40px; width:490px'}
97
55
  %tr
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.2.0
1
+ 0.2.4
data/lib/mercury.rb CHANGED
@@ -7,49 +7,10 @@ class Mercury < Sinatra::Default
7
7
 
8
8
  get '/*' do
9
9
  unless params["splat"][0].empty?
10
- haml params["splat"][0].to_sym
10
+ haml params["splat"][0].to_sym, :layout => open(File.dirname(__FILE__) + '/views/layout.haml','r').read
11
11
  else
12
- haml :index
12
+ haml open(File.dirname(__FILE__) + '/views/index.haml','r').read, :layout => open(File.dirname(__FILE__) + '/views/layout.haml','r').read
13
13
  end
14
14
  end
15
15
 
16
16
  end
17
-
18
- __END__
19
-
20
- @@ layout
21
- !!!
22
- %html{ :xmlns => "http://www.w3.org/1999/xhtml", :lang => "en", 'xml:lang' => "en" }
23
- %head
24
- %title Mercury
25
- - ['reset','text','960','app'].each do |css|
26
- %link{ :href => "/stylesheets/#{css}.css", :rel => "stylesheet", :type => "text/css", :media => "screen", :charset => "utf-8" }
27
- %body
28
- #header
29
- .container_12
30
- %small{:style => 'font-style:italic;float:right;'} WireFrame Tool
31
- %h1{:style => 'margin:0;padding:0;'}
32
- %a{:href => '/', :style => 'color:white;text-decoration:none;'} Mercury
33
-
34
- #wrap
35
- .container_16
36
- = yield
37
- .clear
38
- #footer
39
- .container_12
40
- .grid_4.prefix_8
41
- %p Jack Russell Software Company, LLC
42
-
43
- - ['jquery-1.4.2.min'].each do |js|
44
- %script{:src => "/javascripts/#{js}.js", :type => 'text/javascript'}
45
-
46
- @@ index
47
- .grid_16
48
- %p Welcome
49
-
50
- %ul
51
- - Dir.glob('views/**/*.haml').each do |f|
52
- - unless f =~ /index/ or f =~ /layout/
53
- %li
54
- %a{:href => f.gsub(/views/,'').match(/(.*).haml$/)[1]}= f.match(/\/(.*).haml$/)[1]
55
-
data/lib/public/favicon.ico ADDED
Binary file
data/lib/views/index.haml ADDED
@@ -0,0 +1,11 @@
1
+ .grid_16
2
+ %p Welcome
3
+
4
+ %ul
5
+ - Dir.glob('views/**/*.haml').each do |f|
6
+ - unless f =~ /index/ or f =~ /layout/
7
+ %li
8
+ %a{:href => f.gsub(/views/,'').match(/(.*).haml$/)[1]}= f.match(/\/(.*).haml$/)[1]
9
+
10
+
11
+
data/lib/views/layout.haml ADDED
@@ -0,0 +1,24 @@
1
+ !!!
2
+ %html{ :xmlns => "http://www.w3.org/1999/xhtml", :lang => "en", 'xml:lang' => "en" }
3
+ %head
4
+ %title Mercury
5
+ - ['reset','text','960','app'].each do |css|
6
+ %link{ :href => "/stylesheets/#{css}.css", :rel => "stylesheet", :type => "text/css", :media => "screen", :charset => "utf-8" }
7
+ %body
8
+ #header
9
+ .container_12
10
+ %small{:style => 'font-style:italic;float:right;'} WireFrame Tool
11
+ %h1{:style => 'margin:0;padding:0;'}
12
+ %a{:href => '/', :style => 'color:white;text-decoration:none;'} Mercury
13
+
14
+ #wrap
15
+ .container_16
16
+ = yield
17
+ .clear
18
+ #footer
19
+ .container_12
20
+ .grid_4.prefix_8
21
+ %p Jack Russell Software Company, LLC
22
+
23
+ - ['jquery-1.4.2.min'].each do |js|
24
+ %script{:src => "/javascripts/#{js}.js", :type => 'text/javascript'}
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mercury
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0
4
+ version: 0.2.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tom Wilson
@@ -50,12 +50,14 @@ files:
50
50
  - Rakefile
51
51
  - VERSION
52
52
  - lib/mercury.rb
53
- - lib/public/images/sixhour.png
53
+ - lib/public/favicon.ico
54
54
  - lib/public/javascripts/jquery-1.4.2.min.js
55
55
  - lib/public/stylesheets/960.css
56
56
  - lib/public/stylesheets/app.css
57
57
  - lib/public/stylesheets/reset.css
58
58
  - lib/public/stylesheets/text.css
59
+ - lib/views/index.haml
60
+ - lib/views/layout.haml
59
61
  - spec/mercury_spec.rb
60
62
  - spec/spec.opts
61
63
  - spec/spec_helper.rb
data/lib/public/images/sixhour.png DELETED
Binary file