imagine_cms 3.0.0.beta8 → 3.0.0.beta9

data/.gitignore

@@ -1,5 +1,10 @@
+.bundle/
+log/*.log
+pkg/
+rdoc/
+test/dummy/db/*.sqlite3
+test/dummy/log/*.log
+test/dummy/tmp/
+test/dummy/.sass-cache
+
 *.gem
-.bundle
-Gemfile.lock
-gems
-pkg/*

data/.rvmrc

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+ruby_string="ruby-1.9.3-p286"
+gemset_name="imagine_cms"
+
+alias rails='bundle exec rails'
+
+if rvm list strings | grep -q "${ruby_string}" ; then
+  # Load or create the specified environment
+  if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
+    && -s "${rvm_path:-$HOME/.rvm}/environments/${ruby_string}@${gemset_name}" ]] ; then
+    \. "${rvm_path:-$HOME/.rvm}/environments/${ruby_string}@${gemset_name}"
+  else
+    rvm --create  "${ruby_string}@${gemset_name}"
+  fi
+else
+  # Notify the user to install the desired interpreter before proceeding.
+  echo "${ruby_string} was not found, please run 'rvm install ${ruby_string}' and then cd back into the project directory."
+fi

data/Gemfile

@@ -1,4 +1,17 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in imagine_cms.gemspec
+# Declare your gem's dependencies in imagine_cms.gemspec.
+# Bundler will treat runtime dependencies like base dependencies, and
+# development dependencies will be added by default to the :development group.
 gemspec
+
+# jquery-rails is used by the dummy application
+gem "jquery-rails"
+
+# Declare any dependencies that are still in development here instead of in
+# your gemspec. These might include edge Rails or gems from your path or
+# Git. Remember to move these dependencies to your gemspec before releasing
+# your gem to rubygems.org.
+
+# To use debugger
+# gem 'debugger'

data/Gemfile.lock

@@ -0,0 +1,111 @@
+PATH
+  remote: .
+  specs:
+    imagine_cms (3.0.0.beta9)
+      acts_as_tree (~> 1.2)
+      mini_magick (~> 3.4)
+      net-dns (~> 0.7.1)
+      prototype-rails
+      rails (~> 3.2.8)
+      rinku (~> 1.7.2)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.2.8)
+      actionpack (= 3.2.8)
+      mail (~> 2.4.4)
+    actionpack (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+    activesupport (3.2.8)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    acts_as_tree (1.2.0)
+      activerecord (>= 3.0.0)
+    arel (3.0.2)
+    builder (3.0.4)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.1)
+    journey (1.0.4)
+    jquery-rails (2.1.3)
+      railties (>= 3.1.0, < 5.0)
+      thor (~> 0.14)
+    json (1.7.5)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.19)
+    mini_magick (3.4)
+      subexec (~> 0.2.1)
+    multi_json (1.3.7)
+    net-dns (0.7.1)
+    polyglot (0.3.3)
+    prototype-rails (3.2.1)
+      rails (~> 3.2)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.8)
+      actionmailer (= 3.2.8)
+      actionpack (= 3.2.8)
+      activerecord (= 3.2.8)
+      activeresource (= 3.2.8)
+      activesupport (= 3.2.8)
+      bundler (~> 1.0)
+      railties (= 3.2.8)
+    railties (3.2.8)
+      actionpack (= 3.2.8)
+      activesupport (= 3.2.8)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rinku (1.7.2)
+    sprockets (2.1.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.6)
+    subexec (0.2.2)
+    thor (0.16.0)
+    tilt (1.3.3)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.35)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  imagine_cms!
+  jquery-rails
+  sqlite3

data/README.rdoc

@@ -1,39 +1,55 @@
 =About Imagine CMS
 
-Imagine CMS is a content management system originally developed for internal use at Bigger Bird
-Creative (biggerbird.com). However, it was so strongly bound to Rails that it became difficult to
-port to newer Rails versions. Thus, sites using Imagine have been stuck on Rails 1.2 since time
-immemorial.
+Imagine CMS is a content management system developed by {Bigger Bird Creative, Inc.}[https://www.biggerbird.com] in 2006 for its clients. Other systems came with a learning curve: fine for daily users, but clients who only used it once a month or so would never remember how to use the system the next time they logged in. Simpler systems didn't allow us enough flexibility as designers and developers.
 
-This project intends to fix all that. By extracting Imagine functionality out into a gem, we should
-be able to achieve compatibility with Rails 4.0 (hopefully around the time it is released). However,
-at the same time, backwards compatibility with existing sites is extremely important, as the whole
-reason for doing this is to allow us to upgrade existing sites to a modern, supported version of
-Rails.
+=History and Roadmap
 
-So... don't use this. I'm not even including a license right now. (But it will probably be AGPLv3.)
+Thus, Imagine was created in the Rails 1.0 days, to run a large number of technically simple content-based sites (versus the one or two highly customized web applications most Rails developers were building at the time). We wanted to provide a way to create and manage static content while also allowing some automation (navigation, RSS feeds, etc.) while also allowing limitless custom development. However, because plugins/engines were quite limited in those days, Imagine was implemented by monkey-patching core parts of Rails and creating a new framework on top of Rails. Although this allowed us great insight into the inner workings of Rails (and led to a minor contribution to Rails core), this approach proved extremely difficult to port to Rails 2. Thus, sites using Imagine have been stuck on Rails 1.2 since time immemorial.
 
-Wait until the second phase of this project (Imagine 4.x). Why? Well, the 3.x versions, while
-usable, will be hobbled by their need to remain compatible with Bigger Bird's existing sites. The
-ERB templating language is dangerous (allows shell escapes) and the editor is Firefox-only. Once we
-are into the 4.x era, when we can move ahead without worrying about backward compatibility, it will
-be a good time to get on board.
+All that is now firmly in the past. By extracting Imagine functionality into a gem (a Rails Engine), we have achieved compatibility with Rails 3.2 and Ruby 1.9 and removed roadblocks to a future upgrade to Rails 4 and Ruby 2, all while remaining backwards compatible with the legacy Imagine CMS database structure.
 
-=Roadmap
+Of the three original phases of this project, two remain:
 
-Current status: Original functionality 75% restored
+* Imagine 3.0 (Rails 3.2, Ruby 1.9): [DONE] 90% restored functionality, no database changes.
+* Imagine 3.1 (Rails 3.2, Ruby 1.9/2.0): 100% restored functionality, plus a few extras. May require a few simple migrations.
+* Imagine 4.0 (Rails 4.0, Ruby 2.0): Upgrade to Rails 4; refactor & rewrite the worst parts (substitutions); drop ERB templating for something safer, like Liquid; switch to a cross-browser editor; drop Prototype for jQuery; modernize HTML, CSS, JS
 
-Here's what's coming up:
+(Imagine 1.x and 2.x version numbers have already been used internally, so we started at 3.0.)
 
-* Imagine 3.0 (Rails 3.2): 90% restored functionality, can function on existing sites with no database changes
-* Imagine 3.1 (Rails 3.2): 100% restored functionality, may require a few simple migrations
-* Imagine 4.0 (Rails 4.0): Refactoring & rewriting of the worst parts (substitutions); move away from ERB templating, to something like Liquid; switch to a cross-browser editor; switch to jQuery
+=Current Status
 
-(Imagine 1.x and 2.x version numbers have already been used internally, so might as well start at 3.0.)
+Imagine 3.0 is finally ready for production use internally at Bigger Bird, but it's not quite ready for general use yet. For starters, it has no install generator or migrations, so good luck figuring out the database schema on your own. Probably still buggy, not all functionality has been properly exercised. No tests or documentation yet, I'll tackle this for 4.0 as we modernize the internals.
 
-Dependencies:
-* Rails 3.2
-* acts_as_tree
-* acts_as_versioned
-* mini_magick
-* net-dns
+One major feature is still missing: browser-based editing of application layout and stylesheets. While convenient, this was probably not ever a good idea, so I'm working on a better solution. Might need to go into 3.1. Once 3.0 has stabilized in production (December 2012-ish), I'll branch off 3.0-stable and begin work on 3.1 on master.
+
+Unless you are interested in contributing to development, it might be best to wait until the second phase of this project (Imagine 4). Why? Well, the purpose of Imagine 3 is strictly to port legacy sites to Rails 3.2 as simply as possible. Imagine 3 will always be held back by its need to remain compatible with legacy installations dating back to 2006. The ERB templating language can be dangerous (it allows all Ruby, including shell escapes), and the editor (powered by an ancient version of Dojo) is Firefox-only. It also uses Prototype, which has become a bit unfashionable these days.
+
+Imagine 4 will be a clean break from all of these "traditions," and thus will be a good time to get on board.
+
+=Getting Help
+
+Get paid support and hosting for Imagine CMS straight from the people who made it: {Bigger Bird Creative, Inc.}[https://www.biggerbird.com] Neither is required, of course. :-) Free support is up top (Issues).
+
+=Contributing
+
+Pull requests always appreciated (recommend getting in touch first). If companies or individuals are willing to sponsor major features on the roadmap (or features that meet their own needs) development can proceed more quickly.
+
+=License and Copyright
+
+Imagine 3 is licensed under AGPLv3, meaning that if you run a modified version on a publicly-accessible server, you need to offer source code. With Github, that's quite easy: just don't make any private forks, and link to your Github site.
+
+imagine_cms - The Imagine Content Management System
+Copyright (c) 2012 Aaron Namba (aaron@biggerbird.com)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.

data/Rakefile

@@ -1,2 +1,40 @@
-require 'bundler'
+#!/usr/bin/env rake
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rdoc/rdoc'
+  require 'rake/rdoctask'
+  RDoc::Task = Rake::RDocTask
+end
+
+RDoc::Task.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'ImagineCms'
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+load 'rails/tasks/engine.rake'
+
+
+
 Bundler::GemHelper.install_tasks
+
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+
+
+task :default => :test

data/app/controllers/management/cms_controller.rb

@@ -403,11 +403,20 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
         @page_objects[key] = obj.content.html_safe
       end
       
-      @dynamic_javascripts ||= []
-      @dynamic_javascripts << url_for(:action => 'page_tags_for_lookup')
+      # set "legacy" vars
+      @content_levels = @pg.path.split('/')
+      params[:section] = @content_levels.size < 1 ? '' : @content_levels.first
+      params[:subsection] = @content_levels[1] unless @content_levels.size < 3
+      if @content_levels.size == 1
+        params[:page] = 'index'
+      elsif @content_levels.size > 1
+        params[:page] = @content_levels.last
+      end
+      
+      @page_title = @pg.title
       
-      @stylesheets ||= []
-      @stylesheets << 'imagine_ccs'
+      @cms_head ||= ''
+      @cms_head << "<script type=\"text/javascript\" src=\"#{url_for(:action => 'page_tags_for_lookup')}\"></script>"
       
       @template_content = substitute_placeholders(@pg.template.content, @pg)
       render :layout => 'application'

data/app/helpers/cms_application_helper.rb

@@ -1092,12 +1092,12 @@ EOF
   
   
   def cropper_image_tag(options)
-    ret = image_tag(options[:url] || '', :id => "testImage")
-    ret += javascript_tag "cropper = new Cropper.Img('testImage', { minWidth: 0, minHeight: 0, captureKeys: false, onEndCrop: onEndCrop });"
+    ret = "<img id=\"testImage\" src=\"/assets/#{options[:url]}\" />".html_safe
+    ret += javascript_tag("cropper = new Cropper.Img('testImage', { minWidth: 0, minHeight: 0, captureKeys: false, onEndCrop: onEndCrop });")
   end
   
   def page_image_tag(page, filename)
-    image_tag File.join('content', page.path, File.basename(filename))
+    "<img id=\"testImage\" src=\"/#{File.join('assets', 'content', page.path, File.basename(filename))}\" alt=\"#{File.basename(filename, '.*').sub(/-[[:xdigit:]]{32}\z/, '').capitalize}\" />".html_safe
   end
   
   def copyright_year(year)

data/app/models/cms_page.rb

@@ -10,6 +10,7 @@ class CmsPage < ActiveRecord::Base
   has_many :objects, :class_name => 'CmsPageObject', :dependent => :destroy
   has_many :tags, :class_name => 'CmsPageTag', :dependent => :destroy
   has_many :versions, :class_name => 'CmsPageVersion', :dependent => :destroy
+  has_many :sub_pages, :class_name => 'CmsPage', :foreign_key => :parent_id, :conditions => [ 'published_version >= 0' ], :order => 'position, title, name'
   
   validates_format_of :name, :with => /\A[-\w\d%]+\Z/
   validates_uniqueness_of :path, :message => 'conflicts with an existing page'
@@ -37,12 +38,6 @@ class CmsPage < ActiveRecord::Base
     self.published_date ||= self.created_on || Time.now
   end
   
-  def sub_pages(options = {})
-    # not using options just yet, but you can override if you like
-    conditions = [ 'published_version >= 0' ]
-    self.children.find(:all, :conditions => conditions, :order => 'position')
-  end
-  
   def tags_as_css_classes
     self.tags.map { |t| t.name.downcase.gsub(/[^\w]+/, '-') }.join(' ')
   end

data/app/views/{management/cms → imagine_cms}/_dialogs.html.erb

@@ -34,6 +34,7 @@
        hasShadow="true" resizable="true" followScroll="false" displayCloseAction="true" style="width: 650px; height: 580px;">
     <div id="gallery_dialog_content"></div>
   </div>
-  
-  
-</div>
+</div>
+
+<div id="preview_cover" onclick="return false;" style="display: none;"></div>
+<div id="dialog-temp"></div>

data/app/views/imagine_cms/_header.html.erb

@@ -0,0 +1,40 @@
+<%#= javascript_tag 'var djConfig = { isDebug: true };' %>
+
+<script type="text/javascript">
+    var load_dojo = false;
+    if (<%= @load_dojo || 'false' %>) {
+      load_dojo = true;
+    }
+    
+    function readCookie(name) {
+        var ca = document.cookie.split(';');
+        for (var i=0; i < ca.length; i++) {
+            var c = ca[i];
+            while (c.charAt(0) == ' ') c = c.substring(1, c.length);
+            if (c.indexOf(name+'=') == 0) return c.substring((name+'=').length, c.length);
+        }
+        return null;
+    }
+    
+    function loggedIn() {
+        return readCookie('user_auth_status') == 'authenticated';
+    }
+    
+    if (loggedIn() || load_dojo) {
+        document.writeln('<scr' + 'ipt src="/assets/dojo/dojo.js" type="text/javascript"></scr' + 'ipt>');
+    }
+</script>
+
+<script type="text/javascript">
+    if (loggedIn()) {
+        dojo.require("dojo.widget.Editor2");
+        dojo.require("dojo.widget.Editor2Plugin.TableOperation");
+    }
+</script>
+
+<%- for feed in [].concat(@rss_feeds || []) -%>
+  <%= auto_discovery_link_tag(:rss, { :controller => '/cms/content', :action => 'rss_feed', :page_id => @pg.id, :page_list_name => feed }, :title => feed) if @pg && @pg.id %>
+<%- end -%>
+
+<%=raw @cms_head %>
+<%= @pg.html_head if @pg && @pg.respond_to?(:html_head) %>

data/app/views/imagine_cms/_toolbar.html.erb

@@ -0,0 +1,26 @@
+<%- if params[:action] != 'preview_template' -%>
+  <table id="mainCCSToolbar" cellpadding="0" cellspacing="0" border="0" width="100%" style="display: none">
+    <%- if [ 'content', 'cms' ].include?(controller.controller_name) && params[:action] != 'preview_template' -%>
+      <tr>
+        <td>
+      <%- if is_editing_page? -%>
+        <div dojoType="Editor2" widgetId="main_toolbar" useActiveX="false" htmlEditing="true" focusOnLoad="false"
+          toolbarTemplatePath="<%= url_for :controller => '/management/cms', :action => 'toolbar_edit', :id => @pg, :version => params[:version] %>"
+          toolbarTemplateCssPath="/assets/dojo/src/widget/templates/EditorToolbarFullFeature.css"
+          toolbarAlwaysVisible="true" style="height: 25px; vertical-align: middle" toolbarGroup="main">
+        </div>
+      <%- else -%>
+        <div dojoType="Editor2" widgetId="main_toolbar" useActiveX="false" htmlEditing="false" focusOnLoad="false"
+          toolbarTemplatePath="<%= url_for :controller => '/management/cms', :action => 'toolbar_preview', :id => @pg, :version => params[:version] %>"
+          toolbarTemplateCssPath="/assets/dojo/src/widget/templates/EditorToolbarFullFeature.css"
+          toolbarAlwaysVisible="true" style="height: 25px; vertical-align: middle">
+        </div>
+      <%- end -%>
+        </td>
+      </tr>
+    <%- end -%>
+      </td>
+    </tr>
+  </table>
+  <%= javascript_tag "if (loggedIn()) $('mainCCSToolbar').show();" %>
+<%- end -%>

data/app/views/layouts/management.html.erb

@@ -15,6 +15,7 @@
     <%#= javascript_tag 'var djConfig = { isDebug: true };' %>
     <%- if is_logged_in_user? -%>
       <script src="/assets/dojo/dojo.js" type="text/javascript"></script>
+      <script src="/assets/codepress/codepress.js" type="text/javascript"></script>
     <%- end -%>
     <%= stylesheet_link_tag    "application", :media => "all" %>
     <%= stylesheet_link_tag    "manage", :media => "all" %>
@@ -60,5 +61,9 @@
       <!-- Main Content -->
       <%= yield %>
     </div>
+    
+    <footer>
+      
+    </footer>
   </body>
 </html>

data/imagine_cms.gemspec

@@ -1,7 +1,10 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
+
+# Maintain your gem's version:
 require "imagine_cms/version"
 
+# Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
   s.name        = "imagine_cms"
   s.version     = ImagineCms::VERSION
@@ -10,7 +13,7 @@ Gem::Specification.new do |s|
   s.email       = ["aaron@biggerbird.com"]
   s.homepage    = "https://github.com/anamba/imagine_cms"
   s.summary     = %q{Imagine Content Management System for Rails}
-  s.description = %q{Don't use this for now. See README for details.}
+  s.description = %q{See README for details.}
 
   s.rubyforge_project = "imagine_cms"
 
@@ -26,4 +29,6 @@ Gem::Specification.new do |s|
   s.add_dependency "rinku",               "~> 1.7.2"
   s.add_dependency "net-dns",             "~> 0.7.1"
   s.add_dependency "acts_as_tree",        "~> 1.2"
+  
+  s.add_development_dependency "sqlite3"
 end

data/lib/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "3.0.0.beta8"
+  VERSION = "3.0.0.beta9"
 end