classiccms 0.3.5 → 0.3.6

data/lib/classiccms/controllers/cms.rb

@@ -48,7 +48,7 @@ module Classiccms
     end
     post '/destroy' do
       items = Base.where(_id: params[:id])
-      items.first.delete if items.count > 0
+      items.first.destroy if items.count > 0
     end
     post '/sort' do
       section = params[:section]

data/lib/classiccms/helpers.rb

@@ -36,7 +36,7 @@ module Classiccms
     #renders a specific page
     def layout(section_name, position)
       id = get_parent_id(position)
-      records = Base.where(:'connection.parent_id' => id)
+      records = Base.where(:_id => id)
       if records.count > 0 and records.first.connections.where(:section => section_name, :file.ne => nil).count > 0
         file_name = records.first.connections.where(:section => section_name, :file.ne => nil).first.file
         show "#{records.first._type}/#{file_name}", {}, {record: records.first}

data/lib/classiccms/version.rb

@@ -1,3 +1,3 @@
 module Classiccms #:nodoc
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

data/spec/helpers_spec.rb

@@ -77,20 +77,20 @@ describe Classiccms do
   describe 'layout helper' do
     it 'should return 404 when section does not exist' do
       @routes = [Menu.create.id]
-      layout('menu', 0).should == '404'
+      layout('menu', 1).should == '404'
     end
     it 'should return when there are no records' do
       @routes = []
-      layout('menu', 0).should == '404'
+      layout('menu', 1).should == '404'
     end
     it 'should return 404 when section exist but no file name is given' do
       m = Menu.create(connections: [Connection.new(section: 'menu')])
       @routes = [m.id]
-      layout('menu', 0).should == '404'
+      layout('menu', 1).should == '404'
     end
-    it 'should return 404 when file does not exist' do
+    it 'should return the rendered file' do
       with_constants :CONFIG => {home: 'application/index4', model: 'Menu', section: 'menu'} do
-        set_file "views/application/index4.haml", "= layout 'menu', 0"
+        set_file "views/application/index4.haml", "= layout 'menu', 1"
         create_dir 'views/Menu'
         set_file "views/Menu/index.haml", "%h1 menu"
 
@@ -102,7 +102,7 @@ describe Classiccms do
     end
     it 'should also pass the current record' do
       with_constants :CONFIG => {home: 'application/index4', model: 'Menu', section: 'menu'} do
-        set_file "views/application/index4.haml", "= layout 'menu', 0"
+        set_file "views/application/index4.haml", "= layout 'menu', 1"
         create_dir 'views/menu'
         set_file "views/menu/record.haml", "%h1= record.id"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: classiccms
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors: