merbiful-release 0.2.1 → 0.2.2

data/lib/merbiful-release/erubis.rb~

@@ -1,11 +1,13 @@
 module Merbiful
 
-  class Eruby
+  class Erubis
 
     def render(text, scope)
-      ERB.new(text).result(scope)
+      ::Erubis::Eruby.new(text).result(scope.instance_eval do binding end)
     end
 
   end
 
+  FILTERS << Erubis
+
 end

data/lib/merbiful-release/filters.rb~

@@ -0,0 +1,22 @@
+
+module Merbiful
+
+  module Filter
+
+    @filters = []
+  
+    def self.register_filter(filter)
+      @filters << filter
+    end
+
+    def self.filters
+      @filters.inject([[nil, "Verbatim"]]) do |sum, filter|
+        filter_name = filter.name.gsub(/^Merbiful::/, "")
+        sum + [[filter_name, filter_name]]
+      end
+    end
+
+  end
+
+end
+

data/lib/merbiful-release/haml.rb~

@@ -3,9 +3,21 @@ module Merbiful
 
   class Haml
 
-    def render(text)
+    def render(text, scope)
+      ::Haml::Engine.new(text).render(scope)
     end
 
   end
 
+  class Sass
+    
+    def render(text, scope)
+      ::Sass::Engine.new(text).render
+    end
+    
+  end
+
+  FILTERS << Haml
+  FILTERS << Sass
+
 end

data/lib/merbiful-release/images.rb~

@@ -0,0 +1,14 @@
+
+module Merbiful
+
+  class ImageHandler
+
+    IMAGE_REGEXP = /\.(gif|jpg|jpeg|png|bmp)$/
+
+    def images
+      
+    end
+
+  end
+
+end

data/lib/merbiful-release/js.rb~

@@ -1,7 +1,7 @@
 
 module Merbiful
 
-  class Css
+  class Js
     
     include DataMapper::Resource
     include DataMapper::Validate
@@ -10,30 +10,40 @@ module Merbiful
     property :id, Serial
 
     property :name, DataMapper::Types::Text, :nullable => false
-    property :media, DataMapper::Types::Text
     property :cached, Boolean, :default => true, :nullable => false
 
     property :created_at, DateTime
     property :updated_at, DateTime
 
-    has n, :css_nesses, :class_name => "Merbiful::Css::Ness"
-    has n, :page_versions, :through => :css_nesses, :class_name => "Merbiful::Page::Version"
-    has n, :css_versions, :class_name => "Merbiful::Css::Version"
+    has n, :js_nesses, :class_name => "Merbiful::Js::Ness"
+    has n, :page_versions, :through => :js_nesses, :class_name => "Merbiful::Page::Version", :child_key => [:js_id]
+    has n, :js_versions, :class_name => "Merbiful::Js::Version"
+
+    before :destroy do
+      js_nesses.destroy!
+      js_versions.destroy!
+    end
 
     def latest
-      css_versions.first(:order => [:id.desc])
+      js_versions.first(:js_id => self.id, :order => [:id.desc])
     end
 
-    def_delegators :latest, :render
+    def_delegators :latest, :render, :body, :filter
+
+    def path
+      "/javascripts/#{latest.id}"
+    end
 
     class Ness
       include DataMapper::Resource
       include DataMapper::Validate
 
       property :id, Serial
+      property :page_version_id, Integer
+      property :js_id, Integer
 
-      belongs_to :css, :class_name => "Merbiful::Css"
-      belongs_to :page_version, :class_name => "Merbiful::Page::Version"
+      belongs_to :js, :class_name => "Merbiful::Js", :child_key => [:js_id]
+      belongs_to :page_version, :class_name => "Merbiful::Page::Version", :child_key => [:page_version_id]
     end
 
     class Version
@@ -44,7 +54,7 @@ module Merbiful
       
       property :id, Serial
       
-      property :css_id, Integer, :index => true, :nullable => false
+      property :js_id, Integer, :index => true, :nullable => false
       
       property :body, DataMapper::Types::Text
       property :filter, DataMapper::Types::Text
@@ -52,8 +62,12 @@ module Merbiful
       property :created_at, DateTime
       property :updated_at, DateTime
       
-      belongs_to :css, :class_name => "Merbiful::Css"
+      belongs_to :js, :class_name => "Merbiful::Js"
       
+      before :save do
+        clear_cache(js.path) if js.latest
+      end
+
     end
 
   end

data/lib/merbiful-release/layout.rb~

@@ -1,21 +1,49 @@
 
-class Page
-
-  include DataMapper::Resource
-  include DataMapper::Validate
-  
-  property :id, Integer, :key => true, :serial => true
-  property :version, Integer, :key => true
-  property :body, DataMapper::Types::Text
-  property :filter, DataMapper::Types::Text
-  property :parent_id, Integer
-  property :path, DataMapper::Types::Text, :key => true
-  property :created_at, DateTime
-  property :updated_at, DateTime
-  property :position, Integer
-  property :author, DataMapper::Types::Text
-  property :layout, Integer
-  property :title, DataMapper::Types::Text
-  property :keywords, DataMapper::Types::Text
+module Merbiful
+
+  class Layout
+    
+    include DataMapper::Resource
+    include DataMapper::Validate
+    extend Forwardable
+    
+    property :id, Serial
+
+    property :name, DataMapper::Types::Text, :nullable => false
+
+    property :created_at, DateTime
+    property :updated_at, DateTime
+
+    has n, :layout_versions, :class_name => "Merbiful::Layout::Version"
+    has n, :page_versions, :class_name => "Merbiful::Page::Version"
+
+    def latest
+      layout_versions.first(:layout_id => self.id, :order => [:id.desc])
+    end
+
+    def_delegators :latest, :render, :body, :filter
+
+    class Version
+      
+      include DataMapper::Resource
+      include DataMapper::Validate
+      include Merbiful::Body
+      
+      property :id, Serial
+      
+      property :layout_id, Integer, :index => true, :nullable => false
+      
+      property :body, DataMapper::Types::Text
+      property :filter, DataMapper::Types::Text
+      
+      property :created_at, DateTime
+      property :updated_at, DateTime
+      
+      belongs_to :layout, :class_name => "Merbiful::Layout"
+      
+    end
+
+  end
+
 
 end

data/lib/merbiful-release/page.rb~

@@ -8,48 +8,100 @@ module Merbiful
 
     include DataMapper::Resource
     include DataMapper::Validate
-    include Merbiful::Body
-
-    validates_is_unique :version, :scope => [:path]
+    extend Forwardable
 
     property :id, Serial
-    property :version, Integer, :index => true
-    property :body, DataMapper::Types::Text
-    property :filter, DataMapper::Types::Text
-    property :path, DataMapper::Types::Text, :index => true
+    property :parent_id, Integer, :index => true
+
+    property :path, DataMapper::Types::Text, :unique_index => true, :nullable => false
     property :position, Integer
+    property :cached, Boolean, :default => true, :nullable => false
+
     property :created_at, DateTime
     property :updated_at, DateTime
-    property :title, DataMapper::Types::Text
-    property :keywords, DataMapper::Types::Text
-    property :parent_path, DataMapper::Types::Text
-    property :layout_id, Integer
 
-    belongs_to :layout, :class_name => "Merbiful::Layout"
+    belongs_to :parent, :class_name => "Merbiful::Page", :child_key => [:parent_id]
+    has n, :children, :class_name => "Merbiful::Page", :child_key => [:parent_id]
+    has n, :versions, :class_name => "Merbiful::Page::Version"
 
-    before :save do
-      last_version = self.class.first(:path => self.path, :order => [:version.desc])
-      if last_version.nil?
-        self.version = 0
-      else
-        self.version = last_version.version + 1
+    validates_is_unique :path
+
+    before :destroy do
+      versions.each do |version|
+        version.destroy
       end
+    end
+
+    before :save do
       if self.position.nil?
-        last_position = self.class.first(:parent_path => self.parent_path, :path.not => self.path)
+        last_position = self.class.first(:parent_id => self.parent_id, :id.not => self.id)
         if last_position.nil?
           self.position = 0
         else
           self.position = last_position.position + 1
         end
       end
-      if self.path.nil?
-        self.path = "/"
-      end
+    end
 
+    def latest
+      versions.first(:page_id => self.id, :order => [:id.desc])
     end
 
-    def children
-      Page.find_by_sql(["SELECT id FROM merbiful_pages WHERE parent_path = ? GROUP BY path ORDER BY version DESC", self.path])
+    def_delegators :latest, :render, :layout, :csses, :add_css, :remove_css, :jses, :add_js, :remove_js, :body, :filter, :title, :keywords
+
+    class Version
+
+      include DataMapper::Resource
+      include DataMapper::Validate
+      include Merbiful::Body
+      
+      property :id, Serial
+      
+      property :page_id, Integer, :nullable => false, :index => true
+      property :layout_id, Integer, :index => true
+      
+      property :body, DataMapper::Types::Text
+      property :filter, DataMapper::Types::Text
+      property :title, DataMapper::Types::Text
+      property :keywords, DataMapper::Types::Text
+      
+      property :created_at, DateTime
+      property :updated_at, DateTime
+      
+      belongs_to :page, :class_name => "Merbiful::Page"
+      belongs_to :layout, :class_name => "Merbiful::Layout"
+
+      has n, :css_nesses, :class_name => "Merbiful::Css::Ness"
+      has n, :csses, :through => :css_nesses, :class_name => "Merbiful::Css", :remote_name => :css, :child_key => [:page_version_id]
+
+      has n, :js_nesses, :class_name => "Merbiful::Js::Ness"
+      has n, :jses, :through => :js_nesses, :class_name => "Merbiful::Js", :remote_name => :js, :child_key => [:page_version_id]
+
+      before :destroy do
+        css_nesses.destroy!
+        js_nesses.destroy!
+      end
+
+      before :save do
+        clear_cache(page.path) if page.latest
+      end
+      
+      def add_css(css)
+        Merbiful::Css::Ness.create(:css => css, :page_version => self)
+      end
+      
+      def remove_css(css)
+        css_nesses.first(:css_id => css.id).destroy
+      end
+
+      def add_js(js)
+        Merbiful::Js::Ness.create(:js => js, :page_version => self)
+      end
+
+      def remove_js(js)
+        js_nesses.first(:js_id => js.id).destroy
+      end
+
     end
 
   end

data/lib/merbiful-release/string.rb~

@@ -0,0 +1,16 @@
+
+String.class_eval do
+
+  def cached_path
+      path = Pathname.new(File.join(Merb.root, "public", self))
+      raise "H4xx0r" unless path.to_s.index(Pathname.new(Merb.root).join("public").expand_path.to_s) == 0
+      if path.parent.file?
+        path.parent.unlink
+      elsif path.directory?
+        path = path.join("index.html")
+      end
+      path
+    end
+
+
+end

data/templates/admin.css~

@@ -1,3 +1,14 @@
-ul {
-  background-color: red;
+ul.info {
 }
+
+ul.info li {
+  list-style: none none inside;
+  display: inline;
+  margin: 1px;
+  padding: 1px;
+}
+
+li.page_title {
+  font-weight: bold;
+}
+

data/templates/admin_layout.html.haml

@@ -2,6 +2,10 @@
   %link{:href => url(:merbiful_admin_css), :rel => 'Stylesheet', :type => 'text/css'}
   %body
     %h1= link_to("Merbiful Release Administration Interface", url(:merbiful_admin_index))
+    - if logged_in_user
+      %ul.access
+        %li= "You are logged in as #{logged_in_user}."
+        %li= link_to("Logout", logout_url)
     %ul.menu
       %li= link_to("Pages", url(:merbiful_admin, :action => "pages"))
       %li= link_to("Layouts", url(:merbiful_admin, :action => "layouts"))

data/templates/admin_layout.html.haml~

@@ -1,9 +1,11 @@
 %html
+  %link{:href => url(:merbiful_admin_css), :rel => 'Stylesheet', :type => 'text/css'}
   %body
-    %h1 Merbiful Release Administration Interface
+    %h1= link_to("Merbiful Release Administration Interface", url(:merbiful_admin_index))
     %ul.menu
-      %li Pages
-      %li Layouts
-      %li Css
-      %li Js
+      %li= link_to("Pages", url(:merbiful_admin, :action => "pages"))
+      %li= link_to("Layouts", url(:merbiful_admin, :action => "layouts"))
+      %li= link_to("Css", url(:merbiful_admin, :action => "css"))
+      %li= link_to("Js", url(:merbiful_admin, :action => "js"))
+      %li= link_to("Images", url(:merbiful_admin, :action => "images"))
     = catch_content :for_layout

data/templates/css.html.haml~

@@ -6,24 +6,27 @@
         %a{:href => url(:merbiful_admin, :action => "css", :css_id => css.id)}
           %li{:class => "css_name"}= css.name
           %li{:class => "css_version"}= "ver##{css.latest.id} (#{time_ago_in_words(css.latest.created_at)} ago)"
-        %li= link_to("-", url(:merbiful_admin, :action => "destroy_css", :css_id => css.id))
+        %li= link_to("-", url(:merbiful_admin, :action => "destroy_css", :css_id => css.id), :onclick => confirm("Are you absolutely certain that you want to destroy the css named #{css.name}? All versions will be irreversibly destroyed."))
       - if params[:css_id].to_s == css.id.to_s
         %table.css
           %form{:action => url(:merbiful_admin, :action => "css", :css_id => css.id), :method => "post"}
+            %tr{:class => "version"}
+              %td Viewing version
+              %td= @form_css.css_versions(:order => [:id.desc]).collect do |v| "<a class='#{v.id == @form_version.id ? 'active' : 'inactive'}' href='#{url(:merbiful_admin, :action => "css", :css_id => @form_css.id, :version_id => v.id)}'>#{v.id}</a>" end.join(", ")
             %tr
-              %td Name
+              %td Name (not versioned)
               %td= text_field(:name => "css[name]", :value => @form_css.name) + errors(@form_css, :name)
             %tr
               %td Body
-              %td~ text_area(@form_css.body, :name => "version[body]", :cols => 80, :rows => (2 * @form_css.body.to_s.split(/\n/).size)) + errors(@form_version, :body)
+              %td~ text_area(@form_version.body, :name => "version[body]", :cols => 80, :rows => text_area_rows) + errors(@form_version, :body)
             %tr{:class => "filter"}
               %td Filter
-              %td= select(:name => "version[filter]", :collection => Merbiful::filters, :selected => @form_css.latest.filter) + errors(@form_version, :filter)
+              %td= select(:name => "version[filter]", :collection => Merbiful::Filter.filters, :selected => @form_version.filter) + errors(@form_version, :filter)
             %tr
-              %td Media
+              %td Media (not versioned)
               %td= text_field(:name => "css[media]", :value => @form_css.media) + errors(@form_css, :media)
             %tr{:class => "cached"}
-              %td Cached
+              %td Cached (not versioned)
               %td= check_box(:name => "css[cached]", :checked => @form_css.cached) + errors(@form_css, :cached)
             %tr{:class => "submit"}
-              %td{:colspan => "2"}= submit("Save")
+              %td{:colspan => "2"}= submit("Save as new version")