milk 0.0.6 → 0.0.7

data/Rakefile

@@ -3,6 +3,10 @@ task :gem do
   exec "gem build milk.gemspec"
 end
 
+desc "Delete gems"
+task :clean do
+  exec "rm *.gem"
+end
 
 desc "Run Sample site to test framework"
 task :sample_test do

data/lib/milk.rb

@@ -39,6 +39,7 @@ module Milk
   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

data/lib/milk/application.rb

@@ -4,6 +4,12 @@ module Milk
     PAGE_PATH_REGEX = /^\/([a-zA-Z0-9_]+(\/[a-zA-Z0-9_]+)*)+\/*$/
     EDIT_PATH_REGEX = /^\/([a-zA-Z0-9_]+(\/[a-zA-Z0-9_]+)*)+\/edit\/*$/
     
+    attr_reader :req
+    
+    def initialize(require_ssl=false)
+      @require_ssl = require_ssl
+    end
+    
     def route
       path = @req.path_info
       
@@ -16,6 +22,7 @@ module Milk
       regex = /(.*)/
       
       # Route the request to the right callback
+      https = @req.env['HTTPS'] == 'on'
       action = case 
         when @req.get?
           case
@@ -23,7 +30,11 @@ module Milk
               :logout
             when path =~ EDIT_PATH_REGEX
               regex = EDIT_PATH_REGEX
-              :edit
+              if @require_ssl && !https
+                :https_redirect
+              else
+                :edit
+              end
             when path =~ PAGE_PATH_REGEX
               regex = PAGE_PATH_REGEX
               :view
@@ -52,7 +63,6 @@ module Milk
       if (action == :view || action == :edit)
         begin 
           page = Milk::Page.find(page_name)
-          page.instance_variable_set(:@app, self)
         rescue Milk::PageNotFoundError
           action = :not_found
         end
@@ -60,7 +70,6 @@ module Milk
 
       if (action == :preview || action == :save)
         page = Milk::Page.json_unserialize(YAML.load(@req.body.read), page_name)
-        page.instance_variable_set(:@app, self)
       end
       
       if !@user && [:edit, :save, :delete].include?(action)
@@ -103,17 +112,21 @@ module Milk
     
     def login()
       email = @req.params['email']
-      user = users[email]
-      if user
-        expected = user["hash"]
-        actual = hash(email, @req.params['password'])
-        if actual == expected
-          @resp.set_cookie('auth', :path => "/", :value => obfuscate(email))
+      if email.length > 0
+        user = users[email]
+        if user
+          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)
+          else
+            flash "Incorrect password for user #{email}"
+          end
         else
-          flash "Incorrect password for user #{email}"
+          flash "User #{email} not found"
         end
       else
-        flash "User #{email} not found"
+        flash "Please enter user email and password"
       end
       @resp.redirect(@req.params['dest'])
     end
@@ -153,14 +166,24 @@ module Milk
       case action
         when :not_found
           @resp.status = 404
-          @resp.write Milk::Page.find('NotFound').view
+          page = Milk::Page.find('NotFound')
+          Milk::Application.join_tree(page, self)
+          @resp.write page.view
         when :view
+          Milk::Application.join_tree(@page, self)
           @resp.write @page.view
+        when :https_redirect
+          @resp.redirect('https://' +  @req.host + @req.fullpath)
+        when :http_redirect
+          @resp.redirect('http://' +  @req.host + @req.fullpath)
         when :edit
+          Milk::Application.join_tree(@page, self)
           @resp.write @page.edit
         when :save
+          Milk::Application.join_tree(@page, self)
           @resp.write @page.save
         when :preview
+          Milk::Application.join_tree(@page, self)
           @resp.write @page.preview
         when :login_form
           filename = FIELDS_DIR + "/login.haml"
@@ -178,6 +201,23 @@ module Milk
       end
       @resp.finish
     end    
+
+    # 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)
+          if var.class == Array
+            var.each do |subvar|
+              join_tree(subvar, obj)
+            end
+          end
+        end
+      end
+    end
+    
   end
   
   class PageNotFoundError < Exception

data/lib/milk/component.rb

@@ -3,12 +3,21 @@ module Milk
   
     @@local_flag = {}
     
+    attr_accessor :parent
+    @parent = nil
+
+    
+    # Don't store global properties or backreferences to the parent
     def to_yaml_properties
-      if respond_to? :global_properties
-        instance_variables.select { |name| name == :page || !global_properties.member?(name) }
+      (if respond_to? :global_properties
+        instance_variables.reject { |name| global_properties.member?(name) }
       else
         instance_variables
-      end
+      end).reject { |name| name == :@parent }
+    end
+    
+    def app
+      page.app
     end
 
     def page
@@ -18,7 +27,6 @@ module Milk
         @parent.page
       end
     end
-
     
     def self.local_properties(*props)
     end
@@ -74,19 +82,27 @@ module Milk
     end
     
     def save_settings
+      return unless respond_to? :global_properties
+      yaml_file = Milk::CONFIG_DIR + "/#{system_name}.yaml"
+      data = {}
+      global_properties.each do |name|
+        data[name.to_s.sub('@','')] = instance_variable_get(name)
+      end
+      
+      File.open(yaml_file, "w") do |file|
+        file.write(YAML.dump(data))
+      end
+    end
+    
+    def system_name
+      self.class.to_s.gsub(/([a-z])([A-Z])/) { "#{$1}_#{$2}" }.downcase
     end
     
     def load_settings
-      # Only load once
-      return unless @system_name.nil?
-      
-      @system_name = self.class.to_s.gsub(/([a-z])([A-Z])/) { "#{$1}_#{$2}" }.downcase
-      yaml_file = Milk::CONFIG_DIR + "/#{@system_name}.yaml"
+      yaml_file = Milk::CONFIG_DIR + "/#{system_name}.yaml"
       if File.file? yaml_file
-        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)) unless self.instance_variable_get(key)
+        YAML.load_file(yaml_file).each_pair do |key, value|
+          instance_variable_set("@#{key}".to_sym, value)
         end
       end
     end
@@ -115,13 +131,11 @@ module Milk
     end
     
     def view
-      load_settings
-      haml_file = Milk::COMPONENTS_DIR + "/" + @system_name + ".haml"
+      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/component.rb.~1~

@@ -0,0 +1,141 @@
+module Milk
+  class Component
+  
+    @@local_flag = {}
+    
+    attr_accessor :parent
+    @parent = nil
+
+    
+    # Don't store global properties or backreferences to the parent
+    def to_yaml_properties
+      (if respond_to? :global_properties
+        instance_variables.reject { |name| global_properties.member?(name) }
+      else
+        instance_variables
+      end).reject { |name| name == :@parent }
+    end
+    
+    def app
+      page.app
+    end
+
+    def page
+      if @parent.class == Milk::Page
+        @parent
+      else
+        @parent.page
+      end
+    end
+    
+    def self.local_properties(*props)
+    end
+
+    def self.global_properties(*props)
+      globals = props.collect{|name|"@#{name}".to_sym}
+      class_def :global_properties do
+        globals
+      end
+    end
+    
+    def name
+      self.class.to_s
+    end
+
+    # All Components start out with default of no fields    
+    def self.fields
+      []
+    end
+    
+    # Assume no defaults
+    def self.defaults
+      {}
+    end
+
+    # 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.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 save_settings
+      return unless respond_to? :global_properties
+      yaml_file = Milk::CONFIG_DIR + "/#{system_name}.yaml"
+      data = {}
+      instance_variables.each do |name|
+        data[name] = instance_variable_get(name)
+      end
+      File.open(yaml_file, "w") do |file|
+        file.write(data)
+      end
+    end
+    
+    def system_name
+      self.class.to_s.gsub(/([a-z])([A-Z])/) { "#{$1}_#{$2}" }.downcase
+    end
+    
+    def load_settings
+      yaml_file = Milk::CONFIG_DIR + "/#{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)
+        end
+      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)
+    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)
+    end
+    
+  end
+end
+
+

data/lib/milk/fields/login.haml

@@ -6,52 +6,63 @@
     %style{:type=>"text/css"}
       :sass
         !width = 400
-        !height = 150
+        !height = 160
         table, #shadow, .ui-widget-shadow
           :width = !width + "px"
           :height = !height + "px"
-        table, #shadow
+        table#login, #shadow
+          :font-size 15px
           :position absolute
           :top 50%
           :left 50%
           :margin
             :top = (-!height/2)+"px"
             :left = (-!width/2)+"px"
-        #flash
-          :padding 0pt 0.7em
-          span
-            :float left
-            :margin-right 0.3em
-        button
-          :cursor pointer
-          :line-height 1em
-          :padding 2px 5px 2px 2px
-          .ui-icon
-            :float left
+        table#login td, table#login th
+          :vertical-align middle
+        #login
+          tr.ui-state-error
+            td
+              :padding 5px 10px
+            :font-size 12px
+            span
+              :float left
+              :margin-right 0.3em
+          .ui-widget-header
+            :line-height 2em
+            :height 2em
+          button
+            :font-size 12px
+            :cursor pointer
             :line-height 1em
+            :padding 2px 5px 2px 2px
+            .ui-icon
+              :float left
+              :line-height 1em
           
     %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" }/
+    %link{ :href => "/skin/jquery-ui-1.7.2.custom.css", :media => "screen", :rel => "stylesheet", :type => "text/css" }/
     %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"}
+    %script{:src=>"/js/jquery-1.3.2.min.js", :type=>"text/javascript"}
+    %script{:src=>"/js/jquery.json-1.3.min.js", :type=>"text/javascript"}
+    %script{:src=>"/js/jquery-ui-1.7.2.custom.min.js", :type=>"text/javascript"}
   %body
-    - if f = flash
-      #flash{:class => "ui-state-error ui-corner-all"}
-        %p
-          %span{:class => "ui-icon ui-icon-alert"}
-          %strong Alert:
-          &= f
+    .ui-widget-overlay
     %form{:action => "/login", :method=>"post"}
       %input{:type=>"hidden", :name => "dest", :value => @req.path_info}
       #shadow
         .ui-widget-shadow
-      %table{:class => "ui-widget ui-widget-content ui-corner-all"}
+      %table#login{:class => "ui-widget ui-widget-content ui-corner-all"}
         %thead
           %tr
-            %th{:colspan=>2, :class=>"ui-widget-header ui-corner-all"}
+            %th{:colspan=>2, :class=>"ui-widget-header ui-corner-top"}
               &= "Please Login to edit '#{@page.pagename}'"
+        - if f = flash
+          %tr.ui-state-error{:class=>"ui-corner-all"}
+            %td{:colspan=>2}
+              %span{:class => "ui-icon ui-icon-alert",:style=>"float:left"}
+              %strong Alert:
+              &= f
         %tr
           %th Email
           %td