creationix-milk 0.0.9 → 0.1.0

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.homepage = "http://github.com/creationix/milk"
     gem.authors = ["Tim Caswell"]
     gem.rubyforge_project = "milk"
-    gem.required_ruby_version = '>=1.9'
+    gem.required_ruby_version = '>=1.8'
     gem.add_dependency('rack', '>= 1.0.0')
     gem.add_dependency('maruku', '>= 0.6.0')
     gem.add_dependency('haml', '>= 2.0.9')

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.1.0

data/lib/milk/application.rb

@@ -47,6 +47,8 @@ module Milk
         when @req.post?
           if path == '/login'
             :login
+          elsif path == '/formmail'
+            :formmail
           elsif path =~ PAGE_PATH_REGEX
             regex = PAGE_PATH_REGEX
             :preview
@@ -79,7 +81,7 @@ module Milk
       return action, page_name, page
     end
     
-    def obfuscate(value)
+    def encode(value)
       require 'base64'
       len = Milk::SECRET.length
       result = (0...value.length).collect { |i| value[i].ord ^ Milk::SECRET[i%len].ord }
@@ -113,12 +115,12 @@ module Milk
     def login()
       email = @req.params['email']
       if email.length > 0
-        user = users[email]
+        user = USERS[email]
         if user
-          expected = user["hash"]
+          expected = user[:hash]
           actual = hash(email, @req.params['password'])
           if actual == expected
-            @resp.set_cookie('auth', :path => "/", :value => obfuscate(email), :secure=>@require_ssl, :httponly=>true)
+            @resp.set_cookie('auth', :path => "/", :value => encode(email), :secure=>@require_ssl, :httponly=>true)
           else
             flash "Incorrect password for user #{email}"
           end
@@ -131,20 +133,36 @@ module Milk
       @resp.redirect(@req.params['dest'])
     end
     
-    def users
-      users_file = Milk::CONFIG_DIR+"/users.yaml"
-      YAML.load(open(users_file).read)
-    end
-    
     def load_user
       @user = nil
       if current = @req.cookies['auth']
         email = decode(current)
-        @user = users[email]
+        @user = USERS[email]
         @resp.delete_cookie('auth', :path => "/") unless @user
       end
     end
     
+    def render_dependencies(deps=[])
+      deps << @action
+      list = []
+      deps.each do |target|
+        load_deps(list, target)
+      end
+      list.uniq!
+      haml("dependencies", :list => list)
+    end
+    
+    def load_deps(list, target)
+      DEPENDENCY_TREE[target].each do |more|
+        if more.class == Symbol
+          load_deps(list, more)
+        else
+          list << more
+        end
+      end
+    end
+    
+    
     # Rack call interface
     def call(env)
       @req = Rack::Request.new(env)
@@ -152,7 +170,7 @@ module Milk
       load_user
       
       # Route the request
-      action, page_name, @page = route
+      @action, page_name, @page = route
       
       # Send proper mime types for browsers that claim to accept it
       @resp["Content-Type"] = 
@@ -163,7 +181,7 @@ module Milk
         "text/html"
       end
 
-      case action
+      case @action
         when :not_found
           @resp.status = 404
           page = Milk::Page.find('NotFound')
@@ -183,23 +201,26 @@ module Milk
           @resp.write @page.edit
         when :save
           Milk::Application.join_tree(@page, self)
-          @resp.write @page.save
+          yaml = @page.save
+          @page.save_to_cache if Milk::USE_CACHE
+          @resp.write yaml
         when :preview
           Milk::Application.join_tree(@page, self)
           @resp.write @page.preview
         when :login_form
-          filename = FIELDS_DIR + "/login.haml"
-          @resp.write(::Haml::Engine.new(File.read(filename), :filename => filename).render(self))
+          @resp.write(haml("login"))
         when :login
           login
         when :logout
           logout
+        when :formmail
+          formmail
         when :access_denied
           @resp.staus = 403
           @resp.write "Access Denied"
         else
           @resp.status = 500
-          @resp.write action.to_s
+          @resp.write @action.to_s
       end
       @resp.finish
     end    

data/lib/milk/component.rb

@@ -1,3 +1,4 @@
+
 module Milk
   class Component
   
@@ -6,7 +7,6 @@ module Milk
     attr_accessor :parent
     @parent = nil
 
-    
     # Don't store global properties or backreferences to the parent
     def to_yaml_properties
       (if respond_to? :global_properties
@@ -30,6 +30,12 @@ module Milk
     
     def self.local_properties(*props)
     end
+    
+    def self.requires(*resources)
+      class_def :requirements do
+        resources
+      end
+    end
 
     def self.global_properties(*props)
       globals = props.collect{|name|"@#{name}".to_sym}
@@ -39,7 +45,7 @@ module Milk
     end
     
     def name
-      self.class.to_s
+      self.class.to_s.rpartition('::').last
     end
 
     # All Components start out with default of no fields    
@@ -76,14 +82,14 @@ module Milk
     end
     
     def self.method_missing(method, *args)
-      raise "Missing '#{method}' method" unless File.file? FIELDS_DIR+"/#{method}.rb"
+      raise "Missing '#{method}' method" unless File.file? LIB_DIR+"/fields/#{method}.rb"
       klass = eval("Fields::" + method.to_s.gsub(/(^|_)(.)/) { $2.upcase })
       add_field(klass, *args)
     end
     
     def save_settings
       return unless respond_to? :global_properties
-      yaml_file = Milk::CONFIG_DIR + "/#{system_name}.yaml"
+      yaml_file = Milk::DATA_DIR + "/global/#{system_name}.yaml"
       data = {}
       global_properties.each do |name|
         data[name.to_s.sub('@','')] = instance_variable_get(name)
@@ -95,11 +101,11 @@ module Milk
     end
     
     def system_name
-      self.class.to_s.gsub(/([a-z])([A-Z])/) { "#{$1}_#{$2}" }.downcase
+      self.class.to_s.class_to_require.rpartition('/').last
     end
     
     def load_settings
-      yaml_file = Milk::CONFIG_DIR + "/#{system_name}.yaml"
+      yaml_file = Milk::DATA_DIR + "/global/#{system_name}.yaml"
       if File.file? yaml_file
         YAML.load_file(yaml_file).each_pair do |key, value|
           instance_variable_set("@#{key}".to_sym, value)
@@ -107,36 +113,25 @@ module Milk
       end
     end
     
-    def haml(filename, context=self, extras={})
-      if block_given?
-        Page.haml(filename, context, extras) { yield }
-      else
-        Page.haml(filename, context, extras)
-      end
-    end
-
-    def partial(filename, vars, extras={})
-      obj = self.dup
-      vars.each do |key, value|
-        obj.instance_variable_set("@#{key}", value)
-      end
-      haml(filename, obj, extras)
-    end
-
 
     def edit(prefix)
       @prefix = prefix
-      haml_file = FIELDS_DIR + "/component.haml"
-      ::Haml::Engine.new(File.read(haml_file), :filename => haml_file).render(self)
+      haml("edit.component")
     end
     
     def view
-      haml_file = Milk::COMPONENTS_DIR + "/" + system_name + ".haml"
-      raise "Missing template \"" + haml_file + "\"" unless File.file? haml_file
-      ::Haml::Engine.new(File.read(haml_file), :filename => haml_file).render(self)
+      haml("components/#{system_name}")
     end
     
+    
   end
-end
 
+  module Components
+    base = Milk::LIB_DIR + "/components/"
+    Dir.glob("#{base}*.rb").each do |path|
+      autoload path.sub(base, '').path_to_class.to_sym, path
+    end
+  end
+
+end
 

data/lib/milk/field.rb

@@ -33,28 +33,17 @@ module Milk
       @prefix = prefix
       
       name = self.class.to_s.rpartition('::').last.gsub(/([a-z])([A-Z])/) { "#{$1}_#{$2}" }.downcase
-      haml_file = "#{FIELDS_DIR}/#{name}.haml"
-      if File.file?(haml_file)
-        ::Haml::Engine.new(File.read(haml_file), :filename => haml_file).render(self)
-      else
-        "#{self.class} Not Implemented"
-      end
+      haml("fields/#{name}")
     end
-    
-  end
+
   
-  # This module is a namespace for all the subclasses of Milk::Field
-  # Is sets up autoloading for the fields classes
-  module Fields
+  end
 
-    Dir.glob(Milk::FIELDS_DIR + "/*.rb").each do |c|
-      name = c.split('/').last.gsub(/(.*)\.rb/) { $1 }
-      class_name = name.gsub(/\/(.?)/) { "::" + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
-      path = c.gsub(/(.*)\.rb/) { $1 }
-      autoload class_name.to_sym, path
+  module Fields
+    base = Milk::LIB_DIR + "/fields/"
+    Dir.glob("#{base}*.rb").each do |path|
+      autoload path.sub(base, '').path_to_class.to_sym, path
     end
-  
   end
-  
 end
 

data/lib/milk/page.rb

@@ -8,10 +8,10 @@ module Milk
     attr_accessor :parent
     @parent = nil
     
-    PATH_TO_NAME_REGEXP = Regexp.new("#{Milk::PAGES_DIR}\/(.*)\.yaml")
+    PATH_TO_NAME_REGEXP = Regexp.new("#{Milk::DATA_DIR}\/pages\/(.*)\.yaml")
   
     def self.each_page
-      Dir.glob(Milk::PAGES_DIR + "/**/*.yaml").each do |yaml_file|
+      Dir.glob(Milk::DATA_DIR + "/pages/**/*.yaml").each do |yaml_file|
         p = load_file(yaml_file)
         Milk::Application.join_tree(p, nil)
         yield p
@@ -27,29 +27,11 @@ module Milk
     end
     
     def self.find(pagename)
-      yaml_file = Milk::PAGES_DIR + "/" + pagename + ".yaml"
+      yaml_file = Milk::DATA_DIR + "/pages/" + pagename + ".yaml"
       raise PageNotFoundError unless File.readable? yaml_file
       load_file(yaml_file, pagename)
     end
 
-    def self.haml(filename, context, extras)
-      if block_given?
-        ::Haml::Engine.new(File.read(filename), :filename => filename).render(context, extras) do
-          yield
-        end
-      else
-        ::Haml::Engine.new(File.read(filename), :filename => filename).render(context, extras)
-      end
-    end
-    
-    def haml(filename, context=self, extras={})
-      if block_given?
-        Page.haml(filename, context, extras) { yield }
-      else
-        Page.haml(filename, context, extras)
-      end
-    end
-    
     def to_yaml_properties
       [:@components, :@title, :@keywords, :@description]
     end
@@ -60,7 +42,7 @@ module Milk
     
     def save
       save_settings
-      yaml_file = Milk::PAGES_DIR + "/" + @pagename + ".yaml"
+      yaml_file = Milk::DATA_DIR + "/pages/" + @pagename + ".yaml"
       data = YAML.dump(self)
       File.open(yaml_file, "w") do |file|
         file.write(data)
@@ -81,6 +63,18 @@ module Milk
       obj
     end
     
+    def render_dependencies
+      deps = []
+      @components.each do |component|
+        if component.respond_to? :requirements
+          component.requirements.each do |dep|
+            deps << dep
+          end
+        end
+      end
+      app.render_dependencies deps
+    end
+    
     def load_settings
       @components.each do |component|
         component.load_settings
@@ -94,11 +88,11 @@ module Milk
     end
 
     def edit
-      haml(FIELDS_DIR + "/xhtml.haml", self)
+      haml("edit")
     end
     
     def preview
-      haml(Milk::COMPONENTS_DIR + "/page.haml", self) do 
+      haml("view.page") do 
         (@components.collect do |component|
           component.view
         end).join("")
@@ -106,7 +100,7 @@ module Milk
     end
     
     def view
-      haml(Milk::COMPONENTS_DIR + "/xhtml.haml", self) do 
+      haml("view") do 
         preview
       end
     end

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/lib/milk.rb

@@ -7,69 +7,68 @@ autoload 'FileUtils', 'fileutils'
 
 # Set up our main namespace with autoloaded parts
 module Milk
-  VERSION = '0.0.5'
 
-  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 
-  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 if File.file?(config_file)
-  
-  # Set defaults otherwise
-  COMPONENTS_DIR ||= MILK_ROOT + "/design"
-  PAGES_DIR ||= MILK_ROOT + "/pages"
-  PUBLIC_DIR ||= MILK_ROOT + "/public"
-  FIELDS_DIR ||= LIB_DIR + "/milk/fields"
+
+  # Setup some nice constants
+  MILK_DIR = File.dirname(__FILE__)
+  SITE_DIR ||= get_milk_root 
+  VERSION = open(MILK_DIR+"/../VERSION").read
+
+  # All these can be overidden by the bootstrap.rb file
+  DATA_DIR ||= SITE_DIR + "/data"
+  LIB_DIR ||= SITE_DIR + "/lib"
+  TEMPLATE_DIR ||= SITE_DIR + "/templates"
+  PUBLIC_DIR ||= SITE_DIR + "/public"
   
+  $LOAD_PATH.unshift(MILK_DIR) unless $LOAD_PATH.include?(MILK_DIR)
   $LOAD_PATH.unshift(LIB_DIR) unless $LOAD_PATH.include?(LIB_DIR)
   autoload :Application, "milk/application"
   autoload :Component, "milk/component"
+  autoload :Components, "milk/component"
   autoload :Page, "milk/page"
-  autoload :Haxe, "milk/haxe"
   autoload :Field, "milk/field"
   autoload :Fields, "milk/field"
-  
-end
 
-# Autoload the components of the user space app into the root namespace for easy use
-Dir.glob(Milk::COMPONENTS_DIR + "/*.rb").each do |c|
-  name = c.split('/').last.gsub(/(.*)\.rb/) { $1 }
-  class_name = name.gsub(/\/(.?)/) { "::" + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
-  path = c.gsub(/(.*)\.rb/) { $1 }
-  autoload class_name.to_sym, path
 end
 
 # Include metaid for easy metaclass management
 class Object
- # The hidden singleton lurks behind everyone
- def metaclass; class << self; self; end; end
- def meta_eval &blk; metaclass.instance_eval &blk; end
+  # The hidden singleton lurks behind everyone
+  def metaclass; class << self; self; end; end
+  def meta_eval &blk; metaclass.instance_eval &blk; end
 
- # Adds methods to a metaclass
- def meta_def name, &blk
-   meta_eval { define_method name, &blk }
- end
+  # Adds methods to a metaclass
+  def meta_def name, &blk
+    meta_eval { define_method name, &blk }
+  end
+
+  # Defines an instance method within a class
+  def class_def name, &blk
+    class_eval { define_method name, &blk }
+  end
+
+  # Better integration of haml with our objects
+  def haml(path, extras={})
+    filename = "#{Milk::TEMPLATE_DIR}/#{path}.haml"
+    if block_given?
+      ::Haml::Engine.new(File.read(filename), :filename => filename).render(self, extras) do
+        yield
+      end
+    else
+      ::Haml::Engine.new(File.read(filename), :filename => filename).render(self, extras)
+    end
+  end
 
- # Defines an instance method within a class
- def class_def name, &blk
-   class_eval { define_method name, &blk }
- end
 end
 
-# Add ability to get constants from a string name.
-# WARNING: this is akin to eval for security concerns.
 class String
+  # Add ability to get constants from a string name.
+  # WARNING: this is akin to eval for security concerns.
   def constantize
     const = Object
     self.split("::").each do |part|
@@ -77,6 +76,31 @@ class String
     end
     const
   end
+  
+  # Useful for converting between filepaths, require paths, and class names
+  def path_to_require
+    name = self.rpartition('.').first
+    $LOAD_PATH.each do |lib|
+      name.sub!(lib+"/", '')
+    end
+    name
+  end
+  def require_to_path
+    Milk::LIB_DIR + "/" + self + ".rb"
+  end
+  def require_to_class
+    self.gsub(/\/(.?)/) { "::" + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
+  end
+  def class_to_require
+    self.gsub(/([a-z])([A-Z])/) { "#{$1}_#{$2}" }.downcase.gsub('::', '/')
+  end
+  def path_to_class
+    self.path_to_require.require_to_class
+  end
+  def class_to_path
+    self.class_to_require.require_to_path
+  end
+
 end