merbiful-release 0.2.3 → 0.2.4

data/Rakefile

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

data/lib/merbiful-release/admin.rb

@@ -159,7 +159,11 @@ module Merbiful
     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)
+      uploaded_path = Pathname.new(params[:image][:tempfile].path)
+      path.open("w") do |out|
+        out.write(uploaded_path.read)
+      end
+      uploaded_path.unlink
       redirect url(:merbiful_admin, :action => "images")
     end
 

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

@@ -5,6 +5,31 @@ module Merbiful
 
     include RelativeTimeHelpers
 
+    before :authorize!
+
+    def authorize!
+      unless authorized?
+        redirect login_url
+        throw :halt, "Access denied"
+      end
+    end
+
+    def logged_in_user
+      nil
+    end
+
+    def login_url
+      ""
+    end
+
+    def logout_url
+      ""
+    end
+
+    def authorized?
+      true
+    end
+
     def index
       render_template_with_layout("index.html.haml")
     end
@@ -88,18 +113,23 @@ module Merbiful
       @form_page = Page.get(params[:page_id])
       if request.post?
         params[:page][:cached] = !!params[:page][:cached]
+
         @form_page.update_attributes(params[:page])
+
+        version_csses = params[:version].delete(:css)
+        version_jses = params[:version].delete(:js)
+
+        @form_version = Page::Version.new(params[:version].merge(:page => @form_page))
+
+        version_csses.each do |css|
+          @form_version.add_css(Css.get(css))
+        end if version_csses
+        version_jses.each do |js|
+          @form_version.add_js(Js.get(js))
+        end if version_jses
+        
         if @form_page.valid?
           @form_page.save 
-          version_csses = params[:version].delete(:css)
-          version_jses = params[:version].delete(:js)
-          @form_version = Page::Version.new(params[:version].merge(:page => @form_page))
-          version_csses.each do |css|
-            @form_version.add_css(Css.get(css))
-          end if version_csses
-          version_jses.each do |js|
-            @form_version.add_js(Js.get(js))
-          end if version_jses
           if @form_version.valid?
             @form_version.save 
             redirect url(:merbiful_admin, :action => "pages", :page_id => @form_page.id)
@@ -224,9 +254,8 @@ module Merbiful
     end
 
     def errors(obj, meth)
-      return ""
       if obj.errors.on(meth)
-        obj.errors.on(meth).join(", ")
+        "<div class='error'>#{obj.errors.on(meth).join(", ")}</div>"
       else
         ""
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merbiful-release
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Martin Kihlgren