merbiful-release 0.0.2 → 0.0.3

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

@@ -1,21 +1,49 @@
 
-class Page
-
-  include DataMapper::Resource
-  include DataMapper::Validate
-  
-  property :id, Integer, :key => true, :serial => true
-  property :version, Integer, :key => true
-  property :body, DataMapper::Types::Text
-  property :filter, DataMapper::Types::Text
-  property :parent_id, Integer
-  property :path, DataMapper::Types::Text, :key => true
-  property :created_at, DateTime
-  property :updated_at, DateTime
-  property :position, Integer
-  property :author, DataMapper::Types::Text
-  property :layout, Integer
-  property :title, DataMapper::Types::Text
-  property :keywords, DataMapper::Types::Text
+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

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

@@ -8,48 +8,89 @@ module Merbiful
 
     include DataMapper::Resource
     include DataMapper::Validate
-    include Merbiful::Body
-
-    validates_is_unique :version, :scope => [:path]
+    extend Forwardable
 
     property :id, Serial
-    property :version, Integer, :index => true
-    property :body, DataMapper::Types::Text
-    property :filter, DataMapper::Types::Text
-    property :path, DataMapper::Types::Text, :index => true
+    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
-    property :title, DataMapper::Types::Text
-    property :keywords, DataMapper::Types::Text
-    property :parent_path, DataMapper::Types::Text
-    property :layout_id, Integer
 
-    belongs_to :layout, :class_name => "Merbiful::Layout"
+    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 :save do
-      last_version = self.class.first(:path => self.path, :order => [:version.desc])
-      if last_version.nil?
-        self.version = 0
-      else
-        self.version = last_version.version + 1
-      end
       if self.position.nil?
-        last_position = self.class.first(:parent_path => self.parent_path, :path.not => self.path)
+        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
-      if self.path.nil?
-        self.path = "/"
-      end
+    end
 
+    def latest
+      versions.first(:page_id => self.id, :order => [:id.desc])
     end
 
-    def children
-      Page.find_by_sql(["SELECT id FROM merbiful_pages WHERE parent_path = ? GROUP BY path ORDER BY version DESC", self.path])
+    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
+
+      has n, :js_nesses, :class_name => "Merbiful::Js::Ness"
+      has n, :jses, :through => :js_nesses, :class_name => "Merbiful::Js", :remote_name => :js
+
+      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
+      end
+      
+      def remove_css(css)
+        css_nesses.first(:css_id => css.id).destroy
+      end
+
+      def add_js(js)
+        Merbiful::Js::Ness.new(:js => js, :page_version => self).save
+      end
+
+      def remove_js(js)
+        js_nesses.first(:js_id => js.id).destroy
+      end
+
     end
 
   end

data/lib/merbiful-release.rb~

@@ -1,2 +1,40 @@
 
-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'
+
+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', 'relative_time.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/templates/admin.css~

@@ -1,3 +1,14 @@
-ul {
-  background-color: red;
+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,9 +1,10 @@
 %html
+  %link{:href => url(:merbiful_admin_css), :rel => 'Stylesheet', :type => 'text/css'}
   %body
-    %h1 Merbiful Release Administration Interface
+    %h1= link_to("Merbiful Release Administration Interface", url(:merbiful_admin_index))
     %ul.menu
-      %li Pages
-      %li Layouts
-      %li Css
-      %li Js
+      %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"))
     = catch_content :for_layout

data/templates/css.html.haml~

@@ -15,7 +15,7 @@
               %td= text_field(:name => "css[name]", :value => @form_css.name) + errors(@form_css, :name)
             %tr
               %td Body
-              %td~ text_area(@form_css.body, :name => "version[body]", :cols => 80, :rows => (2 * @form_css.body.to_s.split(/\n/).size)) + errors(@form_version, :body)
+              %td~ text_area(@form_css.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_css.latest.filter) + errors(@form_version, :filter)

data/templates/{js.html.haml~ → images.html.haml~}

@@ -1,6 +1,5 @@
-%a{:href => url(:merbiful_admin, :action => "create_css")} New css
-%ul{:class => "css"}
-  - Merbiful::Css.all.each do |css|
+%ul{:class => "images"}
+  - Merbiful::Images.all.each do |css|
     %li{:class => "css"}
       %ul{:class => "css_info info"}
         %a{:href => url(:merbiful_admin, :action => "css", :css_id => css.id)}
@@ -15,7 +14,7 @@
               %td= text_field(:name => "css[name]", :value => @form_css.name) + errors(@form_css, :name)
             %tr
               %td Body
-              %td~ text_area(@form_css.body, :name => "version[body]", :cols => 80, :rows => (2 * @form_css.body.to_s.split(/\n/).size)) + errors(@form_version, :body)
+              %td~ text_area(@form_css.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_css.latest.filter) + errors(@form_version, :filter)

data/templates/page_form.html.haml~

@@ -1 +1,41 @@
-%p hej!
+%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")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merbiful-release
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Martin Kihlgren
@@ -9,7 +9,7 @@ autorequire: merbiful-release
 bindir: bin
 cert_chain: []
 
-date: 2008-09-12 00:00:00 +02:00
+date: 2008-09-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,53 +43,45 @@ extra_rdoc_files: []
 files: 
 - Rakefile
 - lib/merbiful-release
-- lib/merbiful-release/page.rb~
-- lib/merbiful-release/layout.rb~
-- lib/merbiful-release/layout.rb
-- lib/merbiful-release/merbiful.rb~
-- lib/merbiful-release/routes.rb~
-- lib/merbiful-release/routes.rb
+- lib/merbiful-release/admin.rb
 - lib/merbiful-release/admin.rb~
-- lib/merbiful-release/controller.rb~
-- lib/merbiful-release/controller.rb
-- lib/merbiful-release/haml.rb~
-- lib/merbiful-release/page.rb
-- lib/merbiful-release/version.rb~
-- lib/merbiful-release/body.rb~
 - lib/merbiful-release/body.rb
-- lib/merbiful-release/css.rb~
-- lib/merbiful-release/js.rb~
-- lib/merbiful-release/js.rb
-- lib/merbiful-release/eruby.rb~
-- lib/merbiful-release/erubis.rb~
-- lib/merbiful-release/relative_time.rb~
-- lib/merbiful-release/relative_time.rb
+- lib/merbiful-release/body.rb~
+- lib/merbiful-release/controller.rb
 - lib/merbiful-release/css.rb
-- lib/merbiful-release/admin.rb
+- lib/merbiful-release/css.rb~
 - lib/merbiful-release/erubis.rb
+- lib/merbiful-release/erubis.rb~
 - lib/merbiful-release/filters.rb
+- lib/merbiful-release/filters.rb~
 - lib/merbiful-release/haml.rb
+- lib/merbiful-release/haml.rb~
 - lib/merbiful-release/images.rb
-- lib/merbiful-release.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.rb
-- templates/index.html.haml~
-- templates/index.html.haml
-- templates/admin_layout.html.haml~
-- templates/pages.html.haml~
-- templates/admin.css~
-- templates/page_form.html.haml~
-- templates/layouts.html.haml~
-- templates/layouts.html.haml
-- templates/admin_layout.html.rhtml~
-- templates/css.html.haml~
-- templates/js.html.haml~
-- templates/js.html.haml
-- templates/css.html.haml
+- 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.orig
+- templates/css.html.haml~
 - templates/images.html.haml
+- templates/images.html.haml~
+- templates/index.html.haml
+- templates/js.html.haml
+- templates/layouts.html.haml
 - templates/page_form.html.haml
+- templates/page_form.html.haml~
 has_rdoc: true
 homepage: ""
 post_install_message: 

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

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

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

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

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

@@ -1,8 +0,0 @@
-
-class Merbiful < Application
-
-  def peek
-    
-  end
-
-end

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

@@ -1,78 +0,0 @@
-module Merbiful
-
-  module RelativeTimeHelpers
-    mattr_accessor :time_class
-    mattr_accessor :time_output
-    
-    self.time_class = Time
-    self.time_output = {
-      :today          => 'today',
-      :yesterday      => 'yesterday',
-      :tomorrow       => 'tomorrow',
-      :initial_format => '%b %d',
-      :year_format    => ', %Y'
-    }
-
-    def relative_date(time)
-      date  = time.to_date
-      today = time_class.now.to_date
-      if date == today
-        time_output[:today]
-      elsif date == (today - 1)
-        time_output[:yesterday]
-      elsif date == (today + 1)
-        time_output[:tomorrow]
-      else
-        fmt  = time_output[:initial_format].dup
-        fmt << time_output[:year_format] unless date.year == today.year
-        time.strftime_ordinalized(fmt)
-      end
-    end
-    
-    def relative_date_span(times)
-      times = [times.first, times.last].collect!(&:to_date)
-      times.sort!
-      if times.first == times.last
-        relative_date(times.first)
-      else
-        first = times.first; last = times.last; now = time_class.now
-        [first.strftime_ordinalized('%b %d')].tap do |arr|
-          arr << ", #{first.year}" unless first.year == last.year
-          arr << ' - '
-          arr << last.strftime('%b') << ' ' unless first.year == last.year && first.month == last.month
-          arr << last.day.ordinalize
-          arr << ", #{last.year}" unless first.year == last.year && last.year == now.year
-        end.to_s
-      end
-    end
-    
-    def relative_time_span(times)
-      times = [times.first, times.last].collect!(&:to_time)
-      times.sort!
-      if times.first == times.last
-        "#{prettier_time(times.first)} #{relative_date(times.first)}"
-      elsif times.first.to_date == times.last.to_date
-          same_half = (times.first.hour/12 == times.last.hour/12)
-          "#{prettier_time(times.first, !same_half)} - #{prettier_time(times.last)} #{relative_date(times.first)}"
-
-      else
-        first = times.first; last = times.last; now = time_class.now        
-        [prettier_time(first)].tap do |arr|
-          arr << ' '
-          arr << first.strftime_ordinalized('%b %d')
-          arr << ", #{first.year}" unless first.year == last.year
-          arr << ' - '
-          arr << prettier_time(last)
-          arr << ' '
-          arr << last.strftime('%b') << ' ' unless first.year == last.year && first.month == last.month
-          arr << last.day.ordinalize
-          arr << ", #{last.year}" unless first.year == last.year && last.year == now.year
-        end.to_s
-      end
-    end
-    
-    def prettier_time(time, ampm=true)
-      time.strftime("%I:%M#{" %p" if ampm}").sub(/^0/, '')
-    end
-  end
-end

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

@@ -1,4 +0,0 @@
-Merb.logger.info("Compiling merbiful routes...")
-Merb::Router.prepare do |r|
-  r.match(/(.*)/).to(:controller => "merbiful", :action => "peek")
-end

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

@@ -1,45 +0,0 @@
-
-module Merbiful
-
-  class Page
-
-    class NoSuchFilterError < RuntimeError
-    end
-
-    include DataMapper::Resource
-    include DataMapper::Validate
-    include Merbiful::Body
-
-    validates_is_unique :version, :scope => [:path]
-
-    property :id, Serial
-    property :version, Integer, :index => true
-    property :body, DataMapper::Types::Text
-    property :filter, DataMapper::Types::Text
-    property :path, DataMapper::Types::Text, :index => true
-    property :position, Integer
-    property :created_at, DateTime
-    property :updated_at, DateTime
-    property :title, DataMapper::Types::Text
-    property :keywords, DataMapper::Types::Text
-    property :parent_path, DataMapper::Types::Text
-    property :layout_id, Integer
-
-    before :save do
-      if self.position.nil?
-        last_position = self.class.first(:parent_path => self.parent_path, :path.not => self.path)
-        if last_position.nil?
-          self.position = 0
-        else
-          self.position = last_position.position + 1
-        end
-      end
-      if self.path.nil?
-        self.path = "/"
-      end
-
-    end
-
-  end
-
-end

data/templates/admin_layout.html.rhtml~

@@ -1,10 +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"))
-    = catch_content :for_layout

data/templates/index.html.haml~

@@ -1,2 +0,0 @@
-%p Welcome to the Merbiful Release Administration Interface
-%p I am sure we will get along well.

data/templates/pages.html.haml~

@@ -1,3 +0,0 @@
-%ul
-  = render_page @root
-