milk 0.0.1 → 0.0.2

data/Rakefile

@@ -5,7 +5,7 @@ spec = Gem::Specification.new do |s|
   s.summary    = "Milk is a rack based content management system built for ease of use and simplicity. Milk tastes great with and without cookies."
   s.description= File.read(File.join(File.dirname(__FILE__), 'README'))
   s.requirements << 'none'
-  s.version     = "0.0.1"
+  s.version     = "0.0.2"
   s.author      = "Tim Caswell"
   s.email       = "tim@creationix.com"
   s.homepage    = "http://milk.rubyforge.org"

data/lib/milk.rb

@@ -20,6 +20,7 @@ module Milk
   COMPONENTS_DIR = MILK_ROOT + "/design"
   PAGES_DIR = MILK_ROOT + "/pages"
   PUBLIC_DIR = MILK_ROOT + "/public"
+  FIELDS_DIR = LIB_DIR + "/milk/fields"
 
   $LOAD_PATH.unshift(LIB_DIR) unless $LOAD_PATH.include?(LIB_DIR)
   autoload :Application, "milk/application"
@@ -55,4 +56,16 @@ class Object
  end
 end
 
+# Add ability to get constants from a string name.
+# WARNING: this is akin to eval for security concerns.
+class String
+  def constantize
+    const = Object
+    self.split("::").each do |part|
+      const = const.const_get(part)
+    end
+    const
+  end
+end
+
 

data/lib/milk/application.rb

@@ -35,6 +35,11 @@ module Milk
             regex = PAGE_PATH_REGEX
             :delete
           end
+        when req.post?
+          if path =~ PAGE_PATH_REGEX
+            regex = PAGE_PATH_REGEX
+            :preview
+          end
         when req.put?
           if path =~ PAGE_PATH_REGEX
             regex = PAGE_PATH_REGEX
@@ -60,6 +65,10 @@ module Milk
         end
       end
       
+      if (action == :preview || action == :save)
+        page = Milk::Page.json_unserialize(YAML.load(req.body.read))
+      end
+      
       return action, page_name, page
     end
   
@@ -76,6 +85,7 @@ module Milk
       else
         html_type = "text/html"
       end
+      html_type = "text/html"
 
       case action
         when :haxe
@@ -86,6 +96,10 @@ module Milk
           [200, {"Content-Type"=>html_type}, [page.view]]
         when :edit
           [200, {"Content-Type"=>html_type}, [page.edit]]
+        when :save
+          [200, {"Content-Type"=>html_type}, [page.save(page_name)]]
+        when :preview
+          [200, {"Content-Type"=>html_type}, [page.preview]]
         else
           [500, {"Content-Type"=>html_type}, [action.to_s]]
       end

data/lib/milk/component.rb

@@ -1,72 +1,99 @@
 module Milk
   class Component
-    @@props = []
-    @@fields = []
+  
+    @@local_flag = {}
     
-    def self.local_properties(*props)
-        @@props += props
-      # Dynamically set the yaml dumper to only store local properties
-      meta_def :to_yaml_properties do
-        props
+    def to_yaml_properties
+      if respond_to? :global_properties
+        instance_variables.select { |name| !global_properties.member? name }
+      else
+        instance_variables
       end
     end
+    
+    def self.local_properties(*props)
+    end
 
     def self.global_properties(*props)
-        @@props += props
-      # TODO: put hook in save
+      globals = props.collect{|name|"@#{name}".to_sym}
+      class_def :global_properties do
+        globals
+      end
     end
     
-    def self.component_array(field, label, com_class)
-      # TODO: create hooks to add field
-    end
-    def self.image_chooser(field, label, alt_field)
-      # TODO: create hooks to add field
+    def name
+      self.class.to_s
     end
-    def self.markdown_field(field, label)
-      # TODO: create hooks to add field
+
+    # All Components start out with default of no fields    
+    def self.fields
+      []
     end
-    def self.page_chooser(field, label)
-      # TODO: create hooks to add field
+    
+    # Assume no defaults
+    def self.defaults
+      {}
     end
-    def self.sprite_chooser(field, label, main_class, sub_classes)
-      # TODO: create hooks to add field
+
+    # Metaclass black magic to simulate appending items to a list
+    # This works by getting the old result of the fields class method
+    # and stores it in a closure, and then redefines the method, but with
+    # a new item appended.
+    def self.add_field(klass, field, label, options={})
+    
+      # Merge in assumes options
+      options[:field] = field
+      options[:label] = label
+      
+      # Fill in blanks with defaults
+      defaults.each do |k, v|
+        options[k] ||= v
+      end
+      
+      field = klass.new(options)
+      
+      newfields = self.fields + [field]
+      meta_def("fields") do
+        newfields
+      end
     end
-    def self.text_field(field, label)
-      # TODO: create hooks to add field
+    
+    def self.method_missing(method, *args)
+      raise "Missing '#{method}' method" unless File.file? FIELDS_DIR+"/#{method}.rb"
+      klass = eval("Fields::" + method.to_s.gsub(/(^|_)(.)/) { $2.upcase })
+      add_field(klass, *args)
     end
     
-    def initilize(*props)
-      props.each_pair do |key, value|
-        raise "Undefined property \"" + key.to_s + "\"" unless @@props.member? key
-        self.instance_variable_set(key, value)
-      end
+    def save_settings
     end
     
     def load_settings
-      name = self.class.to_s.gsub(/([a-z])([A-Z])/) { "#{$1}_#{$2}" }.downcase
-      yml_file = Milk::PAGES_DIR + "/global/" + name + ".yml"
+      # Only load once
+      return unless @system_name.nil?
+      
+      @system_name = self.class.to_s.gsub(/([a-z])([A-Z])/) { "#{$1}_#{$2}" }.downcase
+      yml_file = Milk::PAGES_DIR + "/global/" + @system_name + ".yml"
       if File.file? yml_file
-        YAML.load_file(yml_file)
-      else
-        {}
+        YAML.load_file(yml_file).each_pair do |key, value|
+          self.instance_eval("@#{key} ||= value")
+        end
       end
     end
     
-    def edit
-      self.inspect
+    def edit(prefix)
+      @prefix = prefix
+      haml_file = FIELDS_DIR + "/component.haml"
+      ::Haml::Engine.new(File.read(haml_file), :filename => haml_file).render(self)
     end
     
     def view
-      globals = load_settings
-      globals.each_pair do |key, value|
-          self.instance_variable_set(('@' + key).to_sym, value)
-      end unless globals.nil?
-      name = self.class.to_s.gsub(/([a-z])([A-Z])/) { "#{$1}_#{$2}" }.downcase
-      haml_file = Milk::COMPONENTS_DIR + "/" + name + ".haml"
+      load_settings
+      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)
     end
     
+    
   end
 end
 

data/lib/milk/field.rb

@@ -1,10 +1,53 @@
 module Milk
+  
+  # A field is a data type for part of a component.  This way components can be
+  # quickly built without coding any logic.  The fields take care of the heavy
+  # work.
   class Field
+    
+    attr_reader :field
+    
+    # Store the field configurations
+    def initialize(props)
+      props.each do |key, value|
+        self.instance_variable_set('@' + key.to_s, value)
+      end
+    end
+    
+    # This is the name shown to the user for the field.
+    def name
+      @label || self.class.to_s.rpartition('::').last
+    end
+
+    def form_field
+      @prefix
+    end
+    
+    def value
+      @component.instance_variable_get('@' + @field.to_s)
+    end
+    
+    # This is called to render the html for a field's form
+    def render(component, prefix)
+      @component = component
+      @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
+    end
+    
   end
   
+  # This module is a namespace for all the subclasses of Milk::Field
+  # Is sets up autoloading for the fields classes
   module Fields
-    # Autoload the fields of the user space app into the root namespace for easy use
-    Dir.glob(Milk::LIB_DIR + "/milk/fields/*.rb").each do |c|
+
+    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 }
@@ -12,5 +55,6 @@ module Milk
     end
   
   end
+  
 end
 

data/lib/milk/fields/component.haml

@@ -0,0 +1,8 @@
+%h3
+  %a{:href => "#"}&= name
+%div
+  %input{:type=>"hidden", :name=>"#{@prefix}:class", :value=>self.class.to_s}
+  -self.class.fields.each do |field|
+    .field
+      %h4= field.name
+      .field-content= field.render(self, "#{@prefix}:#{field.field}")

data/lib/milk/fields/component_array.haml

@@ -0,0 +1,3 @@
+.sub-fields
+  - value.each_with_index do |item, i|
+    = item.edit("#{@prefix}:#{i}")

data/lib/milk/fields/component_view.haml

@@ -0,0 +1,2 @@
+%div{:class=>"component com_#{index}"}
+  = yield

data/lib/milk/fields/image_chooser.haml

@@ -0,0 +1,7 @@
+%select{:name=>form_field}
+  - images.each do |img|
+    %option{:value=>img[:url], :selected=>value==img[:url], :title=>"#{img[:size]} bytes"}&= img[:filename]
+%br
+Alt:
+%input{:name=>alt_form_field, :value=>alt_value}
+

data/lib/milk/fields/image_chooser.rb

@@ -1,4 +1,26 @@
 module Milk::Fields
   class ImageChooser < Milk::Field
+    @@images = []
+    IMAGE_DIR = Milk::PUBLIC_DIR + "/images"
+    Dir.glob(IMAGE_DIR + "/*").each do |img|
+      @@images << {
+        size: File.size(img),
+        url: img.sub(Milk::PUBLIC_DIR, ''),
+        filename: img.rpartition('/').last
+      }
+    end
+    
+    def images
+      @@images
+    end
+    
+    def alt_form_field
+      @prefix.rpartition(':').first + ":#{@alt_field}"
+    end
+    
+    def alt_value
+      @component.instance_variable_get('@' + @alt_field.to_s)
+    end
+
   end
 end

data/lib/milk/fields/markdown_field.haml

@@ -0,0 +1 @@
+%textarea.markdown{:class=>"ui-widget ui-corner-all", :name => form_field}&= value

data/lib/milk/fields/page_chooser.haml

@@ -0,0 +1,3 @@
+%select{:name=>form_field}
+  - pages.each do |page|
+    %option{:value=>page[:url], :selected=>value==page[:url], :title=>page[:file]}&= page[:name]

data/lib/milk/fields/page_chooser.rb

@@ -1,4 +1,17 @@
 module Milk::Fields
   class PageChooser < Milk::Field
+    @@pages = []
+    Dir.glob(Milk::PAGES_DIR + "/*.yml").each do |page|
+      pagename = File.basename(page, '.yml').rpartition('/').last.gsub('.','/')
+      @@pages << {
+        file: page,
+        name: pagename,
+        url: "/"+pagename
+      }
+    end
+    
+    def pages
+      @@pages
+    end
   end
 end

data/lib/milk/fields/sprite_chooser.haml

@@ -0,0 +1,6 @@
+.sprite-select
+  %input{:type=>"hidden", :name=>form_field, :value=>value}
+  - @sprites.each do |sprite|
+    %div{:class => "ui-state-default ui-corner-all sprite-option" + ((value == sprite[:name]) ? " ui-state-highlight" : "")}
+      %span{:class => sprite[:css_class], :title => sprite[:name]} 
+  %br.clear

data/lib/milk/fields/sprite_chooser.rb

@@ -1,4 +1,19 @@
 module Milk::Fields
   class SpriteChooser < Milk::Field
+    
+    def initialize(*args)
+      super(*args)
+      @sprites = []
+      open(Milk::COMPONENTS_DIR+"/sprites.sass") do |sass|
+        sass.each do |line|
+          if match = @icon_classes.match(line)
+            @sprites << {
+              css_class: @main_class + " " + match[1],
+              name: match[2]
+            }
+          end
+        end
+      end
+    end
   end
 end

data/lib/milk/fields/text_field.haml

@@ -0,0 +1 @@
+%input{:class=>"ui-widget ui-widget-content ui-corner-all", :type =>"text", :name=>form_field, :value=>value}

data/lib/milk/fields/xhtml.haml

@@ -2,9 +2,260 @@
 !!! 1.1
 %html{:xmlns =>"http://www.w3.org/1999/xhtml"}
   %head
+    %title&= "Editing \"#{@pagename}\""
+    %style{:type=>"text/css"}
+      :sass
+        body, html
+          :border 0
+          :margin 0
+          :padding 0
+        body.busy
+          :cursor busy
+        div.component
+          border: 2px solid transparent
+          &:hover
+            border-color: #08f
+        #framework-logo
+          :position absolute
+          :bottom 0
+          :right 20px
+          :opacity 0.3
+          :background transparent url(http://static.creationix.com/milk-logo.png)
+          :width 139px
+          :height 69px
+        #admin-title
+          :position absolute
+          :margin 0
+          :top 5px
+          :left 10px
+          :line-height 1em
+          :font-size 20px
+          :font-family monaco,monospace
+          
+        #toolbar
+          :position absolute
+          :left 0
+          :bottom 0
+          :right 0
+          :padding 3px
+          .toolitem
+            :cursor pointer
+            :line-height 1em
+            :padding 2px 5px 2px 2px
+            .ui-icon
+              :float left
+              :line-height 1em
+        #frame
+          :position absolute
+          :top 0px
+          :left 0px
+          :right 0px
+          :bottom 0px
+        #left
+          :position absolute
+          :top 0px
+          :left 0px
+          :width 400px
+          :bottom 0px
+        #divider
+          :position absolute
+          :top 0px
+          :left 400px
+          :width 5px
+          :bottom 0px
+          :background-color #555
+        
+        #fields
+          :position absolute
+          :top 0px
+          :bottom 35px
+          :overflow auto
+          :left 0px
+          :right 0
+          .ui-accordion-content
+            :padding 10px
+            h4
+              :margin 0
+            .field-content
+              :margin-bottom 10px
+              input
+                :width 95%
+                :padding 2px
+              textarea
+                :width 100%
+                :min-height 380px
+              .sprite-select
+                .sprite-option
+                  :padding 5px
+                  :margin 2px
+                  :float left
+                  :cursor pointer
+          
+        #preview
+          :position absolute
+          :top 0px
+          :left 405px
+          :right 0
+          :width auto
+          :bottom 0px
+          :overflow auto
+          
+          
     %link{ :rel => "shortcut icon", :href => "/favicon.ico", :type => "image/x-icon"}/
     %link{ :href => "http://static.creationix.com/skins/ui-lightness/jquery-ui-1.7.1.custom.css", :media => "screen", :rel => "stylesheet", :type => "text/css" }/
-    %title&= "Edit #{@pagename}"
+    %link{ :href => "/style/style.css", :media => "screen", :rel => "stylesheet", :type => "text/css" }/
     %script{:src=>"http://static.creationix.com/scripts/jquery-1.3.2.min.js", :type=>"text/javascript"}
+    %script{:src=>"http://static.creationix.com/scripts/jquery.json-1.3.min.js", :type=>"text/javascript"}
     %script{:src=>"http://static.creationix.com/scripts/jquery-ui-1.7.1.custom.min.js", :type=>"text/javascript"}
-  %body= yield
+  %body
+    #frame
+      #left
+        %form#fields{:method => "post", :action => "/"+@pagename}
+          %h3
+            %a{:href => "#"} Page Settings
+          %div
+            %input{:type=>"hidden", :name=>"class", :value=>self.class.to_s}
+            -to_yaml_properties.each do |name|
+              - next if name == :@components
+              - fieldname = name.to_s.sub('@','')
+              .field
+                %h4= fieldname.capitalize + ":"
+                .field-content
+                  %input{:type=>"text", :name=>fieldname, :value=>instance_variable_get(name)}
+          -@components.each_with_index do |component, i|
+            = component.edit("components:#{i}")
+        #toolbar{:class=>'ui-widget ui-widget-header'}
+          %button#save_button.toolitem{:title=>'Save changes and go to live page.'}
+            %span{:class=>'ui-icon ui-icon-disk'}
+            Save
+          %button#cancel_button.toolitem{:title=>'Cancel changes and go to live page.'}
+            %span{:class=>'ui-icon ui-icon-cancel'}
+            Cancel
+      #preview{:class => "ui-widget ui-helper-reset ui-widget-content"}
+        = preview
+      #divider
+      #framework-logo
+      
+    :javascript
+      function on_click_sprite(e)
+      {
+        // Look up some useful variables
+        var current = e.currentTarget;
+        var sprite_select = $(current.parentNode);
+        var peers = $(".sprite-option", sprite_select);
+        var hidden_input = $('input', sprite_select)[0];
+        var inner_span = $('span', current)[0];
+
+        // Set the value on the hidden input
+        hidden_input.value = inner_span.title;
+
+        // Move the highlight        
+        peers.removeClass('ui-state-highlight');
+        $(current).addClass('ui-state-highlight');
+        update_preview(50);
+      }
+      
+      function jsonify(form)
+      {
+        var data = {}
+        $("input, textarea, select", form).each(function (i, field){
+          var parts = field.name.split(':');
+          var root = data;
+          var part = parts[0];
+          var numeric_regexp = /[0-9]+/;
+          for(i=0;i<parts.length-1;i++)
+          {
+            if (!root[part])
+            {
+              if (numeric_regexp.test(part))
+                root[part]={};
+              else
+                root[part]=[];
+            }
+            root = root[part];
+            part = parts[i + 1];
+          }
+          root[part] = field.value;
+        });
+        return $.toJSON(data);
+      }
+      
+      function do_update_preview()
+      {
+        var preview = $("#preview");
+        $("body").addClass("busy")
+        $.ajax({
+          type: "POST",
+          url: $("form")[0].action,
+          contentType: "application/json",
+          data: jsonify($("form")[0]),
+          success: function(msg){
+            preview.html(msg);
+            $("body").removeClass("busy")
+          }
+        });
+      }
+      
+      function update_preview(timeout)
+      {
+        clearTimeout(window.preview_timeout);
+        window.preview_timeout = setTimeout(do_update_preview, timeout);
+      }
+      
+      
+      $(function() {
+        $("#left").resizable({handles: "e", resize: function(event, ui) {
+          $("#divider").css("left", ui.size.width);
+          $("#preview").css("left", ui.size.width+5);
+        }});
+        $(".sub-fields").accordion({
+          collapsible: true,
+          autoHeight: false,
+          active: false
+        });
+        var sections = $("#fields").accordion({
+          autoHeight: false
+        });
+        
+        $(".sprite-option").click(on_click_sprite);
+       $(".toolitem, .sprite-option")
+        .addClass("ui-state-default ui-corner-all")
+        .hover(
+          function() { $(this).addClass('ui-state-hover'); },
+          function() { $(this).removeClass('ui-state-hover'); }
+        );
+        $("#fields select, #fields input, #fields textarea").change(function(){
+          update_preview(100);
+        });
+        $("#fields select, #fields input, #fields textarea").keyup(function(){
+          update_preview(1000);
+        });
+        $("#save_button").click(function(){
+          $.ajax({
+            type: "PUT",
+            url: $("form")[0].action,
+            contentType: "application/json",
+            data: jsonify($("form")[0]),
+            success: function(msg){
+              window.location = $("form")[0].action;
+            }
+          });
+        });
+        
+        $("#cancel_button").click(function(){
+          window.location = $("form")[0].action;
+        });
+        
+        $(".component").click(function(evt){
+          evt.stopPropagation();
+          evt.preventDefault();
+          var index = this.className.split("_")[1];
+          console.log(index);
+          console.log(sections);
+          sections.accordion('activate', parseInt(index)+1);
+        });
+
+
+      });
+
+