merbiful-release 0.1.2 → 0.2.1

data/Rakefile

@@ -5,7 +5,7 @@ require 'pathname'
 
 PLUGIN = "merbiful-release"
 NAME = "merbiful-release"
-GEM_VERSION = "0.1.2"
+GEM_VERSION = "0.2.1"
 AUTHOR = "Martin Kihlgren"
 EMAIL = "martin@wemind.se"
 HOMEPAGE = ""
@@ -21,8 +21,6 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency('merb-core', '>= 0.9.5')
-  s.add_dependency('dm-core', '>= 0.9.5')
   s.require_path = 'lib'
   s.autorequire = PLUGIN
   s.files = %w(Rakefile LICENSE) + Dir.glob("{lib,specs,templates}/**/*")

data/lib/merbiful-release/admin.rb

@@ -88,18 +88,23 @@ module Merbiful
       @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 
-          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)
@@ -224,9 +229,8 @@ module Merbiful
     end
 
     def errors(obj, meth)
-      return ""
       if obj.errors.on(meth)
-        obj.errors.on(meth).join(", ")
+        "<div class='error'>#{obj.errors.on(meth).join(", ")}</div>"
       else
         ""
       end

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

@@ -1,282 +1,10 @@
 
 module Merbiful
 
-  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
+  class Controller < Merb::Controller
     
-    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)
+    def display(what)
+      render what.inspect
     end
 
   end

data/lib/merbiful-release/body.rb

@@ -3,12 +3,20 @@ 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
-               filter_class = Merbiful.const_get(self.filter.to_sym)
-               filter_class.new.render(self.body, controller)
+               controller.send(Merb::Template::METHOD_LIST[render_id] ||=
+                               Merb::Template::EXTENSIONS[self.filter].compile_template(FAKE_IO_CLASS.new(self.body, render_id), 
+                                                                                        render_id,
+                                                                                        Merb::InlineTemplates))
              end
       unless Merb.environment == "development"
         caches.each do |destination, to_cache|

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

@@ -2,35 +2,14 @@
 module Merbiful
 
   module Body
-
-    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
+    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)
       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/controller.rb~

@@ -0,0 +1,12 @@
+
+module Merbiful
+
+  class Controller < Merb::Controller
+    
+    def display(what)
+      render what.inspect
+    end
+
+  end
+
+end

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

@@ -17,34 +17,23 @@ 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", :child_key => [:css_id]
+    has n, :page_versions, :through => :css_nesses, :class_name => "Merbiful::Page::Version"
     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])
+      css_versions.first(:order => [:id.desc])
     end
 
-    def_delegators :latest, :render, :body, :filter
-
-    def path
-      "/stylesheets/#{latest.id}"
-    end
+    def_delegators :latest, :render
 
     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]
+      belongs_to :css, :class_name => "Merbiful::Css"
+      belongs_to :page_version, :class_name => "Merbiful::Page::Version"
     end
 
     class Version
@@ -65,10 +54,6 @@ module Merbiful
       
       belongs_to :css, :class_name => "Merbiful::Css"
       
-      before :save do
-        clear_cache(css.path) if css.latest
-      end
-
     end
 
   end

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

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

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

@@ -0,0 +1,11 @@
+module Merbiful
+
+  class Eruby
+
+    def render(text, scope)
+      ::Haml::Engine.new(text).render(scope)
+    end
+
+  end
+
+end

data/lib/merbiful-release/filters.rb

@@ -3,17 +3,12 @@ module Merbiful
 
   module Filter
 
-    @filters = []
-  
-    def self.register_filter(filter)
-      @filters << filter
-    end
-
     def self.filters
-      @filters.inject([[nil, "No filter"]]) do |sum, filter|
-        filter_name = filter.name.gsub(/^Merbiful::/, "")
-        sum + [[filter_name, filter_name]]
+      rval = [[nil, "No filter"]]
+      Merb::Template::EXTENSIONS.each do |name, klass|
+        rval << [name, klass.name]
       end
+      rval
     end
 
   end

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

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

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

@@ -1,7 +1,7 @@
 
 module Merbiful
 
-  class Js
+  class Css
     
     include DataMapper::Resource
     include DataMapper::Validate
@@ -10,40 +10,30 @@ 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, :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
+    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"
 
     def latest
-      js_versions.first(:js_id => self.id, :order => [:id.desc])
+      css_versions.first(:order => [:id.desc])
     end
 
-    def_delegators :latest, :render, :body, :filter
-
-    def path
-      "/javascripts/#{latest.id}"
-    end
+    def_delegators :latest, :render
 
     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]
+      belongs_to :css, :class_name => "Merbiful::Css"
+      belongs_to :page_version, :class_name => "Merbiful::Page::Version"
     end
 
     class Version
@@ -54,7 +44,7 @@ module Merbiful
       
       property :id, Serial
       
-      property :js_id, Integer, :index => true, :nullable => false
+      property :css_id, Integer, :index => true, :nullable => false
       
       property :body, DataMapper::Types::Text
       property :filter, DataMapper::Types::Text
@@ -62,12 +52,8 @@ module Merbiful
       property :created_at, DateTime
       property :updated_at, DateTime
       
-      belongs_to :js, :class_name => "Merbiful::Js"
+      belongs_to :css, :class_name => "Merbiful::Css"
       
-      before :save do
-        clear_cache(js.path) if js.latest
-      end
-
     end
 
   end