merbiful-release 0.2.1 → 0.2.2

data/Rakefile

@@ -5,7 +5,7 @@ require 'pathname'
 
 PLUGIN = "merbiful-release"
 NAME = "merbiful-release"
-GEM_VERSION = "0.2.1"
+GEM_VERSION = "0.2.2"
 AUTHOR = "Martin Kihlgren"
 EMAIL = "martin@wemind.se"
 HOMEPAGE = ""
@@ -21,6 +21,9 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
+  %w(merb-core merb_helpers merb_datamapper merb-action-args merb-assets merb-haml dm-core dm-aggregates dm-migrations dm-timestamps dm-validations).each do |dep|
+    s.add_dependency(dep)
+  end
   s.require_path = 'lib'
   s.autorequire = PLUGIN
   s.files = %w(Rakefile LICENSE) + Dir.glob("{lib,specs,templates}/**/*")

data/lib/merbiful-release.rb~

@@ -1,2 +1,29 @@
 
-require File.join(File.dirname(__FILE__), 'merbiful-release', 'merbiful.rb')
+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 'haml'
+require 'forwardable'
+require 'pathname'
+require 'erubis'
+require 'pp'
+require 'digest/sha1'
+
+require File.join(File.dirname(__FILE__), 'merbiful-release', 'filters.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')
+require File.join(File.dirname(__FILE__), 'merbiful-release', 'haml.rb')
+require File.join(File.dirname(__FILE__), 'merbiful-release', 'erubis.rb')

data/lib/merbiful-release/admin.rb

@@ -5,6 +5,31 @@ module Merbiful
 
     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

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

@@ -1,10 +1,282 @@
 
 module Merbiful
 
-  class Controller < Merb::Controller
+  class Admin < Merb::Controller
+
+    include RelativeTimeHelpers
+
+    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])
+        if @form_page.valid?
+          @form_page.save 
+          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_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)
+      return ""
+      if obj.errors.on(meth)
+        obj.errors.on(meth).join(", ")
+      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 display(what)
-      render what.inspect
+    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

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

@@ -2,14 +2,35 @@
 module Merbiful
 
   module Body
-    def to_html(controller)
-      if self.filter.nil?
-        self.body
-      else
-        filter_class = Merbiful.const_get(self.filter.to_sym)
-        filter_class.new.render(self.body, controller)
+
+    def render(controller, caches = {})
+      rval = if self.filter.blank?
+               self.body
+             else
+               filter_class = Merbiful.const_get(self.filter.to_sym)
+               filter_class.new.render(self.body, controller)
+             end
+      unless Merb.environment == "development"
+        caches.each do |destination, to_cache|
+          if to_cache
+            path = Pathname.new(File.join(Merb.root, "public", destination))
+            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
+
+    def clear_cache(target)
+      return if target == "/"
+      path = Pathname.new(File.join(Merb.root, "public", target))
+      path.unlink if path.exist?
     end
+
   end
 
 end

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

@@ -17,23 +17,34 @@ module Merbiful
     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, :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(:order => [:id.desc])
+      css_versions.first(:css_id => self.id, :order => [:id.desc])
     end
 
-    def_delegators :latest, :render
+    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"
-      belongs_to :page_version, :class_name => "Merbiful::Page::Version"
+      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
@@ -54,6 +65,10 @@ module Merbiful
       
       belongs_to :css, :class_name => "Merbiful::Css"
       
+      before :save do
+        clear_cache(css.path) if css.latest
+      end
+
     end
 
   end