classiccms 0.5.14 → 0.5.15

data/lib/classiccms/controllers/website.rb

@@ -36,7 +36,7 @@ module Classiccms
       show index
     end
 
-    use Dragonfly::Middleware, :image
+    
     not_found do
       show :'404', views: File.join(Classiccms::ROOT, 'views/cms')
     end

data/lib/classiccms/helpers.rb

@@ -60,21 +60,23 @@ module Classiccms
     end
     #renders all child pages of the given position (id)
     def section(section_name, parent_id = nil)
-      html = {}
+      html = ""
       parent_id = get_parent_id(parent_id)
-
+      objects_to_render = {}
       Base.where(:'connections.parent_id' => parent_id, :'connections.section' => section_name, :'connections.file'.ne => nil).each do |record|
         connection = record.connections.where(:parent_id => parent_id, :section => section_name, :file.ne => nil).first
 
-        #render html
-        rendering = show connection.file, {views: ["app/views/#{record._type}", "app/views/#{record._type.downcase}"]}, {record: record}
-        if html[connection.order_id] == nil
-          html[connection.order_id] = rendering
+        if objects_to_render[connection.order_id] == nil
+          number = connection.order_id
         else
-          html[get_unique_number(html, connection.order_id)] = rendering
+          number = get_unique_number(objects_to_render, connection.order_id)
         end
+        objects_to_render[number] = {:record => record, :connection => connection}
+      end
+      Hash[objects_to_render.sort].each do |k, object|
+        html += show object[:connection].file, {views: ["app/views/#{object[:record]._type}", "app/views/#{object[:record]._type.downcase}"]}, {record: object[:record]}
       end
-      Hash[html.sort].map{|k,v| v}.join
+      return html
     end
     def get_unique_number(hash, number)
       if hash[number] == nil

data/lib/classiccms/version.rb

@@ -1,3 +1,3 @@
 module Classiccms #:nodoc
-  VERSION = "0.5.14"
+  VERSION = "0.5.15"
 end

data/spec/helpers_spec.rb

@@ -168,7 +168,7 @@ describe Classiccms do
         last_response.body.should == "<h1>#{m.id}</h1>\n"
       end
     end
-    it 'should return items base upon order_id' do
+    it 'should return items based upon order_id' do
       with_constants :CONFIG => {home: 'application/index5'} do
         set_file "views/application/index5.haml", "= section 'menu', 0"
         create_dir 'views/menu'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: classiccms
 version: !ruby/object:Gem::Version
-  version: 0.5.14
+  version: 0.5.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000 Z
+date: 2012-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec