mercury-rails 0.7.1 → 0.8.0

data/POST_INSTALL

@@ -4,12 +4,18 @@ and other useful info can be found at: https://github.com/jejacks0n/mercury
 
 Here's a post install checklist:
 
-* Setup the database for image processing (ActiveRecord only) by running:
+* Adjust your application.js & css files to not `require_tree .`
 
-  rake mercury_engine:install:migrations
-  rake db:migrate
+* Learn about, and change configurations in app/assets/javascripts/mercury.js.
 
-* Learn about, and make configuration adjustments in the mercury.js file.
+* If installed, you can make changes to the provided layout and css files too.
 
-* If installed, check out mercury.html.erb and mercury_overrides.css for more
-  customization info.
+* If you want image processing and uploading (using paperclip by default):
+
+  rails g mercury:install:images (use --orm=mongoid for MongoDB)
+  bundle
+  rake db:migrate (if using ActiveRecord)
+
+* For a basic example of authentication for Mercury, install the example:
+
+  rails g mercury:install:authentication

data/app/assets/javascripts/mercury.js

@@ -2,10 +2,8 @@
  * Mercury Editor is a CoffeeScript and jQuery based WYSIWYG editor.  Documentation and other useful information can be
  * found at https://github.com/jejacks0n/mercury
  *
- *= require_self
- *
  * Minimum jQuery requirements are 1.7
- *= require mercury/dependencies/jquery-1.7
+ *= require_self
  *
  * You can include the Rails jQuery ujs script here to get some nicer behaviors in modals, panels and lightviews when
  * using :remote => true within the contents rendered in them.

data/app/assets/javascripts/mercury/dependencies/jquery.additions.js

@@ -1,23 +1,113 @@
 /*
- * jQuery serializeObject Plugin
+ * jQuery serializeObject Plugin: https://github.com/fojas/jQuery-serializeObject
  *
  */
-(function($) {
-  $.fn.serializeObject = function() {
-    var o = {};
-    var a = this.serializeArray();
-    jQuery.each(a, function() {
-      if (o[this.name] !== undefined) {
-        if (!o[this.name].push) o[this.name] = [o[this.name]];
-        o[this.name].push(this.value || '');
-      } else {
-        o[this.name] = this.value || '';
+!function($){
+  $.serializeObject = function(obj){
+    var o={},lookup=o,a = obj;
+    $.each(a,function(){
+      var named = this.name.replace(/\[([^\]]+)?\]/g,',$1').split(','),
+          cap = named.length - 1,
+          i = 0;
+      for(;i<cap;i++) {
+        // move down the tree - create objects or array if necessary
+        if(lookup.push){ // this is an array, add values instead of setting them
+          // push an object if this is an empty array or we are about to overwrite a value
+          if( !lookup[lookup.length -1] // this is an empty array
+              || lookup[lookup.length -1].constructor !== Object //current value is not a hash
+              || lookup[lookup.length -1][named[i+1]] !== undefined //current item is already set
+              ){
+            lookup.push({});
+          }
+          lookup = lookup[lookup.length -1];
+        } else {
+          lookup = lookup[named[i]] = lookup[named[i]] || (named[i+1]==""?[]:{});
+        }
       }
+      if(lookup.push){
+        lookup.push(this.value);
+      }else{
+        lookup[named[cap]]=this.value;
+      }
+      lookup = o;
     });
     return o;
   };
-})(jQuery);
 
+  $.deserializeObject = function deserializeObject(json,arr,prefix){
+    var i,j,thisPrefix,objType;
+    arr = arr || [];
+    if(Object.prototype.toString.call(json) ==='[object Object]'){
+      for(i in json){
+        thisPrefix = prefix ? [prefix,'[',i,']'].join('') : i;
+        if(json.hasOwnProperty(i)){
+          objType = Object.prototype.toString.call(json[i])
+          if(objType === '[object Array]'){
+            for(j = 0,jsonLen = json[i].length;j<jsonLen;j++){
+              deserializeObject(json[i][j],arr,thisPrefix+'[]');
+            }
+          }else if(objType === '[object Object]'){
+            deserializeObject(json[i],arr,thisPrefix);
+          }else {
+            arr.push({
+              name : thisPrefix,
+              value : json[i]
+            });
+          }
+        }
+      }
+    } else {
+      arr.push({
+        name : prefix,
+        value : json
+      });
+    }
+    return arr;
+  }
+
+  var check = function(){
+    // older versions of jQuery do not have prop
+    var propExists = !!$.fn.prop;
+    return function(obj,checked){
+      if(propExists) obj.prop('checked',checked);
+      else obj.attr('checked', (checked ? 'checked' : null ));
+    };
+  }();
+
+  $.applySerializedArray = function(form,obj){
+    var $form = $(form).find('input,select,textarea'), el;
+    check($form.filter(':checked'),false)
+    for(var i = obj.length;i--;){
+      el = $form.filter("[name='"+obj[i].name+"']");
+      if(el.filter(':checkbox').length){
+        if(el.val() == obj[i].value) check(el.filter(':checkbox'),true);
+      }else if(el.filter(':radio').length){
+        check(el.filter("[value='"+obj[i].value+"']"),true)
+      } else {
+        el.val(obj[i].value);
+      }
+    }
+  };
+
+  $.applySerializedObject = function(form, obj){
+    $.applySerializedArray(form,$.deserializeObject(obj));
+  };
+
+  $.fn.serializeObject = $.fn.serializeObject || function(){
+    return $.serializeObject(this.serializeArray());
+  };
+
+  $.fn.applySerializedObject = function(obj){
+    $.applySerializedObject(this,obj);
+    return this;
+  };
+
+  $.fn.applySerializedArray = function(obj){
+    $.applySerializedArray(this,obj);
+    return this;
+  };
+
+}(jQuery);
 /*
  * jQuery Easing v1.3 - http://gsgd.co.uk/sandbox/jquery/easing/
  *
@@ -203,4 +293,4 @@ jQuery.extend(jQuery.easing, {
       return this;
     });
   };
-})(jQuery);
+})(jQuery);

data/app/assets/javascripts/mercury/dialogs/forecolor.js.coffee

@@ -1,6 +1,6 @@
 @Mercury.dialogHandlers.foreColor = ->
   @element.find('.picker, .last-picked').on 'click', (event) =>
-    color = jQuery(event.target).css('background-color')
+    color = jQuery(event.target).css('background-color').toHex()
     @element.find('.last-picked').css({background: color})
     @button.css({backgroundColor: color})
     Mercury.trigger('action', {action: 'foreColor', value: color})

data/app/assets/javascripts/mercury/mercury.js.coffee

@@ -34,7 +34,7 @@
 #
 @Mercury ||= {}
 jQuery.extend @Mercury,
-  version: '0.7.1'
+  version: '0.8.0'
 
   # Mercury object namespaces
   Regions: Mercury.Regions || {}

data/app/assets/javascripts/mercury/modals/insertlink.js.coffee

@@ -1,6 +1,9 @@
 @Mercury.modalHandlers.insertLink = {
 
   initialize: ->
+    @editing = false
+    @content = null
+
     # make the inputs work with the radio buttons
     @element.find('.control-label input').on('click', @onLabelChecked)
     @element.find('.controls .optional, .controls .required').on('focus', @onInputFocused)
@@ -32,13 +35,19 @@
     @element.find('#link_text').val(selection.textContent()) if selection.textContent
 
     # if we're editing a link prefill the information
+
     a = selection.commonAncestor(true).closest('a') if selection && selection.commonAncestor
-    return false unless a && a.length
-    @editing = a
+    img = /<img/.test(selection.htmlContent()) if selection.htmlContent
+    return false unless img || a && a.length
 
     # don't allow changing the content on edit
     @element.find('#link_text_container').hide()
 
+    @content = selection.htmlContent() if img
+
+    return false unless a && a.length
+    @editing = a
+
     # fill in the external url or bookmark select based on what it looks like
     if a.attr('href') && a.attr('href').indexOf('#') == 0
       bookmarkSelect = @element.find('#link_existing_bookmark')
@@ -106,7 +115,7 @@
     el = @element.find("#link_#{type}")
     @addInputError(el, "can't be blank") unless el.val()
 
-    unless @editing
+    if !@editing && !@content
       el = @element.find('#link_text')
       @addInputError(el, "can't be blank") unless el.val()
 
@@ -133,7 +142,7 @@
       else
         attrs['target'] = target if target
 
-    value = {tagName: 'a', attrs: attrs, content: content}
+    value = {tagName: 'a', attrs: attrs, content: @content || content}
 
     if @editing
       Mercury.trigger('action', {action: 'replaceLink', value: value, node: @editing.get(0)})

data/app/assets/javascripts/mercury/page_editor.js.coffee

@@ -3,7 +3,7 @@ class @Mercury.PageEditor
   # options
   # saveStyle: 'form', or 'json' (defaults to json)
   # saveDataType: 'xml', 'json', 'jsonp', 'script', 'text', 'html' (defaults to json)
-  # saveMethod: 'POST', or 'PUT', create or update actions on save (defaults to POST)
+  # saveMethod: 'POST', or 'PUT', create or update actions on save (defaults to PUT)
   # visible: boolean, if the interface should start visible or not (defaults to true)
   constructor: (@saveUrl = null, @options = {}) ->
     throw Mercury.I18n('Mercury.PageEditor can only be instantiated once.') if window.mercuryInstance
@@ -21,7 +21,7 @@ class @Mercury.PageEditor
   initializeInterface: ->
     @focusableElement = jQuery('<input>', {class: 'mercury-focusable', type: 'text'}).appendTo(@options.appendTo ? 'body')
 
-    @iframe = jQuery('<iframe>', {id: 'mercury_iframe', class: 'mercury-iframe', seamless: 'true', frameborder: '0', src: 'about:blank'})
+    @iframe = jQuery('<iframe>', {id: 'mercury_iframe', class: 'mercury-iframe', frameborder: '0', src: 'about:blank'})
     @iframe.appendTo(jQuery(@options.appendTo).get(0) ? 'body')
 
     @toolbar = new Mercury.Toolbar(@options)
@@ -221,14 +221,21 @@ class @Mercury.PageEditor
   save: (callback) ->
     url = @saveUrl ? Mercury.saveUrl ? @iframeSrc()
     data = @serialize()
+    data = {content: data}
+
+    if @options.saveMethod == 'POST'
+      method = 'POST'
+    else
+      method = 'PUT'
+      data['_method'] = method
+
     Mercury.log('saving', data)
-    data = jQuery.toJSON(data) unless @options.saveStyle == 'form'
-    method = 'PUT' if @options.saveMethod == 'PUT'
-    jQuery.ajax url, {
+
+    options = {
       headers: Mercury.ajaxHeaders()
-      type: method || 'POST'
-      dataType: @options.saveDataType,
-      data: {content: data, _method: method}
+      type: method
+      dataType: @options.saveDataType
+      data: data
       success: =>
         Mercury.changes = false
         Mercury.trigger('saved')
@@ -237,6 +244,10 @@ class @Mercury.PageEditor
         Mercury.trigger('save_failed', response)
         Mercury.notify('Mercury was unable to save to the url: %s', url)
     }
+    if @options.saveStyle != 'form'
+      options['data'] = jQuery.toJSON(data)
+      options['contentType'] = 'application/json'
+    jQuery.ajax url, options
 
 
   serialize: ->

data/app/assets/javascripts/mercury/region.js.coffee

@@ -88,7 +88,6 @@ class @Mercury.Region
     for element in @element.find('[data-snippet]')
       snippet = Mercury.Snippet.find(jQuery(element).data('snippet'))
       continue unless snippet
-      snippet.setVersion(jQuery(element).data('version'))
       snippets[snippet.identity] = snippet.serialize()
     return snippets
 

data/app/assets/javascripts/mercury/regions/full.coffee

@@ -216,7 +216,9 @@ class @Mercury.Regions.Full extends Mercury.Region
         element.contentEditable = false
         element = jQuery(element)
         if snippet = Mercury.Snippet.find(element.data('snippet'))
-          unless element.data('version')
+          if element.data('version')
+            snippet.setVersion(element.data('version'))
+          else
             try
               version = parseInt(element.html().match(/\/(\d+)\]/)[1])
               if version
@@ -365,6 +367,7 @@ class @Mercury.Regions.Full extends Mercury.Region
   sanitize: (sanitizer) ->
     # always remove nested regions
     sanitizer.find("[#{Mercury.config.regions.attribute}]").remove()
+    sanitizer.find('[src*="webkit-fake-url://"]').remove()
 
     if Mercury.config.pasting.sanitize
       switch Mercury.config.pasting.sanitize
@@ -490,7 +493,13 @@ class Mercury.Regions.Full.Selection
 
 
   textContent: ->
-    return @range.cloneContents().textContent
+    return @content().textContent
+
+
+  htmlContent: ->
+    content = @content()
+    return jQuery('<div>').html(content).html()
+    return null
 
 
   content: ->

data/app/assets/javascripts/mercury/snippet.js.coffee

@@ -100,8 +100,8 @@ class @Mercury.Snippet
   setVersion: (version = null) ->
     version = parseInt(version)
     if version && @history.stack[version - 1]
-      @version = version - 1
-      @options = @history.stack[@version]
+      @version = version
+      @options = @history.stack[version - 1]
       return true
     return false
 

data/app/assets/stylesheets/mercury/bootstrap-overrides.css

@@ -18,6 +18,7 @@ legend {
   display: block;
   position: relative;
   margin-left: 10px;
+  margin-bottom: 0;
   font-weight: bold;
   width: auto;
   padding: 0;

data/app/assets/stylesheets/mercury/dialog.css

@@ -201,6 +201,7 @@
 }
 .mercury-snippet-panel ul li img {
   float: left;
+  cursor: move;
 }
 .mercury-snippet-panel ul li h4,
 .mercury-snippet-panel ul li .description {

data/app/helpers/mercury_helper.rb

@@ -0,0 +1,7 @@
+module MercuryHelper
+
+  def mercury_edit_path(path = nil)
+    mercury_engine.mercury_editor_path(path.nil? ? request.path.gsub(/^\/\/?(editor)?/, '') : path)
+  end
+
+end

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

@@ -4,30 +4,20 @@
     <meta name="viewport" content="width=device-width, maximum-scale=1.0, initial-scale=1.0">
     <%= csrf_meta_tags %>
     <title>Mercury Editor</title>
-    <%= stylesheet_link_tag    'mercury', 'mercury_overrides' %>
-    <%= javascript_include_tag 'mercury', 'mercury_overrides' %>
+    <%= stylesheet_link_tag    'mercury' %>
+    <%= javascript_include_tag 'jquery-1.7', 'mercury' %>
   </head>
   <body>
     <script type="text/javascript">
-      var saveUrl = null; // Set to the url that you want to save any given page to.
-      var options = {
-        saveStyle: null,  // 'form', or 'json' (default json)
-        saveMethod: null, // 'POST', or 'PUT', (create, vs. update -- default POST)
-        visible: null     // if the interface should start visible or not (default true)
-      };
+      // Set to the url that you want to save any given page to, leave null for default handling.
+      var saveUrl = null;
 
-      <!-- Mix in any configurations provided through Rails.application.config.mercury_config -->
-      <% if Rails.application.config.respond_to?(:mercury_config) %>
-        jQuery.extend(Mercury.config, <%= Rails.application.config.mercury_config.to_json.html_safe %>);
-      <% end -%>
-
-      <!-- Mix in any options for PageEditor provided through Rails.application.config.mercury_page_editor_config -->
-      <% if Rails.application.config.respond_to?(:mercury_page_editor_config) %>
-        jQuery.extend(options, <%= Rails.application.config.mercury_page_editor_config.to_json.html_safe %>);
-      <% end -%>
-
-      <!-- Instantiate the PageEditor -->
-      new Mercury.PageEditor(saveUrl, options);
+      // Instantiate the PageEditor
+      new Mercury.PageEditor(saveUrl, {
+        saveStyle:  null, // 'form', or 'json' (default json)
+        saveMethod: null, // 'PUT', or 'POST', (create, vs. update -- default PUT)
+        visible:    true  // boolean - if the interface should start visible or not
+      });
     </script>
   </body>
 </html>

data/app/views/mercury/snippets/example/options.html.erb

@@ -1,15 +1,30 @@
-<%= form_for 'options', {html: {class: 'form-horizontal', style: 'width:600px'}} do |f| %>
-  <div class="form-inputs">
-    <label for="options_first_name">First Name</label>
-    <input id="options_first_name" name="options[first_name]" type="text" value="<%= @options[:first_name] %>"/>
+<%= form_for 'options', {html: {class: 'form-horizontal', style: 'width:615px'}} do |f| %>
+
+  <div class="form-inputs mercury-display-pane-container">
+
+    <fieldset>
+      <div class="control-group string optional">
+        <label class="string optional control-label" for="options_first_name">First Name</label>
+        <div class="controls">
+          <input class="span6 string optional" id="options_first_name" name="options[first_name]" size="50" type="text" value="<%= @options[:first_name] %>">
+        </div>
+      </div>
+    </fieldset>
+
     <fieldset>
       <legend>Options</legend>
-      <label class="label" for="options_favorite_beer">Favorite Beer</label>
-      <input id="options_favorite_beer" name="options[favorite_beer]" type="text" value="<%= @options[:favorite_beer] %>"/>
+      <div class="control-group string optional">
+        <label class="string optional control-label" for="options_favorite_beer">Favorite Beer</label>
+        <div class="controls">
+          <input class="span6 string optional" id="options_favorite_beer" name="options[favorite_beer]" size="50" type="text" value="<%= @options[:favorite_beer] %>">
+        </div>
+      </div>
     </fieldset>
+
   </div>
 
-  <div class="form-actions">
-    <input name="commit" type="submit" value="Insert Snippet"/>
+  <div class="form-actions mercury-display-controls">
+    <input class="btn btn-primary" name="commit" type="submit" value="Insert Snippet"/>
   </div>
+
 <% end %>

data/config/routes.rb

@@ -0,0 +1,9 @@
+Mercury::Engine.routes.draw do
+  match '/editor(/*requested_uri)' => "mercury#edit", :as => :mercury_editor
+
+  scope '/mercury' do
+    match ':type/:resource' => "mercury#resource"
+    match 'snippets/:name/options' => "mercury#snippet_options"
+    match 'snippets/:name/preview' => "mercury#snippet_preview"
+  end
+end

data/features/loading/loading.feature

@@ -21,5 +21,5 @@ Feature:
   # Latest selenium webdriver seems to consider the lightview hidden
   @use_hidden_elements
   Scenario: A user can expect to see the status bar
-    Then I should see "Mercury Editor v0.7.1" within the statusbar
+    Then I should see "Mercury Editor v0.8.0" within the statusbar
 

data/features/regions/full/basic_editing.feature

@@ -8,10 +8,10 @@ Feature:
     Given I am on an editable page
     And the editor won't prompt when leaving the page
 
-  # Scenario: A user can expect all this!
+  Scenario: A user can expect all this!
 
 
- Scenario: A user can set and unset bold content
+  Scenario: A user can set and unset bold content
     Given the content of the full region is simple content
     And I make a selection
 
@@ -22,7 +22,7 @@ Feature:
     Then the contents of the full region should be "this is <span>simple</span> <b>content</b>"
 
 
- Scenario: A user can italicize content
+  Scenario: A user can italicize content
     Given the content of the full region is simple content
     And I make a selection
 
@@ -33,7 +33,7 @@ Feature:
     Then the contents of the full region should be "this is <span>simple</span> <b>content</b>"
 
 
- Scenario: A user can overline content
+  Scenario: A user can overline content
     Given the content of the full region is simple content
     And I make a selection
 
@@ -42,7 +42,7 @@ Feature:
     # doesn't remove overlines
 
 
- Scenario: A user can strikeout content
+  Scenario: A user can strikeout content
     Given the content of the full region is simple content
     And I make a selection
 
@@ -52,7 +52,8 @@ Feature:
     When I click on the strikethrough editor button
     Then the contents of the full region should be "this is <span>simple</span> <b>content</b>"
 
- Scenario: A user can underline content
+
+  Scenario: A user can underline content
     Given the content of the full region is simple content
     And I make a selection
 
@@ -63,7 +64,7 @@ Feature:
     Then the contents of the full region should be "this is <span>simple</span> <b>content</b>"
 
 
- Scenario: A user can make content superscript
+  Scenario: A user can make content superscript
     Given the content of the full region is simple content
     And I make a selection
 
@@ -74,7 +75,7 @@ Feature:
     Then the contents of the full region should be "this is <span>simple</span> <b>content</b>"
 
 
- Scenario: A user can make content subscript
+  Scenario: A user can make content subscript
     Given the content of the full region is simple content
     And I make a selection
 
@@ -85,7 +86,7 @@ Feature:
     Then the contents of the full region should be "this is <span>simple</span> <b>content</b>"
 
 
- Scenario: A user can justify content to the left, center, right, or fully justified
+  Scenario: A user can justify content to the left, center, right, or fully justified
     # firefox: this isn't possible on the first line due to a bug in gecko, so we have special content for it
     Given the content of the full region has justifiable content
     And I make a selection
@@ -103,7 +104,7 @@ Feature:
     Then the contents of the full region should be "<div>first line</div><br><div align='justify'>this is <span>justifiable</span><b>content</b></div>"
 
 
- Scenario: A user can make an unordered list
+  Scenario: A user can make an unordered list
     Given the content of the full region is simple content
     And I make a selection
 
@@ -112,7 +113,8 @@ Feature:
 
     # todo: we should test enter and tab, and shift+tab in advanced editing
 
- Scenario: A user can make an ordered list
+
+  Scenario: A user can make an ordered list
     Given the content of the full region is simple content
     And I make a selection
 
@@ -122,7 +124,7 @@ Feature:
     # todo: we should test enter and tab, and shift+tab in advanced editing
 
 
- Scenario: A user can indent and outdent content
+  Scenario: A user can indent and outdent content
     # firefox: this isn't possible on the first line due to a bug in gecko, so we have special content for it
     Given the content of the full region has justifiable content
     And I make a selection
@@ -140,7 +142,7 @@ Feature:
     Then the contents of the full region should be "<div>first line</div><br>this is <span>justifiable</span><b>content</b>"
 
 
- Scenario: A user can insert horizontal rules
+  Scenario: A user can insert horizontal rules
     Given the content of the full region is simple content
     And I make a selection
 
@@ -151,7 +153,7 @@ Feature:
     Then the contents of the full region should be "this is&nbsp;<hr size='2' width='100%'><hr size='2' width='100%'> <b>content</b>"
 
 
- Scenario: A user can clean/remove formatting on their selection
+  Scenario: A user can clean/remove formatting on their selection
     Given the content of the full region has wrapped content
     And I make a selection
 
@@ -159,7 +161,7 @@ Feature:
     Then the contents of the full region should be "this is wrapped content"
 
 
- Scenario: A user can wrap content within predefined styles
+  Scenario: A user can wrap content within predefined styles
     Given the content of the full region is simple content
     And I make a selection
 
@@ -168,7 +170,7 @@ Feature:
     Then the contents of the full region should be "this is <span class='red'><span>simple</span></span> <b>content</b>"
 
 
- Scenario: A user can wrap content in formatted block tags
+  Scenario: A user can wrap content in formatted block tags
     Given the content of the full region is simple content
     And I make a selection
 
@@ -177,7 +179,7 @@ Feature:
     Then the contents of the full region should be "<h2>this is <span>simple</span> <b>content</b></h2>"
 
 
- Scenario: A user can set the background color of a selection
+  Scenario: A user can set the background color of a selection
     Given the content of the full region is simple content
     And I make a selection
 
@@ -186,11 +188,11 @@ Feature:
     Then the contents of the full region should be "this is <span style='background-color:#FF0000'><span>simple</span></span> <b>content</b>"
 
 
- Scenario: A user can set the foreground color
+  Scenario: A user can set the foreground color
     Given the content of the full region is simple content
     And I make a selection
 
     When I click on the foreground color editor palette
     And click on the color red
-    Then the contents of the full region should be "this is <font color='rgb(255, 0, 0)'><span>simple</span></font> <b>content</b>"
+    Then the contents of the full region should be "this is <font color='#FF0000'><span>simple</span></font> <b>content</b>"
 

data/features/regions/full/inserting_snippets.feature

@@ -78,9 +78,8 @@ Feature:
     Then the contents of the full region should be "<div data-version='2' data-snippet='snippet_42' class='example-snippet' contenteditable='false'><strong>Jeremy</strong> likes Stella</div> <b>content</b>"
 
     When I edit the snippet
-    # todo: this is a bug
-#    Then the "First Name" field should contain "Jeremy"
-#    And the "Favorite Beer" field should contain "Stella"
+    Then the "First Name" field should contain "Jeremy"
+    And the "Favorite Beer" field should contain "Stella"
 
     When I close the modal
     When I click on the "Redo" button

data/lib/generators/mercury/install/images/images_generator.rb

@@ -31,9 +31,9 @@ module Mercury
         end
 
         def add_gemfile_dependencies
-          prepend_to_file "Gemfile", %Q{gem 'paperclip'}
+          append_to_file "Gemfile", %Q{gem 'paperclip'}
           if options[:orm] == 'mongoid'
-            prepend_to_file "Gemfile", %Q{gem 'mongoid-paperclip', :require => 'mongoid_paperclip'}
+            append_to_file "Gemfile", %Q{gem 'mongoid-paperclip', :require => 'mongoid_paperclip'}
           end
         end
 

data/lib/mercury/engine.rb

@@ -3,6 +3,8 @@ require 'rails'
 module Mercury
   class Engine < ::Rails::Engine
 
+    paths['app/helpers']
+
     # Additional application configuration to include precompiled assets.
     initializer :assets, :group => :all do |app|
       app.config.assets.precompile += %w( mercury.js mercury.css mercury_overrides.css mercury_overrides.js )

data/lib/mercury/version.rb

@@ -1,3 +1,3 @@
 module Mercury
-  VERSION = '0.7.1'
+  VERSION = '0.8.0'
 end

data/spec/dummy/app/views/layouts/mercury.html.erb

@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, maximum-scale=1.0, initial-scale=1.0">
+    <%= csrf_meta_tags %>
+    <title>Mercury Editor</title>
+    <%= stylesheet_link_tag    'mercury' %>
+    <%= javascript_include_tag 'jquery-1.7', 'mercury' %>
+  </head>
+  <body>
+    <script type="text/javascript">
+      // Mix in configurations provided through Rails.application.config.mercury_config (for cucumber testing)
+      <% if Rails.application.config.respond_to?(:mercury_config) %>
+      jQuery.extend(Mercury.config, <%= Rails.application.config.mercury_config.to_json.html_safe %>);
+      <% end -%>
+
+      // Set to the url that you want to save any given page to, leave null for default handling.
+      var saveUrl = null;
+
+      // Instantiate the PageEditor
+      new Mercury.PageEditor(saveUrl, {
+        saveStyle:  null, // 'form', or 'json' (default json)
+        saveMethod: null, // 'PUT', or 'POST', (create, vs. update -- default PUT)
+        visible:    true  // boolean - if the interface should start visible or not
+      });
+    </script>
+  </body>
+</html>

data/spec/javascripts/mercury/dialogs/forecolor_spec.js.coffee

@@ -26,7 +26,7 @@ describe "Mercury.dialogHandlers.foreColor", ->
       spy = spyOn(Mercury, 'trigger').andCallFake(=>)
       jasmine.simulate.click($('#white').get(0))
       expect(spy.callCount).toEqual(1)
-      expect(spy.argsForCall[0]).toEqual(['action', {action: 'foreColor', value: 'rgb(255, 255, 255)'}])
+      expect(spy.argsForCall[0]).toEqual(['action', {action: 'foreColor', value: '#FFFFFF'}])
 
 
   describe "when any other element is clicked", ->

data/spec/javascripts/mercury/page_editor_spec.js.coffee

@@ -661,7 +661,7 @@ describe "Mercury.PageEditor", ->
     describe "POST", ->
       beforeEach ->
         Mercury.PageEditor.prototype.initializeInterface = ->
-        @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test'), saveDataType: 'text'})
+        @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test'), saveDataType: 'text', saveMethod: 'POST'})
         @iframeSrcSpy = spyOn(Mercury.PageEditor.prototype, 'iframeSrc').andCallFake(=> '/foo/baz')
         @ajaxSpy = spyOn($, 'ajax')
 
@@ -697,7 +697,7 @@ describe "Mercury.PageEditor", ->
         Mercury.config.saveStyle = 'json'
         spyOn(Mercury.PageEditor.prototype, 'serialize').andCallFake(=> {region1: 'region1'})
         @pageEditor.save()
-        expect(@ajaxSpy.argsForCall[0][1]['data']).toEqual({content: '{"region1":"region1"}' })
+        expect(@ajaxSpy.argsForCall[0][1]['data']).toEqual('{"content":{"region1":"region1"}}')
 
       it "can serialize as form values", ->
         @ajaxSpy.andCallFake(=>)
@@ -764,7 +764,7 @@ describe "Mercury.PageEditor", ->
 
       beforeEach ->
         Mercury.PageEditor.prototype.initializeInterface = ->
-        @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test'), saveMethod: 'PUT'})
+        @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test'), saveMethod: 'FOO'})
         @iframeSrcSpy = spyOn(Mercury.PageEditor.prototype, 'iframeSrc').andCallFake(=> '/foo/baz')
         @ajaxSpy = spyOn($, 'ajax')
 
@@ -772,7 +772,7 @@ describe "Mercury.PageEditor", ->
         @ajaxSpy.andCallFake(=>)
         spyOn(Mercury.PageEditor.prototype, 'serialize').andCallFake(=> {region1: 'region1'})
         @pageEditor.save()
-        expect(@ajaxSpy.argsForCall[0][1]['data']['_method']).toEqual('PUT')
+        expect(test=@ajaxSpy.argsForCall[0][1]['data']).toContain('"_method":"PUT"')
 
 
   describe "#serialize", ->

data/spec/javascripts/mercury/snippet_spec.js.coffee

@@ -163,11 +163,11 @@ describe "Mercury.Snippet", ->
 
     it "sets the version", ->
       @snippet.setVersion(5)
-      expect(@snippet.version).toEqual(4)
+      expect(@snippet.version).toEqual(5)
 
     it "accepts a version (can be a string)", ->
       @snippet.setVersion('2')
-      expect(@snippet.version).toEqual(1)
+      expect(@snippet.version).toEqual(2)
 
     it "pulls the version out of the history buffer", ->
       @snippet.setVersion(3)

data/spec/javascripts/spec_helper.js

@@ -1,3 +1,4 @@
+require('/assets/jquery-1.7.js');
 require('/assets/mercury.js');
 
 jasmine.simulate = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mercury-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -266,7 +266,7 @@ files:
 - app/assets/images/mercury/toolbar/primary/snippetpanel.png
 - app/assets/images/mercury/toolbar/primary/undo.png
 - app/assets/images/mercury/toolbar/snippets/buttons.png
-- app/assets/javascripts/mercury/dependencies/jquery-1.7.js
+- app/assets/javascripts/jquery-1.7.js
 - app/assets/javascripts/mercury/dependencies/jquery-ui-1.8.13.custom.js
 - app/assets/javascripts/mercury/dependencies/jquery.additions.js
 - app/assets/javascripts/mercury/dependencies/jquery.htmlClean.js
@@ -340,6 +340,7 @@ files:
 - app/assets/stylesheets/mercury/uploader.css
 - app/assets/stylesheets/mercury.css
 - app/controllers/mercury_controller.rb
+- app/helpers/mercury_helper.rb
 - app/views/layouts/mercury.html.erb
 - app/views/mercury/lightviews/about.html
 - app/views/mercury/modals/character.html
@@ -356,6 +357,7 @@ files:
 - app/views/mercury/selects/style.html
 - app/views/mercury/snippets/example/options.html.erb
 - app/views/mercury/snippets/example/preview.html.erb
+- config/routes.rb
 - LICENSE
 - POST_INSTALL
 - features/generators/authentication.feature
@@ -403,6 +405,7 @@ files:
 - spec/dummy/app/assets/stylesheets/application.css.scss
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/layouts/mercury.html.erb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
@@ -423,9 +426,7 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/public/500.html
 - spec/dummy/public/blank.html
-- spec/dummy/public/distro.html
 - spec/dummy/public/favicon.ico
-- spec/dummy/public/frame.html
 - spec/dummy/public/images/bunny.gif
 - spec/dummy/public/images/bunny2.jpg
 - spec/dummy/public/index.html
@@ -517,7 +518,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1857149294402445734
+      hash: -2908225509589390282
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -526,7 +527,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1857149294402445734
+      hash: -2908225509589390282
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.21
@@ -579,6 +580,7 @@ test_files:
 - spec/dummy/app/assets/stylesheets/application.css.scss
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/layouts/mercury.html.erb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
@@ -599,9 +601,7 @@ test_files:
 - spec/dummy/config/routes.rb
 - spec/dummy/public/500.html
 - spec/dummy/public/blank.html
-- spec/dummy/public/distro.html
 - spec/dummy/public/favicon.ico
-- spec/dummy/public/frame.html
 - spec/dummy/public/images/bunny.gif
 - spec/dummy/public/images/bunny2.jpg
 - spec/dummy/public/index.html

data/spec/dummy/public/distro.html

@@ -1,349 +0,0 @@
-<html>
-  <head>
-    <!-- add prototype and styles to ensure that libraries don't collide and css doesn't conflict -->
-    <title>Mercury Editor Regression Testing</title>
-    <script src="/prototype.js" type="text/javascript"></script>
-    <style type="text/css">
-      body { border: 1px dotted #000; padding: 10px; }
-      input { padding: 20px !important }
-      .mercury-toolbar-container { display: none !important }
-    </style>
-
-    <meta name="viewport" content="width=device-width, maximum-scale=1.0, initial-scale=1.0">
-
-    <!-- include the loader -->
-    <script src="/assets/mercury/support/history.js" type="text/javascript"></script>
-    <script src="/mercury/javascripts/mercury_loader.js?pack=bundled&src=/mercury" type="text/javascript"></script>
-
-    <!-- preload snippets -->
-    <script type="text/javascript">
-      // it's worth mentioning that mercury is not loaded in the first request, but should be loaded in the second.
-      History.Adapter.bind(window, 'statechange', function() {
-        var state = History.getState();
-        console.debug(state.data, state.title, state.url);
-      });
-
-      Event.observe(window, "mercury:ready", function() {
-        Mercury.saveURL = '/contents';
-        Mercury.Snippet.load({
-          snippet_0:  {name: 'example', options: {'options[favorite_beer]': "Bells Hopslam", 'options[first_name]': "00"}},
-          snippet_1:  {name: 'example', options: {'options[favorite_beer]': "Bells Hopslam", 'options[first_name]': "01"}},
-          snippet_2:  {name: 'example', options: {'options[favorite_beer]': "Bells Hopslam", 'options[first_name]': "02"}},
-          snippet_3:  {name: 'example', options: {'options[favorite_beer]': "Bells Hopslam", 'options[first_name]': "03"}},
-          snippet_4:  {name: 'example', options: {'options[favorite_beer]': "Bells Hopslam", 'options[first_name]': "04"}},
-          snippet_5:  {name: 'example', options: {'options[favorite_beer]': "Bells Hopslam", 'options[first_name]': "05"}},
-          snippet_6:  {name: 'example', options: {'options[favorite_beer]': "Bells Hopslam", 'options[first_name]': "06"}},
-          snippet_7:  {name: 'example', options: {'options[favorite_beer]': "Bells Hopslam", 'options[first_name]': "07"}},
-          snippet_8:  {name: 'example', options: {'options[favorite_beer]': "Bells Hopslam", 'options[first_name]': "08"}},
-          snippet_9:  {name: 'example', options: {'options[favorite_beer]': "Bells Hopslam", 'options[first_name]': "09"}},
-          snippet_10: {name: 'example', options: {'options[favorite_beer]': "Bells Hopslam", 'options[first_name]': "10"}},
-          snippet_11: {name: 'example', options: {'options[favorite_beer]': "Bells Hopslam", 'options[first_name]': "11"}},
-          snippet_12: {name: 'example', options: {'options[favorite_beer]': "Bells Hopslam", 'options[first_name]': "12"}},
-          snippet_13: {name: 'example', options: {'options[favorite_beer]': "Bells Hopslam", 'options[first_name]': "13"}}
-        });
-      })
-    </script>
-
-    <!-- styles for the content layout -->
-    <style type="text/css">
-      body, td {
-        font: normal normal normal 100%/normal 'Helvetica Neue', Helvetica, Arial, sans-serif;
-      }
-      h1 {
-        color: #09F;
-        margin: 20px 0 0 0;
-        font-weight: 200;
-      }
-      h2 {
-        font-weight: 200;
-        margin: 15px 0 0 0;
-        border-bottom: 1px solid #CCC;
-      }
-      #forms form {
-        display: inline;
-      }
-      #content {
-        min-width: 500px;
-        width: 70%;
-        margin: 20px auto;
-      }
-      #controls {
-        position: absolute;
-        top: 20px;
-        left: 20px;
-        padding: 10px;
-        margin: 0;
-        border: 1px solid #999;
-        background: rgba(255, 255, 255, 0.8);
-        border-radius: 3px;
-        -moz-border-radius: 3px;
-        -webkit-border-radius: 3px;
-        list-style-type: none;
-      }
-      #controls div {
-        color: #333;
-        text-transform: lowercase;
-        text-decoration: none;
-        cursor: pointer;
-      }
-      .mercury-snippet {
-        background: rgba(0, 0, 0, 0.5);
-        color: #FFF;
-        width: 300px;
-        height: 100px;
-        margin: 1px 0;
-        border-radius: 3px;
-        -moz-border-radius: 3px;
-        -webkit-border-radius: 3px;
-      }
-      #snippetable1 {
-        float: left;
-        width: 100%;
-        margin-bottom: 20px;
-      }
-      #snippetable1 .mercury-snippet {
-        float: left;
-        width: 33%;
-        border: 1px solid #000;
-      }
-    </style>
-  </head>
-  <body>
-
-  <div id="content">
-
-    <ul id="controls">
-      <li><div onclick="alert(Mercury.version)">Mercury Version</div></li>
-      <li><div onclick="Mercury.trigger('toggle:interface')">Toggle Interface</div></li>
-      <li><div onclick="var num = 1; History.pushState({state: num}, 'Mercury Editor -- With history.pushState!', '?pushstate=' + num);">history.pushState</div></li>
-      <li><div onclick="History.go(-1);">History.go(-1)</div></li>
-      <li><div onclick="History.back();">History.back()</div></li>
-      <li><div onclick="History.forward();">History.forward()</div></li>
-    </ul>
-
-    <h1>Forms (with various methods and targets)</h1>
-    <div id="forms">
-      <form id="form1" action="/mercury/test_page" method="post" target="_top">
-        <input type="submit" name="commit" value="post _top">
-      </form>
-      <form id="form2" action="/mercury/test_page" method="get" target="_blank">
-        <input type="submit" name="commit" value="post _blank">
-      </form>
-      <form id="form3" action="/mercury/test_page" method="post" target="_self">
-        <input type="submit" name="commit" value="post _self">
-      </form>
-      <form id="form4" action="/mercury/test_page" method="get">
-        <input type="submit" name="commit" value="get [none]">
-      </form>
-      <form id="form5" action="/mercury/test_page" method="post" class="lightview" target="_self">
-        <input type="submit" name="commit" value="post _self .lightview">
-      </form>
-      <form id="form6" action="/mercury/test_page" method="get" target="foo">
-        <input type="submit" name="commit" value="get foo">
-      </form>
-    </div>
-
-    <h1>Links (With various targets)</h1>
-    <div id="links">
-      <a id="anchor1" href="/mercury/test_page" target="_top">_top</a>
-      <a id="anchor2" href="/mercury/test_page" target="_blank">_blank</a>
-      <a id="anchor3" href="/mercury/test_page" target="_self">_self</a>
-      <a id="anchor4" href="/mercury/test_page">[none]</a>
-      <a id="anchor5" href="/mercury/test_page" class="lightview" target="_self">_self .lightview</a>
-      <a id="anchor6" href="/mercury/test_page" target="foo">foo</a>
-    </div>
-
-    <h1>Editable region</h1>
-    <div id="editable1" class="mercury-region" data-type="editable">
-      If the first line of content isn't wrapped in an element you can't set justification (mozilla only bug).
-
-      <h2>text with a meta tag (that will be removed)</h2>
-      123<meta>editable content
-
-      <h2>anchor with a div inside</h2>
-      <a href="/foo1">l<div>ink with a div in</div> it</a>
-
-      <h2>image wrapped in an anchor</h2>
-      <a href="/foo2"><img alt="logo" src="/assets/mercury/temp-logo.png"></a>123
-
-      <h2>table with header and definition cells</h2>
-      <table border="1">
-        <tbody>
-          <tr>
-            <th>R1C1</th>
-            <th colspan="5">R1C2</th>
-          </tr>
-          <tr>
-            <th colspan="2">R2C1</th>
-            <th rowspan="2">R2C2</th>
-            <th>R2C3</th>
-            <th rowspan="5">R2C4</th>
-            <th>R2C5</th>
-          </tr>
-          <tr>
-            <td colspan="2">R3C1</td>
-            <td>R3C2</td>
-            <td>R3C3</td>
-          </tr>
-          <tr>
-            <td>R4C1</td>
-            <td>R4C2</td>
-            <td rowspan="4">R4C3</td>
-            <td>R4C4</td>
-            <td>R4C5</td>
-          </tr>
-          <tr>
-            <td>R5C1</td>
-            <td>R5C2</td>
-            <td>R5C3</td>
-            <td>R5C4</td>
-          </tr>
-          <tr>
-            <th rowspan="2">R6C1</th>
-            <th rowspan="2">R6C2</th>
-            <th>R6C3</th>
-            <th>R6C4</th>
-          </tr>
-          <tr>
-            <td>R7C1</td>
-            <td>R7C2</td>
-            <td>R7C3</td>
-          </tr>
-          <tr>
-            <td colspan="2">R8C1</td>
-            <td colspan="4">R7C2</td>
-          </tr>
-        </tbody>
-      </table>
-
-      <h2>table without tbody or border</h2>
-      <table>
-        <tr>
-          <th>R1C1</th>
-          <th colspan="2">R1C2</th>
-        </tr>
-        <tr>
-          <td rowspan="2">R2C1</td>
-          <td>R2C2</td>
-          <td>R2C3</td>
-        </tr>
-        <tr>
-          <td>R3C1</td>
-          <td>R3C2</td>
-        </tr>
-      </table>
-
-      <h2>fixed width table (column where all colspans > 1, row where all rowspans > 1)</h2>
-      <table border="1" width="200">
-        <tbody>
-          <tr>
-            <td rowspan="2">R1C1</td>
-            <td colspan="2" rowspan="2">R1C2</td>
-          </tr>
-          <tr></tr>
-          <tr>
-            <td>R3C1</td>
-            <td colspan="2">R3C2</td>
-          </tr>
-          <tr>
-            <td>R4C1</td>
-            <td colspan="2">R4C3</td>
-          </tr>
-        </tbody>
-      </table>
-
-      <h2>paragraph with an overline wrapped in an underline</h2>
-      <p>123 <u>under <span style="text-decoration:overline">overline</span> line</u> 123</p>
-
-      <h2>paragraph with an underline wrapped in an overline</h2>
-      <p>123 <span style="text-decoration:overline">over <u>underline</u> line</span> 123</p>
-
-      <h2>style tag that styles images with a border</h2>
-      <style type="text/css">img { border: 2px solid red}</style>
-
-      <h2>image next to content wrapped in an anchor</h2>
-      <img alt="logo" src="/assets/mercury/temp-logo.png"><a href="#bookmark1">link for #bookmark1</a>
-
-      <h2>snippet that's pre-loaded</h2>
-      <div class="mercury-snippet" data-snippet="snippet_0">snippet0</div>
-
-      <h2>bookmark links</h2>
-      <a name="bookmark1">Bookmark1</a><br/><a name="bookmark2">Bookmark2</a>
-
-      <br/><br/>
-      Additional content not wrapped in anything
-
-      <h2>youtube and vimeo iframes with content surrounding it</h2>
-      <!--123<iframe style="width: 560px; height: 349px; " src="http://www.youtube.com/embed/0pXYp72dwl0?wmode=transparent" frameborder="0" allowfullscreen="true"></iframe>123321-->
-      <!--<iframe style="width: 400px; height: 225px; " src="http://player.vimeo.com/video/615344?title=1&amp;byline=1&amp;portrait=0&amp;color=ffffff" frameborder="0"></iframe>123-->
-    </div>
-
-    <h1>Markupable region (with markdown)</h1>
-    <div id="markupable1" class="mercury-region" data-type="markupable">
-## notes ##
-**whitespace** in markupable regions is _important_.
-
-## ordered list ##
-1. list item 1
-2. list item 2
-
-## unordered list ##
-- list item 1
-- list item 2
-
-## horizontal rule ##
-- - -
-
-## anchor ##
-[this is a link](foo 'optional title')
-
-## image ##
-![add alt text](/assets/mercury/temp-logo.png)
-
-## snippet that's pre-loaded ##
-[--snippet_1--]
-
-## code ##
-    <a href="/foo">this html will not be escaped</a>
-                   and     whitespace     will be retained
-
-## blockquote ##
-> this is indented one level
-
-## paragraph with bold, italics, etc. ##
-Turkey corned beef ham, chuck ham hock **venison _drumstick_ ** tongue ribeye. Beef tongue pancetta, short ribs meatball headcheese jowl bacon swine t-bone shoulder venison. Hamburger short loin turkey flank short ribs tail. Chicken tri-tip sausage, bresaola sirloin turkey hamburger <sub>headcheese</sub> shank rump. Pork ground round t-bone, ham hock sirloin biltong chicken fatback pork belly pastrami pancetta jowl tail. Cow ribeye pork chop, flank sirloin tail short loin pork loin chicken boudin pastrami. Boudin chuck shankle, spare ribs pancetta <sup>fatback</sup> bresaola.
-    </div>
-
-    <h1>Snippetable region</h1>
-    <div id="snippetable1" class="mercury-region" data-type="snippetable">
-      <div class="mercury-snippet" data-snippet="snippet_2">snippet2</div>
-      <div class="mercury-snippet" data-snippet="snippet_3">snippet3</div>
-      <div class="mercury-snippet" data-snippet="snippet_4">snippet4</div>
-      <div class="mercury-snippet" data-snippet="snippet_5">snippet5</div>
-      <div class="mercury-snippet" data-snippet="snippet_6">snippet6</div>
-      <div class="mercury-snippet" data-snippet="snippet_7">snippet7</div>
-      <div class="mercury-snippet" data-snippet="snippet_8">snippet8</div>
-      <div class="mercury-snippet" data-snippet="snippet_9">snippet9</div>
-    </div>
-
-    <h1>Editable region (single snippet and no content)</h1>
-    <div id="editable2" class="mercury-region" data-type="editable">
-      <div class="mercury-snippet" data-snippet="snippet_10">snippet10</div>
-    </div>
-
-    <h1>Editable region (fixed width/height and overflow)</h1>
-    <div id="editable3" class="mercury-region" data-type="editable" style="width:200px;height:90px;">
-      wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww
-      <br/>1<br/>2<br/>3<br/>4<br/>5<br/>6<br/>7<br/><a href="#offset_test">8</a><br/>9<br/>10<br/>11<br/>12<br/>13<br/>14<br/>15
-    </div>
-
-    <h1>Snippetable region (iframe snippet that contains flash)</h1>
-    <div id="snippetable2" class="mercury-region" data-type="snippetable">
-      <div class="mercury-snippet" data-snippet="snippet_11">snippet11</div>
-      <div class="mercury-snippet" data-snippet="snippet_12">snippet12</div>
-      <iframe class="mercury-snippet" data-snippet="snippet_13"  width="560" height="349" src="http://www.youtube.com/embed/0pXYp72dwl0?wmode=transparent" frameborder="0" allowfullscreen="true"></iframe>
-    </div>
-  </div>
-
-  </body>
-</html>

data/spec/dummy/public/frame.html

@@ -1,15 +0,0 @@
-<html>
-  <head>
-    <!-- add prototype and styles to ensure that libraries don't collide and css doesn't conflict -->
-    <title>Mercury Editor Regression Testing</title>
-    <style type="text/css">
-      html, body {
-        padding: 0;
-        margin: 0;
-      }
-    </style>
-  </head>
-  <body>
-    <iframe src="/" width="100%" height="300"></iframe>
-  </body>
-</html>