milk 0.0.7 → 0.0.8

data/lib/milk/application.rb

@@ -171,7 +171,9 @@ module Milk
           @resp.write page.view
         when :view
           Milk::Application.join_tree(@page, self)
-          @resp.write @page.view
+          html = @page.view
+          @page.save_to_cache(html) if Milk::USE_CACHE
+          @resp.write html
         when :https_redirect
           @resp.redirect('https://' +  @req.host + @req.fullpath)
         when :http_redirect
@@ -205,7 +207,6 @@ module Milk
     # method that walks an object linking Milk objects to eachother
     def self.join_tree(obj, parent)
       if [Milk::Page, Milk::Component, Milk::Application].any? {|klass| obj.kind_of? klass}
-        puts "Setting  #{obj}'s parent to #{parent}"
         obj.parent = parent
         obj.instance_variables.each do |name|
           var = obj.instance_variable_get(name)

data/lib/milk/fields/xhtml.haml

@@ -236,7 +236,7 @@
             contentType: "application/json",
             data: jsonify($("form")[0]),
             success: function(msg){
-              window.location = $("form")[0].action;
+              window.location = $("form")[0].action.replace('https://', 'http://');
             }
           });
         });

data/lib/milk/haxe.rb

@@ -22,7 +22,7 @@ module Milk
         end
       end
 
-      # Compile haxe binary is nonexistant/outdated 
+      # Compile haxe binary if nonexistant/outdated 
       # if a swfmill resource exists, it can outdate the main swf too
       if (not (File.file?(@haxe_swf)) \
         or (File.mtime(@haxe) > File.mtime(@haxe_swf)) \

data/lib/milk/page.rb

@@ -7,15 +7,30 @@ module Milk
     attr_reader :pagename
     attr_accessor :parent
     @parent = nil
+    
+    PATH_TO_NAME_REGEXP = Regexp.new("#{Milk::PAGES_DIR}\/(.*)\.yaml")
   
-    def self.find(pagename)
-      yaml_file = Milk::PAGES_DIR + "/" + pagename + ".yaml"
-      raise PageNotFoundError unless File.readable? yaml_file
+    def self.each_page
+      Dir.glob(Milk::PAGES_DIR + "/**/*.yaml").each do |yaml_file|
+        p = load_file(yaml_file)
+        Milk::Application.join_tree(p, nil)
+        yield p
+      end
+    end
+    
+    def self.load_file(yaml_file, pagename=nil)
+      pagename ||= PATH_TO_NAME_REGEXP.match(yaml_file)[1]
       page = YAML.load_file(yaml_file)
       page.instance_variable_set('@pagename', pagename)
       page.load_settings
       page
     end
+    
+    def self.find(pagename)
+      yaml_file = Milk::PAGES_DIR + "/" + pagename + ".yaml"
+      raise PageNotFoundError unless File.readable? yaml_file
+      load_file(yaml_file, pagename)
+    end
 
     def self.haml(filename, context, extras)
       if block_given?
@@ -85,7 +100,6 @@ module Milk
     def preview
       haml(Milk::COMPONENTS_DIR + "/page.haml", self) do 
         (@components.collect do |component|
-          print "component #{component}\n"
           component.view
         end).join("")
       end
@@ -113,7 +127,6 @@ module Milk
       html ||= view
       folder =  Milk::PUBLIC_DIR + "/cache/" + @pagename
       cache_file = folder + "/index.html"
-      
       # Make the folder if it doesn't exist
       FileUtils.mkdir_p folder
       open(cache_file, "w") { |file| file.write html }

data/lib/milk/tasks.rb

@@ -5,43 +5,6 @@ task :environment do |t|
   require "milk"
 end
 
-desc "Build the site from scratch if needed"
-task :default => [:install, :sass]
-
-desc "Create the skeleton structure, install the rackup file, and init the bzr repo"
-task :install => :environment do
-
-
-  # Create missing directories
-  [ Milk::COMPONENTS_DIR + "/haxe", \
-    Milk::PAGES_DIR + "/global", \
-    Milk::PUBLIC_DIR + "/cache", \
-    Milk::PUBLIC_DIR + "/images", \
-    Milk::PUBLIC_DIR + "/style", \
-    MILK_ROOT + "/tmp", \
-  ].each do |path|
-    FileUtils.mkdir_p(path, :verbose=>true) unless File.directory?(path)
-  end
-  
-  # Install/update some template files
-  [ ["rackup", MILK_ROOT + "/config.ru"], \
-    ["bzrignore", MILK_ROOT + "/.bzrignore"], \
-    ["rakefile", MILK_ROOT + "/Rakefile"], \
-    ["restart", MILK_ROOT+"/tmp/restart.txt"] \
-  ].each do |pair|
-    source = Milk::LIB_DIR+"/milk/templates/" + pair.first
-    target = pair.last
-    FileUtils.install(source, target, :verbose=>true, :preserve => true) \
-      unless (File.file?(target) && File.mtime(source) <= File.mtime(target))
-  end
-  
-  # Set up bzr repository
-  if !File.directory? MILK_ROOT+"/.bzr"
-    exec("cd #{MILK_ROOT} && bzr init && bzr add && bzr ci -m 'Commit initial Milk structure'")
-  end
-
-end
-
 desc "Compile all the sass files in the component dir and merge into style.css"
 task :sass => :environment do
   style_file = Milk::PUBLIC_DIR + "/style/style.css"
@@ -57,12 +20,14 @@ task :sass => :environment do
   end
 end
 
-desc "Delete the cache files and the generated style file"
-task :clean => :environment do
+desc "Rebuild the page cache files"
+task :cache => :environment do
   cachedir = Milk::PUBLIC_DIR+"/cache"
   FileUtils.rm_rf(cachedir, :verbose=>true)
-  FileUtils.mkdir_p(cachedir, :verbose=>true)
-  FileUtils.rm(Milk::PUBLIC_DIR+"/style/style.css", :verbose=>true)
+  Milk::Page.each_page do |page|
+    puts "saving #{page.pagename}"
+    page.save_to_cache
+  end
 end
 
 desc "Start up an interactive ruby session with Milk preloaded"
@@ -77,7 +42,7 @@ end
 
 desc "Start up a development server using thin"
 task :server do
-  exec "rackup -s thin"
+  exec "thin -R config.ru start"
 end
 
 

data/milk.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
 tastes great with and without cookies. The public facing aspect is static html
 files, and the admin side is super easy to use."
   s.requirements << 'none'
-  s.version     = "0.0.7"
+  s.version     = "0.0.8"
   s.author      = "Tim Caswell"
   s.email       = "tim@creationix.com"
   s.homepage    = "http://milk.rubyforge.org"

data/site_template/config/config.yaml

@@ -25,7 +25,7 @@ SECRET: "098f6bcd4621d373cade4e832627b4f6ad0234829205b9033196ba818f7a872b"
 #   # Enable loading page cache files directly
 #   rewrite ^/$ /cache/Home/index.html;
 #   rewrite ^((/[A-Z][A-Za-z]*)+)$ /cache/$1/index.html;
-USE_CACHE: false
+USE_CACHE: true
 
 # This is used in some views to show the site name
 SITE_NAME: "Sample Site"

data/site_template/design/button.rb

@@ -7,7 +7,6 @@ class Button < Milk::Component
   
   # highlight if current page shares base folder with target of link
   def css_class
-    print "self #{self}\n"
     (page.link_to.split('/')[1] == @href.split('/')[1] || page.link_to?(@href)) && "active"
   end
   

data/site_template/public/cache/About/index.html

@@ -0,0 +1,42 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html lang='en' xmlns='http://www.w3.org/1999/xhtml'>
+  <head>
+    <meta content='application/xhtml+xml; charset=UTF-8' http-equiv='content-type' />
+    <link href='/favicon.ico' rel='shortcut icon' type='image/x-icon' />
+    <link href='/style/style.css' media='screen' rel='stylesheet' type='text/css' />
+    <title>About Us - Sample Site</title>
+  </head>
+  <body>
+    <div class='container_12'>
+      <ul class='grid_12' id='head'>
+        <li>
+          <a class='ui-corner-all' href='/Home' title='Description of home page'>
+            Home
+          </a>
+        </li>
+        <li>
+          <a class='ui-corner-all' href='/News' title='Description of news page'>
+            News
+          </a>
+        </li>
+        <li>
+          <a class='ui-corner-all' href='/Products' title='Description of products page'>
+            Products
+          </a>
+        </li>
+        <li>
+          <a class='active ui-corner-all' href='/About' title='Description of about page'>
+            About Us
+          </a>
+        </li>
+      </ul>
+      <div class='grid_12 body'>
+        <h1 id='about_us'>About Us</h1>
+        
+        <p>Description of about page</p>
+      </div>
+      <div class='grid_12' id='foot'><p>© 2009 Your company name here. - Hosted on the <a href='http://milk.rubyforge.org/'>Milk</a> framework.</p></div>
+    </div>
+  </body>
+</html>

data/site_template/public/cache/Home/index.html

@@ -0,0 +1,44 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html lang='en' xmlns='http://www.w3.org/1999/xhtml'>
+  <head>
+    <meta content='application/xhtml+xml; charset=UTF-8' http-equiv='content-type' />
+    <link href='/favicon.ico' rel='shortcut icon' type='image/x-icon' />
+    <meta content='keywords, that, are, relevent, to, search, engines' name='keywords' />
+    <meta content='This is a description of this site.' name='description' />
+    <link href='/style/style.css' media='screen' rel='stylesheet' type='text/css' />
+    <title>Home - Sample Site</title>
+  </head>
+  <body>
+    <div class='container_12'>
+      <ul class='grid_12' id='head'>
+        <li>
+          <a class='active ui-corner-all' href='/Home' title='Description of home page'>
+            Home
+          </a>
+        </li>
+        <li>
+          <a class='ui-corner-all' href='/News' title='Description of news page'>
+            News
+          </a>
+        </li>
+        <li>
+          <a class='ui-corner-all' href='/Products' title='Description of products page'>
+            Products
+          </a>
+        </li>
+        <li>
+          <a class='ui-corner-all' href='/About' title='Description of about page'>
+            About Us
+          </a>
+        </li>
+      </ul>
+      <div class='grid_12 body'>
+        <h1 id='home'>Home</h1>
+        
+        <p>Description of home page</p>
+      </div>
+      <div class='grid_12' id='foot'><p>© 2009 Your company name here. - Hosted on the <a href='http://milk.rubyforge.org/'>Milk</a> framework.</p></div>
+    </div>
+  </body>
+</html>

data/site_template/public/cache/News/index.html

@@ -0,0 +1,42 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html lang='en' xmlns='http://www.w3.org/1999/xhtml'>
+  <head>
+    <meta content='application/xhtml+xml; charset=UTF-8' http-equiv='content-type' />
+    <link href='/favicon.ico' rel='shortcut icon' type='image/x-icon' />
+    <link href='/style/style.css' media='screen' rel='stylesheet' type='text/css' />
+    <title>News - Sample Site</title>
+  </head>
+  <body>
+    <div class='container_12'>
+      <ul class='grid_12' id='head'>
+        <li>
+          <a class='ui-corner-all' href='/Home' title='Description of home page'>
+            Home
+          </a>
+        </li>
+        <li>
+          <a class='active ui-corner-all' href='/News' title='Description of news page'>
+            News
+          </a>
+        </li>
+        <li>
+          <a class='ui-corner-all' href='/Products' title='Description of products page'>
+            Products
+          </a>
+        </li>
+        <li>
+          <a class='ui-corner-all' href='/About' title='Description of about page'>
+            About Us
+          </a>
+        </li>
+      </ul>
+      <div class='grid_12 body'>
+        <h1 id='news'>News</h1>
+        
+        <p>Description of news page</p>
+      </div>
+      <div class='grid_12' id='foot'><p>© 2009 Your company name here. - Hosted on the <a href='http://milk.rubyforge.org/'>Milk</a> framework.</p></div>
+    </div>
+  </body>
+</html>

data/site_template/public/cache/Products/index.html

@@ -0,0 +1,42 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html lang='en' xmlns='http://www.w3.org/1999/xhtml'>
+  <head>
+    <meta content='application/xhtml+xml; charset=UTF-8' http-equiv='content-type' />
+    <link href='/favicon.ico' rel='shortcut icon' type='image/x-icon' />
+    <link href='/style/style.css' media='screen' rel='stylesheet' type='text/css' />
+    <title>Products - Sample Site</title>
+  </head>
+  <body>
+    <div class='container_12'>
+      <ul class='grid_12' id='head'>
+        <li>
+          <a class='ui-corner-all' href='/Home' title='Description of home page'>
+            Home
+          </a>
+        </li>
+        <li>
+          <a class='ui-corner-all' href='/News' title='Description of news page'>
+            News
+          </a>
+        </li>
+        <li>
+          <a class='active ui-corner-all' href='/Products' title='Description of products page'>
+            Products
+          </a>
+        </li>
+        <li>
+          <a class='ui-corner-all' href='/About' title='Description of about page'>
+            About Us
+          </a>
+        </li>
+      </ul>
+      <div class='grid_12 body'>
+        <h1 id='products'>Products</h1>
+        
+        <p>Description of products page</p>
+      </div>
+      <div class='grid_12' id='foot'><p>© 2009 Your company name here. - Hosted on the <a href='http://milk.rubyforge.org/'>Milk</a> framework.</p></div>
+    </div>
+  </body>
+</html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: milk
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Tim Caswell
@@ -79,6 +79,15 @@ files:
 - site_template/public/js/jquery-ui-1.7.2.custom.min.js
 - site_template/public/images
 - site_template/public/images/README.txt
+- site_template/public/cache
+- site_template/public/cache/Home
+- site_template/public/cache/Home/index.html
+- site_template/public/cache/Products
+- site_template/public/cache/Products/index.html
+- site_template/public/cache/News
+- site_template/public/cache/News/index.html
+- site_template/public/cache/About
+- site_template/public/cache/About/index.html
 - site_template/public/favicon.ico
 - site_template/tmp
 - site_template/tmp/restart.txt