milk 0.0.2 → 0.0.3

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.2"
+  s.version     = "0.0.3"
   s.author      = "Tim Caswell"
   s.email       = "tim@creationix.com"
   s.homepage    = "http://milk.rubyforge.org"

data/lib/milk/application.rb

@@ -15,6 +15,8 @@ module Milk
       
       # Fallback to match everything
       regex = /(.*)/
+      
+      puts path
 
       # Route the request to the right callback
       action = case 
@@ -66,12 +68,12 @@ module Milk
       end
       
       if (action == :preview || action == :save)
-        page = Milk::Page.json_unserialize(YAML.load(req.body.read))
+        page = Milk::Page.json_unserialize(YAML.load(req.body.read), page_name)
       end
       
       return action, page_name, page
     end
-  
+    
     # Rack call interface
     def call(env)
       req = Rack::Request.new(env)
@@ -85,7 +87,7 @@ module Milk
       else
         html_type = "text/html"
       end
-      html_type = "text/html"
+#      html_type = "text/html"
 
       case action
         when :haxe
@@ -97,7 +99,7 @@ module Milk
         when :edit
           [200, {"Content-Type"=>html_type}, [page.edit]]
         when :save
-          [200, {"Content-Type"=>html_type}, [page.save(page_name)]]
+          [200, {"Content-Type"=>html_type}, [page.save]]
         when :preview
           [200, {"Content-Type"=>html_type}, [page.preview]]
         else

data/lib/milk/component.rb

@@ -80,6 +80,23 @@ 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"

data/lib/milk/fields/component_view.haml

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

data/lib/milk/fields/xhtml.haml

@@ -12,9 +12,8 @@
         body.busy
           :cursor busy
         div.component
-          border: 2px solid transparent
           &:hover
-            border-color: #08f
+            :border 10px solid #08f
         #framework-logo
           :position absolute
           :bottom 0
@@ -131,7 +130,7 @@
           %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
         = preview
       #divider
       #framework-logo
@@ -250,8 +249,6 @@
           evt.stopPropagation();
           evt.preventDefault();
           var index = this.className.split("_")[1];
-          console.log(index);
-          console.log(sections);
           sections.accordion('activate', parseInt(index)+1);
         });
 

data/lib/milk/page.rb

@@ -1,21 +1,44 @@
 module Milk
   class Page
+    
+    attr_reader :title
+    attr_reader :description
+    attr_reader :pagename
+  
     def self.find(pagename)
-      yaml_file = Milk::PAGES_DIR + "/" + pagename.gsub(/\//, '.') + ".yml"
+      yaml_file = Milk::PAGES_DIR + "/" + pagename + ".yml"
       raise PageNotFoundError unless File.readable? yaml_file
       page = YAML.load_file(yaml_file)
       page.instance_variable_set('@pagename', pagename)
       page.load_settings
       page
     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
     
-    def save(pagename)
+    def save
       save_settings
-      yaml_file = Milk::PAGES_DIR + "/" + pagename.gsub(/\//, '.') + ".yml"
+      yaml_file = Milk::PAGES_DIR + "/" + @pagename + ".yml"
       data = YAML.dump(self)
       File.open(yaml_file, "w") do |file|
         file.write(data)
@@ -23,7 +46,7 @@ module Milk
       data
     end
     
-    def self.json_unserialize(data)  
+    def self.json_unserialize(data, pagename=nil)  
       class_name = data.delete('class')
       obj = class_name.constantize.allocate
       data.each do |key, value|
@@ -32,6 +55,7 @@ module Milk
         end
         obj.instance_variable_set("@#{key}", value)
       end
+      obj.instance_variable_set("@pagename", pagename) if obj.class == Milk::Page
       obj
     end
     
@@ -48,24 +72,23 @@ module Milk
     end
 
     def edit
-      filename = FIELDS_DIR + "/xhtml.haml"
-      ::Haml::Engine.new(File.read(filename), :filename => filename).render(self)
+      haml(FIELDS_DIR + "/xhtml.haml", self)
     end
     
     def preview
-      haml_template_file = FIELDS_DIR + "/component_view.haml" 
-      i = 0
-      (@components.map do |component|
-        ::Haml::Engine.new(File.read(haml_template_file), :filename => haml_template_file).render(self, {:index=>i}) do
-          i += 1
-          component.view
-        end
-      end).join("\n")
+      haml(Milk::COMPONENTS_DIR + "/page.haml", self) do 
+        i = 0
+        (@components.collect do |component|
+          haml(FIELDS_DIR + "/component_view.haml", component, {:index=>i}) do
+            i += 1
+            component.view
+          end
+        end).join("\n")
+      end
     end
     
     def view
-      filename = Milk::COMPONENTS_DIR + "/xhtml.haml"
-      ::Haml::Engine.new(File.read(filename), :filename => filename).render(self) do 
+      haml(Milk::COMPONENTS_DIR + "/xhtml.haml", self) do 
         preview
       end
     end

data/lib/milk/templates/rackup

@@ -1,5 +1,4 @@
-::MILK_ROOT = ::File.absolute_path(::File.dirname(__FILE__))
-require '../lib/milk'
+require 'milk'
 
 # use Lock
 if %w{rackup thin}.member?($0.rpartition('/').last)

data/lib/milk/templates/rakefile

@@ -1,4 +1,3 @@
-::MILK_ROOT = File.dirname(__FILE__)
 require 'rake'
-load '../lib/milk/tasks.rb'
+load 'milk/tasks.rb'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: milk
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Tim Caswell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-18 00:00:00 -05:00
+date: 2009-06-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,44 +51,42 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- INSTALL
-- README
-- Rakefile
-- test
-- pkg
 - bin
 - bin/milk
-- LICENSE
+- INSTALL
 - lib
-- lib/milk.rb
 - lib/milk
-- lib/milk/tasks.rb
+- lib/milk/application.rb
+- lib/milk/component.rb
 - lib/milk/field.rb
-- lib/milk/haxe.rb
 - lib/milk/fields
-- lib/milk/fields/component_array.rb
-- lib/milk/fields/sprite_chooser.haml
-- lib/milk/fields/sprite_chooser.rb
-- lib/milk/fields/image_chooser.rb
-- lib/milk/fields/page_chooser.haml
-- lib/milk/fields/markdown_field.rb
 - lib/milk/fields/component.haml
+- lib/milk/fields/component_array.haml
+- lib/milk/fields/component_array.rb
+- lib/milk/fields/component_view.haml
 - lib/milk/fields/image_chooser.haml
+- lib/milk/fields/image_chooser.rb
 - lib/milk/fields/markdown_field.haml
-- lib/milk/fields/text_field.rb
-- lib/milk/fields/component_view.haml
+- lib/milk/fields/markdown_field.rb
+- lib/milk/fields/page_chooser.haml
 - lib/milk/fields/page_chooser.rb
-- lib/milk/fields/component_array.haml
+- 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/application.rb
+- lib/milk/haxe.rb
 - lib/milk/page.rb
+- lib/milk/tasks.rb
 - lib/milk/templates
-- lib/milk/templates/rackup
-- lib/milk/templates/restart
 - lib/milk/templates/bzrignore
+- lib/milk/templates/rackup
 - lib/milk/templates/rakefile
-- lib/milk/component.rb
+- lib/milk/templates/restart
+- lib/milk.rb
+- LICENSE
+- Rakefile
+- README
 has_rdoc: false
 homepage: http://milk.rubyforge.org
 post_install_message: