milk 0.0.9 → 0.1.0

data/lib/milk/tasks.rb

@@ -1,20 +1,19 @@
 
 desc "Loads the Milk environment, mainly used as a dependency"
 task :environment do |t|
-  MILK_ROOT ||= t.application.original_dir
+  SITE_DIR ||= t.application.original_dir
   require "milk"
 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"
-  puts "Updating #{style_file}..."
   require 'haml'
-  open(style_file, "w") do |style|
-    Dir.glob(Milk::COMPONENTS_DIR + "/*.sass").sort.each do |c|
-      puts "Adding #{c}"
+  Dir.glob(Milk::TEMPLATE_DIR + "/*.sass").sort.each do |c|
+    target_file = Milk::PUBLIC_DIR+"/style/"+(c.gsub(/.*\/([^\/]*)\.sass/) { |m| $1 })+".css"
+    puts "Generating #{target_file}"
+    open(target_file, "w") do |style|
       open(c, "r") do |file|
-        style.write Sass::Engine.new(file.read, :filename=>c, :style=>:compact, :load_paths => [Milk::COMPONENTS_DIR]).render.strip
+        style.write Sass::Engine.new(file.read, :filename=>c, :style=>:compact, :load_paths => [Milk::TEMPLATE_DIR]).render.strip
       end
     end
   end

data/milk.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{milk}
-  s.version = "0.0.9"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Caswell"]
-  s.date = %q{2009-06-25}
+  s.date = %q{2009-06-28}
   s.default_executable = %q{milk}
   s.email = %q{tim@creationix.com}
   s.executables = ["milk"]
@@ -26,62 +26,43 @@ Gem::Specification.new do |s|
      "lib/milk/application.rb",
      "lib/milk/component.rb",
      "lib/milk/field.rb",
-     "lib/milk/fields/component.haml",
-     "lib/milk/fields/component_array.haml",
-     "lib/milk/fields/component_array.rb",
-     "lib/milk/fields/image_chooser.haml",
-     "lib/milk/fields/image_chooser.rb",
-     "lib/milk/fields/login.haml",
-     "lib/milk/fields/markdown_field.haml",
-     "lib/milk/fields/markdown_field.rb",
-     "lib/milk/fields/page_chooser.haml",
-     "lib/milk/fields/page_chooser.rb",
-     "lib/milk/fields/sprite_chooser.haml",
-     "lib/milk/fields/sprite_chooser.rb",
-     "lib/milk/fields/text_field.haml",
-     "lib/milk/fields/text_field.rb",
-     "lib/milk/fields/xhtml.haml",
-     "lib/milk/haxe.rb",
      "lib/milk/page.rb",
      "lib/milk/tasks.rb",
      "milk.gemspec",
      "site_template/Rakefile",
+     "site_template/bootstrap.rb",
      "site_template/config.ru",
-     "site_template/config/config.yaml",
-     "site_template/config/foot.yaml",
-     "site_template/config/head.yaml",
-     "site_template/config/users.yaml",
-     "site_template/design/0-reset.sass",
-     "site_template/design/1-text.sass",
-     "site_template/design/960.sass",
-     "site_template/design/body.haml",
-     "site_template/design/body.rb",
-     "site_template/design/button.haml",
-     "site_template/design/button.rb",
-     "site_template/design/foot.haml",
-     "site_template/design/foot.rb",
-     "site_template/design/foot.sass",
-     "site_template/design/head.haml",
-     "site_template/design/head.rb",
-     "site_template/design/head.sass",
-     "site_template/design/page.haml",
-     "site_template/design/page.sass",
-     "site_template/design/sprites.sass",
-     "site_template/design/xhtml.haml",
-     "site_template/pages/About.yaml",
-     "site_template/pages/Home.yaml",
-     "site_template/pages/News.yaml",
-     "site_template/pages/NotFound.yaml",
-     "site_template/pages/Products.yaml",
+     "site_template/data/global/foot.yaml",
+     "site_template/data/global/head.yaml",
+     "site_template/data/pages/About.yaml",
+     "site_template/data/pages/Home.yaml",
+     "site_template/data/pages/News.yaml",
+     "site_template/data/pages/NotFound.yaml",
+     "site_template/data/pages/Products.yaml",
+     "site_template/lib/components/body.rb",
+     "site_template/lib/components/button.rb",
+     "site_template/lib/components/foot.rb",
+     "site_template/lib/components/head.rb",
+     "site_template/lib/fields/checkbox_field.rb",
+     "site_template/lib/fields/component_array.rb",
+     "site_template/lib/fields/dropdown_field.rb",
+     "site_template/lib/fields/image_chooser.rb",
+     "site_template/lib/fields/markdown_field.rb",
+     "site_template/lib/fields/page_chooser.rb",
+     "site_template/lib/fields/sprite_chooser.rb",
+     "site_template/lib/fields/text_field.rb",
      "site_template/public/cache/About/index.html",
      "site_template/public/cache/Home/index.html",
      "site_template/public/cache/News/index.html",
      "site_template/public/cache/Products/index.html",
      "site_template/public/favicon.ico",
      "site_template/public/images/README.txt",
+     "site_template/public/js/edit.js",
+     "site_template/public/js/form_validate.js",
      "site_template/public/js/jquery-1.3.2.min.js",
      "site_template/public/js/jquery-ui-1.7.2.custom.min.js",
      "site_template/public/js/jquery.json-1.3.min.js",
+     "site_template/public/js/login.js",
      "site_template/public/robots.txt",
      "site_template/public/skin/images/ui-bg_diagonals-thick_18_b81900_40x40.png",
      "site_template/public/skin/images/ui-bg_diagonals-thick_20_666666_40x40.png",
@@ -98,7 +79,37 @@ Gem::Specification.new do |s|
      "site_template/public/skin/images/ui-icons_ffd27a_256x240.png",
      "site_template/public/skin/images/ui-icons_ffffff_256x240.png",
      "site_template/public/skin/jquery-ui-1.7.2.custom.css",
+     "site_template/public/style/960.css",
+     "site_template/public/style/edit.css",
+     "site_template/public/style/login.css",
+     "site_template/public/style/reset.css",
      "site_template/public/style/style.css",
+     "site_template/public/style/text.css",
+     "site_template/public/style/view.css",
+     "site_template/templates/960.sass",
+     "site_template/templates/components/body.haml",
+     "site_template/templates/components/button.haml",
+     "site_template/templates/components/foot.haml",
+     "site_template/templates/components/head.haml",
+     "site_template/templates/dependencies.haml",
+     "site_template/templates/edit.component.haml",
+     "site_template/templates/edit.haml",
+     "site_template/templates/edit.sass",
+     "site_template/templates/fields/checkbox_field.haml",
+     "site_template/templates/fields/component_array.haml",
+     "site_template/templates/fields/dropdown_field.haml",
+     "site_template/templates/fields/image_chooser.haml",
+     "site_template/templates/fields/markdown_field.haml",
+     "site_template/templates/fields/page_chooser.haml",
+     "site_template/templates/fields/sprite_chooser.haml",
+     "site_template/templates/fields/text_field.haml",
+     "site_template/templates/login.haml",
+     "site_template/templates/login.sass",
+     "site_template/templates/reset.sass",
+     "site_template/templates/text.sass",
+     "site_template/templates/view.haml",
+     "site_template/templates/view.page.haml",
+     "site_template/templates/view.sass",
      "site_template/tmp/restart.txt",
      "test/milk_test.rb",
      "test/test_helper.rb"
@@ -107,7 +118,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/creationix/milk}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.required_ruby_version = Gem::Requirement.new(">= 1.9")
+  s.required_ruby_version = Gem::Requirement.new(">= 1.8")
   s.rubyforge_project = %q{milk}
   s.rubygems_version = %q{1.3.1}
   s.summary = %q{Milk is a rack based content management system built for ease of use and simplicity. Milk tastes great with and without cookies.}

data/site_template/Rakefile

@@ -1,3 +1,8 @@
+# This allows for local gems to be used if they exist
+Dir.glob(File.absolute_path(File.dirname(__FILE__)) + "/vendor/*/lib").each do |path|
+  puts "Using local gem at #{path}"
+  $LOAD_PATH.unshift(path)
+end
 require 'rake'
 load 'milk/tasks.rb'
 

data/site_template/bootstrap.rb

@@ -0,0 +1,71 @@
+# This section is the milk configs for this local app
+module Milk
+
+  SITE_DIR = File.absolute_path(File.dirname(__FILE__)) 
+
+  # 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 determines what resources depend on what.  That way a page can specify only what it 
+  # needs and the rest will be pulled in automatically.
+  # Full paths mean to include a file, module name means that module is a dependency.
+  DEPENDENCY_TREE = {
+    :view => ["/favicon.ico", "/style/reset.css", "/style/text.css", "/style/960.css", "/style/view.css"],
+    :jquery => ["/js/jquery-1.3.2.min.js"], 
+    :jquery_ui => [:jquery, "/js/jquery-ui-1.7.2.custom.min.js", "/skin/jquery-ui-1.7.2.custom.css"],
+    :jquery_json => [:jquery, "/js/jquery.json-1.3.min.js"],
+    :form_validate => [:jquery, "/js/form_validate.js"],
+    :edit => [:view, :jquery_json, :jquery_ui, "/js/edit.js", "/style/edit.css"],
+    :login_form => [:view, :jquery_ui, "/js/login.js", "/style/login.css"]
+  }
+
+  # This sets the authorized users to the site.  When we implement an interface to change these
+  # settings through the web, then we will move these to a seperate file.  
+  # 
+  # 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
+  USERS = {
+    "admin@example.com" => { :name => "Sample Admin", :hash => "098f6bcd4621d373cade4e832627b4f6" }
+  }
+
+end
+
+# This allows for local gems to be used if they exist
+Dir.glob(Milk::SITE_DIR+"/vendor/*/lib").each do |path|
+  puts "Using local gem at #{path}"
+  $LOAD_PATH.unshift(path)
+end
+require 'milk'
+

data/site_template/config.ru

@@ -1,6 +1,5 @@
-require 'milk'
+require 'bootstrap'
 
-# use Lock
 if %w{rackup thin}.member?($0.rpartition('/').last)
   puts "Running in development mode"
   use ContentLength
@@ -10,7 +9,6 @@ if %w{rackup thin}.member?($0.rpartition('/').last)
     Milk::Application.new
   ])
 else
-  # When using passenger, require secure cookies and don't bother with static files
   run Milk::Application.new(true)
 end
 

data/site_template/{config → data/global}/head.yaml

@@ -1,18 +1,18 @@
 --- 
 buttons: 
-- !ruby/object:Button 
+- !ruby/object:Milk::Components::Button 
   href: /Home
   title: Home
   description: Description of home page
-- !ruby/object:Button 
+- !ruby/object:Milk::Components::Button 
   href: /News
   title: News
   description: Description of news page
-- !ruby/object:Button 
+- !ruby/object:Milk::Components::Button 
   href: /Products
   title: Products
   description: Description of products page
-- !ruby/object:Button 
+- !ruby/object:Milk::Components::Button 
   href: /About
   title: About Us
   description: Description of about page

data/site_template/{pages → data/pages}/About.yaml

@@ -1,13 +1,13 @@
 --- !ruby/object:Milk::Page 
 components: 
-- !ruby/object:Head {}
+- !ruby/object:Milk::Components::Head {}
 
-- !ruby/object:Body 
+- !ruby/object:Milk::Components::Body 
   markdown: |-
     # About Us
     
     Description of about page
-- !ruby/object:Foot {}
+- !ruby/object:Milk::Components::Foot {}
 
 title: About Us
 keywords: ""

data/site_template/{pages → data/pages}/Home.yaml

@@ -1,13 +1,14 @@
 --- !ruby/object:Milk::Page 
+#comment
 components: 
-- !ruby/object:Head {}
+- !ruby/object:Milk::Components::Head {}
 
-- !ruby/object:Body 
+- !ruby/object:Milk::Components::Body 
   markdown: |-
     # Home
     
     Description of home page
-- !ruby/object:Foot {}
+- !ruby/object:Milk::Components::Foot {}
 
 title: Home
 keywords: keywords, that, are, relevent, to, search, engines

data/site_template/{pages → data/pages}/News.yaml

@@ -1,13 +1,13 @@
 --- !ruby/object:Milk::Page 
 components: 
-- !ruby/object:Head {}
+- !ruby/object:Milk::Components::Head {}
 
-- !ruby/object:Body 
+- !ruby/object:Milk::Components::Body 
   markdown: |-
     # News
     
     Description of news page
-- !ruby/object:Foot {}
+- !ruby/object:Milk::Components::Foot {}
 
 title: News
 keywords: ""

data/site_template/{pages → data/pages}/NotFound.yaml

@@ -1,13 +1,13 @@
 --- !ruby/object:Milk::Page 
 components: 
-- !ruby/object:Head {}
+- !ruby/object:Milk::Components::Head {}
 
-- !ruby/object:Body 
+- !ruby/object:Milk::Components::Body 
   markdown: |-
     # 404 - Page not found
     
     The page you were looking for was not found
-- !ruby/object:Foot {}
+- !ruby/object:Milk::Components::Foot {}
 
 title: 404 - Page not found
 keywords: ""

data/site_template/{pages → data/pages}/Products.yaml

@@ -1,13 +1,13 @@
 --- !ruby/object:Milk::Page 
 components: 
-- !ruby/object:Head {}
+- !ruby/object:Milk::Components::Head {}
 
-- !ruby/object:Body 
+- !ruby/object:Milk::Components::Body 
   markdown: |-
     # Products
     
     Description of products page
-- !ruby/object:Foot {}
+- !ruby/object:Milk::Components::Foot {}
 
 title: Products
 keywords: ""

data/site_template/lib/components/body.rb

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

data/site_template/lib/components/button.rb

@@ -0,0 +1,19 @@
+module Milk::Components
+  class Button < Milk::Component
+    local_properties :href, :icon, :title, :description
+
+    page_chooser :href, "Link target"
+    text_field :title, "Label text"
+    text_field :description, "Tooltip"
+
+    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
+    
+  end
+end

data/site_template/lib/components/foot.rb

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

data/site_template/lib/components/head.rb

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

data/site_template/lib/fields/checkbox_field.rb

@@ -0,0 +1,4 @@
+module Milk::Fields
+  class CheckboxField < Milk::Field
+  end
+end

data/site_template/lib/fields/dropdown_field.rb

@@ -0,0 +1,4 @@
+module Milk::Fields
+  class DropdownField < Milk::Field
+  end
+end