kiteditor 1.0.12 → 1.0.13

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kiteditor
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-22 00:00:00.000000000 Z
+date: 2013-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -268,38 +268,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: railties
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: coffee-rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.2
 description: This is a fork of the wonderful Mercury Rails WYSIWYG editor, modified
   very slightly for use with DSC's Kit Community and Content Management System.  All
   credit for this Gem goes to the original author, Jeremy Jackson
@@ -310,25 +278,19 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE
-- POST_INSTALL
 files:
-- lib/generators/mercury/install/authentication/authentication_generator.rb
-- lib/generators/mercury/install/images/images_generator.rb
-- lib/generators/mercury/install/images/templates/ar_paperclip_image.rb
-- lib/generators/mercury/install/images/templates/ar_paperclip_image_migration.rb
-- lib/generators/mercury/install/images/templates/images_controller.rb
-- lib/generators/mercury/install/images/templates/mongoid_paperclip_image.rb
 - lib/generators/mercury/install/install_generator.rb
+- lib/generators/mercury/install/templates/mongoid_paperclip_image.rb
 - lib/mercury/authentication.rb
-- lib/mercury/cucumber/step_definitions/mercury_steps.rb
-- lib/mercury/cucumber/step_definitions.rb
-- lib/mercury/cucumber/support/mercury_contents.rb
-- lib/mercury/cucumber/support/mercury_selectors.rb
-- lib/mercury/engine.rb
-- lib/mercury/rails.rb
-- lib/mercury/version.rb
 - lib/mercury-rails.rb
+- vendor/assets/images/mercury/button.png
+- vendor/assets/images/mercury/close.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/missing-image.png
+- 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
@@ -349,125 +311,85 @@ files:
 - vendor/assets/images/mercury/toolbar/primary/user.png
 - vendor/assets/images/mercury/toolbar/snippetable/buttons.png
 - vendor/assets/images/mercury/toolbar/snippets/buttons.png
+- vendor/assets/javascripts/mercury/dependencies/jquery-1.7.js
+- vendor/assets/javascripts/mercury/dependencies/jquery-ui-1.8.13.custom.js
 - vendor/assets/javascripts/mercury/dependencies/jquery-ui-1.8.18.custom.min.js
 - vendor/assets/javascripts/mercury/dependencies/jquery-ui.1.8.13.custom.min.js
+- vendor/assets/javascripts/mercury/dependencies/jquery.additions.js
+- vendor/assets/javascripts/mercury/dependencies/jquery.htmlClean.js
+- vendor/assets/javascripts/mercury/dependencies/liquidmetal.js
+- vendor/assets/javascripts/mercury/dependencies/showdown.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/snippetpanel.js.coffee
+- vendor/assets/javascripts/mercury/dialogs/style.js.coffee
+- vendor/assets/javascripts/mercury/finalize.js.coffee
+- vendor/assets/javascripts/mercury/history_buffer.js.coffee
+- vendor/assets/javascripts/mercury/lightview.js.coffee
+- vendor/assets/javascripts/mercury/locales/da.locale.js.coffee
+- vendor/assets/javascripts/mercury/locales/de.locale.js.coffee
+- vendor/assets/javascripts/mercury/locales/es.locale.js.coffee
+- vendor/assets/javascripts/mercury/locales/example.local.js.coffee
+- vendor/assets/javascripts/mercury/locales/fr.locale.js.coffee
+- vendor/assets/javascripts/mercury/locales/it.locale.js.coffee
+- vendor/assets/javascripts/mercury/locales/ko.local.js.coffee
+- vendor/assets/javascripts/mercury/locales/nl.locale.js.coffee
+- vendor/assets/javascripts/mercury/locales/pt.locale.js.coffee
+- vendor/assets/javascripts/mercury/locales/sv.local.js.coffee
+- vendor/assets/javascripts/mercury/locales/swedish_chef.locale.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/plugins/save_as_xml/mercury/page_editor.js.coffee
+- vendor/assets/javascripts/mercury/plugins/save_as_xml/plugin.js
+- 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/simple.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/support/history.js
+- 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.js
+- vendor/assets/javascripts/mercury_loader.js
+- vendor/assets/javascripts/mercury_overrides.js
 - vendor/assets/javascripts/popup.js
+- vendor/assets/stylesheets/mercury/all_images.css.erb
+- 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
+- vendor/assets/stylesheets/mercury.css
+- vendor/assets/stylesheets/mercury_overrides.css
 - vendor/assets/stylesheets/popup.css.erb
-- app/assets/images/mercury/button.png
-- app/assets/images/mercury/close.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/missing-image.png
-- app/assets/images/mercury/search-icon.png
-- app/assets/images/mercury/temp-logo.png
-- app/assets/images/mercury/toolbar/editable/buttons.png
-- app/assets/images/mercury/toolbar/primary/_expander.png
-- app/assets/images/mercury/toolbar/primary/_pressed.png
-- app/assets/images/mercury/toolbar/primary/action.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/preview.png
-- app/assets/images/mercury/toolbar/primary/redo.png
-- app/assets/images/mercury/toolbar/primary/save.png
-- app/assets/images/mercury/toolbar/primary/snippetpanel.png
-- app/assets/images/mercury/toolbar/primary/tools.png
-- app/assets/images/mercury/toolbar/primary/undo.png
-- app/assets/images/mercury/toolbar/primary/user.png
-- app/assets/images/mercury/toolbar/snippets/buttons.png
-- 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
-- app/assets/javascripts/mercury/dependencies/liquidmetal.js
-- app/assets/javascripts/mercury/dependencies/showdown.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/snippetpanel.js.coffee
-- app/assets/javascripts/mercury/dialogs/style.js.coffee
-- app/assets/javascripts/mercury/finalize.js.coffee
-- app/assets/javascripts/mercury/history_buffer.js.coffee
-- app/assets/javascripts/mercury/lightview.js.coffee
-- app/assets/javascripts/mercury/locales/ar.locale.js.coffee
-- app/assets/javascripts/mercury/locales/da.locale.js.coffee
-- app/assets/javascripts/mercury/locales/de.locale.js.coffee
-- app/assets/javascripts/mercury/locales/es.locale.js.coffee
-- app/assets/javascripts/mercury/locales/example.local.js.coffee
-- app/assets/javascripts/mercury/locales/fr.locale.js.coffee
-- app/assets/javascripts/mercury/locales/hu.locale.js.coffee
-- app/assets/javascripts/mercury/locales/it.locale.js.coffee
-- app/assets/javascripts/mercury/locales/ko.local.js.coffee
-- app/assets/javascripts/mercury/locales/nl.locale.js.coffee
-- app/assets/javascripts/mercury/locales/pl.locale.js.coffee
-- app/assets/javascripts/mercury/locales/pt.locale.js.coffee
-- app/assets/javascripts/mercury/locales/ru.locale.js.coffee
-- app/assets/javascripts/mercury/locales/sv.local.js.coffee
-- app/assets/javascripts/mercury/locales/swedish_chef.locale.js.coffee
-- app/assets/javascripts/mercury/locales/uk.locale.js.coffee
-- app/assets/javascripts/mercury/locales/zh.local.js.coffee
-- app/assets/javascripts/mercury/mercury-compiled.js
-- 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/plugins/save_as_xml/mercury/page_editor.js.coffee
-- app/assets/javascripts/mercury/plugins/save_as_xml/plugin.js
-- app/assets/javascripts/mercury/region.js.coffee
-- app/assets/javascripts/mercury/regions/full.js.coffee
-- app/assets/javascripts/mercury/regions/image.js.coffee
-- app/assets/javascripts/mercury/regions/markdown.js.coffee
-- app/assets/javascripts/mercury/regions/simple.js.coffee
-- app/assets/javascripts/mercury/regions/snippets.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/support/history.js
-- 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.js
-- app/assets/stylesheets/_mercury-bootstrap-overrides.scss
-- app/assets/stylesheets/_mercury-sass.scss
-- app/assets/stylesheets/mercury/all_images.css.erb
-- app/assets/stylesheets/mercury/bootstrap-ish.css
-- app/assets/stylesheets/mercury/bootstrap-overrides.css
-- app/assets/stylesheets/mercury/dialog.css
-- app/assets/stylesheets/mercury/lightview.css
-- app/assets/stylesheets/mercury/mercury.css
-- app/assets/stylesheets/mercury/modal.css
-- app/assets/stylesheets/mercury/statusbar.css
-- app/assets/stylesheets/mercury/toolbar.css
-- app/assets/stylesheets/mercury/tooltip.css
-- app/assets/stylesheets/mercury/uploader.css
-- app/assets/stylesheets/mercury.css
+- app/controllers/mercury/images_controller.rb
 - app/controllers/mercury_controller.rb
-- app/helpers/mercury_helper.rb
+- app/models/mercury/image.rb
 - app/views/layouts/mercury.html.erb
-- app/views/layouts/mercury.html.haml
-- app/views/layouts/mercury.html.slim
 - app/views/layouts/popup.html.haml
 - app/views/mercury/images/_list.html.haml
 - app/views/mercury/images/index.html.haml
@@ -487,116 +409,42 @@ files:
 - app/views/mercury/selects/style.html
 - app/views/mercury/snippets/example/options.html.erb
 - app/views/mercury/snippets/example/preview.html.erb
-- app/views/mercury/snippets/no_options/preview.html.erb
+- db/migrate/20110526035601_create_mercury_images.rb
 - config/engine.rb
-- config/routes.rb
 - LICENSE
-- POST_INSTALL
-- features/generators/authentication.feature
-- features/generators/images.feature
-- features/generators/install.feature
 - features/loading/loading.feature
 - features/loading/navigating.feature
 - features/loading/user_interface.feature
-- features/regions/full/advanced_editing.feature
-- features/regions/full/basic_editing.feature
-- features/regions/full/inserting_links.feature
-- features/regions/full/inserting_media.feature
-- features/regions/full/inserting_snippets.feature
-- features/regions/full/inserting_special_characters.feature
-- features/regions/full/inserting_tables.feature
-- features/regions/full/pasting.feature
-- features/regions/full/uploading_images.feature
-- features/regions/image/uploading_images.feature
-- features/regions/markdown/advanced_editing.feature
-- features/regions/markdown/basic_editing.feature
-- features/regions/markdown/inserting_links.feature
-- features/regions/markdown/inserting_media.feature
-- features/regions/markdown/inserting_snippets.feature
-- features/regions/markdown/inserting_special_characters.feature
-- features/regions/markdown/inserting_tables.feature
-- features/regions/markdown/uploading_images.feature
-- features/regions/simple/basic_editing.feature
-- features/regions/snippets/advanced_editing.feature
-- features/regions/snippets/basic_editing.feature
-- features/regions/snippets/inserting_snippets.feature
+- features/regions/editable/advanced_editing.feature
+- features/regions/editable/basic_editing.feature
+- features/regions/editable/inserting_links.feature
+- features/regions/editable/inserting_media.feature
+- features/regions/editable/inserting_snippets.feature
+- features/regions/editable/inserting_special_characters.feature
+- features/regions/editable/inserting_tables.feature
+- features/regions/editable/pasting.feature
+- features/regions/editable/uploading_images.feature
+- features/regions/markupable/advanced_editing.feature
+- features/regions/markupable/basic_editing.feature
+- features/regions/markupable/inserting_links.feature
+- features/regions/markupable/inserting_media.feature
+- features/regions/markupable/inserting_snippets.feature
+- features/regions/markupable/inserting_special_characters.feature
+- features/regions/markupable/inserting_tables.feature
+- features/regions/markupable/uploading_images.feature
+- features/regions/snippetable/advanced_editing.feature
+- features/regions/snippetable/basic_editing.feature
+- features/regions/snippetable/inserting_snippets.feature
 - features/saving/saving.feature
-- features/step_definitions/custom_web_steps.rb
 - features/step_definitions/debug_steps.rb
-- features/step_definitions/generator_steps.rb
 - features/step_definitions/mercury_steps.rb
 - features/step_definitions/web_steps.rb
-- features/support/aruba.rb
 - features/support/env.rb
+- features/support/mercury_contents.rb
+- features/support/mercury_selectors.rb
 - features/support/paths.rb
 - features/support/selectors.rb
-- spec/dummy/Rakefile
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/javascripts/prototype.js
-- 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
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/teabag.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/db/.gitkeep
-- spec/dummy/public/500.html
-- spec/dummy/public/blank.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/public/images/bunny.gif
-- spec/dummy/public/images/bunny2.jpg
-- spec/dummy/public/index.html
-- spec/dummy/script/rails
-- spec/javascripts/fixtures/mercury/dialog.html
-- spec/javascripts/fixtures/mercury/dialogs/backcolor.html
-- spec/javascripts/fixtures/mercury/dialogs/forecolor.html
-- spec/javascripts/fixtures/mercury/dialogs/formatblock.html
-- spec/javascripts/fixtures/mercury/dialogs/snippetpanel.html
-- spec/javascripts/fixtures/mercury/dialogs/style.html
-- spec/javascripts/fixtures/mercury/lightview.html
-- spec/javascripts/fixtures/mercury/modal.html
-- spec/javascripts/fixtures/mercury/modals/htmleditor.html
-- spec/javascripts/fixtures/mercury/modals/insertcharacter.html
-- spec/javascripts/fixtures/mercury/modals/insertlink.html
-- spec/javascripts/fixtures/mercury/modals/insertmedia.html
-- spec/javascripts/fixtures/mercury/modals/insertsnippet.html
-- spec/javascripts/fixtures/mercury/modals/inserttable.html
-- spec/javascripts/fixtures/mercury/page_editor.html
-- spec/javascripts/fixtures/mercury/palette.html
-- spec/javascripts/fixtures/mercury/panel.html
-- spec/javascripts/fixtures/mercury/region.html
-- spec/javascripts/fixtures/mercury/regions/full.html
-- spec/javascripts/fixtures/mercury/regions/image.html
-- spec/javascripts/fixtures/mercury/regions/markdown.html
-- spec/javascripts/fixtures/mercury/regions/simple.html
-- spec/javascripts/fixtures/mercury/regions/snippets.html
-- spec/javascripts/fixtures/mercury/select.html
-- spec/javascripts/fixtures/mercury/snippet.html
-- spec/javascripts/fixtures/mercury/snippet_toolbar.html
-- spec/javascripts/fixtures/mercury/statusbar.html
-- spec/javascripts/fixtures/mercury/table_editor.html
-- spec/javascripts/fixtures/mercury/toolbar.button.html
-- spec/javascripts/fixtures/mercury/toolbar.button_group.html
-- spec/javascripts/fixtures/mercury/toolbar.expander.html
-- spec/javascripts/fixtures/mercury/toolbar.html
-- spec/javascripts/fixtures/mercury/tooltip.html
-- spec/javascripts/fixtures/mercury/uploader.html
-- spec/javascripts/mercury/dialog_spec.coffee
+- 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
@@ -617,11 +465,9 @@ files:
 - 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/full_spec.js.coffee
-- spec/javascripts/mercury/regions/image_spec.js.coffee
-- spec/javascripts/mercury/regions/markdown_spec.js.coffee
-- spec/javascripts/mercury/regions/simple_spec.js.coffee
-- spec/javascripts/mercury/regions/snippets_spec.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
 - spec/javascripts/mercury/snippet_toolbar_spec.js.coffee
@@ -633,9 +479,38 @@ files:
 - spec/javascripts/mercury/toolbar_spec.js.coffee
 - spec/javascripts/mercury/tooltip_spec.js.coffee
 - spec/javascripts/mercury/uploader_spec.js.coffee
-- spec/javascripts/spec_helper.coffee
-- spec/javascripts/support/event_simulation.js
-- spec/teabag_env.rb
+- spec/javascripts/spec_helper.js
+- spec/javascripts/templates/mercury/dialog.html
+- 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/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
+- spec/javascripts/templates/mercury/modals/insertmedia.html
+- spec/javascripts/templates/mercury/modals/insertsnippet.html
+- spec/javascripts/templates/mercury/modals/inserttable.html
+- spec/javascripts/templates/mercury/page_editor.html
+- spec/javascripts/templates/mercury/palette.html
+- spec/javascripts/templates/mercury/panel.html
+- spec/javascripts/templates/mercury/region.html
+- spec/javascripts/templates/mercury/regions/editable.html
+- spec/javascripts/templates/mercury/regions/snippetable.html
+- spec/javascripts/templates/mercury/select.html
+- spec/javascripts/templates/mercury/snippet.html
+- spec/javascripts/templates/mercury/snippet_toolbar.html
+- spec/javascripts/templates/mercury/statusbar.html
+- spec/javascripts/templates/mercury/table_editor.html
+- spec/javascripts/templates/mercury/toolbar.button.html
+- spec/javascripts/templates/mercury/toolbar.button_group.html
+- spec/javascripts/templates/mercury/toolbar.expander.html
+- spec/javascripts/templates/mercury/toolbar.html
+- spec/javascripts/templates/mercury/tooltip.html
+- spec/javascripts/templates/mercury/uploader.html
 homepage: http://github.com/dsc-os/kiteditor
 licenses:
 - MIT
@@ -662,111 +537,39 @@ signing_key:
 specification_version: 3
 summary: An HTML5 editor for use with DSC's Kit, the CCMS.
 test_files:
-- features/generators/authentication.feature
-- features/generators/images.feature
-- features/generators/install.feature
 - features/loading/loading.feature
 - features/loading/navigating.feature
 - features/loading/user_interface.feature
-- features/regions/full/advanced_editing.feature
-- features/regions/full/basic_editing.feature
-- features/regions/full/inserting_links.feature
-- features/regions/full/inserting_media.feature
-- features/regions/full/inserting_snippets.feature
-- features/regions/full/inserting_special_characters.feature
-- features/regions/full/inserting_tables.feature
-- features/regions/full/pasting.feature
-- features/regions/full/uploading_images.feature
-- features/regions/image/uploading_images.feature
-- features/regions/markdown/advanced_editing.feature
-- features/regions/markdown/basic_editing.feature
-- features/regions/markdown/inserting_links.feature
-- features/regions/markdown/inserting_media.feature
-- features/regions/markdown/inserting_snippets.feature
-- features/regions/markdown/inserting_special_characters.feature
-- features/regions/markdown/inserting_tables.feature
-- features/regions/markdown/uploading_images.feature
-- features/regions/simple/basic_editing.feature
-- features/regions/snippets/advanced_editing.feature
-- features/regions/snippets/basic_editing.feature
-- features/regions/snippets/inserting_snippets.feature
+- features/regions/editable/advanced_editing.feature
+- features/regions/editable/basic_editing.feature
+- features/regions/editable/inserting_links.feature
+- features/regions/editable/inserting_media.feature
+- features/regions/editable/inserting_snippets.feature
+- features/regions/editable/inserting_special_characters.feature
+- features/regions/editable/inserting_tables.feature
+- features/regions/editable/pasting.feature
+- features/regions/editable/uploading_images.feature
+- features/regions/markupable/advanced_editing.feature
+- features/regions/markupable/basic_editing.feature
+- features/regions/markupable/inserting_links.feature
+- features/regions/markupable/inserting_media.feature
+- features/regions/markupable/inserting_snippets.feature
+- features/regions/markupable/inserting_special_characters.feature
+- features/regions/markupable/inserting_tables.feature
+- features/regions/markupable/uploading_images.feature
+- features/regions/snippetable/advanced_editing.feature
+- features/regions/snippetable/basic_editing.feature
+- features/regions/snippetable/inserting_snippets.feature
 - features/saving/saving.feature
-- features/step_definitions/custom_web_steps.rb
 - features/step_definitions/debug_steps.rb
-- features/step_definitions/generator_steps.rb
 - features/step_definitions/mercury_steps.rb
 - features/step_definitions/web_steps.rb
-- features/support/aruba.rb
 - features/support/env.rb
+- features/support/mercury_contents.rb
+- features/support/mercury_selectors.rb
 - features/support/paths.rb
 - features/support/selectors.rb
-- spec/dummy/Rakefile
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/javascripts/prototype.js
-- 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
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/teabag.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/db/.gitkeep
-- spec/dummy/public/500.html
-- spec/dummy/public/blank.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/public/images/bunny.gif
-- spec/dummy/public/images/bunny2.jpg
-- spec/dummy/public/index.html
-- spec/dummy/script/rails
-- spec/javascripts/fixtures/mercury/dialog.html
-- spec/javascripts/fixtures/mercury/dialogs/backcolor.html
-- spec/javascripts/fixtures/mercury/dialogs/forecolor.html
-- spec/javascripts/fixtures/mercury/dialogs/formatblock.html
-- spec/javascripts/fixtures/mercury/dialogs/snippetpanel.html
-- spec/javascripts/fixtures/mercury/dialogs/style.html
-- spec/javascripts/fixtures/mercury/lightview.html
-- spec/javascripts/fixtures/mercury/modal.html
-- spec/javascripts/fixtures/mercury/modals/htmleditor.html
-- spec/javascripts/fixtures/mercury/modals/insertcharacter.html
-- spec/javascripts/fixtures/mercury/modals/insertlink.html
-- spec/javascripts/fixtures/mercury/modals/insertmedia.html
-- spec/javascripts/fixtures/mercury/modals/insertsnippet.html
-- spec/javascripts/fixtures/mercury/modals/inserttable.html
-- spec/javascripts/fixtures/mercury/page_editor.html
-- spec/javascripts/fixtures/mercury/palette.html
-- spec/javascripts/fixtures/mercury/panel.html
-- spec/javascripts/fixtures/mercury/region.html
-- spec/javascripts/fixtures/mercury/regions/full.html
-- spec/javascripts/fixtures/mercury/regions/image.html
-- spec/javascripts/fixtures/mercury/regions/markdown.html
-- spec/javascripts/fixtures/mercury/regions/simple.html
-- spec/javascripts/fixtures/mercury/regions/snippets.html
-- spec/javascripts/fixtures/mercury/select.html
-- spec/javascripts/fixtures/mercury/snippet.html
-- spec/javascripts/fixtures/mercury/snippet_toolbar.html
-- spec/javascripts/fixtures/mercury/statusbar.html
-- spec/javascripts/fixtures/mercury/table_editor.html
-- spec/javascripts/fixtures/mercury/toolbar.button.html
-- spec/javascripts/fixtures/mercury/toolbar.button_group.html
-- spec/javascripts/fixtures/mercury/toolbar.expander.html
-- spec/javascripts/fixtures/mercury/toolbar.html
-- spec/javascripts/fixtures/mercury/tooltip.html
-- spec/javascripts/fixtures/mercury/uploader.html
-- spec/javascripts/mercury/dialog_spec.coffee
+- 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
@@ -787,11 +590,9 @@ test_files:
 - 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/full_spec.js.coffee
-- spec/javascripts/mercury/regions/image_spec.js.coffee
-- spec/javascripts/mercury/regions/markdown_spec.js.coffee
-- spec/javascripts/mercury/regions/simple_spec.js.coffee
-- spec/javascripts/mercury/regions/snippets_spec.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
 - spec/javascripts/mercury/snippet_toolbar_spec.js.coffee
@@ -803,6 +604,35 @@ test_files:
 - spec/javascripts/mercury/toolbar_spec.js.coffee
 - spec/javascripts/mercury/tooltip_spec.js.coffee
 - spec/javascripts/mercury/uploader_spec.js.coffee
-- spec/javascripts/spec_helper.coffee
-- spec/javascripts/support/event_simulation.js
-- spec/teabag_env.rb
+- spec/javascripts/spec_helper.js
+- spec/javascripts/templates/mercury/dialog.html
+- 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/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
+- spec/javascripts/templates/mercury/modals/insertmedia.html
+- spec/javascripts/templates/mercury/modals/insertsnippet.html
+- spec/javascripts/templates/mercury/modals/inserttable.html
+- spec/javascripts/templates/mercury/page_editor.html
+- spec/javascripts/templates/mercury/palette.html
+- spec/javascripts/templates/mercury/panel.html
+- spec/javascripts/templates/mercury/region.html
+- spec/javascripts/templates/mercury/regions/editable.html
+- spec/javascripts/templates/mercury/regions/snippetable.html
+- spec/javascripts/templates/mercury/select.html
+- spec/javascripts/templates/mercury/snippet.html
+- spec/javascripts/templates/mercury/snippet_toolbar.html
+- spec/javascripts/templates/mercury/statusbar.html
+- spec/javascripts/templates/mercury/table_editor.html
+- spec/javascripts/templates/mercury/toolbar.button.html
+- spec/javascripts/templates/mercury/toolbar.button_group.html
+- spec/javascripts/templates/mercury/toolbar.expander.html
+- spec/javascripts/templates/mercury/toolbar.html
+- spec/javascripts/templates/mercury/tooltip.html
+- spec/javascripts/templates/mercury/uploader.html