merbiful-release 0.2.4 → 0.2.8

data/Rakefile

@@ -5,7 +5,7 @@ require 'pathname'
 
 PLUGIN = "merbiful-release"
 NAME = "merbiful-release"
-GEM_VERSION = "0.2.4"
+GEM_VERSION = "0.2.8"
 AUTHOR = "Martin Kihlgren"
 EMAIL = "martin@wemind.se"
 HOMEPAGE = ""
@@ -21,9 +21,6 @@ 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,7 +1,11 @@
 
 require 'merb-core'
 require 'merb-action-args'
-require 'merb_helpers'
+begin
+  require 'merb-helpers' 
+rescue LoadError => e
+  require 'merb_helpers'
+end
 require 'merb-assets'
 require 'dm-core'
 require 'dm-validations'

data/lib/merbiful-release.rb~

@@ -7,14 +7,13 @@ 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', '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')
@@ -25,5 +24,3 @@ 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/body.rb

@@ -17,14 +17,14 @@ module Merbiful
                                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)
+                                   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)
+                                   filter.compile_template(FAKE_IO_CLASS.new(self.body, render_id), 
+                                                           render_id,
+                                                           [],
+                                                           Merb::InlineTemplates)
                                  end
                                end)
              end

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

@@ -14,10 +14,19 @@ module Merbiful
                self.body
              else
                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))
+                               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|

data/lib/merbiful-release/controller.rb

@@ -14,20 +14,26 @@ module Merbiful
 
     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 display(what)
+    def page(what)
       @page = Page.first(:path => what)
       raise NotFound.new(what.inspect) unless @page
       unless @page.jses.empty?

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

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

@@ -32,7 +32,7 @@ module Merbiful
     def_delegators :latest, :render, :body, :filter
 
     def path
-      "/stylesheets/#{latest.id}"
+      "/stylesheets/#{latest.id}.css"
     end
 
     class Ness

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/js.rb

@@ -31,7 +31,7 @@ module Merbiful
     def_delegators :latest, :render, :body, :filter
 
     def path
-      "/javascripts/#{latest.id}"
+      "/javascripts/#{latest.id}.js"
     end
 
     class Ness

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/page.rb

@@ -43,6 +43,26 @@ module Merbiful
       end
     end
 
+    def self.root
+      first(:path => "/")
+    end
+
+    def ancestors
+      if self.parent.nil?
+        return []
+      else
+        return [parent] + parent.ancestors
+      end
+    end
+
+    def descendants
+      if self.children.empty?
+        return []
+      else
+        return self.children + self.children.inject([]) do |sum, child| sum + child.descendants end
+      end
+    end
+
     def latest
       versions.first(:page_id => self.id, :order => [:id.desc])
     end

data/lib/merbiful-release/routes.rb

@@ -4,9 +4,9 @@ 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").to(:controller => "controller", :namespace => "merbiful", :action => "css")
-  r.match("/javascripts/:id").to(:controller => "controller", :namespace => "merbiful", :action => "js")
-  r.match(/(.*)/).to(:controller => "controller", :namespace => "merbiful", :action => "display", :what => "[1]")
+  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

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

@@ -0,0 +1,42 @@
+
+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 => "plur", :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
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merbiful-release
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.8
 platform: ruby
 authors: 
 - Martin Kihlgren
@@ -9,119 +9,10 @@ autorequire: merbiful-release
 bindir: bin
 cert_chain: []
 
-date: 2008-10-18 00:00:00 +02:00
+date: 2009-02-19 00:00:00 +01:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: merb-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: merb_helpers
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: merb_datamapper
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: merb-action-args
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: merb-assets
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: merb-haml
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: dm-aggregates
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: dm-migrations
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: dm-timestamps
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: dm-validations
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+dependencies: []
+
 description: Merb plugin that provides a simple CMS
 email: martin@wemind.se
 executables: []
@@ -139,6 +30,7 @@ files:
 - 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~
@@ -155,6 +47,7 @@ files:
 - 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