mercury-rails 0.1.2 → 0.2.0

data/app/views/mercury/modals/table.html

@@ -0,0 +1,84 @@
+<form id="mercury_table" style="width:700px">
+
+  <div class="mercury-modal-pane-container">
+    <div class="mercury-modal-pane">
+
+      <div id="table_display">
+        <table border="1" cellspacing="0">
+          <tr>
+            <td>&nbsp;</td>
+            <td>&nbsp;</td>
+            <td>&nbsp;</td>
+          </tr>
+          <tr>
+            <td>&nbsp;</td>
+            <td>&nbsp;</td>
+            <td>&nbsp;</td>
+          </tr>
+        </table>
+      </div>
+
+      <div id="table_options">
+        <fieldset class="inputs">
+          <ol>
+            <li id="table_rows_input" class="select input optional">
+              <label for="table_rows">Rows</label>
+              <input type="button" class="action" value="Add Before" name="insertRowBefore"/>
+              <input type="button" class="action" value="Add After" name="insertRowAfter"/>
+              <input type="button" class="action" value="Remove" name="deleteRow"/>
+            </li>
+            <li id="table_columns_input" class="select input optional">
+              <label for="table_columns">Columns</label>
+              <input type="button" class="action" value="Add Before" name="insertColumnBefore"/>
+              <input type="button" class="action" value="Add After" name="insertColumnAfter"/>
+              <input type="button" class="action" value="Remove" name="deleteColumn"/>
+            </li>
+            <hr/>
+            <li id="table_row_adjust_input" class="select input optional">
+              <label for="table_row_adjust">Row Span</label>
+              <input type="button" class="action" value="+" name="increaseRowspan"/>
+              <input type="button" class="action" value="-" name="decreaseRowspan"/>
+            </li>
+            <li id="table_column_adjust_input" class="select input optional">
+              <label for="table_column_adjust">Column Span</label>
+              <input type="button" class="action" value="+" name="increaseColspan"/>
+              <input type="button" class="action" value="-" name="decreaseColspan"/>
+            </li>
+          </ol>
+        </fieldset>
+
+        <fieldset class="inputs">
+          <legend><span>Options</span></legend>
+          <ol>
+            <li id="table_alignment_input" class="select input optional">
+              <label class="label" for="table_alignment">Alignment</label>
+              <select id="table_alignment" name="table[alignment]">
+                <option value="">None</option>
+                <option value="left">Left</option>
+                <option value="right">Right</option>
+              </select>
+            </li>
+            <li id="table_border_input" class="string input optional stringish">
+              <label class="label" for="table_border">Border</label>
+              <input id="table_border" name="table[border]" type="text" value="1"/>
+            </li>
+            <li id="table_spacing_input" class="string input optional stringish">
+              <label class="label" for="table_spacing">Spacing</label>
+              <input id="table_spacing" name="table[spacing]" type="text" value="0"/>
+            </li>
+          </ol>
+        </fieldset>
+      </div>
+
+    </div>
+  </div>
+
+  <div class="mercury-modal-controls">
+    <fieldset class="buttons">
+      <ol>
+        <li class="commit button"><input class="submit" name="commit" type="submit" value="Insert Table" /></li>
+      </ol>
+    </fieldset>
+  </div>
+
+</form>

data/app/views/mercury/palettes/backcolor.html

@@ -0,0 +1,73 @@
+<div class="mercury-color-picker">
+  <div class="picker" style="background:#FFFFFF"></div>
+  <div class="picker" style="background:#FFCCCC"></div>
+  <div class="picker" style="background:#FFCC99"></div>
+  <div class="picker" style="background:#FFFF99"></div>
+  <div class="picker" style="background:#FFFFCC"></div>
+  <div class="picker" style="background:#99FF99"></div>
+  <div class="picker" style="background:#99FFFF"></div>
+  <div class="picker" style="background:#CCFFFF"></div>
+  <div class="picker" style="background:#CCCCFF"></div>
+  <div class="picker" style="background:#FFCCFF"></div>
+  <div class="picker" style="background:#CCCCCC"></div>
+  <div class="picker" style="background:#FF6666"></div>
+  <div class="picker" style="background:#FF9966"></div>
+  <div class="picker" style="background:#FFFF66"></div>
+  <div class="picker" style="background:#FFFF33"></div>
+  <div class="picker" style="background:#66FF99"></div>
+  <div class="picker" style="background:#33FFFF"></div>
+  <div class="picker" style="background:#66FFFF"></div>
+  <div class="picker" style="background:#9999FF"></div>
+  <div class="picker" style="background:#FF99FF"></div>
+  <div class="picker" style="background:#C0C0C0"></div>
+  <div class="picker" style="background:#FF0000"></div>
+  <div class="picker" style="background:#FF9900"></div>
+  <div class="picker" style="background:#FFCC66"></div>
+  <div class="picker" style="background:#FFFF00"></div>
+  <div class="picker" style="background:#33FF33"></div>
+  <div class="picker" style="background:#66CCCC"></div>
+  <div class="picker" style="background:#33CCFF"></div>
+  <div class="picker" style="background:#6666CC"></div>
+  <div class="picker" style="background:#CC66CC"></div>
+  <div class="picker" style="background:#999999"></div>
+  <div class="picker" style="background:#CC0000"></div>
+  <div class="picker" style="background:#FF6600"></div>
+  <div class="picker" style="background:#FFCC33"></div>
+  <div class="picker" style="background:#FFCC00"></div>
+  <div class="picker" style="background:#33CC00"></div>
+  <div class="picker" style="background:#00CCCC"></div>
+  <div class="picker" style="background:#3366FF"></div>
+  <div class="picker" style="background:#6633FF"></div>
+  <div class="picker" style="background:#CC33CC"></div>
+  <div class="picker" style="background:#666666"></div>
+  <div class="picker" style="background:#990000"></div>
+  <div class="picker" style="background:#CC6600"></div>
+  <div class="picker" style="background:#CC9933"></div>
+  <div class="picker" style="background:#999900"></div>
+  <div class="picker" style="background:#009900"></div>
+  <div class="picker" style="background:#339999"></div>
+  <div class="picker" style="background:#3333FF"></div>
+  <div class="picker" style="background:#6600CC"></div>
+  <div class="picker" style="background:#993399"></div>
+  <div class="picker" style="background:#333333"></div>
+  <div class="picker" style="background:#660000"></div>
+  <div class="picker" style="background:#993300"></div>
+  <div class="picker" style="background:#996633"></div>
+  <div class="picker" style="background:#666600"></div>
+  <div class="picker" style="background:#006600"></div>
+  <div class="picker" style="background:#336666"></div>
+  <div class="picker" style="background:#000099"></div>
+  <div class="picker" style="background:#333399"></div>
+  <div class="picker" style="background:#663366"></div>
+  <div class="picker" style="background:#000000"></div>
+  <div class="picker" style="background:#330000"></div>
+  <div class="picker" style="background:#663300"></div>
+  <div class="picker" style="background:#663333"></div>
+  <div class="picker" style="background:#333300"></div>
+  <div class="picker" style="background:#003300"></div>
+  <div class="picker" style="background:#003333"></div>
+  <div class="picker" style="background:#000066"></div>
+  <div class="picker" style="background:#330099"></div>
+  <div class="picker" style="background:#330033"></div>
+  <div class="last-picked">Last Color Picked</div>
+</div>

data/app/views/mercury/palettes/forecolor.html

@@ -0,0 +1,73 @@
+<div class="mercury-color-picker">
+  <div class="picker" style="background:#FFFFFF"></div>
+  <div class="picker" style="background:#FFCCCC"></div>
+  <div class="picker" style="background:#FFCC99"></div>
+  <div class="picker" style="background:#FFFF99"></div>
+  <div class="picker" style="background:#FFFFCC"></div>
+  <div class="picker" style="background:#99FF99"></div>
+  <div class="picker" style="background:#99FFFF"></div>
+  <div class="picker" style="background:#CCFFFF"></div>
+  <div class="picker" style="background:#CCCCFF"></div>
+  <div class="picker" style="background:#FFCCFF"></div>
+  <div class="picker" style="background:#CCCCCC"></div>
+  <div class="picker" style="background:#FF6666"></div>
+  <div class="picker" style="background:#FF9966"></div>
+  <div class="picker" style="background:#FFFF66"></div>
+  <div class="picker" style="background:#FFFF33"></div>
+  <div class="picker" style="background:#66FF99"></div>
+  <div class="picker" style="background:#33FFFF"></div>
+  <div class="picker" style="background:#66FFFF"></div>
+  <div class="picker" style="background:#9999FF"></div>
+  <div class="picker" style="background:#FF99FF"></div>
+  <div class="picker" style="background:#C0C0C0"></div>
+  <div class="picker" style="background:#FF0000"></div>
+  <div class="picker" style="background:#FF9900"></div>
+  <div class="picker" style="background:#FFCC66"></div>
+  <div class="picker" style="background:#FFFF00"></div>
+  <div class="picker" style="background:#33FF33"></div>
+  <div class="picker" style="background:#66CCCC"></div>
+  <div class="picker" style="background:#33CCFF"></div>
+  <div class="picker" style="background:#6666CC"></div>
+  <div class="picker" style="background:#CC66CC"></div>
+  <div class="picker" style="background:#999999"></div>
+  <div class="picker" style="background:#CC0000"></div>
+  <div class="picker" style="background:#FF6600"></div>
+  <div class="picker" style="background:#FFCC33"></div>
+  <div class="picker" style="background:#FFCC00"></div>
+  <div class="picker" style="background:#33CC00"></div>
+  <div class="picker" style="background:#00CCCC"></div>
+  <div class="picker" style="background:#3366FF"></div>
+  <div class="picker" style="background:#6633FF"></div>
+  <div class="picker" style="background:#CC33CC"></div>
+  <div class="picker" style="background:#666666"></div>
+  <div class="picker" style="background:#990000"></div>
+  <div class="picker" style="background:#CC6600"></div>
+  <div class="picker" style="background:#CC9933"></div>
+  <div class="picker" style="background:#999900"></div>
+  <div class="picker" style="background:#009900"></div>
+  <div class="picker" style="background:#339999"></div>
+  <div class="picker" style="background:#3333FF"></div>
+  <div class="picker" style="background:#6600CC"></div>
+  <div class="picker" style="background:#993399"></div>
+  <div class="picker" style="background:#333333"></div>
+  <div class="picker" style="background:#660000"></div>
+  <div class="picker" style="background:#993300"></div>
+  <div class="picker" style="background:#996633"></div>
+  <div class="picker" style="background:#666600"></div>
+  <div class="picker" style="background:#006600"></div>
+  <div class="picker" style="background:#336666"></div>
+  <div class="picker" style="background:#000099"></div>
+  <div class="picker" style="background:#333399"></div>
+  <div class="picker" style="background:#663366"></div>
+  <div class="picker" style="background:#000000"></div>
+  <div class="picker" style="background:#330000"></div>
+  <div class="picker" style="background:#663300"></div>
+  <div class="picker" style="background:#663333"></div>
+  <div class="picker" style="background:#333300"></div>
+  <div class="picker" style="background:#003300"></div>
+  <div class="picker" style="background:#003333"></div>
+  <div class="picker" style="background:#000066"></div>
+  <div class="picker" style="background:#330099"></div>
+  <div class="picker" style="background:#330033"></div>
+  <div class="last-picked">Last Color Picked</div>
+</div>

data/app/views/mercury/panels/history.html

@@ -0,0 +1,3 @@
+<div class="mercury-history-panel">
+  <p>The history panel is expected to be implemented with a server back end.  Since this is a demo, we didn't include it.</p>
+</div>

data/app/views/mercury/panels/notes.html

@@ -0,0 +1,3 @@
+<div class="mercury-notes-panel">
+  <p>The notes panel is expected to be implemented with a server back end.  Since this is a demo, we didn't include it.</p>
+</div>

data/app/views/mercury/panels/snippets.html

@@ -0,0 +1,12 @@
+<div class="mercury-snippet-panel">
+  <div class="filter">
+    <input class="filter" type="text">
+  </div>
+  <ul>
+    <li data-filter="example-snippet">
+      <img alt="Snippet Name" data-snippet="example" src="/assets/mercury/default-snippet.png"/>
+      <h4>Snippet Name</h4>
+      <div class="description">A one to two line long description of what this snippet does.</div>
+    </li>
+  </ul>
+</div>

data/app/views/mercury/selects/formatblock.html

@@ -0,0 +1,11 @@
+<div class="mercury-select-options">
+  <h1 data-tag="h1">Heading 1 &lt;h1&gt;</h1>
+  <h2 data-tag="h2">Heading 2 &lt;h2&gt;</h2>
+  <h3 data-tag="h3">Heading 3 &lt;h3&gt;</h3>
+  <h4 data-tag="h4">Heading 4 &lt;h4&gt;</h4>
+  <h5 data-tag="h5">Heading 5 &lt;h5&gt;</h5>
+  <h6 data-tag="h6">Heading 6 &lt;h6&gt;</h6>
+  <div data-tag="p">Paragraph &lt;p&gt;</div>
+  <div data-tag="blockquote">Blockquote &lt;blockquote&gt;</div>
+  <div data-tag="pre">Formatted &lt;pre&gt;</div>
+</div>

data/app/views/mercury/selects/style.html

@@ -0,0 +1,5 @@
+<div class="mercury-select-options">
+  <div class="red" data-class="red">Red text</div>
+  <div class="large-bold" data-class="large-bold">Large bold text</div>
+  <div class="blue" data-class="blue">Blue background</div>
+</div>

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

@@ -0,0 +1 @@
+<strong><%= params[:options][:first_name] %></strong> likes <%= params[:options][:favorite_beer] %>

data/app/views/mercury/snippets/example_options.html.erb

@@ -0,0 +1,23 @@
+<% @options = params[:options] || {} %>
+<%= semantic_form_for 'options', { :html => { :style => 'width:600px' } } do |f| %>
+
+  <div class="mercury-modal-pane-container">
+    <div class="mercury-modal-pane">
+      <%= f.inputs do %>
+        <%= f.input :first_name, :required => false, :label => 'First Name',
+                    :input_html => {:value => @options[:first_name] || 'First Name'} %>
+      <% end %>
+      <%= f.inputs 'Options' do %>
+        <%= f.input :favorite_beer, :required => false, :label => 'Favorite Beer',
+                    :input_html => {:value => @options[:favorite_beer] || 'PBR'} %>
+      <% end %>
+    </div>
+  </div>
+
+  <div class="mercury-modal-controls">
+    <%= f.buttons do %>
+      <%= f.commit_button 'Insert Snippet' %>
+    <% end %>
+  </div>
+
+<% end %>

data/config/routes.rb

@@ -10,6 +10,6 @@ Rails.application.routes.draw do
   end
 
   if defined?(Mercury::Application)
-    root to: "application#show"
+    match '/test_post' => "mercury#post"
   end
 end

data/features/editing/basic.feature

@@ -5,7 +5,7 @@ Feature:
 
   @javascript
   Scenario: A user can expect to see the editor load
-    When I go to an edit page
+    When I go to the root page
     Then I should see "Save" within the toolbar
     And I should see "Preview" within the toolbar
     And I should see "Bold" within the toolbar

data/features/support/paths.rb

@@ -10,6 +10,7 @@ module NavigationHelpers
 
     when 'an edit page' then '/edit'
 
+    when /the root( page)?/ then '/'
     when /the home\s?page/ then '/'
     when /the url: "(.*)"/ then url_for($1)
 

data/lib/generators/mercury/install/install_generator.rb

@@ -0,0 +1,14 @@
+module Mercury
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      source_root Mercury::Engine.root
+
+      desc "Installs Mercury into your application by copying the configuration file."
+
+      def copy_config
+        copy_file 'vendor/assets/javascripts/mercury.js', 'app/assets/javascripts/mercury.js'
+      end
+
+    end
+  end
+end

data/mercury-rails.gemspec

@@ -5,108 +5,43 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mercury-rails}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Jackson"]
-  s.date = %q{2011-06-21}
+  s.date = %q{2011-09-25}
   s.description = %q{A fully featured and advanced HTML5 WYSIWYG editor written in CoffeeScript on top of Rails 3.1}
   s.email = %q{jejacks0n@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-    "README.rdoc"
+    "README.md"
   ]
   s.files = [
     "LICENSE",
-    "README.rdoc",
+    "README.md",
     "VERSION",
-    "app/assets/images/mercury/button.png",
-    "app/assets/images/mercury/clippy.png",
-    "app/assets/images/mercury/default-snippet.png",
-    "app/assets/images/mercury/loading-dark.gif",
-    "app/assets/images/mercury/loading-light.gif",
-    "app/assets/images/mercury/search-icon.png",
-    "app/assets/images/mercury/toolbar/editable/buttons.png",
-    "app/assets/images/mercury/toolbar/markupable/buttons.png",
-    "app/assets/images/mercury/toolbar/primary/_expander.png",
-    "app/assets/images/mercury/toolbar/primary/_pressed.png",
-    "app/assets/images/mercury/toolbar/primary/historypanel.png",
-    "app/assets/images/mercury/toolbar/primary/insertcharacter.png",
-    "app/assets/images/mercury/toolbar/primary/insertlink.png",
-    "app/assets/images/mercury/toolbar/primary/insertmedia.png",
-    "app/assets/images/mercury/toolbar/primary/inserttable.png",
-    "app/assets/images/mercury/toolbar/primary/inspectorpanel.png",
-    "app/assets/images/mercury/toolbar/primary/notespanel.png",
-    "app/assets/images/mercury/toolbar/primary/objectspanel.png",
-    "app/assets/images/mercury/toolbar/primary/preview.png",
-    "app/assets/images/mercury/toolbar/primary/redo.png",
-    "app/assets/images/mercury/toolbar/primary/save.png",
-    "app/assets/images/mercury/toolbar/primary/todospanel.png",
-    "app/assets/images/mercury/toolbar/primary/undo.png",
-    "app/assets/images/mercury/toolbar/snippetable/buttons.png",
-    "app/assets/javascripts/mercury.js",
-    "app/assets/javascripts/mercury/dialog.js.coffee",
-    "app/assets/javascripts/mercury/dialogs/backcolor.js.coffee",
-    "app/assets/javascripts/mercury/dialogs/forecolor.js.coffee",
-    "app/assets/javascripts/mercury/dialogs/formatblock.js.coffee",
-    "app/assets/javascripts/mercury/dialogs/objectspanel.js.coffee",
-    "app/assets/javascripts/mercury/dialogs/style.js.coffee",
-    "app/assets/javascripts/mercury/history_buffer.js.coffee",
-    "app/assets/javascripts/mercury/mercury.js.coffee",
-    "app/assets/javascripts/mercury/modal.js.coffee",
-    "app/assets/javascripts/mercury/modals/htmleditor.js.coffee",
-    "app/assets/javascripts/mercury/modals/insertcharacter.js.coffee",
-    "app/assets/javascripts/mercury/modals/insertlink.js.coffee",
-    "app/assets/javascripts/mercury/modals/insertmedia.js.coffee",
-    "app/assets/javascripts/mercury/modals/insertsnippet.js.coffee",
-    "app/assets/javascripts/mercury/modals/inserttable.js.coffee",
-    "app/assets/javascripts/mercury/native_extensions.js.coffee",
-    "app/assets/javascripts/mercury/page_editor.js.coffee",
-    "app/assets/javascripts/mercury/palette.js.coffee",
-    "app/assets/javascripts/mercury/panel.js.coffee",
-    "app/assets/javascripts/mercury/region.js.coffee",
-    "app/assets/javascripts/mercury/regions/editable.js.coffee",
-    "app/assets/javascripts/mercury/regions/markupable.js.coffee",
-    "app/assets/javascripts/mercury/regions/snippetable.js.coffee",
-    "app/assets/javascripts/mercury/select.js.coffee",
-    "app/assets/javascripts/mercury/snippet.js.coffee",
-    "app/assets/javascripts/mercury/snippet_toolbar.js.coffee",
-    "app/assets/javascripts/mercury/statusbar.js.coffee",
-    "app/assets/javascripts/mercury/table_editor.js.coffee",
-    "app/assets/javascripts/mercury/toolbar.button.js.coffee",
-    "app/assets/javascripts/mercury/toolbar.button_group.js.coffee",
-    "app/assets/javascripts/mercury/toolbar.expander.js.coffee",
-    "app/assets/javascripts/mercury/toolbar.js.coffee",
-    "app/assets/javascripts/mercury/tooltip.js.coffee",
-    "app/assets/javascripts/mercury/uploader.js.coffee",
-    "app/assets/javascripts/mercury_loader.js",
-    "app/assets/stylesheets/mercury.css",
-    "app/assets/stylesheets/mercury/dialog.scss",
-    "app/assets/stylesheets/mercury/mercury.scss",
-    "app/assets/stylesheets/mercury/modal.scss",
-    "app/assets/stylesheets/mercury/statusbar.scss",
-    "app/assets/stylesheets/mercury/toolbar.scss",
-    "app/assets/stylesheets/mercury/tooltip.scss",
-    "app/assets/stylesheets/mercury/uploader.scss",
+    "annotated_source.template",
     "app/controllers/images_controller.rb",
     "app/controllers/mercury_controller.rb",
     "app/models/image.rb",
-    "app/views/layouts/mercury.html.haml",
-    "app/views/mercury/modals/character.html.haml",
-    "app/views/mercury/modals/htmleditor.html.haml",
-    "app/views/mercury/modals/link.html.haml",
-    "app/views/mercury/modals/media.html.haml",
-    "app/views/mercury/modals/sanitizer.html.haml",
-    "app/views/mercury/modals/table.html.haml",
-    "app/views/mercury/palettes/backcolor.html.haml",
-    "app/views/mercury/palettes/forecolor.html.haml",
-    "app/views/mercury/panels/history.html.haml",
-    "app/views/mercury/panels/notes.html.haml",
-    "app/views/mercury/panels/snippets.html.haml",
-    "app/views/mercury/selects/formatblock.html.haml",
-    "app/views/mercury/selects/style.html.haml",
-    "app/views/mercury/snippets/example.html.haml",
-    "app/views/mercury/snippets/example_options.html.haml",
+    "app/views/layouts/mercury.html.erb",
+    "app/views/mercury/lightviews/about.html",
+    "app/views/mercury/lightviews/imageprocessor.html",
+    "app/views/mercury/modals/character.html",
+    "app/views/mercury/modals/htmleditor.html",
+    "app/views/mercury/modals/link.html",
+    "app/views/mercury/modals/media.html",
+    "app/views/mercury/modals/sanitizer.html",
+    "app/views/mercury/modals/table.html",
+    "app/views/mercury/palettes/backcolor.html",
+    "app/views/mercury/palettes/forecolor.html",
+    "app/views/mercury/panels/history.html",
+    "app/views/mercury/panels/notes.html",
+    "app/views/mercury/panels/snippets.html",
+    "app/views/mercury/selects/formatblock.html",
+    "app/views/mercury/selects/style.html",
+    "app/views/mercury/snippets/example.html.erb",
+    "app/views/mercury/snippets/example_options.html.erb",
     "config/engine.rb",
     "config/routes.rb",
     "db/migrate/20110526035601_create_images.rb",
@@ -116,17 +51,19 @@ Gem::Specification.new do |s|
     "features/support/env.rb",
     "features/support/paths.rb",
     "features/support/selectors.rb",
+    "lib/generators/mercury/install/install_generator.rb",
     "lib/mercury-rails.rb",
-    "log/.gitkeep",
     "mercury-rails.gemspec",
     "spec/javascripts/mercury/dialog_spec.js.coffee",
     "spec/javascripts/mercury/dialogs/backcolor_spec.js.coffee",
     "spec/javascripts/mercury/dialogs/forecolor_spec.js.coffee",
     "spec/javascripts/mercury/dialogs/formatblock_spec.js.coffee",
-    "spec/javascripts/mercury/dialogs/objectspanel_spec.js.coffee",
+    "spec/javascripts/mercury/dialogs/snippetpanel_spec.js.coffee",
     "spec/javascripts/mercury/dialogs/style_spec.js.coffee",
     "spec/javascripts/mercury/history_buffer_spec.js.coffee",
+    "spec/javascripts/mercury/lightview_spec.js.coffee",
     "spec/javascripts/mercury/mercury_spec.js.coffee",
+    "spec/javascripts/mercury/modal_spec.js.coffee",
     "spec/javascripts/mercury/modals/htmleditor_spec.js.coffee",
     "spec/javascripts/mercury/modals/insertcharacter_spec.js.coffee",
     "spec/javascripts/mercury/modals/insertlink_spec.js.coffee",
@@ -138,8 +75,8 @@ Gem::Specification.new do |s|
     "spec/javascripts/mercury/palette_spec.js.coffee",
     "spec/javascripts/mercury/panel_spec.js.coffee",
     "spec/javascripts/mercury/region_spec.js.coffee",
-    "spec/javascripts/mercury/regions/_markupable_.js.coffee",
     "spec/javascripts/mercury/regions/editable_spec.js.coffee",
+    "spec/javascripts/mercury/regions/markupable_spec.js.coffee",
     "spec/javascripts/mercury/regions/snippetable_spec.js.coffee",
     "spec/javascripts/mercury/select_spec.js.coffee",
     "spec/javascripts/mercury/snippet_spec.js.coffee",
@@ -158,8 +95,10 @@ Gem::Specification.new do |s|
     "spec/javascripts/templates/mercury/dialogs/backcolor.html",
     "spec/javascripts/templates/mercury/dialogs/forecolor.html",
     "spec/javascripts/templates/mercury/dialogs/formatblock.html",
-    "spec/javascripts/templates/mercury/dialogs/objectspanel.html",
+    "spec/javascripts/templates/mercury/dialogs/snippetpanel.html",
     "spec/javascripts/templates/mercury/dialogs/style.html",
+    "spec/javascripts/templates/mercury/lightview.html",
+    "spec/javascripts/templates/mercury/modal.html",
     "spec/javascripts/templates/mercury/modals/htmleditor.html",
     "spec/javascripts/templates/mercury/modals/insertcharacter.html",
     "spec/javascripts/templates/mercury/modals/insertlink.html",
@@ -183,11 +122,81 @@ Gem::Specification.new do |s|
     "spec/javascripts/templates/mercury/toolbar.html",
     "spec/javascripts/templates/mercury/tooltip.html",
     "spec/javascripts/templates/mercury/uploader.html",
-    "vendor/assets/javascripts/jquery-1.6.js",
-    "vendor/assets/javascripts/jquery-ui-1.8.13.custom.js",
-    "vendor/assets/javascripts/jquery.additions.js",
-    "vendor/assets/javascripts/liquidmetal.js",
-    "vendor/assets/javascripts/showdown.js"
+    "vendor/assets/images/mercury/button.png",
+    "vendor/assets/images/mercury/clippy.png",
+    "vendor/assets/images/mercury/default-snippet.png",
+    "vendor/assets/images/mercury/loading-dark.gif",
+    "vendor/assets/images/mercury/loading-light.gif",
+    "vendor/assets/images/mercury/search-icon.png",
+    "vendor/assets/images/mercury/temp-logo.png",
+    "vendor/assets/images/mercury/toolbar/editable/buttons.png",
+    "vendor/assets/images/mercury/toolbar/primary/_expander.png",
+    "vendor/assets/images/mercury/toolbar/primary/_pressed.png",
+    "vendor/assets/images/mercury/toolbar/primary/historypanel.png",
+    "vendor/assets/images/mercury/toolbar/primary/insertcharacter.png",
+    "vendor/assets/images/mercury/toolbar/primary/insertlink.png",
+    "vendor/assets/images/mercury/toolbar/primary/insertmedia.png",
+    "vendor/assets/images/mercury/toolbar/primary/inserttable.png",
+    "vendor/assets/images/mercury/toolbar/primary/inspectorpanel.png",
+    "vendor/assets/images/mercury/toolbar/primary/notespanel.png",
+    "vendor/assets/images/mercury/toolbar/primary/preview.png",
+    "vendor/assets/images/mercury/toolbar/primary/redo.png",
+    "vendor/assets/images/mercury/toolbar/primary/save.png",
+    "vendor/assets/images/mercury/toolbar/primary/snippetpanel.png",
+    "vendor/assets/images/mercury/toolbar/primary/undo.png",
+    "vendor/assets/images/mercury/toolbar/snippetable/buttons.png",
+    "vendor/assets/javascripts/mercury.js",
+    "vendor/assets/javascripts/mercury/dialog.js.coffee",
+    "vendor/assets/javascripts/mercury/dialogs/backcolor.js.coffee",
+    "vendor/assets/javascripts/mercury/dialogs/forecolor.js.coffee",
+    "vendor/assets/javascripts/mercury/dialogs/formatblock.js.coffee",
+    "vendor/assets/javascripts/mercury/dialogs/objectspanel.js.coffee",
+    "vendor/assets/javascripts/mercury/dialogs/style.js.coffee",
+    "vendor/assets/javascripts/mercury/history_buffer.js.coffee",
+    "vendor/assets/javascripts/mercury/lightview.js.coffee",
+    "vendor/assets/javascripts/mercury/lightviews/imageprocessor.js.coffee",
+    "vendor/assets/javascripts/mercury/mercury.js.coffee",
+    "vendor/assets/javascripts/mercury/modal.js.coffee",
+    "vendor/assets/javascripts/mercury/modals/htmleditor.js.coffee",
+    "vendor/assets/javascripts/mercury/modals/insertcharacter.js.coffee",
+    "vendor/assets/javascripts/mercury/modals/insertlink.js.coffee",
+    "vendor/assets/javascripts/mercury/modals/insertmedia.js.coffee",
+    "vendor/assets/javascripts/mercury/modals/insertsnippet.js.coffee",
+    "vendor/assets/javascripts/mercury/modals/inserttable.js.coffee",
+    "vendor/assets/javascripts/mercury/native_extensions.js.coffee",
+    "vendor/assets/javascripts/mercury/page_editor.js.coffee",
+    "vendor/assets/javascripts/mercury/palette.js.coffee",
+    "vendor/assets/javascripts/mercury/panel.js.coffee",
+    "vendor/assets/javascripts/mercury/region.js.coffee",
+    "vendor/assets/javascripts/mercury/regions/editable.js.coffee",
+    "vendor/assets/javascripts/mercury/regions/markupable.js.coffee",
+    "vendor/assets/javascripts/mercury/regions/snippetable.js.coffee",
+    "vendor/assets/javascripts/mercury/select.js.coffee",
+    "vendor/assets/javascripts/mercury/snippet.js.coffee",
+    "vendor/assets/javascripts/mercury/snippet_toolbar.js.coffee",
+    "vendor/assets/javascripts/mercury/statusbar.js.coffee",
+    "vendor/assets/javascripts/mercury/table_editor.js.coffee",
+    "vendor/assets/javascripts/mercury/toolbar.button.js.coffee",
+    "vendor/assets/javascripts/mercury/toolbar.button_group.js.coffee",
+    "vendor/assets/javascripts/mercury/toolbar.expander.js.coffee",
+    "vendor/assets/javascripts/mercury/toolbar.js.coffee",
+    "vendor/assets/javascripts/mercury/tooltip.js.coffee",
+    "vendor/assets/javascripts/mercury/uploader.js.coffee",
+    "vendor/assets/javascripts/mercury_dependencies/jquery-1.6.js",
+    "vendor/assets/javascripts/mercury_dependencies/jquery-ui-1.8.13.custom.js",
+    "vendor/assets/javascripts/mercury_dependencies/jquery.additions.js",
+    "vendor/assets/javascripts/mercury_dependencies/liquidmetal.js",
+    "vendor/assets/javascripts/mercury_dependencies/showdown.js",
+    "vendor/assets/javascripts/mercury_loader.js",
+    "vendor/assets/stylesheets/mercury.css",
+    "vendor/assets/stylesheets/mercury/dialog.css",
+    "vendor/assets/stylesheets/mercury/lightview.css",
+    "vendor/assets/stylesheets/mercury/mercury.css",
+    "vendor/assets/stylesheets/mercury/modal.css",
+    "vendor/assets/stylesheets/mercury/statusbar.css",
+    "vendor/assets/stylesheets/mercury/toolbar.css",
+    "vendor/assets/stylesheets/mercury/tooltip.css",
+    "vendor/assets/stylesheets/mercury/uploader.css"
   ]
   s.homepage = %q{http://github.com/jejacks0n/mercury}
   s.licenses = ["MIT"]
@@ -199,13 +208,13 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, ["= 3.1.0.rc4"])
+      s.add_runtime_dependency(%q<rails>, ["~> 3.1.0"])
       s.add_runtime_dependency(%q<paperclip>, [">= 0"])
       s.add_runtime_dependency(%q<formtastic>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
-      s.add_runtime_dependency(%q<sass-rails>, ["~> 3.1.0.rc"])
+      s.add_runtime_dependency(%q<sass-rails>, [">= 0"])
       s.add_runtime_dependency(%q<coffee-script>, [">= 0"])
-      s.add_runtime_dependency(%q<haml>, [">= 0"])
+      s.add_development_dependency(%q<rocco>, [">= 0"])
       s.add_development_dependency(%q<uglifier>, [">= 0"])
       s.add_development_dependency(%q<jquery-rails>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
@@ -214,13 +223,13 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
       s.add_development_dependency(%q<evergreen>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, ["= 3.1.0.rc4"])
+      s.add_dependency(%q<rails>, ["~> 3.1.0"])
       s.add_dependency(%q<paperclip>, [">= 0"])
       s.add_dependency(%q<formtastic>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<sass-rails>, ["~> 3.1.0.rc"])
+      s.add_dependency(%q<sass-rails>, [">= 0"])
       s.add_dependency(%q<coffee-script>, [">= 0"])
-      s.add_dependency(%q<haml>, [">= 0"])
+      s.add_dependency(%q<rocco>, [">= 0"])
       s.add_dependency(%q<uglifier>, [">= 0"])
       s.add_dependency(%q<jquery-rails>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
@@ -230,13 +239,13 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<evergreen>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, ["= 3.1.0.rc4"])
+    s.add_dependency(%q<rails>, ["~> 3.1.0"])
     s.add_dependency(%q<paperclip>, [">= 0"])
     s.add_dependency(%q<formtastic>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<sass-rails>, ["~> 3.1.0.rc"])
+    s.add_dependency(%q<sass-rails>, [">= 0"])
     s.add_dependency(%q<coffee-script>, [">= 0"])
-    s.add_dependency(%q<haml>, [">= 0"])
+    s.add_dependency(%q<rocco>, [">= 0"])
     s.add_dependency(%q<uglifier>, [">= 0"])
     s.add_dependency(%q<jquery-rails>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])