liquid_cms 0.2.2.0 → 0.3.0

data/.gitignore

@@ -2,5 +2,5 @@ pkg/*
 *.gem
 *.swp
 .bundle
-Gemfile.lock
+.rvmrc
 test/rails_app/log

data/CHANGELOG.rdoc

@@ -1,57 +1,3 @@
-== 0.2.2.0
-
-* Enhancements
-  * Optimize paperclip image dimension lookup in to_liquid calls.  To make use of optimized paperclip attachments in your custom to_liquid methods, add a column to your table in a migration. See the README under the customization section for more information.
-  * Update to codemirror v2
-  * Ctrl+s now uses ajax for editing pages, textual assets and textual components in order to streamline the editing process.
-
-== 0.2.1.1
-
-* Fixes
-  * Move data_tag.rb file into cms dir due to rails class loading issues.
-
-== 0.2.1.0
-
-* Enhancements
-  * Many improvements to assets including the addition of meta data fields, tags and the ability to specify custom image sizes.
-  * Assets can now be searched for using the liquid 'asset_data' tag.  {% asset_data tag:'test' %}
-    See the built-in docs for more details on how to use "asset_data" and asset drops.
-  * Asset drops (accessible via the asset_data tag) give you access to the meta data and custom image information.
-  * limit and random ordering for collection retrieved from the asset_data tag.
-
-* Fixes
-  * Optimize asset image file sizes with -strip
-
-== 0.2.0.13
-
-* Enhancements
-  * Integrate basic page search capabilities.
-  * locale file now allows you to change the CMS title
-
-* Fixes
-  * Fix generation of duplicate migration files if they already exist.
-
-== 0.2.0.12
-
-* Enhancements
-  * Upgrade codemirror syntax highlighting to 0.94
-  * Remember component folders view state.
-  * Add tabs for each resource type.
-
-== 0.2.0.11
-
-* Fixes
-  * Fix translation issue in forms.
-
-== 0.2.0.10
-
-* Enhancements
-  * Allow text based assets to be editable inline.
-
-== 0.2.0.3
-
-Updated codemirror to 0.9
-
-== 0.2.0
+== 0.5.0
 
 * First release

data/Gemfile

@@ -2,3 +2,12 @@ source :gemcutter
 
 # Specify your gem's dependencies in liquid_cms.gemspec
 gemspec
+
+# this version of vestal_versions is compatible with rails 3
+gem 'vestal_versions', '~> 1.2.1', :git => 'http://github.com/adamcooper/vestal_versions.git'
+
+group :test do
+  gem 'shoulda', '~> 2.10.3'
+  gem 'factory_girl', '~> 1.3.0'
+  gem 'factory_girl_rails'
+end

data/Gemfile.lock

@@ -0,0 +1,120 @@
+GIT
+  remote: http://github.com/adamcooper/vestal_versions.git
+  revision: ab3bb722278d7fd6332f6250372e0c99187c6531
+  specs:
+    vestal_versions (1.2.1)
+      activerecord (>= 3.0.0)
+
+PATH
+  remote: .
+  specs:
+    liquid_cms (0.3.0)
+      bundler (>= 1.0.0)
+      formatize
+      paperclip (~> 2.3.1)
+      rails (~> 3.0.0)
+      rubyzip (~> 0.9.1)
+      simple_form (~> 1.2.0)
+      will_paginate (~> 2.3.12)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    RedCloth (4.2.3)
+    abstract (1.0.0)
+    actionmailer (3.0.1)
+      actionpack (= 3.0.1)
+      mail (~> 2.2.5)
+    actionpack (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
+      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)
+    activemodel (3.0.1)
+      activesupport (= 3.0.1)
+      builder (~> 2.1.2)
+      i18n (~> 0.4.1)
+    activerecord (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
+      arel (~> 1.0.0)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
+    activesupport (3.0.1)
+    arel (1.0.1)
+      activesupport (~> 3.0.0)
+    bluecloth (2.0.9)
+    builder (2.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    factory_girl (1.3.2)
+    factory_girl_rails (1.0)
+      factory_girl (~> 1.3)
+      rails (>= 3.0.0.beta4)
+    formatize (1.0.1)
+      RedCloth (~> 4.2)
+      actionpack (~> 3.0)
+      bluecloth (~> 2.0)
+    i18n (0.4.1)
+    mail (2.2.7)
+      activesupport (>= 2.3.6)
+      mime-types
+      treetop (>= 1.4.5)
+    mime-types (1.16)
+    paperclip (2.3.4)
+      activerecord
+      activesupport
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.6)
+      rack (>= 1.0)
+    rails (3.0.1)
+      actionmailer (= 3.0.1)
+      actionpack (= 3.0.1)
+      activerecord (= 3.0.1)
+      activeresource (= 3.0.1)
+      activesupport (= 3.0.1)
+      bundler (~> 1.0.0)
+      railties (= 3.0.1)
+    railties (3.0.1)
+      actionpack (= 3.0.1)
+      activesupport (= 3.0.1)
+      rake (>= 0.8.4)
+      thor (~> 0.14.0)
+    rake (0.8.7)
+    rubyzip (0.9.4)
+    shoulda (2.10.3)
+    simple_form (1.2.2)
+    sqlite3-ruby (1.3.1)
+    thor (0.14.3)
+    treetop (1.4.8)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.23)
+    will_paginate (2.3.15)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (>= 1.0.0)
+  factory_girl (~> 1.3.0)
+  factory_girl_rails
+  formatize
+  liquid_cms!
+  paperclip (~> 2.3.1)
+  rails (~> 3.0.0)
+  rubyzip (~> 0.9.1)
+  shoulda (~> 2.10.3)
+  simple_form (~> 1.2.0)
+  sqlite3-ruby
+  vestal_versions (~> 1.2.1)!
+  will_paginate (~> 2.3.12)

data/README.rdoc

@@ -2,34 +2,34 @@
 
 A context aware CMS Ruby on Rails engine that uses liquid templates.
 
-If you're using rails 2, use the 0.2.x series of this gem (tested with ruby 1.8.7). https://github.com/redlinesoftware/liquid_cms/tree/rails2
+If you're using rails 2, use the 0.2.x series of this gem.
 
-If you're using rails 3, use the 0.3.x series of this gem (tested with ruby 1.9.2). https://github.com/redlinesoftware/liquid_cms
-
-{rubygems page}[https://rubygems.org/gems/liquid_cms]
-
-See the {wiki page}[http://github.com/redlinesoftware/liquid_cms/wiki] for additional documentation on usage and customizations... currently a work in progress.
+If you're using rails 3, use the 0.3.x series of this gem.
 
 = Installation
 
-Add it to your config/environment.rb:
+Add the gem to your Gemfile:
 
-  config.gem 'liquid_cms', :version => '~> 0.2.1'
+  gem 'liquid_cms', '~> 0.3.0'
 
 Install the gem:
 
-  rake gems:install
+  bundle install
 
 Run the generator:
 
-  script/generate liquid_cms
+  rails g liquid_cms:install
+
+The generator adds an additional dependency to your application, so bundler should be run once more:
+
+  bundle install
 
 = Configuration
 
 Configure the engine in config/initializers/cms/liquid_cms.rb:
 
   If you wish to run the cms under multiple "contexts" (ie. a cms each for a company, business, customer, etc.) then you need to perform the following steps:
-
+  
     * Set the *context_class* attribute to your apps context class:
 
       config.context_class = :Company
@@ -52,32 +52,10 @@ Once the engine is configured, you can view the CMS at the <b>/cms</b> path in y
 
 = Customization
 
-All CMS templates and the layout can be overridden in the main application.  Simply create the partial or template at the same path as the engine and your applications template will take priority.
-
 In order to expose data in your application in the templates, liquid filters, drops, tags and blocks specific to your application can be added to the <b>app/liquid</b> folder.  Knowledge of liquid templates and the liquid library is required to do this.  Examples of custom filters, drops, tags and blocks can be found in the liquid_cms gem files or in additional documentation on this website or related forums.
 
 A set of filters, drops and tags are provided in addition to the defaults provided by liquid.  The documentation link accessible in the CMS provides additional details.
 
-If you're using paperclip images in any models and exposing them via to_liquid, you can add an addtional column to your table to optimize dimension lookup.
-
-  class Customer
-    has_attached :photo
-
-    def to_liquid
-      photo.to_liquid
-    end
-  end
-
-  change_table :customers do |t|
-    t.text :cms_photo_dimensions # field name must be named after the paperclip name. ie. :cms_{paperclip name}_dimensions
-  end
-
-= Upgrading
-
-To upgrade the liquid_cms engine once you've installed a newer gem, simply re-run the liquid_cms generator. If any differences are found in files, you'll be prompted to overwrite or compare versions.
-
-If you're upgrading to the rails 3 version of the gem from the rails 2 version of the gem, it's recommended that you run the generator with the previous CMS generated files removed from your app and then integrate any customizations back into the application.
-
 = Contribution
 
-If you experience any issues with this CMS engine, please open a bug report.  Contributions to improve this engine are extremely welcome.  A 1.0 release will be made when the engine has a bit more _polish_ on it.
+If you experience any issues with this CMS engine, please open a bug report.  Contributionis to improve this engine is extremely welcome.  A 1.0 release will be made when the engine has a bit more _polish_ on it.

data/Rakefile

@@ -7,23 +7,13 @@ require 'rake/testtask'
 desc 'Default: run tests.'
 task :default => :test
 
-test_types = %w(unit functional integration)
-
 desc 'Test the liquid_cms gem.'
-task :test => test_types.collect{|t| ["test:#{t}", "test:#{t}:no_context"]}.flatten
+task :test => ['test:unit', 'test:functional', 'test:integration']
 
-test_types.each do |test|
-  desc "Run the #{test} tests for the liquid_cms gem"
+%w(unit functional integration).each do |test|
+  desc "Run the #{test} tests for the liquid_cms gem."
   Rake::TestTask.new("test:#{test}") do |t|
     t.pattern = "test/#{test}/*_test.rb"
     t.verbose = true
   end
 end
-
-test_types.each do |test|
-  desc "Run the #{test} tests for the liquid_cms gem (no context)"
-  Rake::TestTask.new("test:#{test}:no_context") do |t|
-    t.pattern = "test/#{test}/*_test_no_context.rb"
-    t.verbose = true
-  end
-end

data/TODO.rdoc

@@ -1,6 +1,7 @@
 * Implement a cleaner, more functional UI.
+* Vestal versions is used, but not exposed via the UI currently to go back to previous versions.
 * No functions are currently limited to specific user roles.  All CMS users can perform the same actions.
 * Implement caching and expiration logic.
 * Provide example apache/nginx/etc. conf files that properly scope cms assets for each context.
-* Generate CMS documentation from rdoc comments in source files?
+* Generate CMS documentation from rdoc comments in source files.
 * Missing tests... add more coverage.

data/app/controllers/cms/assets_controller.rb

@@ -6,13 +6,11 @@ class Cms::AssetsController < Cms::MainController
   end
 
   def new
-    @asset = create_tagged_asset
+    @asset = Cms::Asset.new
   end
 
   def create
-    @asset = @context.assets.build
-    @asset.assign_ordered_attributes params[:cms_asset]
-
+    @asset = @context.assets.build params[:cms_asset]
     if @asset.save
       flash[:notice] = t('assets.flash.created')
       redirect_to cms_root_path
@@ -27,24 +25,11 @@ class Cms::AssetsController < Cms::MainController
 
   def update
     @asset = @context.assets.find params[:id]
-    @asset.assign_ordered_attributes params[:cms_asset]
-
-    if @asset.save
-      respond_to do |format|
-        format.html {
-          redirect_to edit_cms_asset_path(@asset), :notice => t('assets.flash.updated')
-        }
-        format.js {
-          flash.now[:notice] = t('assets.flash.updated')
-        }
-      end
+    if @asset.update_attributes params[:cms_asset]
+      flash[:notice] = t('assets.flash.updated')
+      redirect_to cms_root_path
     else
-      respond_to do |format|
-        format.html {
-          render :action => 'edit'
-        }
-        format.js
-      end
+      render :action => 'edit'
     end
   end
 
@@ -53,38 +38,10 @@ class Cms::AssetsController < Cms::MainController
     @asset.destroy
 
     flash[:notice] = t('assets.flash.deleted')
-
+    
     respond_to do |format|
       format.html { redirect_to cms_root_path }
-    end
-  end
-
-protected
-  # pre-populate an asset with tagged data and meta fields if a tag param is present
-  def create_tagged_asset
-    asset = Cms::Asset.new
-    curr_tag = (params[:tag] || '').strip
-
-    if curr_tag.present?
-      asset.tag_list = curr_tag
-    
-      meta_asset = @context.assets.tagged_with(curr_tag).first :conditions => 'meta_data is not null'
-      if meta_asset
-        # remove meta values since we only want the key names
-        # new values will be provided for the new asset
-        asset.meta_data = meta_asset.meta_data.collect{|m| {:name => m[:name], :value => ''}}
-      end
-
-      dims_asset = @context.assets.tagged_with(curr_tag).first :conditions => 'custom_width is not null and custom_height is not null'
-      if dims_asset
-        # assign custom dims
-        asset.custom_width = dims_asset.custom_width
-        asset.custom_height = dims_asset.custom_height
-      end
-
-      asset
-    else
-      asset
+      format.js
     end
   end
 end

data/app/controllers/cms/components_controller.rb

@@ -13,23 +13,15 @@ class Cms::ComponentsController < Cms::MainController
   end
 
   def update
-    edit_url = {:controller => 'cms/components', :action => 'edit', :url => @path}
-
     if Cms::Component.editable?(@path)
       @component = Cms::Component.new(@context, @path)
-      @component.write params[:file_content]
+      @component.write params[:contents]
 
-      respond_to do |format|
-        format.html {
-          redirect_to edit_url, :notice => t('components.flash.updated')
-        }
-        format.js {
-          flash.now[:notice] = t('components.flash.updated')
-        }
-      end
+      flash[:notice] = "Component file updated."
+      redirect_to :controller => 'cms/components', :action => 'edit', :url => @path
     else
-      flash[:error] = "Not an editable component."
-      redirect_to edit_url
+      flash[:error] = "Not an editable file."
+      redirect_to cms_root_path
     end
   end
 
@@ -47,7 +39,7 @@ class Cms::ComponentsController < Cms::MainController
     component_zip = params[:zip_file]
 
     if component_zip.present? && File.extname(component_zip.original_filename) == '.zip'
-      Cms::Component.expand @context, component_zip.path
+      Cms::Component.new(@context).expand component_zip.path
       flash[:notice] = 'The component has been uploaded.'
     else
       flash[:error] = 'The component file must be a zip archive.'

data/app/controllers/cms/main_controller.rb

@@ -1,25 +1,23 @@
 class Cms::MainController < Cms::SetupController
-  unloadable
   extend Cms::RoleAuthentication
 
   layout 'cms'
 
-  before_filter :load_resources
+  unloadable
+
+  before_filter :load_pages_and_assets
 
   authenticate_user :all, :only => %w(index)
 
   def index
-    render :partial => 'cms/shared/index', :layout => true
+    render :text => render_to_string(:partial => 'cms/shared/index'), :layout => true
   end
 
 protected
-  def load_resources
+  def load_pages_and_assets
     @context = Cms::Context.new(@cms_context)
 
-    @cms_pages = @context.pages.ordered.all(:conditions => {:layout_page_id => nil})
-    @cms_assets = @context.assets.ordered
-    @cms_components = @context.components
-
-    @context_asset_tags = Cms::Asset.tags_for_context(@context)
+    @pages = @context.pages.ordered.all(:conditions => {:layout_page_id => nil})
+    @assets = @context.assets.ordered
   end
 end

data/app/controllers/cms/pages_controller.rb

@@ -3,14 +3,12 @@ class Cms::PagesController < Cms::MainController
 
   authenticate_user :all, :except => %w(load page_asset)
 
-  SEARCH_LIMIT = 40
-
   def new
     @page = Cms::Page.new
   end
 
   def create
-    @page = @context.pages.build(params[:cms_page])
+    @page = @context.pages.build({:updated_by => current_user}.merge(params[:cms_page] || {}))
     if @page.save
       flash[:notice] = t('pages.flash.created')
       redirect_to cms_root_path
@@ -25,22 +23,11 @@ class Cms::PagesController < Cms::MainController
 
   def update
     @page = @context.pages.find params[:id]
-    if @page.update_attributes(params[:cms_page])
-      respond_to do |format|
-        format.html {
-          redirect_to edit_cms_page_path(@page), :notice => t('pages.flash.updated')
-        }
-        format.js {
-          flash.now[:notice] = t('pages.flash.updated')
-        }
-      end
+    if @page.update_attributes({:updated_by => current_user}.merge(params[:cms_page] || {}))
+      flash[:notice] = t('pages.flash.updated')
+      redirect_to edit_cms_page_path(@page)
     else
-      respond_to do |format|
-        format.html {
-          render :action => 'edit'
-        }
-        format.js
-      end
+      render :action => 'edit'
     end
   end
 
@@ -49,7 +36,7 @@ class Cms::PagesController < Cms::MainController
     @page.destroy
 
     flash[:notice] = t('pages.flash.deleted')
-
+    
     respond_to do |format|
       format.html { redirect_to cms_root_path }
       format.js
@@ -60,13 +47,16 @@ class Cms::PagesController < Cms::MainController
     # forces removal of any flash values used during this request
     flash.discard
 
-    path = '/'+params[:url].join('/')
+    params[:url] ||= ''
+
+    path = '/'+params[:url]
+    url_parts = params[:url].split('/')
 
     @page = if path == '/'
       # if the root path is requested, find the root page or if a root page doesn't exist, get the first published page
       @context.pages.root || @context.pages.published.first
     else
-      @context.pages.published.first(:conditions => {:slug => path}) || @context.pages.published.first(:conditions => {:name => params[:url].first}) || @context.pages.published.first(:conditions => {:slug => wildcard_path}) 
+      @context.pages.published.first(:conditions => {:slug => path}) || @context.pages.published.first(:conditions => {:name => url_parts.first}) || @context.pages.published.first(:conditions => {:slug => wildcard_path}) 
     end
 
     if @page
@@ -98,16 +88,8 @@ class Cms::PagesController < Cms::MainController
     end
   end
 
-  def search
-    @search_term = (params[:search] || '').strip
-    # use upper which should be compatible with mysql, postgresql and sqlite
-    @pages = @search_term.blank? ? [] : @context.pages.all(:conditions => ["upper(content) like ?", "%#{@search_term.upcase}%"])
-  end
-
 protected
-  # the current url with the last level of the path removed which essentially allows a page to be loaded with anything (wildcard) one level deeper
-  # ex. normal page at /page will also accept /page/test, /page/abcd, etc.
   def wildcard_path
-    '/'+params[:url].slice(0..-2).join('/')
+    '/'+params[:url].split('/').slice(0..-2).join('/')
   end
 end

data/app/helpers/cms/common_helper.rb

@@ -1,60 +1,51 @@
 module Cms::CommonHelper
-  # js cookie accessor
-  def cookie_jar(key)
-    # if the cookie hasn't been set, need to return '{}' to return a proper hash
-    # and if the cookie has been set, but is 'null', we need to then return a ruby hash
-    # __CJ_ is the cookiejar js lib postfix value for cookies
-    ActiveSupport::JSON.decode(cookies["__CJ_#{key}".to_sym] || '{}') || {}
-  end
-
   def cms_icon(name, options = {})
     image_tag "/cms/images/icons/#{name}", options.merge(:size => '16x16')
   end
 
   def cms_flash_message
     type = (flash[:error] ? :error : :notice)
-    flash[type].present? ? "humanMsg.displayMsg('#{escape_javascript(flash[type])}', '#{type}')" : nil
-  end
-
-  def load_cms_flash_message
-    msg = cms_flash_message
-    msg.present? ? javascript_tag("document.observe('dom:loaded', function(){ #{msg} })") : nil
+    javascript_tag("document.observe('dom:loaded', function(){ humanMsg.displayMsg('#{escape_javascript(flash[type])}', '#{type}');})") if flash[type].present?
   end
 
   def cms_row_class
     cycle 'dark', 'light'
   end
 
-  def cms_ajax_update_form(page, object, path)
-    if object.errors.empty?
-      page << cms_flash_message
-    else
-      page.replace_html 'content', :file => "cms/#{path}/edit.html.erb"
-    end
-  end
-
-  def codemirror_edit(content_type, form, content_id, use_ajax = true, liquid_support = false)
-    mode = nil
-
-    case content_type
+  def codemirror_edit(content_type, form, content_id)
+    js_options = case content_type
     when "text/css"
-      mode = 'css'
-      content_for :cms_styles do
-        javascript_include_tag '/cms/codemirror/mode/css/css'
-      end
+      <<-JS
+      parserfile: ["../../javascripts/parseliquid.js", "parsecss.js"],
+      stylesheet: ["/cms/codemirror/css/csscolors.css", "/cms/stylesheets/liquidcolors.css"],
+      JS
     when "text/javascript"
-      mode = 'javascript'
-      content_for :cms_styles do
-        javascript_include_tag '/cms/codemirror/mode/javascript/javascript'
-      end
+      <<-JS
+      parserfile: ["../../javascripts/parseliquid.js", "tokenizejavascript.js", "parsejavascript.js"],
+      stylesheet: ["/cms/codemirror/css/jscolors.css", "/cms/stylesheets/liquidcolors.css"],
+      JS
     else
-      mode = 'htmlmixed'
-      content_for :cms_styles do
-        javascript_include_tag '/cms/codemirror/mode/htmlmixed/htmlmixed'
-      end
+      <<-JS
+      parserfile: ["../../javascripts/parseliquid.js"],
+      stylesheet: ["/cms/codemirror/css/xmlcolors.css", "/cms/stylesheets/liquidcolors.css"],
+      JS
     end
 
-    javascript_tag %(initCodemirror('#{mode}', $$('#{form}').first(), $('#{content_id}'), #{use_ajax}, #{liquid_support}))
+    javascript_tag do
+      <<-JS
+      var editor = CodeMirror.fromTextArea("#{content_id}", {
+        #{js_options}
+        path: "/cms/codemirror/js/",
+        textWrapping: false,
+        height: '600px',
+        saveFunction: function() {
+          var form = $$('#{form}').first();
+          $('#{content_id}').setValue(editor.getCode());
+          form.submit();
+        }
+      });
+      JS
+    end
   end
 
   def file_type_icon(file_name)
@@ -102,6 +93,7 @@ module Cms::CommonHelper
   end
 
   def asset_preview_option
-    cookie_jar('toggle')['on'] == false ? 'style="display:none"' : ''
+    # __CJ_ is the cookiejar js lib postfix value for cookies
+    ActiveSupport::JSON.decode(cookies[:__CJ_toggle] || '{}')['on'] == false ? 'style="display:none"' : ''
   end
 end