merbiful-release 0.0.3 → 0.1.0

data/LICENSE

@@ -0,0 +1,7 @@
+The person or persons who have associated work with this document (the "Dedicator" or "Certifier") hereby either (a) certifies that, to the best of his knowledge, the work of authorship identified is in the public domain of the country from which the work is published, or (b) hereby dedicates whatever copyright the dedicators holds in the work of authorship identified below (the "Work") to the public domain. A certifier, moreover, dedicates any copyright interest he may have in the associated work, and for these purposes, is described as a "dedicator" below.
+
+A certifier has taken reasonable steps to verify the copyright status of this work. Certifier recognizes that his good faith efforts may not shield him from liability if in fact the work certified is not in the public domain.
+
+Dedicator makes this dedication for the benefit of the public at large and to the detriment of the Dedicator's heirs and successors. Dedicator intends this dedication to be an overt act of relinquishment in perpetuity of all present and future rights under copyright law, whether vested or contingent, in the Work. Dedicator understands that such relinquishment of all rights includes the relinquishment of all rights to enforce (by lawsuit or otherwise) those copyrights in the Work.
+
+Dedicator recognizes that, once placed in the public domain, the Work may be freely reproduced, distributed, transmitted, used, modified, built upon, or otherwise exploited by anyone for any purpose, commercial or non-commercial, and in any way, including by methods that have not yet been invented or conceived.

data/Rakefile

@@ -5,7 +5,7 @@ require 'pathname'
 
 PLUGIN = "merbiful-release"
 NAME = "merbiful-release"
-GEM_VERSION = "0.0.3"
+GEM_VERSION = "0.1.0"
 AUTHOR = "Martin Kihlgren"
 EMAIL = "martin@wemind.se"
 HOMEPAGE = ""
@@ -25,7 +25,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('dm-core', '>= 0.9.5')
   s.require_path = 'lib'
   s.autorequire = PLUGIN
-  s.files = %w(Rakefile) + Dir.glob("{lib,specs,templates}/**/*")
+  s.files = %w(Rakefile LICENSE) + Dir.glob("{lib,specs,templates}/**/*")
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

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

@@ -122,17 +122,13 @@ module Merbiful
 
     def destroy_page
       page = Page.get(params[:page_id])
-      page.versions.each do |version|
-        version.css_nesses.destroy!
-        version.js_nesses.destroy!
-        version.destroy
-      end
       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
@@ -146,27 +142,18 @@ module Merbiful
 
     def destroy_layout
       layout = Layout.get(params[:layout_id])
-      layout.page_versions.each do |page_version|
-        page_version.layout = nil
-        page_version.save
-      end
-      layout.layout_versions.destroy!
       layout.destroy
       redirect url(:merbiful_admin, :action => "layouts")
     end
 
     def destroy_css
       css = Css.get(params[:css_id])
-      css.css_nesses.destroy!
-      css.css_versions.destroy!
       css.destroy
       redirect url(:merbiful_admin, :action => "css")
     end
 
     def destroy_js
       js = Js.get(params[:js_id])
-      js.js_nesses.destroy!
-      js.js_versions.destroy!
       js.destroy
       redirect url(:merbiful_admin, :action => "js")
     end
@@ -181,19 +168,19 @@ module Merbiful
     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')
+      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')
+      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')
+      redirect url(:merbiful_admin, :action => 'layouts', :layout_id => new_layout.id)
     end
 
     def move_page_up

data/templates/css.html.haml

@@ -6,7 +6,7 @@
         %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))
+        %li= link_to("-", url(:merbiful_admin, :action => "destroy_css", :css_id => css.id), :onclick => confirm("Are you absolutely certain that you want to destroy the css named #{css.name}? All versions will be irreversibly destroyed."))
       - 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"}

data/templates/css.html.haml~

@@ -10,20 +10,23 @@
       - 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"}
+            %tr{:class => "version"}
+              %td Viewing version
+              %td= @form_css.css_versions(:order => [:id.desc]).collect do |v| "<a class='#{v.id == @form_version.id ? 'active' : 'inactive'}' href='#{url(:merbiful_admin, :action => "css", :css_id => @form_css.id, :version_id => v.id)}'>#{v.id}</a>" end.join(", ")
             %tr
-              %td Name
+              %td Name (not versioned)
               %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 => text_area_rows) + 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)
+              %td= select(:name => "version[filter]", :collection => Merbiful::Filter.filters, :selected => @form_version.filter) + errors(@form_version, :filter)
             %tr
-              %td Media
+              %td Media (not versioned)
               %td= text_field(:name => "css[media]", :value => @form_css.media) + errors(@form_css, :media)
             %tr{:class => "cached"}
-              %td Cached
+              %td Cached (not versioned)
               %td= check_box(:name => "css[cached]", :checked => @form_css.cached) + errors(@form_css, :cached)
             %tr{:class => "submit"}
-              %td{:colspan => "2"}= submit("Save")
+              %td{:colspan => "2"}= submit("Save as new version")

data/templates/js.html.haml

@@ -6,7 +6,7 @@
         %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))
+        %li= link_to("-", url(:merbiful_admin, :action => "destroy_js", :js_id => js.id), :onclick => confirm("Are you absolutely certain that you want to destroy the js named #{js.name}? All versions will be irreversibly destroyed."))
       - 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"}

data/templates/js.html.haml~

@@ -0,0 +1,29 @@
+%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 (not versioned)
+              %td= text_field(:name => "js[name]", :value => @form_js.name) + errors(@form_js, :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 => "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 as new version")

data/templates/layouts.html.haml

@@ -6,7 +6,7 @@
         %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))
+        %li= link_to("-", url(:merbiful_admin, :action => "destroy_layout", :layout_id => layout.id), :onclick => confirm("Are you absolutely certain that you want to destroy the layout named #{layout.name}? All versions will be irreversibly destroyed."))
       - 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"}
@@ -23,4 +23,4 @@
               %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")
+              %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")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merbiful-release
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Martin Kihlgren
@@ -42,6 +42,7 @@ extra_rdoc_files: []
 
 files: 
 - Rakefile
+- LICENSE
 - lib/merbiful-release
 - lib/merbiful-release/admin.rb
 - lib/merbiful-release/admin.rb~
@@ -79,7 +80,9 @@ files:
 - 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