liquid_cms 0.2.1.1 → 0.2.2.0

data/generators/liquid_cms/templates/public/cms/codemirror/theme/eclipse.css

@@ -0,0 +1,24 @@
+.cm-s-eclipse span.cm-meta {color: #FF1717;}
+.cm-s-eclipse span.cm-keyword { font-weight: bold; color: #7F0055; }
+.cm-s-eclipse span.cm-atom {color: #219;}
+.cm-s-eclipse span.cm-number {color: #164;}
+.cm-s-eclipse span.cm-def {color: #00f;}
+.cm-s-eclipse span.cm-variable {color: black;}
+.cm-s-eclipse span.cm-variable-2 {color: #0000C0;}
+.cm-s-eclipse span.cm-variable-3 {color: #0000C0;}
+.cm-s-eclipse span.cm-property {color: black;}
+.cm-s-eclipse span.cm-operator {color: black;}
+.cm-s-eclipse span.cm-comment {color: #3F7F5F;}
+.cm-s-eclipse span.cm-string {color: #2A00FF;}
+.cm-s-eclipse span.cm-string-2 {color: #f50;}
+.cm-s-eclipse span.cm-error {color: #f00;}
+.cm-s-eclipse span.cm-qualifier {color: #555;}
+.cm-s-eclipse span.cm-builtin {color: #30a;}
+.cm-s-eclipse span.cm-bracket {color: #cc7;}
+.cm-s-eclipse span.cm-tag {color: #170;}
+.cm-s-eclipse span.cm-attribute {color: #00c;}
+
+.CodeMirror-matchingbracket{
+	border:1px solid grey;
+	color:black !important;;
+}

data/generators/liquid_cms/templates/public/cms/codemirror/theme/elegant.css

@@ -0,0 +1,9 @@
+.cm-s-elegant span.cm-number, .cm-s-elegant span.cm-string, .cm-s-elegant span.cm-atom {color: #762;}
+.cm-s-elegant span.cm-comment {color: #262;font-style: italic;}
+.cm-s-elegant span.cm-meta {color: #555;font-style: italic;}
+.cm-s-elegant span.cm-variable {color: black;}
+.cm-s-elegant span.cm-variable-2 {color: #b11;}
+.cm-s-elegant span.cm-qualifier {color: #555;}
+.cm-s-elegant span.cm-keyword {color: #730;}
+.cm-s-elegant span.cm-builtin {color: #30a;}
+.cm-s-elegant span.cm-error {background-color: #fdd;}

data/generators/liquid_cms/templates/public/cms/codemirror/theme/neat.css

@@ -0,0 +1,8 @@
+.cm-s-neat span.cm-comment { color: #a86; }
+.cm-s-neat span.cm-keyword { font-weight: bold; color: blue; }
+.cm-s-neat span.cm-string { color: #a22; }
+.cm-s-neat span.cm-builtin { font-weight: bold; color: #077; }
+.cm-s-neat span.cm-special { font-weight: bold; color: #0aa; }
+.cm-s-neat span.cm-variable { color: black; }
+.cm-s-neat span.cm-number, .cm-s-neat span.cm-atom { color: #3a3; }
+.cm-s-neat span.cm-meta {color: #555;}

data/generators/liquid_cms/templates/public/cms/codemirror/theme/night.css

@@ -0,0 +1,20 @@
+/* Loosely based on the Midnight Textmate theme */
+
+.cm-s-night { background: #0a001f; color: #f8f8f8; }
+.cm-s-night span.CodeMirror-selected { background: #a8f !important; }
+.cm-s-night .CodeMirror-gutter { background: #0a001f; border-right: 1px solid #aaa; }
+.cm-s-night .CodeMirror-gutter-text { color: #f8f8f8; }
+.cm-s-night .CodeMirror-cursor { border-left: 1px solid white !important; }
+
+.cm-s-night span.cm-comment { color: #6900a1; }
+.cm-s-night span.cm-atom { color: #845dc4; }
+.cm-s-night span.cm-number, .cm-s-night span.cm-attribute { color: #ffd500; }
+.cm-s-night span.cm-keyword { color: #599eff; }
+.cm-s-night span.cm-string { color: #37f14a; }
+.cm-s-night span.cm-meta { color: #7678e2; }
+.cm-s-night span.cm-variable-2, .cm-s-night span.cm-tag { color: #99b2ff; }
+.cm-s-night span.cm-variable-3, .cm-s-night span.cm-def { color: white; }
+.cm-s-night span.cm-error { color: #9d1e15; }
+.cm-s-night span.cm-bracket { color: #8da6ce; }
+.cm-s-night span.cm-comment { color: #6900a1; }
+.cm-s-night span.cm-builtin, .cm-s-night span.cm-special { color: #ff9e59; }

data/generators/liquid_cms/templates/public/cms/javascripts/cms.js

@@ -2,7 +2,7 @@
 function set_component_view_state(elem) {
   var key = elem.getAttribute('id');
   var current_folders = jar.get('component_folders') || {};
-  
+
   if (elem.next('ul').visible())
     current_folders[key] = true;
   else

data/generators/liquid_cms/templates/public/cms/javascripts/codemirror_custom.js

@@ -0,0 +1,96 @@
+function codemirrorToggleFullscreenEditing()
+{
+  var editorDiv = $$('.CodeMirror-scroll').first();
+
+  if (!editorDiv.hasClassName('fullscreen')) {
+    var height = document.viewport.getHeight()+document.viewport.getScrollOffsets()[1];
+
+    toggleFullscreenEditing.beforeFullscreen = { height: editorDiv.getHeight(), width: editorDiv.getWidth() }
+    editorDiv.addClassName('fullscreen');
+    editorDiv.setStyle({height:height+'px', width:'100%'});
+    editor.refresh();
+  }
+  else {
+    editorDiv.removeClassName('fullscreen');
+    editorDiv.setStyle({
+      height:toggleFullscreenEditing.beforeFullscreen.height,
+      width:toggleFullscreenEditing.beforeFullscreen.width
+    });
+    editor.refresh();
+  }
+}
+
+function codemirrorSave(editor, form, use_ajax) {
+  editor.save();
+
+  if (!use_ajax) {
+    form.submit();
+    return;
+  }
+
+  var has_indicator = $('indicator');
+
+  if (has_indicator)
+    Element.show('indicator');
+
+  new Ajax.Request(form.action, {asynchronous:true, evalScripts:true, onComplete:
+    function(request){
+      if (has_indicator)
+        Element.hide('indicator');
+
+      form.enable();
+    },
+    parameters:form.serialize()}
+  );
+
+  form.disable();
+}
+
+CodeMirror.defineMode("liquid", function(config, parserConfig) {
+  var liquidOverlay = {
+    token: function(stream, state) {
+      if (stream.match("{{", false)) {
+        stream.match("{{");
+        while ((ch = stream.next()) != null)
+          if (ch == "}" && stream.next() == "}") break;
+        return "liquid-control";
+      }
+
+      if (stream.match("{%", false)) {
+        stream.match("{%");
+        while ((ch = stream.next()) != null)
+          if (ch == "%" && stream.next() == "}") break;
+        return "liquid-output";
+      }
+
+      while (stream.next() != null && !stream.match("{{", false) && !stream.match("{%", false)) {}
+      return null;
+    }
+  };
+
+  return CodeMirror.overlayParser(CodeMirror.getMode(config, parserConfig.backdrop || "text/html"), liquidOverlay);
+});
+
+function initCodemirror(mode, form, textarea, use_ajax, liquid_support) {
+  var codeMirrorOptions = {
+    mode : mode,
+    onKeyEvent : function(instance, event){
+      if (event.type == 'keydown') {
+        if (event.ctrlKey && (event.which == 83 || event.keyCode == 83)) {
+          event.stop();
+          codemirrorSave(instance, form, use_ajax);
+        }
+        // Hook into F11
+        //else if (event.keyCode == 122 || event.keyCode == 27) {
+        //  event.stop();
+        //  codemirrorToggleFullscreenEditing();
+        //}
+      }
+    }
+  }
+
+  //if (liquid_support)
+  //  codeMirrorOptions.mode = 'liquid';
+
+  var editor = CodeMirror.fromTextArea(textarea, codeMirrorOptions);
+}

data/generators/liquid_cms/templates/public/cms/stylesheets/codemirror_changes.css

@@ -0,0 +1,26 @@
+.CodeMirror {
+  background-color: white;
+  border: 1px solid #BBBBBB;
+  display: inline-block;
+  width: 89%;
+}
+.CodeMirror-scroll {
+  height: auto;
+  max-height: 800px;
+  min-height: 350px;
+}
+
+.fullscreen {
+  background-color: white;
+  display: block;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 9999;
+  margin: 0;
+  padding: 0;
+  border: 0px solid #BBBBBB;
+  opacity: 1;
+}

data/generators/liquid_cms/templates/public/cms/stylesheets/liquid.css

@@ -0,0 +1,7 @@
+span.cm-liquid-control {
+}
+span.cm-liquid-output {
+}
+span.cm-liquid-control, span.cm-liquid-output {
+  color: purple;
+}

data/generators/liquid_cms/templates/public/cms/stylesheets/simple_form.css

@@ -104,14 +104,6 @@ form.simple_form .details .label {
   float: none;
 }
 
-.CodeMirror-wrapping {
-  display: inline-block;
-}
-.CodeMirror-wrapping iframe {
-  background-color: white;
-  border: 1px solid #BBBBBB !important;
-}
-
 div.dimensions {
   margin-bottom: 1.3em;
 }

data/lib/liquid_cms/version.rb

@@ -1,3 +1,3 @@
 module Cms
-  VERSION = "0.2.1.1"
+  VERSION = "0.2.2.0"
 end

data/liquid_cms.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'rails', '~> 2.3.5'
   s.add_dependency 'paperclip', '~> 2.3.1'
-  s.add_dependency 'vestal_versions', '~> 1.0.1'
   s.add_dependency 'simple_form', '1.0.4'
   s.add_dependency 'rubyzip', '~> 0.9.1'
   s.add_dependency 'will_paginate', '~> 2.3.12'

data/test/functional/assets_controller_test.rb

@@ -119,7 +119,8 @@ class Cms::AssetsControllerTest < ActionController::TestCase
 
         put :update, :id => asset, :cms_asset => {:asset => ActionController::TestUploadedFile.new(new_asset_file)}
         assert_response :redirect
-        assert_redirected_to cms_root_path
+        assert_redirected_to edit_cms_asset_path(asset)
+        assert_equal 'The asset has been updated.', flash[:notice]
 
         # check that the file name updated
         assert_equal File.basename(new_asset_file), asset.reload.asset_file_name
@@ -131,27 +132,41 @@ class Cms::AssetsControllerTest < ActionController::TestCase
         # file contents are ignored for non-editable assets
         put :update, :id => asset, :cms_asset => {:file_content => 'new content'}
         assert_response :redirect
-        assert_redirected_to cms_root_path
+        assert_redirected_to edit_cms_asset_path(asset)
+        assert_equal 'The asset has been updated.', flash[:notice]
       end
 
-      should "modify the contents of an editable asset file and it's meta data" do
-        asset = Factory(:js_asset, :context => @company)
-        assert_nil asset.meta_data
-        assert_equal 0, asset.meta.length
-
-        asset_file = asset_file(asset.asset_file_name)
-        setup_asset asset_file
-
-        Cms::Asset.any_instance.stubs(:asset => stub(:path => asset_file))
-        Cms::Asset.any_instance.expects(:file_content=).with('new content').returns('new content')
-
-        put :update, :id => asset, :cms_asset => {:file_content => 'new content', :meta => {'new_0' => {:name => 'key_a', :value => 'test'}, 'new_1' => {:name => 'key_b', :value => 'test'}}}
-        assert_response :redirect
-        assert_redirected_to cms_root_path
-
-        asset.reload
-        assert_not_nil asset.meta_data
-        assert_equal 2, asset.meta.length
+      context "update editable content" do
+        setup do
+          @asset = Factory(:js_asset, :context => @company)
+
+          asset_file = asset_file(@asset.asset_file_name)
+          setup_asset asset_file
+
+          Cms::Asset.any_instance.stubs(:asset => stub(:path => asset_file))
+          Cms::Asset.any_instance.expects(:file_content=).with('new content').returns('new content')
+        end
+
+        teardown do
+          assert_equal 'The asset has been updated.', flash[:notice]
+          @asset.reload
+          assert_not_nil @asset.meta_data
+          assert_equal 2, @asset.meta.length
+        end
+
+        should "modify the contents of an editable asset file and it's meta data" do
+          assert_nil @asset.meta_data
+          assert_equal 0, @asset.meta.length
+
+          put :update, :id => @asset, :cms_asset => {:file_content => 'new content', :meta => {'new_0' => {:name => 'key_a', :value => 'test'}, 'new_1' => {:name => 'key_b', :value => 'test'}}}
+          assert_response :redirect
+          assert_redirected_to edit_cms_asset_path(@asset)
+        end
+
+        should "update via XHR" do
+          xhr :put, :update, :id => @asset, :cms_asset => {:file_content => 'new content', :meta => {'new_0' => {:name => 'key_a', :value => 'test'}, 'new_1' => {:name => 'key_b', :value => 'test'}}}
+          assert_response :success
+        end
       end
     end
 

data/test/functional/components_controller_test.rb

@@ -27,11 +27,21 @@ class Cms::ComponentsControllerTest < ActionController::TestCase
         assert_template 'edit'
       end
 
-      should "update" do
-        put :update, :url => [@file], :file_content => 'new content'
-        assert_response :redirect
-        assert_equal "The component file has been updated.", flash[:notice]
-        assert_equal "new content\n", File.read(Cms::Component.full_path(@context).join(@file))
+      context "update" do
+        should "update via HTTP" do
+          put :update, :url => [@file], :file_content => 'new content'
+          assert_response :redirect
+          assert_redirected_to :controller => 'cms/components', :action => 'edit', :url => @file
+          assert_equal "The component file has been updated.", flash[:notice]
+          assert_equal "new content\n", File.read(Cms::Component.full_path(@context).join(@file))
+        end
+
+        should "update via XHR" do
+          xhr :put, :update, :url => [@file], :file_content => 'new content'
+          assert_response :success
+          assert_equal "The component file has been updated.", flash[:notice]
+          assert_equal "new content\n", File.read(Cms::Component.full_path(@context).join(@file))
+        end
       end
 
       should "valid destroy" do

data/test/functional/pages_controller_test.rb

@@ -70,12 +70,25 @@ class Cms::PagesControllerTest < ActionController::TestCase
       assert_template 'edit'
     end
 
-    should "update a page" do
-      put :update, :id => @company.pages.first.id, :cms_page => {:slug => '', :published => false}
-      assert_response :redirect
-      assert_equal true, assigns(:page).errors.empty?
-      assert_equal 'The page has been updated.', flash[:notice]
-      assert_redirected_to edit_cms_page_path
+    context "update" do
+      setup do
+        @page = @company.pages.first
+      end
+
+      should "update via HTTP" do
+        put :update, :id => @page.id, :cms_page => {:slug => '', :published => false}
+        assert_response :redirect
+        assert_equal true, assigns(:page).errors.empty?
+        assert_redirected_to edit_cms_page_path(@page)
+        assert_equal 'The page has been updated.', flash[:notice]
+      end
+
+      should "update via XHR" do
+        xhr :put, :update, :id => @page.id, :cms_page => {:slug => '', :published => false}
+        assert_response :success
+        assert_equal true, assigns(:page).errors.empty?
+        assert_equal 'The page has been updated.', flash[:notice]
+      end
     end
 
     should "destroy a page via HTML :DELETE" do

data/test/rails_app/config/environment.rb

@@ -1,7 +1,7 @@
 # Be sure to restart your server when you modify this file
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.11' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.14' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')

data/test/rails_app/config/locales/cms/en.yml

@@ -1,14 +1,19 @@
 en:
   pages:
+    layout:
+      title: 'Liquid CMS'
     actions:
       index:
-        title: 'Site Pages'
+        title: 'Pages'
         none: 'There are currently no pages.'
-        new_link: 'Create a new page'
+        new: 'Create a new page'
+        search: 'Search'
       new:
         title: 'New Page'
       edit:
         title: 'Editing Page'
+      search:
+        title: 'Page Search'
     flash:
       created: 'The page has been saved.'
       updated: 'The page has been updated.'
@@ -17,9 +22,9 @@ en:
   assets:
     actions:
       index:
-        title: 'Site Assets'
+        title: 'Assets'
         none: 'There are currently no assets.'
-        new_link: 'Upload a new asset'
+        new: 'Upload a new asset'
       new:
         title: 'New Asset'
       edit:
@@ -33,6 +38,9 @@ en:
     actions:
       index:
         title: 'Components'
+        none: 'There are currently no components.'
+    flash:
+      updated: 'The component file has been updated.'
 
   simple_form:
     "yes": 'Yes'
@@ -55,16 +63,23 @@ en:
         root: 'Home Page'
       cms_asset:
         asset_file_name: 'File'
+        tag_list: 'Tags'
     hints:
       cms_page:
         name: 'The name must contain no whitespace or any other special characters. Letters, numbers, hyphens, underscores and periods are valid.<br/>The extensions <em>.css</em>, <em>.js</em>, <em>.xml</em>, <em>.json</em> and <em>.txt</em> can used to auto-identify the content-type.  If no extension is provided, html is the default type.'
         content: 'To create a layout page, add the <em>{{ content_for_layout }}</em> tag which will act as a placeholder for the contents of another page.  Use ctrl+s to save.'
         slug: 'The url path that will be used to access this page.  Defaults to the page name if not provided. ie. /name.<br/> Ex. /home_page'
         layout_page_id: 'Optional page that will be used as this pages layout.  Ie. This pages content will be inserted into the layout page where the <em>{{ content_for_layout }}</em> tag is specified.'
+        published: 'Make this page accessible via the pages name or url path?'
+        root: 'Make this page the sites root path (/)? Only one page can have this designation.'
       cms_component:
         file_content: '<em>No liquid support for editing components.</em> Use ctrl+s to save.'
       cms_asset:
         asset: 'Upload an asset file.'
+        tag_list: 'Seperate tags with commas.'
+        dimensions: 'Specify custom dimensions in pixels as width x height.  The aspect ratio will be maintained, so actual dimensions may differ.  Applies to image assets only.'
+        meta:
+          name: 'The name must begin with a letter and consist only of lowercase letters, numbers and underscores.'
         file_content: '<em>No liquid support for editing assets.</em> Use ctrl+s to save.'
         edit:
           asset: 'An existing file has been uploaded.  Upload a new file to replace it.'

data/test/rails_app/db/migrate/20110511161859_create_liquid_cms_upgrade_rev2.rb

@@ -0,0 +1,13 @@
+class CreateLiquidCmsUpgradeRev2 < ActiveRecord::Migration
+  def self.up
+    change_table :cms_assets do |t|
+      t.text :cms_asset_dimensions # serialized yaml
+    end
+  end
+
+  def self.down
+    change_table :cms_assets do |t|
+      t.remove :cms_asset_dimensions
+    end
+  end
+end

data/test/unit/asset_test.rb

@@ -122,7 +122,7 @@ class Cms::AssetTest < ActiveSupport::TestCase
 
     context "javascript" do
       setup do
-        @asset.update_attribute :asset_content_type, 'text/javascript'
+        @asset.update_attributes :asset_content_type => 'text/javascript', :asset_file_name => 'test.js'
         setup_asset @asset.asset.path(:original)
       end