mercury-rails 0.3.1 → 0.5.0

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

@@ -0,0 +1,45 @@
+/*
+ *= require_self
+ *= require ./form
+ *= require ./dialog
+ *= require ./lightview
+ *= require ./modal
+ *= require ./statusbar
+ *= require ./toolbar
+ *= require ./tooltip
+ *= require ./uploader
+ *= require ./buttons
+ *= require ./all_images
+ */
+
+/*
+ * General Layout
+ *---------------------------------------------------------------------------*/
+
+/* Disable text sizing in webkit (ipad/iphone etc -- should apply to mercury only) */
+html {
+  -webkit-text-size-adjust: none;
+}
+
+html, body {
+  -webkit-transition: -webkit-transform 3s;
+  margin: 0;
+  padding: 0;
+  overflow: hidden;
+}
+
+.mercury-iframe {
+  position: absolute;
+  top: 0;
+  width: 100%;
+  visibility: hidden;
+}
+.mercury-focusable {
+  position: absolute;
+  opacity: 0;
+}
+
+.filter {
+  margin: 0;
+  padding: 0;
+}

data/{vendor → app}/assets/stylesheets/mercury/modal.css

@@ -10,7 +10,7 @@
   height: 100%;
   opacity: 0;
   display: none;
-  background: rgba(0,0,0, .65);
+  background: rgba(255,255,255, .8);
 }
 .mercury-modal {
   position: fixed;

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

@@ -1,4 +1,4 @@
-<form id="mercury_character" style="width:456px">
+<form id="mercury_character" class="mercury-form" style="width:456px">
 
   <div class="mercury-display-pane-container">
     <div class="mercury-display-pane">

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

@@ -1,4 +1,4 @@
-<form id="mercury_html_editor" style="width:650px">
+<form id="mercury_html_editor" class="mercury-form" style="width:650px">
 
   <textarea class="mercury-display-pane-container" rows="5" style="width:100%"></textarea>
 

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

@@ -1,4 +1,4 @@
-<form id="mercury_link" style="width:600px">
+<form id="mercury_link" class="mercury-form" style="width:600px">
 
   <div class="mercury-display-pane-container">
     <div class="mercury-display-pane">

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

@@ -1,4 +1,4 @@
-<form id="mercury_media" style="width:600px">
+<form id="mercury_media" class="mercury-form" style="width:600px">
 
   <div class="mercury-display-pane-container">
     <div class="mercury-display-pane">

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

@@ -1,4 +1,4 @@
-<form id="mercury_table" style="width:700px">
+<form id="mercury_table" class="mercury-form" style="width:700px">
 
   <div class="mercury-display-pane-container">
     <div class="mercury-display-pane">

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

@@ -1,4 +1,4 @@
-<%= form_for 'options', { :html => { :style => 'width:600px' } } do |f| %>
+<%= form_for 'options', { :html => { :class => 'mercury-form', :style => 'width:600px' } } do |f| %>
 
   <div class="mercury-display-pane-container">
     <div class="mercury-display-pane">

data/features/generators/authentication.feature

@@ -0,0 +1,10 @@
+Feature:
+  As a developer
+  In order to restrict editing using Mercury
+  I should be able to use a generator to setup my application
+
+  Scenario: I can install a basic authentication template
+    Given I have created a new rails application
+    When I successfully run `bundle exec rails generate mercury:install:authentication --trace`
+    Then the following files should exist:
+      | lib/mercury/authentication.rb           |

data/features/generators/images.feature

@@ -0,0 +1,41 @@
+Feature:
+  As a developer
+  In order to use image processing within Mercury
+  I should be able to use a generator to setup my application
+
+  Scenario: I can install the image processing files required for Mercury
+    Given I have created a new rails application
+    When I successfully run `bundle exec rails generate mercury:install:images --trace`
+    Then the following files should exist:
+      | app/controllers/mercury/images_controller.rb |
+      | app/models/mercury/image.rb |
+    And the file "app/models/mercury/image.rb" should contain "class Mercury::Image < ActiveRecord::Base"
+    And should have the migration "create_mercury_images.rb"
+    And the file "config/routes.rb" should contain:
+      """
+          namespace :mercury do
+            resources :images
+          end
+      """
+    And the file "Gemfile" should contain "gem 'paperclip'"
+
+  Scenario: I can install the image processing files required for Mercury using Mongoid
+    Given I have created a new rails application
+    When I successfully run `bundle exec rails generate mercury:install:images --orm mongoid --trace`
+    Then the following files should exist:
+      | app/controllers/mercury/images_controller.rb |
+      | app/models/mercury/image.rb |
+    And the file "app/models/mercury/image.rb" should contain:
+    """
+    class Mercury::Image
+      include Mongoid::Document
+      include Mongoid::Paperclip
+    """
+    And should not have the migration "create_mercury_images.rb"
+    And the file "config/routes.rb" should contain:
+      """
+          namespace :mercury do
+            resources :images
+          end
+      """
+    And the file "Gemfile" should contain "gem 'paperclip'"

data/features/generators/install.feature

@@ -0,0 +1,21 @@
+Feature:
+  As a developer
+  In order to use Mercury
+  I should be able to use a generator to install configuration and overrides into my application
+
+  Scenario: I can install the Mercury configuration file
+    Given I have created a new rails application
+    When I run `bundle exec rails generate mercury:install --trace` interactively
+    And I type "N"
+    Then the following files should exist:
+      | app/assets/javascripts/mercury.js             |
+    And the file "config/routes.rb" should contain "mount Mercury::Engine => '/'"
+
+  Scenario: I can install the configuration file and overrides
+    Given I have created a new rails application
+    When I successfully run `bundle exec rails generate mercury:install --full --trace`
+    Then the following files should exist:
+      | app/assets/javascripts/mercury.js             |
+      | app/assets/stylesheets/mercury_overrides.css  |
+      | app/views/layouts/mercury.html.erb            |
+    And the file "config/routes.rb" should contain "mount Mercury::Engine => '/'"

data/features/loading/loading.feature

@@ -18,5 +18,8 @@ Feature:
     Then I should see "Editable region" in the content frame
 
 
+  # 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.3.0" within the statusbar
+    Then I should see "Mercury Editor v0.4.0" within the statusbar
+

data/features/loading/user_interface.feature

@@ -7,12 +7,14 @@ Feature:
   Background:
     Given I am on an editable page
 
-  Scenario: A user can expect all this!
+  # Scenario: A user can expect all this!
 
 
-#  Scenario: A user can view and close the about dialog
+ # Latest selenium webdriver seems to consider the lightview hidden
+ @use_hidden_elements
+ Scenario: A user can view and close the about dialog
     When I click on the about the editor link
-    Then I should see "Mercury Editor" within the lightview title
+    Then I should see "Mercury Editor" within the lightview window
     And I should see "Mercury Editor is an open source HTML5 WYSIWYG editor written in Coffeescript using jQuery. The project has been released under the MIT license." within the lightview window
     And I should see "Project Home" within the lightview window
     And I should see "Project Source" within the lightview window
@@ -22,7 +24,7 @@ Feature:
     And the lightview overlay should not be visible
 
 
-#  Scenario: A user can open and close select dropdowns
+  Scenario: A user can open and close select dropdowns
     When I click on the formatblock editor dropdown
     Then the formatblock select should be visible
     And I should see "Heading 1 <h1>" within the formatblock select
@@ -32,7 +34,7 @@ Feature:
     And the formatblock select should not be visible
 
 
-#  Scenario: A user can open and close palette dialogs
+ Scenario: A user can open and close palette dialogs
     When I click on the background color editor button
     Then the background color palette should be visible
 
@@ -41,7 +43,7 @@ Feature:
     And the background color palette should not be visible
 
 
-#  Scenario: A user can open and close a panel
+ Scenario: A user can open and close a panel
     When I click on the "View History" button
     Then the history panel should be visible
     And I should see "Page Version History" within the history panel
@@ -50,7 +52,7 @@ Feature:
     Then the history panel should not be visible
 
 
-#  Scenario: A user can open and close a modal window
+ Scenario: A user can open and close a modal window
     When I click on the "Insert Link" button
     Then the modal window should be visible
     And the modal overlay should be visible

data/features/regions/editable/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 editable region is simple content
     And I make a selection
 
@@ -22,7 +22,7 @@ Feature:
     Then the contents of the editable 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 editable region is simple content
     And I make a selection
 
@@ -33,7 +33,7 @@ Feature:
     Then the contents of the editable 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 editable 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 editable region is simple content
     And I make a selection
 
@@ -52,7 +52,7 @@ Feature:
     When I click on the strikethrough editor button
     Then the contents of the editable 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 editable region is simple content
     And I make a selection
 
@@ -63,7 +63,7 @@ Feature:
     Then the contents of the editable 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 editable region is simple content
     And I make a selection
 
@@ -74,7 +74,7 @@ Feature:
     Then the contents of the editable 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 editable region is simple content
     And I make a selection
 
@@ -85,25 +85,25 @@ Feature:
     Then the contents of the editable 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 editable region has justifiable content
     And I make a selection
 
     When I click on the justify left editor button
-    Then the contents of the editable region should be "<div>first line</div><br><div align='left'>this is <span>justifiable</span><b>content</b></div> "
+    Then the contents of the editable region should be "<div>first line</div><br><div align='left'>this is <span>justifiable</span><b>content</b></div>"
 
     When I click on the justify center editor button
-    Then the contents of the editable region should be "<div>first line</div><br><div align='center'>this is <span>justifiable</span><b>content</b></div> "
+    Then the contents of the editable region should be "<div>first line</div><br><div align='center'>this is <span>justifiable</span><b>content</b></div>"
 
     When I click on the justify right editor button
-    Then the contents of the editable region should be "<div>first line</div><br><div align='right'>this is <span>justifiable</span><b>content</b></div> "
+    Then the contents of the editable region should be "<div>first line</div><br><div align='right'>this is <span>justifiable</span><b>content</b></div>"
 
     When I click on the full justification editor button
-    Then the contents of the editable region should be "<div>first line</div><br><div align='justify'>this is <span>justifiable</span><b>content</b></div> "
+    Then the contents of the editable 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 editable region is simple content
     And I make a selection
 
@@ -112,7 +112,7 @@ 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 editable region is simple content
     And I make a selection
 
@@ -122,25 +122,25 @@ 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 editable region has justifiable content
     And I make a selection
 
     When I click on the indent editor button
-    Then the contents of the editable region should be "<div>first line</div><br><blockquote>this is <span>justifiable</span><b>content</b></blockquote> "
+    Then the contents of the editable region should be "<div>first line</div><br><blockquote>this is <span>justifiable</span><b>content</b></blockquote>"
 
     When I click on the indent editor button
-    Then the contents of the editable region should be "<div>first line</div><br><blockquote><blockquote>this is <span>justifiable</span><b>content</b></blockquote></blockquote> "
+    Then the contents of the editable region should be "<div>first line</div><br><blockquote><blockquote>this is <span>justifiable</span><b>content</b></blockquote></blockquote>"
 
     When I click on the outdent editor button
-    Then the contents of the editable region should be "<div>first line</div><br><blockquote>this is <span>justifiable</span><b>content</b></blockquote> "
+    Then the contents of the editable region should be "<div>first line</div><br><blockquote>this is <span>justifiable</span><b>content</b></blockquote>"
 
     When I click on the outdent editor button
-    Then the contents of the editable region should be "<div>first line</div><br>this is <span>justifiable</span><b>content</b> "
+    Then the contents of the editable 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 editable region is simple content
     And I make a selection
 
@@ -151,7 +151,7 @@ Feature:
     Then the contents of the editable 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 editable region has wrapped content
     And I make a selection
 
@@ -159,7 +159,7 @@ Feature:
     Then the contents of the editable 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 editable region is simple content
     And I make a selection
 
@@ -168,7 +168,7 @@ Feature:
     Then the contents of the editable 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 editable region is simple content
     And I make a selection
 
@@ -177,7 +177,7 @@ Feature:
     Then the contents of the editable 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 editable region is simple content
     And I make a selection
 
@@ -186,10 +186,11 @@ Feature:
     Then the contents of the editable 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 editable 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 editable region should be "this is <font color='rgb(255, 0, 0)'><span>simple</span></font> <b>content</b>"
+

data/features/regions/editable/inserting_links.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 insert and edit a link to an external site
+ Scenario: A user can insert and edit a link to an external site
     Given the content of the editable region is simple content
     And I make a selection
 
@@ -32,7 +32,7 @@ Feature:
     Then the contents of the editable region should be "this is <a href='http://cnn.com'>simple</a> <b>content</b>"
 
 
-#  Scenario: A user can insert and edit a link with a target set
+ Scenario: A user can insert and edit a link with a target set
     Given the content of the editable region is simple content
     And I make a selection
 
@@ -48,7 +48,7 @@ Feature:
     Then the contents of the editable region should be "this is <a target='_top' href='http://google.com'>simple</a> <b>content</b>"
 
 
-#  Scenario: A user can insert a link to an external site and open it in a popup
+ Scenario: A user can insert a link to an external site and open it in a popup
     Given the content of the editable region is simple content
     And I make a selection
 
@@ -65,7 +65,7 @@ Feature:
     And the "Popup Height" field should contain "200"
 
 
-#  Scenario: A user can insert a bookmark and then link to it
+ Scenario: A user can insert a bookmark and then link to it
     Given the content of the editable region is simple content
     And I make a selection
 
@@ -94,5 +94,6 @@ Feature:
     # todo: when I change the name of a bookmark, and bookmarks that are pointing to me should also be updated (on this page)
 
 
-  Scenario: A user can navigate links inside of regions
-    # todo: finish
+  # Scenario: A user can navigate links inside of regions
+    # todo: finish
+