comfortable_mexican_sofa 0.0.18 → 1.0.0

data/.gitignore

@@ -1,10 +1,10 @@
+.bundle
+db/*.sqlite3
+log/*.log
+tmp/**/*
 .DS_Store
+db/schema.rb
+db/development_structure.sql
+public/system/*
 pkg
-rdoc
-test/rails_root/db
-test/rails_root/log
-test/rails_root/vendor
-test/rails_root/config/initializers/paperclip.rb
-test/rails_root/public/javascripts/cms_mce_init.js
-test/rails_root/public/javascripts/cms_codemirror_init.js
-test/rails_root/public/javascripts/cms_utilities.js
+rdoc

data/Gemfile

@@ -0,0 +1,11 @@
+source 'http://rubygems.org'
+
+gem 'rails',          '3.0.0'
+gem 'sqlite3-ruby',   :require => 'sqlite3'
+gem 'active_link_to', '>=0.0.6'
+gem 'paperclip',      '>=2.3.3'
+gem 'mime-types',     :require => 'mime/types'
+
+group :test do
+  gem 'jeweler', '>=1.4.0'
+end

data/Gemfile.lock

@@ -0,0 +1,91 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.0)
+      actionpack (= 3.0.0)
+      mail (~> 2.2.5)
+    actionpack (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4.1)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.12)
+      rack-test (~> 0.5.4)
+      tzinfo (~> 0.3.23)
+    active_link_to (0.0.6)
+    activemodel (3.0.0)
+      activesupport (= 3.0.0)
+      builder (~> 2.1.2)
+      i18n (~> 0.4.1)
+    activerecord (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
+      arel (~> 1.0.0)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
+    activesupport (3.0.0)
+    arel (1.0.1)
+      activesupport (~> 3.0.0)
+    builder (2.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    gemcutter (0.5.0)
+      json_pure
+    git (1.2.5)
+    i18n (0.4.1)
+    jeweler (1.4.0)
+      gemcutter (>= 0.1.0)
+      git (>= 1.2.5)
+      rubyforge (>= 2.0.0)
+    json_pure (1.4.6)
+    mail (2.2.5)
+      activesupport (>= 2.3.6)
+      mime-types
+      treetop (>= 1.4.5)
+    mime-types (1.16)
+    paperclip (2.3.3)
+      activerecord
+      activesupport
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.4)
+      rack (>= 1.0)
+    rails (3.0.0)
+      actionmailer (= 3.0.0)
+      actionpack (= 3.0.0)
+      activerecord (= 3.0.0)
+      activeresource (= 3.0.0)
+      activesupport (= 3.0.0)
+      bundler (~> 1.0.0)
+      railties (= 3.0.0)
+    railties (3.0.0)
+      actionpack (= 3.0.0)
+      activesupport (= 3.0.0)
+      rake (>= 0.8.4)
+      thor (~> 0.14.0)
+    rake (0.8.7)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+    sqlite3-ruby (1.3.1)
+    thor (0.14.0)
+    treetop (1.4.8)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.23)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  active_link_to (>= 0.0.6)
+  jeweler (>= 1.4.0)
+  mime-types
+  paperclip (>= 2.3.3)
+  rails (= 3.0.0)
+  sqlite3-ruby

data/README.md

@@ -0,0 +1,4 @@
+Comfortable Mexican Sofa (CMS)
+==============================
+
+TODO

data/Rakefile

@@ -1,88 +1,59 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
 require 'rubygems'
 require 'rake'
 
+ComfortableMexicanSofa::Application.load_tasks
 
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.name = 'comfortable_mexican_sofa'
-    gem.summary = 'ComfortableMexicanSofa is a Rails Engine CMS gem'
+    gem.name        = 'comfortable_mexican_sofa'
+    gem.summary     = 'ComfortableMexicanSofa is a Rails Engine CMS gem'
     gem.description = ''
-    gem.email = "oleg@theworkinggroup.ca"
-    gem.homepage = "http://theworkinggroup.ca"
-    gem.authors = ["Oleg Khabarov, The Working Group Inc"]
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-    gem.rubyforge_project = 'cms-sofa'
-    gem.add_dependency('haml')
-    gem.add_dependency('will_paginate')
-    gem.add_dependency('paperclip')
-    gem.add_dependency('calendar_date_select')
-    gem.add_dependency('active_link_to')
-  end
-  
-  Jeweler::RubyforgeTasks.new do |rubyforge|
-    rubyforge.doc_task = "rdoc"
+    gem.email       = 'oleg@theworkinggroup.ca'
+    gem.homepage    = 'http://github.com/theworkinggroup/comfortable-mexican-sofa'
+    gem.authors     = ['Oleg Khabarov', 'The Working Group Inc']
+    gem.add_dependency('rails',           '>=3.0.0')
+    gem.add_dependency('active_link_to',  '>=0.0.6')
+    gem.add_dependency('paperclip',       '>=2.3.3')
   end
-  
   Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
+  test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
 
-namespace :generator do
-  desc "Cleans up test application"
-  task :cleanup do
-    files = [
-      'test/rails_root/vendor/plugins/comfortable_mexican_sofa',
-      'test/rails_root/db',
-      'test/rails_root/public/javascripts/cms',
-      'test/rails_root/public/images/cms',
-      'test/rails_root/tmp/',
-      'test/rails_root/public/blank_iframe.html',
-      'test/rails_root/public/images/calendar_date_select',
-      'test/rails_root/public/javascripts/calendar_date_select/',
-      'test/rails_root/public/stylesheets/calendar_date_select/',
-      'test/rails_root/public/stylesheets/cms_master.css',
-      'test/rails_root/config/initializers/cms.rb',
-      'test/rails_root/public/system/files/'
-    ]
-    files.each do |file|
-      FileUtils.rm_rf(file)
-    end
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test'
+    test.pattern = 'test/**/test_*.rb'
+    test.verbose = true
   end
-  
-  desc "Run the generator on the tests"
-  task :prepare do
-    plugin_root = File.expand_path(File.dirname(__FILE__))
-    system("ln -s #{plugin_root} test/rails_root/vendor/plugins/comfortable_mexican_sofa")
-    system "cd test/rails_root && ./script/generate cms && rake db:migrate db:test:prepare"
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
   end
 end
 
-desc "Run the test suite"
-task :default => ['generator:cleanup', 'generator:prepare', :test]
 task :test => :check_dependencies
-task :gemspec => ['generator:cleanup']
+task :default => :test
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION')
-    version = File.read('VERSION')
-  else
-    version = ""
-  end
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "active_link_to #{version}"
+  rdoc.title = "gem #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }
+end

data/VERSION

@@ -1 +1 @@
-0.0.18
+1.0.0

data/app/controllers/application_controller.rb

@@ -0,0 +1,5 @@
+class ApplicationController < ActionController::Base
+  
+  protect_from_forgery
+  
+end

data/app/controllers/cms_admin/base_controller.rb

@@ -1,25 +1,5 @@
 class CmsAdmin::BaseController < ApplicationController
   
-  before_filter :authenticate
-  
   layout 'cms_admin'
-  
-  def manage_session_array(name, action, value)
-    session[name] = case action
-    when :add
-      (session[name] || []) + [value]
-    when :remove
-      (session[name] || []) - [value]
-    end
-  end
-  
-protected
 
-  def authenticate
-    authenticate_or_request_with_http_basic do |username, password|
-      username == ComfortableMexicanSofa::Config.http_auth_username && 
-      password == ComfortableMexicanSofa::Config.http_auth_password
-    end if ComfortableMexicanSofa::Config.http_auth_enabled
-  end
-  
-end
+end

data/app/controllers/cms_admin/layouts_controller.rb

@@ -1,71 +1,56 @@
 class CmsAdmin::LayoutsController < CmsAdmin::BaseController
   
-  before_filter :load_layout, :only => [:children, :edit, :update, :destroy, :reorder]
+  before_filter :build_cms_layout,  :only => [:new, :create]
+  before_filter :load_cms_layout,   :only => [:edit, :update, :destroy]
   
   def index
-    @layouts = CmsLayout.roots
-  end
-  
-  def children
-    manage_session_array(:cms_layout_tree, (params[:state] == 'open' ? :remove : :add), params[:id])
+    @cms_layouts = CmsLayout.roots
   end
   
   def new
-    @layout = CmsLayout.new(params.slice(:parent_id))
+    render
   end
   
   def edit
-    # ...
+    render
   end
   
   def create
-    @layout = CmsLayout.new(params[:layout])
-    @layout.save!
-    
+    @cms_layout.save!
     flash[:notice] = 'Layout created'
-    manage_session_array(:cms_layout_tree, :add, @layout.parent_id.to_s)
-    redirect_to :action => :edit, :id => @layout
-    
+    redirect_to :action => :edit, :id => @cms_layout
   rescue ActiveRecord::RecordInvalid
+    flash.now[:error] = 'Failed to create layout'
     render :action => :new
   end
   
   def update
-    @layout.update_attributes!(params[:layout])
-    
+    @cms_layout.update_attributes!(params[:cms_layout])
     flash[:notice] = 'Layout updated'
-    redirect_to :action => :edit, :id => @layout
-    
+    redirect_to :action => :edit, :id => @cms_layout
   rescue ActiveRecord::RecordInvalid
+    flash.now[:error] = 'Failed to update layout'
     render :action => :edit
   end
   
   def destroy
-    @layout.destroy
-    
-    flash[:notice] = 'Layout removed'
+    @cms_layout.destroy
+    flash[:notice] = 'Layout deleted'
     redirect_to :action => :index
   end
   
-  def reorder
-    if @layout
-      layout_id = @layout.id
-      find_scope = @layout.children
-    else
-      layout_id = 0
-      find_scope = CmsLayout
-    end
-    
-    params["layout_#{layout_id}_branch"].each_with_index do |id, position|
-      find_scope.find(id).update_attribute(:position, position)
-    end
-    render :nothing => true
+protected
+  
+  def build_cms_layout
+    @cms_layout = CmsLayout.new(params[:cms_layout])
+    @cms_layout.parent ||= CmsLayout.find_by_id(params[:parent_id])
   end
   
-protected
-
-  def load_layout
-    @layout = CmsLayout.find_by_id(params[:id])
+  def load_cms_layout
+    @cms_layout = CmsLayout.find(params[:id])
+  rescue ActiveRecord::RecordNotFound
+    flash[:error] = 'Layout not found'
+    redirect_to :action => :index
   end
   
 end

data/app/controllers/cms_admin/pages_controller.rb

@@ -1,79 +1,63 @@
 class CmsAdmin::PagesController < CmsAdmin::BaseController
   
-  include CmsCommon::RenderPage
-  
-  before_filter :load_page, :only => [:children, :edit, :update, :destroy, :reorder]
+  before_filter :build_cms_page,  :only => [:new, :create]
+  before_filter :load_cms_page,   :only => [:edit, :update, :destroy]
   
   def index
-    params[:root] ? @cms_pages = CmsPage.find(params[:root]).children : @cms_pages = CmsPage.roots
-  end
-  
-  def children
-    manage_session_array(:cms_page_tree, (params[:state] == 'open' ? :remove : :add), params[:id])
+    @cms_pages = [CmsPage.root].compact
   end
   
   def new
-    @cms_page = CmsPage.new(params.slice(:parent_id))
-    @cms_page.published_at = Time.now.utc
-    @cms_page.cms_layout = @cms_page.parent.cms_layout if @cms_page.parent
+    render
   end
   
   def edit
-    # ...
+    render
   end
   
   def create
-    @cms_page = CmsPage.new(params[:cms_page])
-    
-    return render_page if !params[:preview].blank? && @cms_page.valid?
-    
     @cms_page.save!
-    
-    flash[:notice] = 'Page created'
-    manage_session_array(:cms_page_tree, :add, @cms_page.parent_id.to_s)
+    flash[:notice] = 'Page saved'
     redirect_to :action => :edit, :id => @cms_page
-    
   rescue ActiveRecord::RecordInvalid
+    flash.now[:error] = 'Failed to create page'
     render :action => :new
   end
   
   def update
-    @cms_page.attributes = params[:cms_page]
-    
-    return render_page if !params[:preview].blank? && @cms_page.valid?
-    
-    @cms_page.save!
-    
+    @cms_page.update_attributes!(params[:cms_page])
     flash[:notice] = 'Page updated'
     redirect_to :action => :edit, :id => @cms_page
-    
   rescue ActiveRecord::RecordInvalid
+    flash.now[:error] = 'Failed to update page'
     render :action => :edit
   end
   
   def destroy
     @cms_page.destroy
-    
-    flash[:notice] = 'Page removed'
+    flash[:notice] = 'Page deleted'
     redirect_to :action => :index
   end
   
   def form_blocks
-    @cms_page = CmsPage.find_by_id(params[:id])
-    @layout = CmsLayout.find(params[:layout_id])
+    @cms_page = CmsPage.find_by_id(params[:id]) || CmsPage.new
+    @cms_page.cms_layout = CmsLayout.find_by_id(params[:layout_id])
   end
   
-  def reorder
-    params["page_#{@cms_page.id}_branch"].each_with_index do |id, position|
-      @cms_page.children.find(id).update_attribute(:position, position)
-    end
-    render :nothing => true
+protected
+  
+  def build_cms_page
+    @cms_page = CmsPage.new(params[:cms_page])
+    @cms_page.parent ||= (CmsPage.find_by_id(params[:parent_id]) || CmsPage.root)
+    @cms_page.cms_layout ||= (@cms_page.parent && @cms_page.parent.cms_layout || CmsLayout.first)
   end
   
-protected
-
-  def load_page
-    @cms_page = CmsPage.find_by_id(params[:id])
+  def load_cms_page
+    @cms_page = CmsPage.find(params[:id])
+    @cms_page.cms_layout ||= (@cms_page.parent && @cms_page.parent.cms_layout || CmsLayout.first)
+  rescue ActiveRecord::RecordNotFound
+    flash[:error] = 'Page not found'
+    redirect_to :action => :index
   end
   
 end