RubyGems - liquid_cms - Versions diffs - 0.3.1.0 → 0.3.2.0 - Mend

liquid_cms 0.3.1.0 → 0.3.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (136) hide show

data/lib/generators/liquid_cms/templates/public/cms/codemirror/mode/yaml/index.html ADDED

@@ -0,0 +1,68 @@
+<!doctype html>
+<html>
+  <head>
+    <title>CodeMirror 2: YAML mode</title>
+    <link rel="stylesheet" href="../../lib/codemirror.css">
+    <script src="../../lib/codemirror.js"></script>
+    <script src="yaml.js"></script>
+    <link rel="stylesheet" href="../../theme/default.css">
+    <style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</style>
+    <link rel="stylesheet" href="../../css/docs.css">
+  </head>
+  <body>
+    <h1>CodeMirror 2: YAML mode</h1>
+    <form><textarea id="code" name="code">
+--- # Favorite movies
+- Casablanca
+- North by Northwest
+- The Man Who Wasn't There
+--- # Shopping list
+[milk, pumpkin pie, eggs, juice]
+--- # Indented Blocks, common in YAML data files, use indentation and new lines to separate the key: value pairs
+  name: John Smith
+  age: 33
+--- # Inline Blocks, common in YAML data streams, use commas to separate the key: value pairs between braces
+{name: John Smith, age: 33}
+---
+receipt:     Oz-Ware Purchase Invoice
+date:        2007-08-06
+customer:
+    given:   Dorothy
+    family:  Gale
+items:
+    - part_no:   A4786
+      descrip:   Water Bucket (Filled)
+      price:     1.47
+      quantity:  4
+    - part_no:   E1628
+      descrip:   High Heeled "Ruby" Slippers
+      size:       8
+      price:     100.27
+      quantity:  1
+bill-to:  &id001
+    street: |
+            123 Tornado Alley
+            Suite 16
+    city:   East Centerville
+    state:  KS
+ship-to:  *id001
+specialDelivery:  >
+    Follow the Yellow Brick
+    Road to the Emerald City.
+    Pay no attention to the
+    man behind the curtain.
+...
+</textarea></form>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
+    </script>
+    <p><strong>MIME types defined:</strong> <code>text/x-yaml</code>.</p>
+  </body>
+</html>

data/lib/generators/liquid_cms/templates/public/cms/codemirror/mode/yaml/yaml.js ADDED

@@ -0,0 +1,95 @@
+CodeMirror.defineMode("yaml", function() {
+	var cons = ['true', 'false', 'on', 'off', 'yes', 'no'];
+	var keywordRegex = new RegExp("\\b(("+cons.join(")|(")+"))$", 'i');
+	return {
+		token: function(stream, state) {
+			var ch = stream.peek();
+			var esc = state.escaped;
+			state.escaped = false;
+			/* comments */
+			if (ch == "#") { stream.skipToEnd(); return "comment"; }
+			if (state.literal && stream.indentation() > state.keyCol) {
+				stream.skipToEnd(); return "string";
+			} else if (state.literal) { state.literal = false; }
+			if (stream.sol()) {
+				state.keyCol = 0;
+				state.pair = false;
+				state.pairStart = false;
+				/* document start */
+				if(stream.match(/---/)) { return "def"; }
+				/* document end */
+				if (stream.match(/\.\.\./)) { return "def"; }
+				/* array list item */
+				if (stream.match(/\s*-\s+/)) { return 'meta'; }
+			}
+			/* pairs (associative arrays) -> key */
+			if (!state.pair && stream.match(/^\s*([a-z0-9\._-])+(?=\s*:)/i)) {
+				state.pair = true;
+				state.keyCol = stream.indentation();
+				return "atom";
+			}
+			if (state.pair && stream.match(/^:\s*/)) { state.pairStart = true; return 'meta'; }
+			/* inline pairs/lists */
+			if (stream.match(/^(\{|\}|\[|\])/)) {
+				if (ch == '{')
+					state.inlinePairs++;
+				else if (ch == '}')
+					state.inlinePairs--;
+				else if (ch == '[')
+					state.inlineList++;
+				else
+					state.inlineList--;
+				return 'meta';
+			}
+			/* list seperator */
+			if (state.inlineList > 0 && !esc && ch == ',') {
+				stream.next();
+				return 'meta';
+			}
+			/* pairs seperator */
+			if (state.inlinePairs > 0 && !esc && ch == ',') {
+				state.keyCol = 0;
+				state.pair = false;
+				state.pairStart = false;
+				stream.next();
+				return 'meta';
+			}
+			/* start of value of a pair */
+			if (state.pairStart) {
+				/* block literals */
+				if (stream.match(/^\s*(\||\>)\s*/)) { state.literal = true; return 'meta'; };
+				/* references */
+				if (stream.match(/^\s*(\&|\*)[a-z0-9\._-]+\b/i)) { return 'variable-2'; }
+				/* numbers */
+				if (state.inlinePairs == 0 && stream.match(/^\s*-?[0-9\.\,]+\s?$/)) { return 'number'; }
+				if (state.inlinePairs > 0 && stream.match(/^\s*-?[0-9\.\,]+\s?(?=(,|}))/)) { return 'number'; }
+				/* keywords */
+				if (stream.match(keywordRegex)) { return 'keyword'; }
+			}
+			/* nothing found, continue */
+			state.pairStart = false;
+			state.escaped = (ch == '\\');
+			stream.next();
+			return null;
+		},
+		startState: function() {
+			return {
+				pair: false,
+				pairStart: false,
+				keyCol: 0,
+				inlinePairs: 0,
+				inlineList: 0,
+				literal: false,
+				escaped: false
+			};
+		}
+	};
+});
+CodeMirror.defineMIME("text/x-yaml", "yaml");

data/lib/generators/liquid_cms/templates/public/cms/codemirror/theme/cobalt.css ADDED

@@ -0,0 +1,17 @@
+.cm-s-cobalt { background: #002240; color: white; }
+.cm-s-cobalt span.CodeMirror-selected { background: #b36539 !important; }
+.cm-s-cobalt .CodeMirror-gutter { background: #002240; border-right: 1px solid #aaa; }
+.cm-s-cobalt .CodeMirror-gutter-text { color: #d0d0d0; }
+.cm-s-cobalt .CodeMirror-cursor { border-left: 1px solid white !important; }
+.cm-s-cobalt span.cm-comment { color: #08f; }
+.cm-s-cobalt span.cm-atom { color: #845dc4; }
+.cm-s-cobalt span.cm-number, .cm-s-cobalt span.cm-attribute { color: #ff80e1; }
+.cm-s-cobalt span.cm-keyword { color: #ffee80; }
+.cm-s-cobalt span.cm-string { color: #3ad900; }
+.cm-s-cobalt span.cm-meta { color: #ff9d00; }
+.cm-s-cobalt span.cm-variable-2, .cm-s-cobalt span.cm-tag { color: #9effff; }
+.cm-s-cobalt span.cm-variable-3, .cm-s-cobalt span.cm-def { color: white; }
+.cm-s-cobalt span.cm-error { color: #9d1e15; }
+.cm-s-cobalt span.cm-bracket { color: #d8d8d8; }
+.cm-s-cobalt span.cm-builtin, .cm-s-cobalt span.cm-special { color: #ff9e59; }

data/lib/generators/liquid_cms/templates/public/cms/codemirror/theme/default.css ADDED

@@ -0,0 +1,19 @@
+.cm-s-default span.cm-keyword {color: #708;}
+.cm-s-default span.cm-atom {color: #219;}
+.cm-s-default span.cm-number {color: #164;}
+.cm-s-default span.cm-def {color: #00f;}
+.cm-s-default span.cm-variable {color: black;}
+.cm-s-default span.cm-variable-2 {color: #05a;}
+.cm-s-default span.cm-variable-3 {color: #0a5;}
+.cm-s-default span.cm-property {color: black;}
+.cm-s-default span.cm-operator {color: black;}
+.cm-s-default span.cm-comment {color: #a50;}
+.cm-s-default span.cm-string {color: #a11;}
+.cm-s-default span.cm-string-2 {color: #f50;}
+.cm-s-default span.cm-meta {color: #555;}
+.cm-s-default span.cm-error {color: #f00;}
+.cm-s-default span.cm-qualifier {color: #555;}
+.cm-s-default span.cm-builtin {color: #30a;}
+.cm-s-default span.cm-bracket {color: #cc7;}
+.cm-s-default span.cm-tag {color: #170;}
+.cm-s-default span.cm-attribute {color: #00c;}

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

@@ -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/lib/generators/liquid_cms/templates/public/cms/codemirror/theme/elegant.css ADDED

@@ -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/lib/generators/liquid_cms/templates/public/cms/codemirror/theme/neat.css ADDED

@@ -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/lib/generators/liquid_cms/templates/public/cms/codemirror/theme/night.css ADDED

@@ -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/lib/generators/liquid_cms/templates/public/cms/javascripts/cms.js CHANGED

@@ -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/lib/generators/liquid_cms/templates/public/cms/javascripts/codemirror_custom.js ADDED

@@ -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/lib/generators/liquid_cms/templates/public/cms/stylesheets/codemirror_changes.css ADDED

@@ -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/lib/generators/liquid_cms/templates/public/cms/stylesheets/liquid.css ADDED

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

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

@@ -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 CHANGED

@@ -1,3 +1,3 @@
 module Cms
-  VERSION = "0.3.1.0"
+  VERSION = "0.3.2.0"
 end

data/liquid_cms.gemspec CHANGED

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rails', '~> 3.0.0'
   s.add_dependency 'paperclip', '~> 2.3.1'
   #s.add_dependency 'vestal_versions', '~> 1.2.1'
-  s.add_dependency 'simple_form', '~> 1.2.0'
+  s.add_dependency 'simple_form', '~> 1.5.2'
   s.add_dependency 'rubyzip', '~> 0.9.1'
   s.add_dependency 'will_paginate', '~> 2.3.12'
   s.add_dependency 'formatize'

data/test/functional/assets_controller_test.rb CHANGED

@@ -119,7 +119,8 @@ class Cms::AssetsControllerTest < ActionController::TestCase
         put :update, :id => asset, :cms_asset => {:asset => fixture_file_upload(File.join('assets', File.basename(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