merbiful-release 0.1.1 → 0.1.2

data/Rakefile

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

data/lib/merbiful-release.rb

@@ -15,6 +15,7 @@ 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')

data/lib/merbiful-release.rb~

@@ -14,20 +14,9 @@ require 'erubis'
 require 'pp'
 require 'digest/sha1'
 
-module Merbiful
-
-  FILTERS = []
-
-  def self.filters
-    FILTERS.inject([[nil, "Verbatim"]]) do |sum, filter|
-      filter_name = filter.name.gsub(/^Merbiful::/, "")
-      sum + [[filter_name, filter_name]]
-    end
-  end
-
-end
-
+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')

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

@@ -199,6 +199,10 @@ module Merbiful
 
     private
 
+    def confirm(message)
+      "return confirm('#{message}');"
+    end
+
     def text_area_rows
       20
     end
@@ -249,7 +253,7 @@ module Merbiful
       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)}'>-</a></li>" unless page.parent_id.nil?
+      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

data/lib/merbiful-release/body.rb

@@ -13,7 +13,7 @@ module Merbiful
       unless Merb.environment == "development"
         caches.each do |destination, to_cache|
           if to_cache
-            path = Pathname.new(File.join(Merb.root, "public", destination))
+            path = destination.cached_path
             Merb.logger.info("Flushing to #{path.inspect}")
             path.parent.mkpath
             path.open("w") do |out|
@@ -25,12 +25,6 @@ module Merbiful
       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

@@ -66,7 +66,7 @@ module Merbiful
       belongs_to :css, :class_name => "Merbiful::Css"
       
       before :save do
-        clear_cache(css.path) if css.latest
+        css.path.clear_cache! if css.latest
       end
 
     end

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

@@ -17,9 +17,14 @@ 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(:css_id => self.id, :order => [:id.desc])
     end
@@ -35,9 +40,11 @@ module Merbiful
       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

data/lib/merbiful-release/filters.rb

@@ -10,7 +10,7 @@ module Merbiful
     end
 
     def self.filters
-      @filters.inject([[nil, "Verbatim"]]) do |sum, filter|
+      @filters.inject([[nil, "No filter"]]) do |sum, filter|
         filter_name = filter.name.gsub(/^Merbiful::/, "")
         sum + [[filter_name, filter_name]]
       end

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

@@ -1,13 +1,21 @@
 
 module Merbiful
 
-  FILTERS = []
+  module Filter
 
-  def self.filters
-    FILTERS.inject([[nil, "Verbatim"]]) do |sum, filter|
-      filter_name = filter.name.gsub(/^Merbiful::/, "")
-      sum + [[filter_name, filter_name]]
+    @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/js.rb

@@ -65,7 +65,7 @@ module Merbiful
       belongs_to :js, :class_name => "Merbiful::Js"
       
       before :save do
-        clear_cache(js.path) if js.latest
+        js.path.clear_cache! if js.latest
       end
 
     end

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

@@ -16,9 +16,14 @@ module Merbiful
     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"
+    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
@@ -34,9 +39,11 @@ module Merbiful
       include DataMapper::Validate
 
       property :id, Serial
+      property :page_version_id, Integer
+      property :js_id, Integer
 
-      belongs_to :js, :class_name => "Merbiful::Js"
-      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

data/lib/merbiful-release/page.rb

@@ -83,7 +83,7 @@ module Merbiful
       end
 
       before :save do
-        clear_cache(page.path) if page.latest
+        page.path.clear_cache! if page.latest
       end
       
       def add_css(css)

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

@@ -26,6 +26,12 @@ module Merbiful
 
     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)
@@ -66,17 +72,22 @@ module Merbiful
       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
+      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
+      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.new(:css => css, :page_version => self).save
+        Merbiful::Css::Ness.create(:css => css, :page_version => self)
       end
       
       def remove_css(css)
@@ -84,7 +95,7 @@ module Merbiful
       end
 
       def add_js(js)
-        Merbiful::Js::Ness.new(:js => js, :page_version => self).save
+        Merbiful::Js::Ness.create(:js => js, :page_version => self)
       end
 
       def remove_js(js)

data/lib/merbiful-release/string.rb

@@ -0,0 +1,26 @@
+
+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.parent.mkpath
+    path
+  end
+  
+  def currently_cached?
+    path = cached_path
+    path.exist? && path.file?
+  end
+  
+  def clear_cache!
+    path = cached_path
+    path.rmtree if path.exist?
+  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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merbiful-release
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Martin Kihlgren
@@ -9,7 +9,7 @@ autorequire: merbiful-release
 bindir: bin
 cert_chain: []
 
-date: 2008-09-13 00:00:00 +02:00
+date: 2008-09-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,6 +67,8 @@ files:
 - lib/merbiful-release/page.rb~
 - lib/merbiful-release/relative_time.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