classiccms 0.5.5 → 0.5.6

data/classiccms.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
   #web server
   s.add_runtime_dependency "sinatra"
   s.add_runtime_dependency "sinatra-support"
+  s.add_runtime_dependency "sinatra-contrib"
   s.add_runtime_dependency "thin"
 
   #background processing

data/lib/classiccms/application.rb

@@ -82,6 +82,7 @@ module Classiccms
 
     #FROM Gem
     #require controllers
+    require File.join(File.dirname(__FILE__), 'controllers/application.rb')
     Dir[File.join(File.dirname(__FILE__), 'controllers/*.rb')].each {|file| require file }
 
     #FROM App

data/lib/classiccms/controllers/admin.rb

@@ -0,0 +1,28 @@
+module Classiccms
+  class AdminController < ApplicationController
+    include Classiccms::Routing
+    register Sinatra::MultiRender
+
+    set :multi_views,   [File.join(Classiccms::ROOT, 'views/admin'), File.join(Classiccms::ROOT, 'public')]
+    set :root, Dir.pwd
+    set :public_folder, Proc.new { File.join(Classiccms::ROOT, 'public/admin') }
+
+    get '/' do
+      show 'index'
+    end
+    get '/destroy/:model' do
+      if Classiccms::CONFIG[:admin].include? params[:model]
+        @model = params[:model].constantize
+        @model.all.destroy
+        redirect to "/#{params[:model]}}"
+      end
+    end
+    get '/:model' do
+      if Classiccms::CONFIG[:admin].include? params[:model]
+        @model = params[:model].constantize
+        @records = @model.all
+        show 'index'
+      end
+    end
+  end
+end

data/lib/classiccms/controllers/cms.rb

@@ -16,19 +16,22 @@ module Classiccms
         begin
           params['cms'] = Base64.decode64(params['cms']).decrypt
           new_params= eval(params['cms'])
-          records = []
-          new_params.each do |new|
-            record = new[0].new
-            records.each do |i|
-              if i.kind_of? new[0]
-                record = i
-                records.delete(i)
+          records = []          
+          if new_params.first.class != Array
+            records << new_params.first.new
+          else
+            new_params.each do |new|
+              record = new[0].new
+              records.each do |i|
+                if i.kind_of? new[0]
+                  record = i
+                  records.delete(i)
+                end
               end
+              files = new.length > 3 ? new[3..new.length] : [new[2]]
+              record.connections << Connection.new(:parent_id => new[1], :section => new[2], :files => files)
+              records << record
             end
-            files = new.length > 3 ? new[3..new.length] : [new[2]]
-            p files
-            record.connections << Connection.new(:parent_id => new[1], :section => new[2], :files => files)
-            records << record
           end
           show :add_window, {}, {:records => records}
         rescue TypeError, ArgumentError

data/lib/classiccms/helpers.rb

@@ -50,6 +50,14 @@ module Classiccms
       end
     end
 
+    def content_for(key, *args, &block)
+      @sections ||= Hash.new{ |k,v| k[v] = [] }
+      if block_given?
+        @sections[key] << block
+      else
+        @sections[key].inject(''){ |content, block| content << block.call(*args) } if @sections.keys.include?(key)
+      end
+    end
     #renders all child pages of the given position (id)
     def section(section_name, parent_id = nil)
       html = {}