merbiful-release 0.2.9 → 0.2.10

data/Rakefile

@@ -5,7 +5,7 @@ require 'pathname'
 
 PLUGIN = "merbiful-release"
 NAME = "merbiful-release"
-GEM_VERSION = "0.2.9"
+GEM_VERSION = "0.2.10"
 AUTHOR = "Martin Kihlgren"
 EMAIL = "martin@wemind.se"
 HOMEPAGE = ""

data/lib/merbiful-release/layout.rb

@@ -31,6 +31,10 @@ module Merbiful
 
     def_delegators :latest, :render, :body, :filter
 
+    def id_to_s
+      id.to_s
+    end
+
     class Version
       
       include DataMapper::Resource

data/templates/page_form.html.haml

@@ -20,7 +20,7 @@
       %td= select(:name => "version[filter]", :collection => Merbiful::Filter.filters, :selected => @form_version.filter) + errors(@form_version, :filter)
     %tr{:class => "layout"}
       %td Layout
-      %td= select(:name => "version[layout_id]", :collection => Merbiful::Layout.all, :include_blank => true, :text_method => :name, :value_method => :id, :selected => @form_version.layout_id) + errors(@form_version, :layout)
+      %td= select(:name => "version[layout_id]", :collection => Merbiful::Layout.all, :include_blank => true, :text_method => :name, :value_method => :id_to_s, :selected => @form_version.layout_id.to_s) + errors(@form_version, :layout)
     %tr{:class => "cached"}
       %td Cached (not versioned)
       %td= check_box(:name => "page[cached]", :checked => @form_page.cached) + errors(@form_page, :cached)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merbiful-release
 version: !ruby/object:Gem::Version 
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors: 
 - Martin Kihlgren
@@ -9,7 +9,7 @@ autorequire: merbiful-release
 bindir: bin
 cert_chain: []
 
-date: 2009-02-19 00:00:00 +01:00
+date: 2009-08-31 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -24,51 +24,31 @@ extra_rdoc_files: []
 files: 
 - Rakefile
 - LICENSE
-- lib/merbiful-release
+- lib/merbiful-release.rb
 - lib/merbiful-release/admin.rb
-- lib/merbiful-release/admin.rb~
 - lib/merbiful-release/body.rb
-- lib/merbiful-release/body.rb~
 - lib/merbiful-release/controller.rb
-- lib/merbiful-release/controller.rb~
 - lib/merbiful-release/css.rb
-- lib/merbiful-release/css.rb~
-- lib/merbiful-release/erubis.rb~
 - lib/merbiful-release/filters.rb
-- lib/merbiful-release/filters.rb~
-- lib/merbiful-release/haml.rb~
 - lib/merbiful-release/images.rb
-- lib/merbiful-release/images.rb~
 - lib/merbiful-release/js.rb
-- lib/merbiful-release/js.rb~
 - lib/merbiful-release/layout.rb
-- lib/merbiful-release/layout.rb~
 - lib/merbiful-release/page.rb
-- lib/merbiful-release/page.rb~
 - lib/merbiful-release/relative_time.rb
 - lib/merbiful-release/routes.rb
-- lib/merbiful-release/routes.rb~
 - lib/merbiful-release/string.rb
-- lib/merbiful-release/string.rb~
-- lib/merbiful-release.rb
-- lib/merbiful-release.rb~
 - templates/admin.css
-- templates/admin.css~
 - templates/admin_layout.html.haml
-- templates/admin_layout.html.haml~
 - templates/css.html.haml
-- templates/css.html.haml~
 - templates/images.html.haml
-- templates/images.html.haml~
 - templates/index.html.haml
 - templates/js.html.haml
-- templates/js.html.haml~
 - templates/layouts.html.haml
-- templates/layouts.html.haml~
 - templates/page_form.html.haml
-- templates/page_form.html.haml~
 has_rdoc: true
 homepage: ""
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -89,9 +69,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Merb plugin that provides a simple CMS
 test_files: []
 

data/lib/merbiful-release.rb~

@@ -1,26 +0,0 @@
-
-require 'merb-core'
-require 'merb-action-args'
-require 'merb_helpers'
-require 'merb-assets'
-require 'dm-core'
-require 'dm-validations'
-require 'dm-timestamps'
-require 'dm-aggregates'
-require 'forwardable'
-require 'pathname'
-require 'pp'
-require 'digest/sha1'
-
-require File.join(File.dirname(__FILE__), 'merbiful-release', 'filters.rb')
-require File.join(File.dirname(__FILE__), 'merbiful-release', 'string.rb')
-require File.join(File.dirname(__FILE__), 'merbiful-release', 'relative_time.rb')
-require File.join(File.dirname(__FILE__), 'merbiful-release', 'images.rb')
-require File.join(File.dirname(__FILE__), 'merbiful-release', 'controller.rb')
-require File.join(File.dirname(__FILE__), 'merbiful-release', 'body.rb')
-require File.join(File.dirname(__FILE__), 'merbiful-release', 'admin.rb')
-require File.join(File.dirname(__FILE__), 'merbiful-release', 'routes.rb')
-require File.join(File.dirname(__FILE__), 'merbiful-release', 'css.rb')
-require File.join(File.dirname(__FILE__), 'merbiful-release', 'js.rb')
-require File.join(File.dirname(__FILE__), 'merbiful-release', 'page.rb')
-require File.join(File.dirname(__FILE__), 'merbiful-release', 'layout.rb')

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

@@ -1,313 +0,0 @@
-
-module Merbiful
-
-  class Admin < Merb::Controller
-
-    include RelativeTimeHelpers
-
-    before :authorize!
-
-    def authorize!
-      unless authorized?
-        redirect login_url
-        throw :halt, "Access denied"
-      end
-    end
-
-    def logged_in_user
-      nil
-    end
-
-    def login_url
-      ""
-    end
-
-    def logout_url
-      ""
-    end
-
-    def authorized?
-      true
-    end
-
-    def index
-      render_template_with_layout("index.html.haml")
-    end
-
-    def layouts
-      @form_layout = Layout.get(params[:layout_id])
-      if request.post?
-        @form_layout.update_attributes(params[:layout])
-        if @form_layout.valid?
-          @form_layout.save
-          @form_version = Layout::Version.new(params[:version].merge(:layout => @form_layout))
-          if @form_version.valid?
-            @form_version.save
-            redirect url(:merbiful_admin, :action => "layouts", :layout_id => @form_layout.id)
-          end
-        end
-      else
-        if @form_layout
-          @form_version = Layout::Version.get(params[:version_id])
-          @form_version = @form_layout.latest unless @form_version
-        end
-      end
-      render_template_with_layout("layouts.html.haml")
-    end
-    
-    def js
-      @form_js = Js.get(params[:js_id])
-      if request.post?
-        params[:js][:cached] = !!params[:js][:cached]
-        @form_js.update_attributes(params[:js])
-        if @form_js.valid?
-          @form_js.save
-          @form_version = Js::Version.new(params[:version].merge(:js => @form_js))
-          if @form_version.valid?
-            @form_version.save
-            redirect url(:merbiful_admin, :action => "js", :js_id => @form_js.id)
-          end
-        end
-      else
-        if @form_js
-          @form_version = Js::Version.get(params[:version_id])
-          @form_version = @form_js.latest unless @form_version
-        end
-      end
-      render_template_with_layout("js.html.haml")
-    end
-
-    def images
-      if request.post?
-      end
-      render_template_with_layout("images.html.haml")
-    end
-
-    def css
-      @form_css = Css.get(params[:css_id])
-      if request.post?
-        params[:css][:cached] = !!params[:css][:cached]
-        @form_css.update_attributes(params[:css])
-        if @form_css.valid?
-          @form_css.save
-          @form_version = Css::Version.new(params[:version].merge(:css => @form_css))
-          if @form_version.valid?
-            @form_version.save
-            redirect url(:merbiful_admin, :action => "css", :css_id => @form_css.id)
-          end
-        end
-      else
-        if @form_css
-          @form_version = Css::Version.get(params[:version_id])
-          @form_version = @form_css.latest unless @form_version
-        end
-      end
-      render_template_with_layout("css.html.haml")
-    end
-
-    def pages
-      if Page.count == 0
-        new_root = Page.create(:path => "/")
-        new_root_version = Page::Version.create(:page => new_root, :body => "Here be Dagon")
-      end
-      @form_page = Page.get(params[:page_id])
-      if request.post?
-        params[:page][:cached] = !!params[:page][:cached]
-
-        @form_page.update_attributes(params[:page])
-
-        version_csses = params[:version].delete(:css)
-        version_jses = params[:version].delete(:js)
-
-        @form_version = Page::Version.new(params[:version].merge(:page => @form_page))
-
-        version_csses.each do |css|
-          @form_version.add_css(Css.get(css))
-        end if version_csses
-        version_jses.each do |js|
-          @form_version.add_js(Js.get(js))
-        end if version_jses
-        
-        if @form_page.valid?
-          @form_page.save 
-          if @form_version.valid?
-            @form_version.save 
-            redirect url(:merbiful_admin, :action => "pages", :page_id => @form_page.id)
-          end
-        end
-      else
-        if @form_page
-          @form_version = Page::Version.get(params[:version_id])
-          @form_version = @form_page.latest unless @form_version
-        end
-      end
-      render_with_layout(Page.all(:parent_id => nil).collect do |page|
-                           "<ul class='root'>\n#{render_page(page)}\n</ul>"
-                         end.join("\n"))
-    end
-    
-    def render_css
-      read_template("admin.css")
-    end
-
-    def destroy_page
-      page = Page.get(params[:page_id])
-      page.destroy
-      redirect url(:merbiful_admin, :action => "pages")
-    end
-
-    def upload_image
-      path = Pathname.new(File.join(Merb.root, "public", "images", File.basename(params[:image][:filename])))
-      raise "H4xx0r" unless path.to_s.index(Pathname.new(Merb.root).expand_path.to_s) == 0
-      Pathname.new(params[:image][:tempfile].path).rename(path)
-      redirect url(:merbiful_admin, :action => "images")
-    end
-
-    def delete_image
-      path = Pathname.new(File.join(Merb.root, "public", params[:path])).expand_path
-      raise "H4xx0r" unless path.to_s.index(Pathname.new(Merb.root).expand_path.to_s) == 0
-      path.unlink
-      redirect url(:merbiful_admin, :action => "images")
-    end
-
-    def destroy_layout
-      layout = Layout.get(params[:layout_id])
-      layout.destroy
-      redirect url(:merbiful_admin, :action => "layouts")
-    end
-
-    def destroy_css
-      css = Css.get(params[:css_id])
-      css.destroy
-      redirect url(:merbiful_admin, :action => "css")
-    end
-
-    def destroy_js
-      js = Js.get(params[:js_id])
-      js.destroy
-      redirect url(:merbiful_admin, :action => "js")
-    end
-
-    def create_page
-      parent = Page.get(params[:parent_id])
-      new_page = Page.create(:parent => parent, :path => next_path(parent.path))
-      new_page_version = Page::Version.create(:page => new_page)
-      redirect url(:merbiful_admin, :action => "pages", :page_id => new_page.id)
-    end
-
-    def create_css
-      new_css = Css.create(:name => next_name(Css))
-      new_css_version = Css::Version.create(:css => new_css)
-      redirect url(:merbiful_admin, :action => 'css', :css_id => new_css.id)
-    end
-
-    def create_js
-      new_js = Js.create(:name => next_name(Js))
-      new_js_version = Js::Version.create(:js => new_js)
-      redirect url(:merbiful_admin, :action => 'js', :js_id => new_js.id)
-    end
-
-    def create_layout
-      new_layout = Layout.create(:name => next_name(Layout))
-      new_layout_version = Layout::Version.create(:layout => new_layout)
-      redirect url(:merbiful_admin, :action => 'layouts', :layout_id => new_layout.id)
-    end
-
-    def move_page_up
-      page = Page.get(params[:page_id])
-      page.position -= 1
-      page.save
-      redirect url(:merbiful_admin, :action => "pages")
-    end
-
-    def move_page_down
-      page = Page.get(params[:page_id])
-      page.position += 1
-      page.save
-      redirect url(:merbiful_admin, :action => "pages")
-    end
-
-    private
-
-    def confirm(message)
-      "return confirm('#{message}');"
-    end
-
-    def text_area_rows
-      20
-    end
-
-    def next_path(parent_path)
-      index = 0
-      while Page.first(:path => File.join(parent_path, index.to_s))
-        index += 1
-      end
-      return File.join(parent_path, index.to_s)
-    end
-
-    def next_name(klass)
-      index = 0
-      while klass.first(:name => index.to_s)
-        index += 1
-      end
-      return index.to_s
-    end
-
-    def errors(obj, meth)
-      if obj.errors.on(meth)
-        "<div class='error'>#{obj.errors.on(meth).join(", ")}</div>"
-      else
-        ""
-      end
-    end
-
-    def render_children(page, ind = "")
-      rval = []
-      rval << "<ul class='children'>"
-      page.children(:order => [:position, :id]).each do |child|
-        rval << render_page(child, ind + "  ")
-      end
-      rval << "</ul>"
-      return rval.collect do |line| ind + line end.join("\n")
-    end
-    
-    def render_page(page, ind = "")
-      rval = []
-      rval << "<li class='page'>"
-      rval << "<ul class='page_info info'>"
-      rval << "<a href='#{url(:merbiful_admin, :action => 'pages', :page_id => page.id)}'>"
-      rval << "<li class='page_path'>#{page.path}</li>"
-      rval << "<li class='page_title'>#{page.title || "untitled"}</li>"
-      rval << "<li class='page_version'>ver##{page.latest.id} (#{time_ago_in_words(page.latest.created_at)} ago)</li>"
-      rval << "</a>"
-      rval << "<li class='up'><a href='#{url(:merbiful_admin, :action => 'move_page_up', :page_id => page.id)}'>&uarr;</a></li>"
-      rval << "<li class='down'><a href='#{url(:merbiful_admin, :action => 'move_page_down', :page_id => page.id)}'>&darr;</a></li>"
-      rval << "<li class='remove'><a href='#{url(:merbiful_admin, :action => 'destroy_page', :page_id => page.id)}' onclick=\"#{confirm("Are you absolutely certain that you want to destroy the page at #{page.path}? All versions will be irreversibly destroyed.")}\">-</a></li>" unless page.parent_id.nil?
-      rval << "<li class='append'><a href='#{url(:merbiful_admin, :action => 'create_page', :parent_id => page.id)}'>+</a></li>"
-      rval << "</ul>"
-      rval << render_template_without_layout("page_form.html.haml") if params[:page_id].to_s == page.id.to_s
-      rval << render_children(page, ind) unless page.children.empty?
-      rval << "</li>"
-      return rval.collect do |line| ind + line end.join("\n")
-    end
-
-    def read_template(template)
-      Pathname.new(__FILE__).parent.parent.parent.join("templates").join(template).read
-    end
-
-    def render_with_layout(text)
-      throw_content :for_layout, text
-      ::Haml::Engine.new(read_template("admin_layout.html.haml")).render(self)
-    end
-
-    def render_template_with_layout(template)
-      render_with_layout(::Haml::Engine.new(read_template(template)).render(self))
-    end
-
-    def render_template_without_layout(template)
-      ::Haml::Engine.new(read_template(template)).render(self)
-    end
-
-  end
-
-end

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

@@ -1,48 +0,0 @@
-
-module Merbiful
-
-  module Body
-
-    FAKE_IO_CLASS = Struct.new(:read, :path)
-
-    def render_id
-      Merb::Template.template_name("#{self.class}##{self.id}")
-    end
-
-    def render(controller, caches = {})
-      rval = if self.filter.blank?
-               self.body
-             else
-               controller.send(Merb::Template::METHOD_LIST[render_id] ||=
-                               begin
-                                 filter = Merb::Template::EXTENSIONS[self.filter]
-                                 if filter.method(:compile_template).arity == 3
-                                   Merb::Template::EXTENSIONS[self.filter].compile_template(FAKE_IO_CLASS.new(self.body, render_id), 
-                                                                                            render_id,
-                                                                                            Merb::InlineTemplates)
-                                 elsif filter.method(:compile_template).arity == 4
-                                   Merb::Template::EXTENSIONS[self.filter].compile_template(FAKE_IO_CLASS.new(self.body, render_id), 
-                                                                                            render_id,
-                                                                                            [],
-                                                                                            Merb::InlineTemplates)
-                                 end
-                               end)
-             end
-      unless Merb.environment == "development"
-        caches.each do |destination, to_cache|
-          if to_cache
-            path = destination.cached_path
-            Merb.logger.info("Flushing to #{path.inspect}")
-            path.parent.mkpath
-            path.open("w") do |out|
-              out.write(rval)
-            end
-          end
-        end
-      end
-      return rval
-    end
-
-  end
-
-end

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

@@ -1,61 +0,0 @@
-
-module Merbiful
-
-  class Controller < Merb::Controller
-    
-    class MissingPageError < RuntimeError
-    end
-
-    class MissingLayoutError < RuntimeError
-    end
-
-    class MissingCssError < RuntimeError
-    end
-
-    class MissingJsError < RuntimeError
-    end
-
-    def root
-      Page.root
-    end
-    
-    def css(id)
-      css_version = Css::Version.get(id)
-      raise MissingCssError.new(id) unless css_version
-      headers["Content-Type"] = "text/css"
-      css_version.render(self, css_version.css.path => css_version.css.cached)
-    end
-
-    def js(id)
-      js_version = Js::Version.get(id)
-      raise MissingJsError.new(id) unless js_version
-      headers["Content-Type"] = "text/javascript"
-      js_version.render(self, js_version.js.path => js_version.js.cached)
-    end
-
-    def plur(what)
-      @page = Page.first(:path => what)
-      raise NotFound.new(what.inspect) unless @page
-      unless @page.jses.empty?
-        throw_content(:for_js, @page.jses.inject([]) do |sum, frozen_js|
-                        js = Js.get(frozen_js.id)
-                        sum << "<script src='#{js.path}' type='text/javascript'></script>"
-                      end.join("\n"))
-      end
-      unless @page.csses.empty?
-        throw_content(:for_css, @page.csses.inject([]) do |sum, frozen_css|
-                        css = Css.get(frozen_css.id)
-                        sum << "<link href='#{css.path}' #{css.media.blank? ? "" : "media='#{css.media}' "}rel='Stylesheet' type='text/css' />"
-                      end.join("\n"))
-      end
-      if @page.layout
-        throw_content :for_layout, @page.render(self)
-        @page.layout.render(self, @page.path => @page.cached)
-      else
-        @page.render(self, @page.path => @page.cached)
-      end
-    end
-
-  end
-
-end

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

@@ -1,77 +0,0 @@
-
-module Merbiful
-
-  class Css
-    
-    include DataMapper::Resource
-    include DataMapper::Validate
-    extend Forwardable
-    
-    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", :child_key => [:css_id]
-    has n, :css_versions, :class_name => "Merbiful::Css::Version"
-
-    before :destroy do
-      css_nesses.destroy!
-      css_versions.destroy!
-    end
-
-    def latest
-      css_versions.first(:css_id => self.id, :order => [:id.desc])
-    end
-
-    def_delegators :latest, :render, :body, :filter
-
-    def path
-      "/stylesheets/#{latest.id}"
-    end
-
-    class Ness
-      include DataMapper::Resource
-      include DataMapper::Validate
-
-      property :id, Serial
-      property :page_version_id, Integer
-      property :css_id, Integer
-
-      belongs_to :css, :class_name => "Merbiful::Css", :child_key => [:css_id]
-      belongs_to :page_version, :class_name => "Merbiful::Page::Version", :child_key => [:page_version_id]
-    end
-
-    class Version
-      
-      include DataMapper::Resource
-      include DataMapper::Validate
-      include Merbiful::Body
-      
-      property :id, Serial
-      
-      property :css_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 :css, :class_name => "Merbiful::Css"
-      
-      before :save do
-        css.path.clear_cache! if css.latest
-      end
-
-    end
-
-  end
-
-
-end

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

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

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

@@ -1,22 +0,0 @@
-
-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~

@@ -1,23 +0,0 @@
-
-module Merbiful
-
-  class Haml
-
-    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~

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

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

@@ -1,76 +0,0 @@
-
-module Merbiful
-
-  class Js
-    
-    include DataMapper::Resource
-    include DataMapper::Validate
-    extend Forwardable
-    
-    property :id, Serial
-
-    property :name, DataMapper::Types::Text, :nullable => false
-    property :cached, Boolean, :default => true, :nullable => false
-
-    property :created_at, DateTime
-    property :updated_at, DateTime
-
-    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
-      js_versions.first(:js_id => self.id, :order => [:id.desc])
-    end
-
-    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 :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
-      
-      include DataMapper::Resource
-      include DataMapper::Validate
-      include Merbiful::Body
-      
-      property :id, Serial
-      
-      property :js_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 :js, :class_name => "Merbiful::Js"
-      
-      before :save do
-        js.path.clear_cache! if js.latest
-      end
-
-    end
-
-  end
-
-
-end

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

@@ -1,49 +0,0 @@
-
-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~

@@ -1,109 +0,0 @@
-
-module Merbiful
-
-  class Page
-
-    class NoSuchFilterError < RuntimeError
-    end
-
-    include DataMapper::Resource
-    include DataMapper::Validate
-    extend Forwardable
-
-    property :id, Serial
-    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
-
-    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"
-
-    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_id => self.parent_id, :id.not => self.id)
-        if last_position.nil?
-          self.position = 0
-        else
-          self.position = last_position.position + 1
-        end
-      end
-    end
-
-    def latest
-      versions.first(:page_id => self.id, :order => [:id.desc])
-    end
-
-    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
-
-end

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

@@ -1,42 +0,0 @@
-
-Merb.logger.info("Compiling merbiful routes...")
-Merb::Router.append do |r|
-  r.match("/merbiful_admin").to(:controller => "admin", :namespace => "merbiful", :action => "index").name(:merbiful_admin_index)
-  r.match("/merbiful_admin/:action").to(:controller => "admin", :namespace => "merbiful").name(:merbiful_admin)
-  r.match("/stylesheets/admin").to(:controller => "admin", :namespace => "merbiful", :action => "render_css").name(:merbiful_admin_css)
-  r.match("/stylesheets/:id.css").to(:controller => "controller", :namespace => "merbiful", :action => "css")
-  r.match("/javascripts/:id.js").to(:controller => "controller", :namespace => "merbiful", :action => "js")
-  r.match(/(.*)/).to(:controller => "controller", :namespace => "merbiful", :action => "page", :what => "[1]")
-end
-
-module Merbiful
-
-  PREPEND_ROUTES = Merb::Router.routes[0..4]
-  APPEND_ROUTES = Merb::Router.routes[5..-1]
-
-end
-
-module Merb
-
-  class Router
-
-    class << self
-
-      alias :merbiful_old_prepare :prepare
-      
-      def prepare(first = [], last = [], &block)
-        merbiful_old_prepare(first + ::Merbiful::PREPEND_ROUTES, last + ::Merbiful::APPEND_ROUTES, &block)
-      end
-
-      alias :merbiful_old_compile :compile
-
-      def compile
-        merbiful_old_compile unless compiled_statement.blank?
-      end
-
-    end
-
-  end
-
-end
-

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

@@ -1,16 +0,0 @@
-
-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,14 +0,0 @@
-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~

@@ -1,11 +0,0 @@
-%html
-  %link{:href => url(:merbiful_admin_css), :rel => 'Stylesheet', :type => 'text/css'}
-  %body
-    %h1= link_to("Merbiful Release Administration Interface", url(:merbiful_admin_index))
-    %ul.menu
-      %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~

@@ -1,32 +0,0 @@
-%a{:href => url(:merbiful_admin, :action => "create_css")} New css
-%ul{:class => "css"}
-  - Merbiful::Css.all.each do |css|
-    %li{:class => "css"}
-      %ul{:class => "css_info info"}
-        %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), :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 (not versioned)
-              %td= text_field(:name => "css[name]", :value => @form_css.name) + errors(@form_css, :name)
-            %tr
-              %td 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::Filter.filters, :selected => @form_version.filter) + errors(@form_version, :filter)
-            %tr
-              %td Media (not versioned)
-              %td= text_field(:name => "css[media]", :value => @form_css.media) + errors(@form_css, :media)
-            %tr{:class => "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 as new version")

data/templates/images.html.haml~

@@ -1,17 +0,0 @@
-- if Merbiful::Images.upload_possible?
-  %form{:action => url(:merbiful_admin, :action => "upload_image"), :enctype => "multipart/form-data", :method => "post"}
-    Upload new image
-    %input{:name => "image", :size => "30", :type => "file"}
-    %input{:type => "submit", :value => "Upload"}
-- else
-  %p Upload seems to be impossible, perhaps the 'public/images' directory is not writable?
-%ul{:class => "images"}
-  - Merbiful::Images.images.each do |image|
-    %li{:class => "image"}
-      %ul{:class => "image_info info"}
-        %a{:href => image}
-          %li{:class => "picture"}
-            %img{:height => 20, :src => image.to_s, :alt => image.to_s}
-          %li{:class => "path"}= image
-        - if Merbiful::Images.delete_possible?(image)
-          %a{:href => url(:merbiful_admin, :action => "delete_image", :path => image)} -

data/templates/js.html.haml~

@@ -1,29 +0,0 @@
-%a{:href => url(:merbiful_admin, :action => "create_js")} New js
-%ul{:class => "js"}
-  - Merbiful::Js.all.each do |js|
-    %li{:class => "js"}
-      %ul{:class => "js_info info"}
-        %a{:href => url(:merbiful_admin, :action => "js", :js_id => js.id)}
-          %li{:class => "js_name"}= js.name
-          %li{:class => "js_version"}= "ver##{js.latest.id} (#{time_ago_in_words(js.latest.created_at)} ago)"
-        %li= link_to("-", url(:merbiful_admin, :action => "destroy_js", :js_id => js.id))
-      - if params[:js_id].to_s == js.id.to_s
-        %table.js
-          %form{:action => url(:merbiful_admin, :action => "js", :js_id => js.id), :method => "post"}
-            %tr{:class => "version"}
-              %td Viewing version
-              %td= @form_js.js_versions(:order => [:id.desc]).collect do |v| "<a class='#{v.id == @form_version.id ? 'active' : 'inactive'}' href='#{url(:merbiful_admin, :action => "js", :js_id => @form_js.id, :version_id => v.id)}'>#{v.id}</a>" end.join(", ")
-            %tr
-              %td Name (not versioned)
-              %td= text_field(:name => "js[name]", :value => @form_js.name) + errors(@form_js, :name)
-            %tr
-              %td 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::Filter.filters, :selected => @form_version.filter) + errors(@form_version, :filter)
-            %tr{:class => "cached"}
-              %td Cached (not versioned)
-              %td= check_box(:name => "js[cached]", :checked => @form_js.cached) + errors(@form_js, :cached)
-            %tr{:class => "submit"}
-              %td{:colspan => "2"}= submit("Save as new version")

data/templates/layouts.html.haml~

@@ -1,26 +0,0 @@
-%a{:href => url(:merbiful_admin, :action => "create_layout")} New layout
-%ul{:class => "layouts"}
-  - Merbiful::Layout.all.each do |layout|
-    %li{:class => "layout"}
-      %ul{:class => "layout_info info"}
-        %a{:href => url(:merbiful_admin, :action => "layouts", :layout_id => layout.id)}
-          %li{:class => "layout_name"}= layout.name
-          %li{:class => "layout_version"}= "ver##{layout.latest.id} (#{time_ago_in_words(layout.latest.created_at)} ago)"
-        %li= link_to("-", url(:merbiful_admin, :action => "destroy_layout", :layout_id => layout.id))
-      - if params[:layout_id].to_s == layout.id.to_s
-        %table.layout
-          %form{:action => url(:merbiful_admin, :action => "layouts", :layout_id => layout.id), :method => "post"}
-            %tr{:class => "version"}
-              %td Viewing version
-              %td= @form_layout.layout_versions(:order => [:id.desc]).collect do |v| "<a class='#{v.id == @form_version.id ? 'active' : 'inactive'}' href='#{url(:merbiful_admin, :action => "layouts", :layout_id => @form_layout.id, :version_id => v.id)}'>#{v.id}</a>" end.join(", ")
-            %tr
-              %td Name (not versioned)
-              %td= text_field(:name => "layout[name]", :value => @form_layout.name) + errors(@form_layout, :name)
-            %tr
-              %td 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::Filter.filters, :selected => @form_version.filter) + errors(@form_version, :filter)
-            %tr{:class => "submit"}
-              %td{:colspan => "2"}= submit("Save as new version")

data/templates/page_form.html.haml~

@@ -1,41 +0,0 @@
-%table.page
-  %form{:action => url(:merbiful_admin, :action => "pages", :page_id => @form_page.id), :method => "post"}
-    %tr{:class => "path"}
-      %td Path
-      %td= text_field(:name => "page[path]", :value => @form_page.path) + errors(@form_page, :path)
-    %tr{:class => "title"}
-      %td Title
-      %td= text_field(:name => "version[title]", :value => @form_page.title) + errors(@form_version, :title)
-    %tr{:class => "keywords"}
-      %td Keywords
-      %td= text_field(:name => "version[keywords]", :value => @form_page.keywords) + errors(@form_version, :keywords)
-    %tr{:class => "body"}
-      %td Body
-      %td~ text_area(@form_page.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_page.latest.filter) + errors(@form_version, :filter)
-    %tr{:class => "layout"}
-      %td Layout
-      %td= select(:name => "version[layout_id]", :collection => Merbiful::Layout.all, :include_blank => true, :text_method => :name, :value_method => :id, :selected => @form_page.latest.layout_id) + errors(@form_version, :layout)
-    %tr{:class => "cached"}
-      %td Cached
-      %td= check_box(:name => "page[cached]", :checked => @form_page.cached) + errors(@form_page, :cached)
-    - Merbiful::Css.all.each_with_index do |css, index|
-      - if index == 0
-        %tr{:class => "css"}
-          %td{:rowspan => Merbiful::Css.count, :valign => "top"} Css
-          %td= check_box(:name => "version[css][]", :value => css.id, :checked => @form_page.csses.include?(css)) + css.name 
-      - else 
-        %tr{:class => "css"}
-          %td= check_box(:name => "version[css][]", :value => css.id, :checked => @form_page.csses.include?(css)) + css.name
-    - Merbiful::Js.all.each_with_index do |js, index|
-      - if index == 0
-        %tr{:class => "js"}
-          %td{:rowspan => Merbiful::Js.count, :valign => "top"} Js
-          %td= check_box(:name => "version[js][]", :value => js.id, :checked => @form_page.jses.include?(js)) + js.name 
-      - else 
-        %tr{:class => "js"}
-          %td= check_box(:name => "version[js][]", :value => js.id, :checked => @form_page.jses.include?(js)) + js.name
-    %tr{:class => "submit"}
-      %td{:colspan => 2}= submit("Save")