milk 0.0.5 → 0.0.6

data/Rakefile

@@ -0,0 +1,12 @@
+desc "Build gem"
+task :gem do
+  exec "gem build milk.gemspec"
+end
+
+
+desc "Run Sample site to test framework"
+task :sample_test do
+  exec "thin -R site_template/config.ru start"
+end
+
+

data/bin/milk

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+
+require 'fileutils'
+
+if ARGV.length != 1
+  puts "\nMilk site generator\n"
+  puts "\nUsage:\n\tmilk [target project]\n\n"
+  exit 1
+end
+
+target_path = File.absolute_path(ARGV[0])
+if File.directory?(target_path)
+  puts "\nERROR: there already exists a folder #{target_path}\n"
+  exit 1
+end
+
+puts "\nCreating milk site at #{target_path}\n"
+FileUtils.mkdir_p(target_path, :verbose => true)
+MILK_ROOT = target_path
+require 'milk'
+FileUtils.cp_r(Milk::TEMPLATE_DIR+"/.", target_path, :verbose => true)
+puts "\nDone!\n\n"

data/lib/milk.rb

@@ -11,18 +11,20 @@ module Milk
 
   LIB_DIR = File.dirname(__FILE__)
   BIN_DIR ||= File.absolute_path(File.dirname(__FILE__)+"/../../local/bin")
+  TEMPLATE_DIR = File.absolute_path(LIB_DIR+"/../site_template")
   def self.get_milk_root
     c = caller(1).collect { |line| line.split(':').first }
     c = c.select { |line| line !~ /\/gems\// }
     File.absolute_path(File.dirname(c.first))
   end
-  MILK_ROOT = get_milk_root 
+  MILK_ROOT ||= get_milk_root 
   CONFIG_DIR = MILK_ROOT + "/config"
   
   # Load overrides from config file
+  config_file = CONFIG_DIR+"/config.yaml"
   YAML.load(open(CONFIG_DIR+"/config.yaml")).each_pair do |key, value|
     eval("#{key} = #{value.inspect}")
-  end
+  end if File.file?(config_file)
   
   # Set defaults otherwise
   COMPONENTS_DIR ||= MILK_ROOT + "/design"

data/lib/milk/application.rb

@@ -34,12 +34,11 @@ module Milk
             :delete
           end
         when @req.post?
-          if path =~ PAGE_PATH_REGEX
-            regex = PAGE_PATH_REGEX
-            :preview
-          end
           if path == '/login'
             :login
+          elsif path =~ PAGE_PATH_REGEX
+            regex = PAGE_PATH_REGEX
+            :preview
           end
         when @req.put?
           if path =~ PAGE_PATH_REGEX
@@ -146,6 +145,7 @@ module Milk
       @resp["Content-Type"] = 
       if env['HTTP_ACCEPT'].include? "application/xhtml+xml"
         "application/xhtml+xml"
+        "text/html"
       else
         "text/html"
       end

data/lib/milk/component.rb

@@ -86,7 +86,7 @@ module Milk
         obj = YAML.load_file(yaml_file)
         obj.instance_variable_set(:@parent, @parent)
         obj.instance_variables.each do |key|
-          self.instance_variable_set(key, obj.instance_variable_get(key))
+          self.instance_variable_set(key, obj.instance_variable_get(key)) unless self.instance_variable_get(key)
         end
       end
     end

data/lib/milk/fields/xhtml.haml

@@ -131,7 +131,7 @@
             %span{:class=>'ui-icon ui-icon-cancel'}
             Cancel
           %button#logout_button.toolitem{:title=>'Cancel changes and logout and go to live page.'}
-            %span{:class=>'ui-icon ui-icon-circle-close'}
+            %span{:class=>'ui-icon ui-icon-locked'}
             Logout
       #preview
         = preview

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.5"
+  s.version     = "0.0.6"
   s.author      = "Tim Caswell"
   s.email       = "tim@creationix.com"
   s.homepage    = "http://milk.rubyforge.org"
@@ -16,7 +16,7 @@ files, and the admin side is super easy to use."
   s.add_dependency('rack', '>= 1.0.0')
   s.add_dependency('maruku', '>= 0.6.0')
   s.add_dependency('haml', '>= 2.0.9')
-  s.test_files = Dir["test/test*.rb"]
   s.has_rdoc    = true
+  s.executables = ['milk']
 end
 

data/site_template/config/config.yaml

@@ -0,0 +1,31 @@
+# This file contains global settings for the milk site
+---
+
+# SECRET is the site specific key used to encrypt the cookies sent for authentication.
+#
+# It is very important that this key be both long and unique to each site you build.
+#
+# My method is to pick two secret passphrases and concatenating the md5 of them together
+#
+#   >> require 'digest/md5'
+#   => true
+#   >> Digest::MD5.hexdigest("Milk") + Digest::MD5.hexdigest("Rocks")
+#   => "e89b2cbb7d11825a67459af2249064de5cdfbc0ea6e85d2cc3dd5ddec72ffe1a"
+SECRET: "098f6bcd4621d373cade4e832627b4f6ad0234829205b9033196ba818f7a872b"
+
+# USE_CACHE is an advanced option for sites that need super high performance.  When
+# this option is set to true, then every time a page is saved, a static html file is
+# created and saved to [MILK_ROOT]/public/cache/[pagename]/index.html
+#
+# In order to use these cache files your apache or nginx server needs to have a rewrite
+# rule that looks here first and uses the static files if they exist.
+#
+# As an example, here is the relevent part of my nginx config:
+#
+#   # Enable loading page cache files directly
+#   rewrite ^/$ /cache/Home/index.html;
+#   rewrite ^((/[A-Z][A-Za-z]*)+)$ /cache/$1/index.html;
+USE_CACHE: false
+
+# This is used in some views to show the site name
+SITE_NAME: "Sample Site"

data/site_template/config/foot.yaml

@@ -0,0 +1,5 @@
+--- !ruby/object:Foot 
+markdown: |-
+  © 2009 Your company name here. - Hosted on the [Milk] framework.
+  
+  [Milk]: http://milk.rubyforge.org/

data/site_template/config/head.yaml

@@ -0,0 +1,27 @@
+--- &id001 !ruby/object:Head 
+buttons: 
+- !ruby/object:Button 
+  href: /Home
+  icon: home
+  title: Home
+  description: Description of home page
+  parent: *id001
+- !ruby/object:Button 
+  href: /News
+  icon: news
+  title: News
+  description: Description of news page
+  parent: *id001
+- !ruby/object:Button 
+  href: /Products
+  icon: products
+  title: Products
+  description: Description of products page
+  parent: *id001
+- !ruby/object:Button 
+  href: /About
+  icon: about
+  title: About Us
+  description: Description of about page
+  parent: *id001
+

data/site_template/config/users.yaml

@@ -0,0 +1,18 @@
+--- 
+# This file contains the emails, names and hashed passwords for 
+# all users of the site.
+# 
+# Hash is a simple md5 of the password for now, future versions of
+# Milk may use something more secure.
+#
+# To create the md5 hash in irb do the following:
+#
+#   >> require 'digest/md5'
+#   => true
+#   >> Digest::MD5.hexdigest("test")
+#   => "098f6bcd4621d373cade4e832627b4f6"
+#
+# Note the default login is admin@example.com/test
+admin@example.com: 
+  name: Sample Admin
+  hash: 098f6bcd4621d373cade4e832627b4f6

data/site_template/design/960.sass

@@ -0,0 +1,305 @@
+// This file is generated using css2sass on 960.css from http://960.gs/
+// Then I factored out the widths to make it easier to edit based on sass variables
+// This defines the columns of the content.
+
+// Configure parameters here
+!full_width = 960
+!gutter_width = 20
+
+// Calculated variables
+!full_column_width_12 = !full_width / 12
+!full_column_width_16 = !full_width / 16
+
+.container_12
+  :margin-left auto
+  :margin-right auto
+  :width = !full_width + "px"
+
+  .grid_3
+    :width = (!full_column_width_12 * 3 - !gutter_width) + "px"
+
+  .grid_6
+    :width = (!full_column_width_12 * 6 - !gutter_width) + "px"
+
+  .grid_9
+    :width = (!full_column_width_12 * 9 - !gutter_width) + "px"
+
+  .grid_12
+    :width = (!full_column_width_12 * 12 - !gutter_width) + "px"
+
+  .grid_1
+    :width = (!full_column_width_12 - !gutter_width) + "px"
+
+  .grid_2
+    :width = (!full_column_width_12 * 2 - !gutter_width) + "px"
+
+  .grid_4
+    :width = (!full_column_width_12 * 4 - !gutter_width) + "px"
+
+  .grid_5
+    :width = (!full_column_width_12 * 5 - !gutter_width) + "px"
+
+  .grid_7
+    :width = (!full_column_width_12 * 7 - !gutter_width) + "px"
+
+  .grid_8
+    :width = (!full_column_width_12 * 8 - !gutter_width) + "px"
+
+  .grid_10
+    :width = (!full_column_width_12 * 10 - !gutter_width) + "px"
+
+  .grid_11
+    :width = (!full_column_width_12 * 11 - !gutter_width) + "px"
+
+  .prefix_3
+    :padding-left = (!full_column_width_12 * 3) + "px"
+
+  .prefix_6
+    :padding-left = (!full_column_width_12 * 6) + "px"
+
+  .prefix_9
+    :padding-left = (!full_column_width_12 * 9) + "px"
+
+  .prefix_1
+    :padding-left = !full_column_width_12 + "px"
+
+  .prefix_2
+    :padding-left = (!full_column_width_12 * 2) + "px"
+
+  .prefix_4
+    :padding-left = (!full_column_width_12 * 4) + "px"
+
+  .prefix_5
+    :padding-left = (!full_column_width_12 * 5) + "px"
+
+  .prefix_7
+    :padding-left = (!full_column_width_12 * 7) + "px"
+
+  .prefix_8
+    :padding-left = (!full_column_width_12 * 8) + "px"
+
+  .prefix_10
+    :padding-left = (!full_column_width_12 * 10) + "px"
+
+  .prefix_11
+    :padding-left = (!full_column_width_12 * 11) + "px"
+
+  .suffix_3
+    :padding-right = (!full_column_width_12 * 3) + "px"
+
+  .suffix_6
+    :padding-right = (!full_column_width_12 * 6) + "px"
+
+  .suffix_9
+    :padding-right = (!full_column_width_12 * 9) + "px"
+
+  .suffix_1
+    :padding-right = !full_column_width_12 + "px"
+
+  .suffix_2
+    :padding-right = (!full_column_width_12 * 2) + "px"
+
+  .suffix_4
+    :padding-right = (!full_column_width_12 * 4) + "px"
+
+  .suffix_5
+    :padding-right = (!full_column_width_12 * 5) + "px"
+
+  .suffix_7
+    :padding-right = (!full_column_width_12 * 7) + "px"
+
+  .suffix_8
+    :padding-right = (!full_column_width_12 * 8) + "px"
+
+  .suffix_10
+    :padding-right = (!full_column_width_12 * 10) + "px"
+
+  .suffix_11
+    :padding-right = (!full_column_width_12 * 11) + "px"
+
+
+.container_16
+  :margin-left auto
+  :margin-right auto
+  :width = !full_width + "px"
+
+  .grid_4
+    :width = (!full_column_width_16 * 4 - !gutter_width) + "px"
+
+  .grid_8
+    :width = (!full_column_width_16 * 8 - !gutter_width) + "px"
+
+  .grid_12
+    :width = (!full_column_width_16 * 12 - !gutter_width) + "px"
+
+  .grid_16
+    :width = (!full_column_width_16 * 16 - !gutter_width) + "px"
+
+  .grid_1
+    :width = (!full_column_width_16 - !gutter_width) + "px"
+
+  .grid_2
+    :width = (!full_column_width_16 * 2 - !gutter_width) + "px"
+
+  .grid_3
+    :width = (!full_column_width_16 * 3 - !gutter_width) + "px"
+
+  .grid_5
+    :width = (!full_column_width_16 * 5 - !gutter_width) + "px"
+
+  .grid_6
+    :width = (!full_column_width_16 * 6 - !gutter_width) + "px"
+
+  .grid_7
+    :width = (!full_column_width_16 * 7 - !gutter_width) + "px"
+
+  .grid_9
+    :width = (!full_column_width_16 * 9 - !gutter_width) + "px"
+
+  .grid_10
+    :width = (!full_column_width_16 * 10 - !gutter_width) + "px"
+
+  .grid_11
+    :width = (!full_column_width_16 * 11 - !gutter_width) + "px"
+
+  .grid_13
+    :width = (!full_column_width_16 * 13 - !gutter_width) + "px"
+
+  .grid_14
+    :width = (!full_column_width_16 * 14 - !gutter_width) + "px"
+
+  .grid_15
+    :width = (!full_column_width_16 * 15 - !gutter_width) + "px"
+
+  .prefix_4
+    :padding-left = (!full_column_width_16 * 4) + "px"
+
+  .prefix_8
+    :padding-left = (!full_column_width_16 * 8) + "px"
+
+  .prefix_12
+    :padding-left = (!full_column_width_16 * 12) + "px"
+
+  .prefix_1
+    :padding-left = !full_column_width_16 + "px"
+
+  .prefix_2
+    :padding-left = (!full_column_width_16 * 2) + "px"
+
+  .prefix_3
+    :padding-left = (!full_column_width_16 * 3) + "px"
+
+  .prefix_5
+    :padding-left = (!full_column_width_16 * 5) + "px"
+
+  .prefix_6
+    :padding-left = (!full_column_width_16 * 6) + "px"
+
+  .prefix_7
+    :padding-left = (!full_column_width_16 * 7) + "px"
+
+  .prefix_9
+    :padding-left = (!full_column_width_16 * 9) + "px"
+
+  .prefix_10
+    :padding-left = (!full_column_width_16 * 10) + "px"
+
+  .prefix_11
+    :padding-left = (!full_column_width_16 * 11) + "px"
+
+  .prefix_13
+    :padding-left = (!full_column_width_16 * 13) + "px"
+
+  .prefix_14
+    :padding-left = (!full_column_width_16 * 14) + "px"
+
+  .prefix_15
+    :padding-left = (!full_column_width_16 * 15) + "px"
+
+  .suffix_4
+    :padding-right = (!full_column_width_16 * 4) + "px"
+
+  .suffix_8
+    :padding-right = (!full_column_width_16 * 8) + "px"
+
+  .suffix_12
+    :padding-right = (!full_column_width_16 * 12) + "px"
+
+  .suffix_1
+    :padding-right = !full_column_width_16 + "px"
+
+  .suffix_2
+    :padding-right = (!full_column_width_16 * 2) + "px"
+
+  .suffix_3
+    :padding-right = (!full_column_width_16 * 3) + "px"
+
+  .suffix_5
+    :padding-right = (!full_column_width_16 * 5) + "px"
+
+  .suffix_6
+    :padding-right = (!full_column_width_16 * 6) + "px"
+
+  .suffix_7
+    :padding-right = (!full_column_width_16 * 7) + "px"
+
+  .suffix_9
+    :padding-right = (!full_column_width_16 * 9) + "px"
+
+  .suffix_10
+    :padding-right = (!full_column_width_16 * 10) + "px"
+
+  .suffix_11
+    :padding-right = (!full_column_width_16 * 11) + "px"
+
+  .suffix_13
+    :padding-right = (!full_column_width_16 * 13) + "px"
+
+  .suffix_14
+    :padding-right = (!full_column_width_16 * 14) + "px"
+
+  .suffix_15
+    :padding-right = (!full_column_width_16 * 15) + "px"
+
+
+.grid_1, .grid_2, .grid_3, .grid_4, .grid_5, .grid_6, .grid_7, .grid_8, .grid_9, .grid_10, .grid_11, .grid_12, .grid_13, .grid_14, .grid_15, .grid_16
+  :display inline
+  :float left
+  :margin-left = (!gutter_width / 2) + "px"
+  :margin-right = (!gutter_width / 2) + "px"
+
+
+.alpha
+  :margin-left 0
+
+
+.omega
+  :margin-right 0
+
+
+.clear
+  :clear both
+  :display block
+  :overflow hidden
+  :visibility hidden
+  :width 0
+  :height 0
+
+
+.clearfix
+  :display inline-block
+  :display block
+
+  &:after
+    :clear both
+    :content ' '
+    :display block
+    :font-size 0
+    :line-height 0
+    :visibility hidden
+    :width 0
+    :height 0
+
+
+* html .clearfix
+  :height 1%

data/site_template/design/body.haml

@@ -0,0 +1,3 @@
+.body
+  = ::Maruku.new(@markdown).to_html
+  %br{:style => "clear:both"}

data/site_template/design/body.rb

@@ -0,0 +1,4 @@
+class Body < Milk::Component
+  local_properties :markdown
+  markdown_field :markdown, "Content"
+end

data/site_template/design/button.haml

@@ -0,0 +1,2 @@
+%a.button{:class=>css_class, :href=>@href, :title=>@description}
+  &= @title

data/site_template/design/button.rb

@@ -0,0 +1,17 @@
+class Button < Milk::Component
+  local_properties :href, :icon, :title, :description
+
+  def name
+    @title + " button"
+  end
+  
+  # highlight if current page shares base folder with target of link
+  def css_class
+    (page.link_to.split('/')[1] == @href.split('/')[1] || page.link_to?(@href)) && "active"
+  end
+  
+  page_chooser :href, "Link target"
+  sprite_chooser :icon, "Icon", :main_class => "icon", :icon_classes => /\.(icon-([a-z]+))/
+  text_field :title, "Label text"
+  text_field :description, "Tooltip"
+end

data/site_template/design/foot.haml

@@ -0,0 +1,3 @@
+#foot
+  = ::Maruku.new(@markdown).to_html
+      

data/site_template/design/foot.rb

@@ -0,0 +1,4 @@
+class Foot < Milk::Component
+  global_properties :markdown
+  markdown_field :markdown, "Footer Text"
+end

data/site_template/design/foot.sass

@@ -0,0 +1,4 @@
+#foot
+  :text-align center
+  :font-size 90%
+  :color #888

data/site_template/design/head.haml

@@ -0,0 +1,6 @@
+#head
+  %ul
+    - @buttons.each do |button|
+      %li.grid_2= button.view
+  %br.clear
+

data/site_template/design/head.rb

@@ -0,0 +1,4 @@
+class Head < Milk::Component
+  global_properties :buttons
+  component_array :buttons, "Navigation buttons", :com_class => "Button"
+end

data/site_template/design/head.sass

@@ -0,0 +1,25 @@
+#head
+  li a
+    :display block
+    &, &:visited, &:active, &:link
+    :color inherit
+    :text-decoration none
+    :border 1px solid #999
+    :text-align center
+    :font
+      :size 80%
+      :weight bold
+    :background-color #222
+    :color #08f
+    :padding
+      :top 5px
+      :bottom 5px
+    &:hover
+      :background-color #8af
+      :color #000
+    &.active
+      :background-color #8fa
+      :color #000
+  :padding
+    :top 20px
+    :bottom 20px

data/site_template/design/page.haml

@@ -0,0 +1,3 @@
+.container_12
+  = yield
+

data/site_template/design/page.sass

@@ -0,0 +1,7 @@
+#admin
+  :color #999
+  :text-align right
+  a
+    &, &:visited, &:active, &:link
+      :color #08f
+

data/site_template/design/reset.sass

@@ -0,0 +1,170 @@
+// This file is generated using css2sass on reset.css from http://960.gs/
+// This unifies the differences in the default styles of different browsers.
+html
+  :margin 0
+  :padding 0
+  :border 0
+  :outline 0
+  :font-size 100%
+  :vertical-align baseline
+  :background transparent
+
+
+body
+  :margin 0
+  :padding 0
+  :border 0
+  :outline 0
+  :font-size 100%
+  :vertical-align baseline
+  :background transparent
+  :line-height 1
+
+
+div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p
+  :margin 0
+  :padding 0
+  :border 0
+  :outline 0
+  :font-size 100%
+  :vertical-align baseline
+  :background transparent
+
+
+blockquote
+  :margin 0
+  :padding 0
+  :border 0
+  :outline 0
+  :font-size 100%
+  :vertical-align baseline
+  :background transparent
+  :quotes none
+
+  &:before, &:after
+    :content ''
+    :content none
+
+
+pre, a, abbr, acronym, address, big, cite, code
+  :margin 0
+  :padding 0
+  :border 0
+  :outline 0
+  :font-size 100%
+  :vertical-align baseline
+  :background transparent
+
+
+del
+  :margin 0
+  :padding 0
+  :border 0
+  :outline 0
+  :font-size 100%
+  :vertical-align baseline
+  :background transparent
+  :text-decoration line-through
+
+
+dfn, em, font, img
+  :margin 0
+  :padding 0
+  :border 0
+  :outline 0
+  :font-size 100%
+  :vertical-align baseline
+  :background transparent
+
+
+ins
+  :margin 0
+  :padding 0
+  :border 0
+  :outline 0
+  :font-size 100%
+  :vertical-align baseline
+  :background transparent
+  :text-decoration none
+
+
+kbd
+  :margin 0
+  :padding 0
+  :border 0
+  :outline 0
+  :font-size 100%
+  :vertical-align baseline
+  :background transparent
+
+
+q
+  :margin 0
+  :padding 0
+  :border 0
+  :outline 0
+  :font-size 100%
+  :vertical-align baseline
+  :background transparent
+  :quotes none
+
+  &:before, &:after
+    :content ''
+    :content none
+
+
+s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd
+  :margin 0
+  :padding 0
+  :border 0
+  :outline 0
+  :font-size 100%
+  :vertical-align baseline
+  :background transparent
+
+
+ol, ul
+  :margin 0
+  :padding 0
+  :border 0
+  :outline 0
+  :font-size 100%
+  :vertical-align baseline
+  :background transparent
+  :list-style none
+
+
+li, fieldset, form, label, legend
+  :margin 0
+  :padding 0
+  :border 0
+  :outline 0
+  :font-size 100%
+  :vertical-align baseline
+  :background transparent
+
+
+table
+  :margin 0
+  :padding 0
+  :border 0
+  :outline 0
+  :font-size 100%
+  :vertical-align baseline
+  :background transparent
+  :border-collapse collapse
+  :border-spacing 0
+
+
+caption, tbody, tfoot, thead, tr, th, td
+  :margin 0
+  :padding 0
+  :border 0
+  :outline 0
+  :font-size 100%
+  :vertical-align baseline
+  :background transparent
+
+
+html :focus
+  :outline 0

data/site_template/design/text.sass

@@ -0,0 +1,65 @@
+// This file is generated using css2sass on text.css from http://960.gs/
+// This gives some good defaults to start with for fonts
+// Feel free to edit as needed
+body
+  :font 13px/1.5 Helvetica,Arial,'Liberation Sans',FreeSans,sans-serif
+
+
+a:focus
+  :outline 1px dotted invert
+
+
+hr
+  :border 0 #ccc solid
+  :border-top-width 1px
+  :clear both
+  :height 0
+  :margin-bottom 20px
+
+
+h1
+  :font-size 25px
+  :margin-bottom 20px
+
+
+h2
+  :font-size 23px
+  :margin-bottom 20px
+
+
+h3
+  :font-size 21px
+  :margin-bottom 20px
+
+
+h4
+  :font-size 19px
+  :margin-bottom 20px
+
+
+h5
+  :font-size 17px
+  :margin-bottom 20px
+
+
+h6
+  :font-size 15px
+  :margin-bottom 20px
+
+
+ol
+  :list-style decimal
+  :margin-bottom 20px
+
+
+ul
+  :list-style disc
+  :margin-bottom 20px
+
+
+li
+  :margin-left 30px
+
+
+p, dl, pre, table, address, fieldset
+  :margin-bottom 20px

data/site_template/design/xhtml.haml

@@ -0,0 +1,15 @@
+!!! xml
+!!! strict
+%html{:xmlns=>"http://www.w3.org/1999/xhtml", :lang=>"en"}
+  %head
+    %meta{:"http-equiv"=>"content-type", :content=>"application/xhtml+xml; charset=UTF-8"}
+    %link{:rel=>"shortcut icon", :type=>"image/x-icon", :href=>"/favicon.ico"}/
+    - if @keywords && @keywords.length > 0
+      %meta{:name=>"keywords", :content=>@keywords}
+    - if @description && @description.length > 0
+      %meta{:name=>"description", :content=>@description}
+    %link{:rel=>"stylesheet", :type=>"text/css", :media=>"screen", :href=>"/style/style.css"}/
+    %title&= (@title || @pagename) + " - " + Milk::SITE_NAME
+  %body
+    = yield
+

data/site_template/pages/About.yaml

@@ -0,0 +1,15 @@
+--- &id001 !ruby/object:Milk::Page 
+components: 
+- !ruby/object:Head 
+  parent: *id001
+- !ruby/object:Body 
+  markdown: |-
+    # About Us
+    
+    Description of about page
+  parent: *id001
+- !ruby/object:Foot 
+  parent: *id001
+title: About Us
+keywords: ""
+description: ""

data/site_template/pages/Home.yaml

@@ -0,0 +1,15 @@
+--- &id001 !ruby/object:Milk::Page 
+components: 
+- !ruby/object:Head 
+  parent: *id001
+- !ruby/object:Body 
+  markdown: |-
+    # Home
+    
+    Description of home page
+  parent: *id001
+- !ruby/object:Foot 
+  parent: *id001
+title: Home
+keywords: keywords, that, are, relevent, to, search, engines
+description: This is a description of this site.

data/site_template/pages/News.yaml

@@ -0,0 +1,15 @@
+--- &id001 !ruby/object:Milk::Page 
+components: 
+- !ruby/object:Head 
+  parent: *id001
+- !ruby/object:Body 
+  markdown: |-
+    # News
+    
+    Description of news page
+  parent: *id001
+- !ruby/object:Foot 
+  parent: *id001
+title: News
+keywords: ""
+description: ""

data/site_template/pages/NotFound.yaml

@@ -0,0 +1,15 @@
+--- &id001 !ruby/object:Milk::Page 
+components: 
+- !ruby/object:Head 
+  parent: *id001
+- !ruby/object:Body 
+  markdown: |-
+    # 404 - Page not found
+    
+    The page you were looking for was not found
+  parent: *id001
+- !ruby/object:Foot 
+  parent: *id001
+title: 404 - Page not found
+keywords: ""
+description: ""

data/site_template/pages/Products.yaml

@@ -0,0 +1,15 @@
+--- &id001 !ruby/object:Milk::Page 
+components: 
+- !ruby/object:Head 
+  parent: *id001
+- !ruby/object:Body 
+  markdown: |-
+    # Products
+    
+    Description of products page
+  parent: *id001
+- !ruby/object:Foot 
+  parent: *id001
+title: Products
+keywords: ""
+description: ""

data/site_template/public/images/README.txt

@@ -0,0 +1,2 @@
+This folder contains images uploaded by the user used as content.
+

data/site_template/public/style/style.css

@@ -0,0 +1,155 @@
+#head { padding-top: 20px; padding-bottom: 20px; }
+#head li a { display: block; color: inherit; text-decoration: none; border: 1px solid #999; text-align: center; font-size: 80%; font-weight: bold; background-color: #222; color: #08f; padding-top: 5px; padding-bottom: 5px; }
+#head li a:hover { background-color: #8af; color: #000; }
+#head li a.active { background-color: #8fa; color: #000; }.container_12 { margin-left: auto; margin-right: auto; width: 960px; }
+.container_12 .grid_3 { width: 220px; }
+.container_12 .grid_6 { width: 460px; }
+.container_12 .grid_9 { width: 700px; }
+.container_12 .grid_12 { width: 940px; }
+.container_12 .grid_1 { width: 60px; }
+.container_12 .grid_2 { width: 140px; }
+.container_12 .grid_4 { width: 300px; }
+.container_12 .grid_5 { width: 380px; }
+.container_12 .grid_7 { width: 540px; }
+.container_12 .grid_8 { width: 620px; }
+.container_12 .grid_10 { width: 780px; }
+.container_12 .grid_11 { width: 860px; }
+.container_12 .prefix_3 { padding-left: 240px; }
+.container_12 .prefix_6 { padding-left: 480px; }
+.container_12 .prefix_9 { padding-left: 720px; }
+.container_12 .prefix_1 { padding-left: 80px; }
+.container_12 .prefix_2 { padding-left: 160px; }
+.container_12 .prefix_4 { padding-left: 320px; }
+.container_12 .prefix_5 { padding-left: 400px; }
+.container_12 .prefix_7 { padding-left: 560px; }
+.container_12 .prefix_8 { padding-left: 640px; }
+.container_12 .prefix_10 { padding-left: 800px; }
+.container_12 .prefix_11 { padding-left: 880px; }
+.container_12 .suffix_3 { padding-right: 240px; }
+.container_12 .suffix_6 { padding-right: 480px; }
+.container_12 .suffix_9 { padding-right: 720px; }
+.container_12 .suffix_1 { padding-right: 80px; }
+.container_12 .suffix_2 { padding-right: 160px; }
+.container_12 .suffix_4 { padding-right: 320px; }
+.container_12 .suffix_5 { padding-right: 400px; }
+.container_12 .suffix_7 { padding-right: 560px; }
+.container_12 .suffix_8 { padding-right: 640px; }
+.container_12 .suffix_10 { padding-right: 800px; }
+.container_12 .suffix_11 { padding-right: 880px; }
+
+.container_16 { margin-left: auto; margin-right: auto; width: 960px; }
+.container_16 .grid_4 { width: 220px; }
+.container_16 .grid_8 { width: 460px; }
+.container_16 .grid_12 { width: 700px; }
+.container_16 .grid_16 { width: 940px; }
+.container_16 .grid_1 { width: 40px; }
+.container_16 .grid_2 { width: 100px; }
+.container_16 .grid_3 { width: 160px; }
+.container_16 .grid_5 { width: 280px; }
+.container_16 .grid_6 { width: 340px; }
+.container_16 .grid_7 { width: 400px; }
+.container_16 .grid_9 { width: 520px; }
+.container_16 .grid_10 { width: 580px; }
+.container_16 .grid_11 { width: 640px; }
+.container_16 .grid_13 { width: 760px; }
+.container_16 .grid_14 { width: 820px; }
+.container_16 .grid_15 { width: 880px; }
+.container_16 .prefix_4 { padding-left: 240px; }
+.container_16 .prefix_8 { padding-left: 480px; }
+.container_16 .prefix_12 { padding-left: 720px; }
+.container_16 .prefix_1 { padding-left: 60px; }
+.container_16 .prefix_2 { padding-left: 120px; }
+.container_16 .prefix_3 { padding-left: 180px; }
+.container_16 .prefix_5 { padding-left: 300px; }
+.container_16 .prefix_6 { padding-left: 360px; }
+.container_16 .prefix_7 { padding-left: 420px; }
+.container_16 .prefix_9 { padding-left: 540px; }
+.container_16 .prefix_10 { padding-left: 600px; }
+.container_16 .prefix_11 { padding-left: 660px; }
+.container_16 .prefix_13 { padding-left: 780px; }
+.container_16 .prefix_14 { padding-left: 840px; }
+.container_16 .prefix_15 { padding-left: 900px; }
+.container_16 .suffix_4 { padding-right: 240px; }
+.container_16 .suffix_8 { padding-right: 480px; }
+.container_16 .suffix_12 { padding-right: 720px; }
+.container_16 .suffix_1 { padding-right: 60px; }
+.container_16 .suffix_2 { padding-right: 120px; }
+.container_16 .suffix_3 { padding-right: 180px; }
+.container_16 .suffix_5 { padding-right: 300px; }
+.container_16 .suffix_6 { padding-right: 360px; }
+.container_16 .suffix_7 { padding-right: 420px; }
+.container_16 .suffix_9 { padding-right: 540px; }
+.container_16 .suffix_10 { padding-right: 600px; }
+.container_16 .suffix_11 { padding-right: 660px; }
+.container_16 .suffix_13 { padding-right: 780px; }
+.container_16 .suffix_14 { padding-right: 840px; }
+.container_16 .suffix_15 { padding-right: 900px; }
+
+.grid_1, .grid_2, .grid_3, .grid_4, .grid_5, .grid_6, .grid_7, .grid_8, .grid_9, .grid_10, .grid_11, .grid_12, .grid_13, .grid_14, .grid_15, .grid_16 { display: inline; float: left; margin-left: 10px; margin-right: 10px; }
+
+.alpha { margin-left: 0; }
+
+.omega { margin-right: 0; }
+
+.clear { clear: both; display: block; overflow: hidden; visibility: hidden; width: 0; height: 0; }
+
+.clearfix { display: inline-block; display: block; }
+.clearfix:after { clear: both; content: ' '; display: block; font-size: 0; line-height: 0; visibility: hidden; width: 0; height: 0; }
+
+* html .clearfix { height: 1%; }body { font: 13px/1.5 Helvetica,Arial,'Liberation Sans',FreeSans,sans-serif; }
+
+a:focus { outline: 1px dotted invert; }
+
+hr { border: 0 #ccc solid; border-top-width: 1px; clear: both; height: 0; margin-bottom: 20px; }
+
+h1 { font-size: 25px; margin-bottom: 20px; }
+
+h2 { font-size: 23px; margin-bottom: 20px; }
+
+h3 { font-size: 21px; margin-bottom: 20px; }
+
+h4 { font-size: 19px; margin-bottom: 20px; }
+
+h5 { font-size: 17px; margin-bottom: 20px; }
+
+h6 { font-size: 15px; margin-bottom: 20px; }
+
+ol { list-style: decimal; margin-bottom: 20px; }
+
+ul { list-style: disc; margin-bottom: 20px; }
+
+li { margin-left: 30px; }
+
+p, dl, pre, table, address, fieldset { margin-bottom: 20px; }#admin { color: #999; text-align: right; }#foot { text-align: center; font-size: 90%; color: #888; }html { margin: 0; padding: 0; border: 0; outline: 0; font-size: 100%; vertical-align: baseline; background: transparent; }
+
+body { margin: 0; padding: 0; border: 0; outline: 0; font-size: 100%; vertical-align: baseline; background: transparent; line-height: 1; }
+
+div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p { margin: 0; padding: 0; border: 0; outline: 0; font-size: 100%; vertical-align: baseline; background: transparent; }
+
+blockquote { margin: 0; padding: 0; border: 0; outline: 0; font-size: 100%; vertical-align: baseline; background: transparent; quotes: none; }
+blockquote:before, blockquote:after { content: ''; content: none; }
+
+pre, a, abbr, acronym, address, big, cite, code { margin: 0; padding: 0; border: 0; outline: 0; font-size: 100%; vertical-align: baseline; background: transparent; }
+
+del { margin: 0; padding: 0; border: 0; outline: 0; font-size: 100%; vertical-align: baseline; background: transparent; text-decoration: line-through; }
+
+dfn, em, font, img { margin: 0; padding: 0; border: 0; outline: 0; font-size: 100%; vertical-align: baseline; background: transparent; }
+
+ins { margin: 0; padding: 0; border: 0; outline: 0; font-size: 100%; vertical-align: baseline; background: transparent; text-decoration: none; }
+
+kbd { margin: 0; padding: 0; border: 0; outline: 0; font-size: 100%; vertical-align: baseline; background: transparent; }
+
+q { margin: 0; padding: 0; border: 0; outline: 0; font-size: 100%; vertical-align: baseline; background: transparent; quotes: none; }
+q:before, q:after { content: ''; content: none; }
+
+s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd { margin: 0; padding: 0; border: 0; outline: 0; font-size: 100%; vertical-align: baseline; background: transparent; }
+
+ol, ul { margin: 0; padding: 0; border: 0; outline: 0; font-size: 100%; vertical-align: baseline; background: transparent; list-style: none; }
+
+li, fieldset, form, label, legend { margin: 0; padding: 0; border: 0; outline: 0; font-size: 100%; vertical-align: baseline; background: transparent; }
+
+table { margin: 0; padding: 0; border: 0; outline: 0; font-size: 100%; vertical-align: baseline; background: transparent; border-collapse: collapse; border-spacing: 0; }
+
+caption, tbody, tfoot, thead, tr, th, td { margin: 0; padding: 0; border: 0; outline: 0; font-size: 100%; vertical-align: baseline; background: transparent; }
+
+html :focus { outline: 0; }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: milk
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Tim Caswell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-16 00:00:00 -05:00
+date: 2009-06-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,13 +44,54 @@ dependencies:
     version: 
 description: Milk is a rack based cms system built for ease of use and simplicity. Milk tastes great with and without cookies. The public facing aspect is static html files, and the admin side is super easy to use.
 email: tim@creationix.com
-executables: []
-
+executables: 
+- milk
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
+- site_template
+- site_template/public
+- site_template/public/robots.txt
+- site_template/public/style
+- site_template/public/style/style.css
+- site_template/public/images
+- site_template/public/images/README.txt
+- site_template/public/favicon.ico
+- site_template/tmp
+- site_template/tmp/restart.txt
+- site_template/config.ru
+- site_template/design
+- site_template/design/head.sass
+- site_template/design/foot.haml
+- site_template/design/body.rb
+- site_template/design/head.rb
+- site_template/design/960.sass
+- site_template/design/text.sass
+- site_template/design/sprites.sass
+- site_template/design/head.haml
+- site_template/design/page.sass
+- site_template/design/foot.rb
+- site_template/design/page.haml
+- site_template/design/xhtml.haml
+- site_template/design/button.haml
+- site_template/design/foot.sass
+- site_template/design/reset.sass
+- site_template/design/body.haml
+- site_template/design/button.rb
+- site_template/pages
+- site_template/pages/News.yaml
+- site_template/pages/NotFound.yaml
+- site_template/pages/Home.yaml
+- site_template/pages/Products.yaml
+- site_template/pages/About.yaml
+- site_template/config
+- site_template/config/head.yaml
+- site_template/config/users.yaml
+- site_template/config/config.yaml
+- site_template/config/foot.yaml
+- site_template/Rakefile
 - lib
 - lib/milk
 - lib/milk/page.rb
@@ -76,14 +117,13 @@ files:
 - lib/milk/fields/component.haml
 - lib/milk/component.rb
 - lib/milk/application.rb
-- lib/milk/templates
-- lib/milk/templates/rakefile
-- lib/milk/templates/restart
-- lib/milk/templates/bzrignore
-- lib/milk/templates/rackup
 - lib/milk.rb
 - LICENSE
+- milk-0.0.5.gem
+- Rakefile
 - milk.gemspec
+- bin
+- bin/milk
 has_rdoc: true
 homepage: http://milk.rubyforge.org
 post_install_message: 

data/lib/milk/templates/bzrignore

@@ -1,3 +0,0 @@
-haxe/*.swf
-public/cache/*
-public/style/style.css