classiccms 0.3.8 → 0.3.9

data/lib/classiccms/controllers/cms.rb

@@ -63,6 +63,8 @@ module Classiccms
     end
 
     post '/save' do
+      content_type :json
+      errors = []
       params.each do |key, value|
         begin
           if value['id'] != nil
@@ -72,13 +74,13 @@ module Classiccms
           end
           record.update_attributes(value)
         rescue TypeError
-          ''
         end
         if !record.save
-          content_type :json
-          return record.errors.messages.to_json
+          errors << record.errors.messages.to_json
+        else
         end
       end
+      return errors
     end
     post '/upload/image' do
       image = Image.new

data/lib/classiccms/controllers/website.rb

@@ -16,10 +16,12 @@ module Classiccms
     end
     get '/javascripts/*.js' do
       response.headers['Cache-Control'] = ENV['RACK_ENV'] == 'development' ? 'no-cache' : 'public, max-age=86400'
+      content_type :js
       show params[:splat].join, :views => [File.join(Dir.pwd, 'public/javascripts')]
     end
     get '/stylesheets/*.css' do
       response.headers['Cache-Control'] = ENV['RACK_ENV'] == 'development' ? 'no-cache' : 'public, max-age=86400'
+      content_type :css
       show params[:splat].join, :views => [File.join(Dir.pwd, 'public/stylesheets')]
     end
     get '/:id/?*' do

data/lib/classiccms/helpers.rb

@@ -55,7 +55,7 @@ module Classiccms
         connection = record.connections.where(:parent_id => parent_id, :section => section_name, :file.ne => nil).first
 
         #render html
-        rendering = show "#{record._type}/#{connection.file}", {}, {record: record}
+        rendering = show connection.file, {views: ["app/views/#{record._type}", "app/views/#{record._type.downcase}"]}, {record: record}
 
         html.insert(connection.order_id, rendering)
       end

data/lib/classiccms/public/js/index.coffee

@@ -110,7 +110,8 @@ class TopPanel
 
   create: (url) ->
     $j.post url, $j(@p.form).serialize(), (data) =>
-      if data == ''
+      alert data
+      if data == null
         window.location.reload()
       else
         $j.each data, (index, value)=>

data/lib/classiccms/scaffold/Rakefile

@@ -1,9 +1,9 @@
 #to run: 
 # QUEUE=* rake resque:work
-require 'classiccms'
+require 'rubygems'
+require 'bundler'
 
-ENV['RACK_ENV'] = 'development'
+Bundler.require
 Classiccms.boot
 
 require 'resque/tasks'
-

data/lib/classiccms/scaffold/config.ru

@@ -2,8 +2,6 @@ require 'rubygems'
 require 'bundler'
 
 Bundler.require
-
-ENV['RACK_ENV'] = 'development'
 Classiccms.boot
 
 

data/lib/classiccms/version.rb

@@ -1,3 +1,3 @@
 module Classiccms #:nodoc
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end

data/spec/helpers_spec.rb

@@ -144,6 +144,18 @@ describe Classiccms do
         last_response.body.should == "<h1>menu</h1>\n"
       end
     end
+    it 'should return the rendered file, even if the directory does not match exactly' do
+      with_constants :CONFIG => {home: 'application/index6'} do
+        set_file "views/application/index6.haml", "= section 'menu', 0"
+        create_dir 'views/Menu'
+        set_file "views/Menu/section.haml", "%h1 menu"
+
+        m = Menu.create connections: [Connection.new(section: 'menu', file: 'section')]
+
+        get '/'
+        last_response.body.should == "<h1>menu</h1>\n"
+      end
+    end
     it 'should add local variable record' do
       with_constants :CONFIG => {home: 'application/index5'} do
         set_file "views/application/index5.haml", "= section 'menu', 0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: classiccms
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-11 00:00:00.000000000 Z
+date: 2012-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -10738,7 +10738,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: classiccms
-rubygems_version: 1.8.21
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: An easy to use wrapper for creating basic and more complicated websites
@@ -10762,4 +10762,3 @@ test_files:
 - spec/models/user_spec.rb
 - spec/queue_spec.rb
 - spec/spec_helper.rb
-has_rdoc: