merbiful-release 0.2.1 → 0.2.2

data/templates/images.html.haml~

@@ -0,0 +1,17 @@
+- if Merbiful::Images.upload_possible?
+  %form{:action => url(:merbiful_admin, :action => "upload_image"), :enctype => "multipart/form-data", :method => "post"}
+    Upload new image
+    %input{:name => "image", :size => "30", :type => "file"}
+    %input{:type => "submit", :value => "Upload"}
+- else
+  %p Upload seems to be impossible, perhaps the 'public/images' directory is not writable?
+%ul{:class => "images"}
+  - Merbiful::Images.images.each do |image|
+    %li{:class => "image"}
+      %ul{:class => "image_info info"}
+        %a{:href => image}
+          %li{:class => "picture"}
+            %img{:height => 20, :src => image.to_s, :alt => image.to_s}
+          %li{:class => "path"}= image
+        - if Merbiful::Images.delete_possible?(image)
+          %a{:href => url(:merbiful_admin, :action => "delete_image", :path => image)} -

data/templates/js.html.haml~

@@ -1,29 +1,29 @@
-%a{:href => url(:merbiful_admin, :action => "create_css")} New css
-%ul{:class => "css"}
-  - Merbiful::Css.all.each do |css|
-    %li{:class => "css"}
-      %ul{:class => "css_info info"}
-        %a{:href => url(:merbiful_admin, :action => "css", :css_id => css.id)}
-          %li{:class => "css_name"}= css.name
-          %li{:class => "css_version"}= "ver##{css.latest.id} (#{time_ago_in_words(css.latest.created_at)} ago)"
-        %li= link_to("-", url(:merbiful_admin, :action => "destroy_css", :css_id => css.id))
-      - if params[:css_id].to_s == css.id.to_s
-        %table.css
-          %form{:action => url(:merbiful_admin, :action => "css", :css_id => css.id), :method => "post"}
+%a{:href => url(:merbiful_admin, :action => "create_js")} New js
+%ul{:class => "js"}
+  - Merbiful::Js.all.each do |js|
+    %li{:class => "js"}
+      %ul{:class => "js_info info"}
+        %a{:href => url(:merbiful_admin, :action => "js", :js_id => js.id)}
+          %li{:class => "js_name"}= js.name
+          %li{:class => "js_version"}= "ver##{js.latest.id} (#{time_ago_in_words(js.latest.created_at)} ago)"
+        %li= link_to("-", url(:merbiful_admin, :action => "destroy_js", :js_id => js.id))
+      - if params[:js_id].to_s == js.id.to_s
+        %table.js
+          %form{:action => url(:merbiful_admin, :action => "js", :js_id => js.id), :method => "post"}
+            %tr{:class => "version"}
+              %td Viewing version
+              %td= @form_js.js_versions(:order => [:id.desc]).collect do |v| "<a class='#{v.id == @form_version.id ? 'active' : 'inactive'}' href='#{url(:merbiful_admin, :action => "js", :js_id => @form_js.id, :version_id => v.id)}'>#{v.id}</a>" end.join(", ")
             %tr
-              %td Name
-              %td= text_field(:name => "css[name]", :value => @form_css.name) + errors(@form_css, :name)
+              %td Name (not versioned)
+              %td= text_field(:name => "js[name]", :value => @form_js.name) + errors(@form_js, :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_version.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)
-            %tr
-              %td Media
-              %td= text_field(:name => "css[media]", :value => @form_css.media) + errors(@form_css, :media)
+              %td= select(:name => "version[filter]", :collection => Merbiful::Filter.filters, :selected => @form_version.filter) + errors(@form_version, :filter)
             %tr{:class => "cached"}
-              %td Cached
-              %td= check_box(:name => "css[cached]", :checked => @form_css.cached) + errors(@form_css, :cached)
+              %td Cached (not versioned)
+              %td= check_box(:name => "js[cached]", :checked => @form_js.cached) + errors(@form_js, :cached)
             %tr{:class => "submit"}
-              %td{:colspan => "2"}= submit("Save")
+              %td{:colspan => "2"}= submit("Save as new version")

data/templates/layouts.html.haml~

@@ -0,0 +1,26 @@
+%a{:href => url(:merbiful_admin, :action => "create_layout")} New layout
+%ul{:class => "layouts"}
+  - Merbiful::Layout.all.each do |layout|
+    %li{:class => "layout"}
+      %ul{:class => "layout_info info"}
+        %a{:href => url(:merbiful_admin, :action => "layouts", :layout_id => layout.id)}
+          %li{:class => "layout_name"}= layout.name
+          %li{:class => "layout_version"}= "ver##{layout.latest.id} (#{time_ago_in_words(layout.latest.created_at)} ago)"
+        %li= link_to("-", url(:merbiful_admin, :action => "destroy_layout", :layout_id => layout.id))
+      - if params[:layout_id].to_s == layout.id.to_s
+        %table.layout
+          %form{:action => url(:merbiful_admin, :action => "layouts", :layout_id => layout.id), :method => "post"}
+            %tr{:class => "version"}
+              %td Viewing version
+              %td= @form_layout.layout_versions(:order => [:id.desc]).collect do |v| "<a class='#{v.id == @form_version.id ? 'active' : 'inactive'}' href='#{url(:merbiful_admin, :action => "layouts", :layout_id => @form_layout.id, :version_id => v.id)}'>#{v.id}</a>" end.join(", ")
+            %tr
+              %td Name (not versioned)
+              %td= text_field(:name => "layout[name]", :value => @form_layout.name) + errors(@form_layout, :name)
+            %tr
+              %td Body
+              %td~ text_area(@form_version.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::Filter.filters, :selected => @form_version.filter) + errors(@form_version, :filter)
+            %tr{:class => "submit"}
+              %td{:colspan => "2"}= submit("Save as new version")

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.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Martin Kihlgren
@@ -9,10 +9,119 @@ autorequire: merbiful-release
 bindir: bin
 cert_chain: []
 
-date: 2008-10-07 00:00:00 +02:00
+date: 2008-10-18 00:00:00 +02:00
 default_executable: 
-dependencies: []
-
+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: 
 description: Merb plugin that provides a simple CMS
 email: martin@wemind.se
 executables: []
@@ -25,51 +134,46 @@ files:
 - Rakefile
 - LICENSE
 - lib/merbiful-release
-- lib/merbiful-release/page.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/version.rb~
+- lib/merbiful-release/body.rb
 - lib/merbiful-release/body.rb~
+- lib/merbiful-release/controller.rb
+- lib/merbiful-release/css.rb
 - lib/merbiful-release/css.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/filters.rb
+- lib/merbiful-release/filters.rb~
+- lib/merbiful-release/haml.rb~
 - lib/merbiful-release/images.rb
-- lib/merbiful-release/layout.rb
-- lib/merbiful-release/admin.rb
-- lib/merbiful-release/body.rb
-- lib/merbiful-release/css.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/string.rb
-- lib/merbiful-release/filters.rb
-- lib/merbiful-release.rb~
+- lib/merbiful-release/string.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/admin_layout.html.rhtml~
-- templates/css.html.haml~
-- templates/js.html.haml~
+- lib/merbiful-release.rb~
 - templates/admin.css
+- templates/admin.css~
 - templates/admin_layout.html.haml
-- templates/images.html.haml
-- templates/page_form.html.haml
+- templates/admin_layout.html.haml~
 - templates/css.html.haml
+- templates/css.html.haml~
+- templates/images.html.haml
+- templates/images.html.haml~
+- templates/index.html.haml
 - templates/js.html.haml
+- templates/js.html.haml~
 - templates/layouts.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