fir 0.1.2 → 0.1.3

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.
@@ -55,14 +55,22 @@ module Fir
55
55
  # Get all the page files without extensions
56
56
  paths = Dir.glob(pages_dir + '/**/**').inject([]) do |result, file|
57
57
  file.gsub!(pages_dir + '/', '')
58
- file.gsub!(/#{File.extname(file)}$/, '')
59
- unless inverted_path_mappings.has_key?(file)
60
- result << file
58
+ is_erb = !!file.match(/\.erb$/)
59
+ file.sub!(/#{File.extname(file)}$/, '')
60
+ if is_erb
61
+ # This was something like .html.erb, so we need to remove two extensions
62
+ file.sub!(/#{File.extname(file)}$/, '')
63
+ end
64
+ # If this is a directory index, then we'll already get it when the directory is picked up in the glob.
65
+ if !file.match(/index$/)
66
+ unless inverted_path_mappings.has_key?(file)
67
+ result << file
68
+ end
61
69
  end
62
70
  result
63
71
  end + path_mappings.keys
64
72
 
65
- puts "Iniitalizing Fir site in #{copy_to}..."
73
+ puts "Exporting to #{copy_to}..."
66
74
 
67
75
  Fir.config.force_caching = true
68
76
  require File.expand_path(File.join(FIR_ROOT, 'config.rb'))
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fir
3
3
  version: !ruby/object:Gem::Version
4
- hash: 31
4
+ hash: 29
5
5
  prerelease: false
6
6
  segments:
7
7
  - 0
8
8
  - 1
9
- - 2
10
- version: 0.1.2
9
+ - 3
10
+ version: 0.1.3
11
11
  platform: ruby
12
12
  authors:
13
13
  - jarrett
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2010-05-22 00:00:00 -05:00
18
+ date: 2010-05-23 00:00:00 -05:00
19
19
  default_executable: fir
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
@@ -173,13 +173,6 @@ files:
173
173
  - example/pages/products/dynamite.html.erb
174
174
  - example/pages/products/index.markdown
175
175
  - example/pages/products/mouse-trap.html.erb
176
- - example/public/cache/404.html
177
- - example/public/cache/contact-us.html
178
- - example/public/cache/index.html
179
- - example/public/cache/products/dynamite-plus.html
180
- - example/public/cache/products/dynamite.html
181
- - example/public/cache/products/index.html
182
- - example/public/cache/products/mouse-trap.html
183
176
  - example/public/dispatch.cgi
184
177
  - example/public/manage-content.html
185
178
  - example/public/static.txt
@@ -1,46 +0,0 @@
1
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
2
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
- <html xmlns="http://www.w3.org/1999/xhtml">
4
-
5
- <head>
6
- <title>
7
-
8
- Acme Co.
9
- </title>
10
- <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
11
-
12
-
13
- <!--[if !IE 6]><!-->
14
- <link href="http://yui.yahooapis.com/2.8.0r4/build/reset/reset-min.css" rel="stylesheet" type="text/css">
15
- <link href="/stylesheets/style.css" rel="stylesheet" type="text/css"/>
16
- <!--<![endif]-->
17
-
18
- <!--[if lte IE 6]>
19
- <link rel="stylesheet" type="text/css" media="screen, projection" href="http://universal-ie6-css.googlecode.com/files/ie6.0.3.css" />
20
- <![endif]-->
21
- </head>
22
-
23
- <body>
24
-
25
- <div id="container">
26
- <ul id="top_nav">
27
-
28
- <!-- current_page is true if the menu item links to the current page, false otherwise.
29
- It's usually not necessary, since you'll automatically get either an <a> or <span class="selected">.-->
30
- <li><a href="/">Home</a></li>
31
-
32
- <!-- current_page is true if the menu item links to the current page, false otherwise.
33
- It's usually not necessary, since you'll automatically get either an <a> or <span class="selected">.-->
34
- <li><a href="/products">Products</a></li>
35
-
36
- <!-- current_page is true if the menu item links to the current page, false otherwise.
37
- It's usually not necessary, since you'll automatically get either an <a> or <span class="selected">.-->
38
- <li><a href="/contact-us">Contact Us</a></li>
39
-
40
- </ul>
41
-
42
- <h1>Sorry, there is nothing at this address. (404 Not Found)</h1>
43
- </div>
44
-
45
- </body>
46
- </html>
@@ -1,48 +0,0 @@
1
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
2
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
- <html xmlns="http://www.w3.org/1999/xhtml">
4
-
5
- <head>
6
- <title>
7
-
8
- Acme Co.
9
- </title>
10
- <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
11
-
12
-
13
- <!--[if !IE 6]><!-->
14
- <link href="http://yui.yahooapis.com/2.8.0r4/build/reset/reset-min.css" rel="stylesheet" type="text/css">
15
- <link href="/stylesheets/style.css" rel="stylesheet" type="text/css"/>
16
- <!--<![endif]-->
17
-
18
- <!--[if lte IE 6]>
19
- <link rel="stylesheet" type="text/css" media="screen, projection" href="http://universal-ie6-css.googlecode.com/files/ie6.0.3.css" />
20
- <![endif]-->
21
- </head>
22
-
23
- <body>
24
-
25
- <div id="container">
26
- <ul id="top_nav">
27
-
28
- <!-- current_page is true if the menu item links to the current page, false otherwise.
29
- It's usually not necessary, since you'll automatically get either an <a> or <span class="selected">.-->
30
- <li><a href="/">Home</a></li>
31
-
32
- <!-- current_page is true if the menu item links to the current page, false otherwise.
33
- It's usually not necessary, since you'll automatically get either an <a> or <span class="selected">.-->
34
- <li><a href="/products">Products</a></li>
35
-
36
- <!-- current_page is true if the menu item links to the current page, false otherwise.
37
- It's usually not necessary, since you'll automatically get either an <a> or <span class="selected">.-->
38
- <li><span class="selected">Contact Us</span></li>
39
-
40
- </ul>
41
-
42
- <h1 id='contact_us'>Contact Us</h1>
43
-
44
- <p>555-123-4567 98765 Runner Road Coyote, AZ</p>
45
- </div>
46
-
47
- </body>
48
- </html>
@@ -1,52 +0,0 @@
1
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
2
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
- <html xmlns="http://www.w3.org/1999/xhtml">
4
-
5
- <head>
6
- <title>
7
-
8
- Home -
9
-
10
- Acme Co.
11
- </title>
12
- <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
13
-
14
- <meta name="description" content="Acme Co. sells all the widgets you need to capture road runners and other desert fauna"/>
15
-
16
-
17
- <!--[if !IE 6]><!-->
18
- <link href="http://yui.yahooapis.com/2.8.0r4/build/reset/reset-min.css" rel="stylesheet" type="text/css">
19
- <link href="/stylesheets/style.css" rel="stylesheet" type="text/css"/>
20
- <!--<![endif]-->
21
-
22
- <!--[if lte IE 6]>
23
- <link rel="stylesheet" type="text/css" media="screen, projection" href="http://universal-ie6-css.googlecode.com/files/ie6.0.3.css" />
24
- <![endif]-->
25
- </head>
26
-
27
- <body>
28
-
29
- <div id="container">
30
- <ul id="top_nav">
31
-
32
- <!-- current_page is true if the menu item links to the current page, false otherwise.
33
- It's usually not necessary, since you'll automatically get either an <a> or <span class="selected">.-->
34
- <li><a href="/">Home</a></li>
35
-
36
- <!-- current_page is true if the menu item links to the current page, false otherwise.
37
- It's usually not necessary, since you'll automatically get either an <a> or <span class="selected">.-->
38
- <li><a href="/products">Products</a></li>
39
-
40
- <!-- current_page is true if the menu item links to the current page, false otherwise.
41
- It's usually not necessary, since you'll automatically get either an <a> or <span class="selected">.-->
42
- <li><a href="/contact-us">Contact Us</a></li>
43
-
44
- </ul>
45
-
46
- <h1 id='home'>Home</h1>
47
-
48
- <p>Welcome to Acme Company!</p>
49
- </div>
50
-
51
- </body>
52
- </html>
@@ -1,52 +0,0 @@
1
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
2
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
- <html xmlns="http://www.w3.org/1999/xhtml">
4
-
5
- <head>
6
- <title>
7
-
8
- Acme Co.
9
- </title>
10
- <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
11
-
12
-
13
- <!--[if !IE 6]><!-->
14
- <link href="http://yui.yahooapis.com/2.8.0r4/build/reset/reset-min.css" rel="stylesheet" type="text/css">
15
- <link href="/stylesheets/style.css" rel="stylesheet" type="text/css"/>
16
- <!--<![endif]-->
17
-
18
- <!--[if lte IE 6]>
19
- <link rel="stylesheet" type="text/css" media="screen, projection" href="http://universal-ie6-css.googlecode.com/files/ie6.0.3.css" />
20
- <![endif]-->
21
- </head>
22
-
23
- <body>
24
-
25
- <div id="container">
26
- <ul id="top_nav">
27
-
28
- <!-- current_page is true if the menu item links to the current page, false otherwise.
29
- It's usually not necessary, since you'll automatically get either an <a> or <span class="selected">.-->
30
- <li><a href="/">Home</a></li>
31
-
32
- <!-- current_page is true if the menu item links to the current page, false otherwise.
33
- It's usually not necessary, since you'll automatically get either an <a> or <span class="selected">.-->
34
- <li><a href="/products">Products</a></li>
35
-
36
- <!-- current_page is true if the menu item links to the current page, false otherwise.
37
- It's usually not necessary, since you'll automatically get either an <a> or <span class="selected">.-->
38
- <li><a href="/contact-us">Contact Us</a></li>
39
-
40
- </ul>
41
-
42
- <h1>Dynamite Plus!</h1>
43
-
44
- <p><a href="/products">Back to products</a></p>
45
-
46
- <p>Like our popular <a href="/products/dynamite">Dynamite</a>, but even more powerful!</p>
47
-
48
- <p>Released: Feb 1st 1956 (54 years ago)</p>
49
- </div>
50
-
51
- </body>
52
- </html>
@@ -1,52 +0,0 @@
1
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
2
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
- <html xmlns="http://www.w3.org/1999/xhtml">
4
-
5
- <head>
6
- <title>
7
-
8
- Acme Co.
9
- </title>
10
- <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
11
-
12
-
13
- <!--[if !IE 6]><!-->
14
- <link href="http://yui.yahooapis.com/2.8.0r4/build/reset/reset-min.css" rel="stylesheet" type="text/css">
15
- <link href="/stylesheets/style.css" rel="stylesheet" type="text/css"/>
16
- <!--<![endif]-->
17
-
18
- <!--[if lte IE 6]>
19
- <link rel="stylesheet" type="text/css" media="screen, projection" href="http://universal-ie6-css.googlecode.com/files/ie6.0.3.css" />
20
- <![endif]-->
21
- </head>
22
-
23
- <body>
24
-
25
- <div id="container">
26
- <ul id="top_nav">
27
-
28
- <!-- current_page is true if the menu item links to the current page, false otherwise.
29
- It's usually not necessary, since you'll automatically get either an <a> or <span class="selected">.-->
30
- <li><a href="/">Home</a></li>
31
-
32
- <!-- current_page is true if the menu item links to the current page, false otherwise.
33
- It's usually not necessary, since you'll automatically get either an <a> or <span class="selected">.-->
34
- <li><a href="/products">Products</a></li>
35
-
36
- <!-- current_page is true if the menu item links to the current page, false otherwise.
37
- It's usually not necessary, since you'll automatically get either an <a> or <span class="selected">.-->
38
- <li><a href="/contact-us">Contact Us</a></li>
39
-
40
- </ul>
41
-
42
- <h1>Dynamite</h1>
43
-
44
- <p><a href="/products">Back to products</a></p>
45
-
46
- <p>Acme's most popular product! Suitable for all forms of demolition and hunting road runners.</p>
47
-
48
- <p>Released: Jan 19th 1956 (54 years ago)</p>
49
- </div>
50
-
51
- </body>
52
- </html>
@@ -1,58 +0,0 @@
1
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
2
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
- <html xmlns="http://www.w3.org/1999/xhtml">
4
-
5
- <head>
6
- <title>
7
-
8
- Products -
9
-
10
- Acme Co.
11
- </title>
12
- <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
13
-
14
- <meta name="description" content="Acme Company's products"/>
15
-
16
-
17
- <!--[if !IE 6]><!-->
18
- <link href="http://yui.yahooapis.com/2.8.0r4/build/reset/reset-min.css" rel="stylesheet" type="text/css">
19
- <link href="/stylesheets/style.css" rel="stylesheet" type="text/css"/>
20
- <!--<![endif]-->
21
-
22
- <!--[if lte IE 6]>
23
- <link rel="stylesheet" type="text/css" media="screen, projection" href="http://universal-ie6-css.googlecode.com/files/ie6.0.3.css" />
24
- <![endif]-->
25
- </head>
26
-
27
- <body>
28
-
29
- <div id="container">
30
- <ul id="top_nav">
31
-
32
- <!-- current_page is true if the menu item links to the current page, false otherwise.
33
- It's usually not necessary, since you'll automatically get either an <a> or <span class="selected">.-->
34
- <li><a href="/">Home</a></li>
35
-
36
- <!-- current_page is true if the menu item links to the current page, false otherwise.
37
- It's usually not necessary, since you'll automatically get either an <a> or <span class="selected">.-->
38
- <li><a href="/products">Products</a></li>
39
-
40
- <!-- current_page is true if the menu item links to the current page, false otherwise.
41
- It's usually not necessary, since you'll automatically get either an <a> or <span class="selected">.-->
42
- <li><a href="/contact-us">Contact Us</a></li>
43
-
44
- </ul>
45
-
46
- <h1 id='products'>Products</h1>
47
-
48
- <ul>
49
- <li><a href='/products/dynamite'>Dynamite</a></li>
50
-
51
- <li><a href='/products/dynamite%2B'>Dynamite Plus!</a></li>
52
-
53
- <li><a href='/products/mouse-trap'>Mouse Trap</a></li>
54
- </ul>
55
- </div>
56
-
57
- </body>
58
- </html>
@@ -1,54 +0,0 @@
1
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
2
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
- <html xmlns="http://www.w3.org/1999/xhtml">
4
-
5
- <head>
6
- <title>
7
-
8
- Acme Co.
9
- </title>
10
- <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
11
-
12
-
13
- <!--[if !IE 6]><!-->
14
- <link href="http://yui.yahooapis.com/2.8.0r4/build/reset/reset-min.css" rel="stylesheet" type="text/css">
15
- <link href="/stylesheets/style.css" rel="stylesheet" type="text/css"/>
16
- <!--<![endif]-->
17
-
18
- <!--[if lte IE 6]>
19
- <link rel="stylesheet" type="text/css" media="screen, projection" href="http://universal-ie6-css.googlecode.com/files/ie6.0.3.css" />
20
- <![endif]-->
21
- </head>
22
-
23
- <body>
24
-
25
- <div id="container">
26
- <ul id="top_nav">
27
-
28
- <!-- current_page is true if the menu item links to the current page, false otherwise.
29
- It's usually not necessary, since you'll automatically get either an <a> or <span class="selected">.-->
30
- <li><a href="/">Home</a></li>
31
-
32
- <!-- current_page is true if the menu item links to the current page, false otherwise.
33
- It's usually not necessary, since you'll automatically get either an <a> or <span class="selected">.-->
34
- <li><a href="/products">Products</a></li>
35
-
36
- <!-- current_page is true if the menu item links to the current page, false otherwise.
37
- It's usually not necessary, since you'll automatically get either an <a> or <span class="selected">.-->
38
- <li><a href="/contact-us">Contact Us</a></li>
39
-
40
- </ul>
41
-
42
- <h1>Mouse Trap</h1>
43
-
44
- <p><a href="/products">Back to products</a></p>
45
-
46
- <p>$2.50.0</p>
47
-
48
- <p>Catch those varmints!</p>
49
-
50
- <p>Released: May 12th 1964 (46 years ago)</p>
51
- </div>
52
-
53
- </body>
54
- </html>