kiteditor 1.0.11 → 1.0.12

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

@@ -1,8 +1,7 @@
 describe "Mercury.Toolbar", ->
 
-  template 'mercury/toolbar.html'
-
   beforeEach ->
+    fixture.load('mercury/toolbar.html')
     $.fx.off = true
     spyOn($, 'ajax').andCallFake (url, options) =>
       options.success('data') if options.success
@@ -16,10 +15,10 @@ describe "Mercury.Toolbar", ->
     beforeEach ->
       @buildSpy = spyOn(Mercury.Toolbar.prototype, 'build').andCallFake(=>)
       @bindEventsSpy = spyOn(Mercury.Toolbar.prototype, 'bindEvents').andCallFake(=>)
-      @toolbar = new Mercury.Toolbar({appendTo: '#test', foo: true})
+      @toolbar = new Mercury.Toolbar({appendTo: fixture.el, foo: true})
 
     it "accepts options as an argument", ->
-      expect(@toolbar.options).toEqual({appendTo: '#test', foo: true})
+      expect(@toolbar.options).toEqual({appendTo: fixture.el, foo: true})
 
     it "calls build", ->
       expect(@buildSpy.callCount).toEqual(1)
@@ -48,7 +47,7 @@ describe "Mercury.Toolbar", ->
       it "builds out toolbar elements from the configuration", ->
         expect($('.mercury-primary-toolbar').length).toEqual(1)
         expect($('.mercury-editable-toolbar').length).toEqual(1)
-        expect($('.mercury-editable-toolbar').data('regions')).toEqual('editable,markupable')
+        expect($('.mercury-editable-toolbar').data('regions')).toEqual('full,markdown')
 
       it "builds buttons etc.", ->
         expect(@buildButtonSpy.callCount).toBeGreaterThan(10)
@@ -82,7 +81,7 @@ describe "Mercury.Toolbar", ->
   describe "#buildButton", ->
 
     beforeEach ->
-      @toolbar = new Mercury.Toolbar({appendTo: '#test'})
+      @toolbar = new Mercury.Toolbar({appendTo: fixture.el})
 
     it "throws an exception when invalid options are passed", ->
       expect(=> @toolbar.buildButton('foo', false)).toThrow('Unknown button structure -- please provide an array, object, or string for "foo".')
@@ -127,24 +126,24 @@ describe "Mercury.Toolbar", ->
   describe "observed events", ->
 
     beforeEach ->
-      @toolbar = new Mercury.Toolbar({appendTo: '#test'})
+      @toolbar = new Mercury.Toolbar({appendTo: fixture.el})
 
     describe "custom event: region:focused", ->
 
       it "enables toolbars based on the region type", ->
         $('.mercury-editable-toolbar').addClass('disabled')
-        Mercury.trigger('region:focused', {region: {type: 'editable'}})
+        Mercury.trigger('region:focused', {region: {type: -> 'full'}})
         expect($('.mercury.editable-toolbar').hasClass('disabled')).toEqual(false)
 
         $('.mercury-editable-toolbar').addClass('disabled')
-        Mercury.trigger('region:focused', {region: {type: 'markupable'}})
+        Mercury.trigger('region:focused', {region: {type: -> 'markdown'}})
         expect($('.mercury.editable-toolbar').hasClass('disabled')).toEqual(false)
 
     describe "custom event: region:blurred", ->
 
       it "disables toolbars for the region type", ->
         $('.mercury-editable-toolbar').removeClass('disabled')
-        Mercury.trigger('region:blurred', {region: {type: 'editable'}})
+        Mercury.trigger('region:blurred', {region: {type: -> 'full'}})
         expect($('.mercury-editable-toolbar').hasClass('disabled')).toEqual(true)
 
     describe "click", ->
@@ -167,7 +166,7 @@ describe "Mercury.Toolbar", ->
     describe "when visible", ->
 
       beforeEach ->
-        @toolbar = new Mercury.Toolbar({appendTo: '#test', visible: true})
+        @toolbar = new Mercury.Toolbar({appendTo: fixture.el, visible: true})
 
       it "returns the element outerheight", ->
         expect(@toolbar.height()).toEqual($('.mercury-toolbar-container').outerHeight())
@@ -175,18 +174,48 @@ describe "Mercury.Toolbar", ->
     describe "when not visible", ->
 
       beforeEach ->
-        @toolbar = new Mercury.Toolbar({appendTo: '#test', visible: false})
+        @toolbar = new Mercury.Toolbar({appendTo: fixture.el, visible: false})
 
       it "returns 0", ->
         expect(@toolbar.height()).toEqual(0)
 
+    describe "when forced", ->
+
+      beforeEach ->
+        @toolbar = new Mercury.Toolbar({appendTo: fixture.el, visible: false})
+
+      it "returns the element outerheight", ->
+        expect(@toolbar.height(true)).toEqual($('.mercury-toolbar-container').outerHeight())
+
+  describe "#top", ->
+
+    beforeEach ->
+      spyOn(Mercury.Toolbar.prototype, 'buildButton').andCallFake(=> $('<div>'))
+      spyOn(Mercury.Toolbar.prototype, 'bindEvents').andCallFake(=>)
+
+    describe "when visible", ->
+
+      beforeEach ->
+        @toolbar = new Mercury.Toolbar({appendTo: fixture.el, visible: true})
+
+      it "returns the element offests top", ->
+        expect(@toolbar.top()).toEqual($('.mercury-toolbar-container').offset().top)
+
+    describe "when not visible", ->
+
+      beforeEach ->
+        @toolbar = new Mercury.Toolbar({appendTo: fixture.el, visible: false})
+
+      it "returns the element offests top", ->
+        expect(@toolbar.top()).toEqual(0)
+
 
   describe "#show", ->
 
     beforeEach ->
       spyOn(Mercury.Toolbar.prototype, 'buildButton').andCallFake(=> $('<div>'))
       spyOn(Mercury.Toolbar.prototype, 'bindEvents').andCallFake(=>)
-      @toolbar = new Mercury.Toolbar({appendTo: '#test', visible: false})
+      @toolbar = new Mercury.Toolbar({appendTo: fixture.el, visible: false})
 
     it "sets visible to true", ->
       @toolbar.visible = false
@@ -209,7 +238,7 @@ describe "Mercury.Toolbar", ->
     beforeEach ->
       spyOn(Mercury.Toolbar.prototype, 'buildButton').andCallFake(=> $('<div>'))
       spyOn(Mercury.Toolbar.prototype, 'bindEvents').andCallFake(=>)
-      @toolbar = new Mercury.Toolbar({appendTo: '#test', visible: true})
+      @toolbar = new Mercury.Toolbar({appendTo: fixture.el, visible: true})
 
     it "sets visible to false", ->
       @toolbar.visible = true

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

@@ -1,8 +1,7 @@
 describe "Mercury.tooltip", ->
 
-  template 'mercury/tooltip.html'
-
   beforeEach ->
+    fixture.load('mercury/tooltip.html')
     @forElement = $('#for_element')
     $.fx.off = true
 

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

@@ -1,9 +1,10 @@
 describe "Mercury.uploader", ->
 
-  template 'mercury/uploader.html'
-
   beforeEach ->
+    fixture.load('mercury/uploader.html')
     Mercury.config.uploading.enabled = true
+    @fileReaderSupport = spyOn(Mercury.uploader, 'fileReaderSupported')
+    @fileReaderSupport.andCallFake(=> true)
     $.fx.off = true
     @mockFile = {
       size: 1024
@@ -120,7 +121,7 @@ describe "Mercury.uploader", ->
   describe "#build", ->
 
     beforeEach ->
-      Mercury.uploader.options = {appendTo: '#test'}
+      Mercury.uploader.options = {appendTo: fixture.el}
 
     it "builds an element structure", ->
       Mercury.uploader.build()
@@ -158,7 +159,7 @@ describe "Mercury.uploader", ->
   describe "#appear", ->
 
     beforeEach ->
-      Mercury.uploader.options = {appendTo: '#test'}
+      Mercury.uploader.options = {appendTo: fixture.el}
       Mercury.uploader.build()
       @fillDisplaySpy = spyOn(Mercury.uploader, 'fillDisplay').andCallFake(=>)
       @positionSpy = spyOn(Mercury.uploader, 'position').andCallFake(=>)
@@ -174,8 +175,8 @@ describe "Mercury.uploader", ->
 
     it "displays the overlay, and the element", ->
       Mercury.uploader.appear()
-      expect($('#test .mercury-uploader').css('display')).toEqual('block')
-      expect($('#test .mercury-uploader-overlay').css('display')).toEqual('block')
+      expect($('.mercury-uploader', fixture.el).css('display')).toEqual('block')
+      expect($('.mercury-uploader-overlay', fixture.el).css('display')).toEqual('block')
 
     it "sets visible to true", ->
       Mercury.uploader.appear()
@@ -189,7 +190,7 @@ describe "Mercury.uploader", ->
   describe "#position", ->
 
     beforeEach ->
-      Mercury.uploader.options = {appendTo: '#test'}
+      Mercury.uploader.options = {appendTo: fixture.el}
       Mercury.uploader.build()
       @fillDisplaySpy = spyOn(Mercury.uploader, 'fillDisplay').andCallFake(=>)
       @positionSpy = spyOn(Mercury.uploader, 'position').andCallFake(=>)
@@ -198,28 +199,29 @@ describe "Mercury.uploader", ->
       # todo: this isn't really being tested
       Mercury.uploader.element.css({display: 'block'})
       Mercury.uploader.position()
-      @expect($('#test .mercury-uploader').offset()).toEqual({top: 0, left: 0})
+      @expect($('.mercury-uploader', fixture.el).offset()).toEqual({top: 0, left: 0})
 
 
   describe "#fillDisplay", ->
 
     beforeEach ->
-      Mercury.uploader.options = {appendTo: '#test'}
+      Mercury.uploader.options = {appendTo: fixture.el}
       Mercury.uploader.file = {name: 'image.png', size: 1024, type: 'image/png'}
       Mercury.uploader.build()
 
     it "puts the file details into the element", ->
       Mercury.uploader.fillDisplay()
-      expect($('#test .mercury-uploader-details').html()).toEqual('Name: image.png<br>Size: undefined<br>Type: image/png')
+      expect($('.mercury-uploader-details', fixture.el).html()).toEqual('Name: image.png<br>Size: undefined<br>Type: image/png')
 
 
   describe "#loadImage", ->
 
     beforeEach ->
-      Mercury.uploader.options = {appendTo: '#test'}
+      Mercury.uploader.options = {appendTo: fixture.el}
       Mercury.uploader.file = new Mercury.uploader.File(@mockFile)
       Mercury.uploader.build()
       spyOn(FileReader.prototype, 'readAsBinaryString').andCallFake(=>)
+      @fileReaderSupport.andCallFake(=> true)
       @readAsDataURLSpy = spyOn(Mercury.uploader.File.prototype, 'readAsDataURL').andCallFake((callback) => callback('data-url'))
 
     it "calls file.readAsDataURL", ->
@@ -228,7 +230,20 @@ describe "Mercury.uploader", ->
 
     it "sets the preview image src to the file contents", ->
       Mercury.uploader.loadImage()
-      expect($('#test .mercury-uploader-preview img').attr('src')).toEqual('data-url')
+      expect($('.mercury-uploader-preview img', fixture.el).attr('src')).toEqual('data-url')
+
+    it "calls upload", ->
+      spy = spyOn(Mercury.uploader, 'upload').andCallFake(=>)
+      Mercury.uploader.loadImage()
+      expect(spy.callCount).toEqual(1)
+
+  describe "#loadImage without FileReader", ->
+
+    beforeEach ->
+      Mercury.uploader.options = {appendTo: fixture.el}
+      Mercury.uploader.file = new Mercury.uploader.File(@mockFile)
+      Mercury.uploader.build()
+      @fileReaderSupport.andCallFake(=> false)
 
     it "calls upload", ->
       spy = spyOn(Mercury.uploader, 'upload').andCallFake(=>)
@@ -238,61 +253,60 @@ describe "Mercury.uploader", ->
 
   describe "#upload", ->
 
-    # todo: test this
-    it "should build a multipart form and submit it", ->
+    it "should build a multipart form and submit it"
 
 
   describe "#updateStatus", ->
 
     beforeEach ->
-      Mercury.uploader.options = {appendTo: '#test'}
+      Mercury.uploader.options = {appendTo: fixture.el}
       Mercury.uploader.build()
 
     it "updated the message in the progress display", ->
       Mercury.uploader.updateStatus('status message')
-      expect($('#test .mercury-uploader-progress span').html()).toEqual('status message')
+      expect($('.mercury-uploader-progress span', fixture.el).html()).toEqual('status message')
 
     it "updates the progress indicator width", ->
       Mercury.uploader.updateStatus('message', 512)
-      expect($('#test .mercury-uploader-indicator div').css('width')).toEqual('50px')
+      expect($('.mercury-uploader-indicator div', fixture.el).css('width')).toEqual('50px')
 
     it "updates the progress indicator value", ->
       Mercury.uploader.updateStatus('message', 512)
-      expect($('#test .mercury-uploader-indicator b').html()).toEqual('50%')
+      expect($('.mercury-uploader-indicator b', fixture.el).html()).toEqual('50%')
 
 
   describe "#hide", ->
 
     beforeEach ->
       @setTimeoutSpy = spyOn(window, 'setTimeout')
-      Mercury.uploader.options = {appendTo: '#test'}
+      Mercury.uploader.options = {appendTo: fixture.el}
       Mercury.uploader.build()
 
     it "accepts a delay", ->
       @setTimeoutSpy.andCallFake(=>)
       Mercury.uploader.hide(1)
       expect(@setTimeoutSpy.callCount).toEqual(1)
-      expect(@setTimeoutSpy.argsForCall[0][0]).toEqual(1000)
+      expect(@setTimeoutSpy.argsForCall[0][1]).toEqual(1000)
 
     it "hides the overlay and element", ->
-      @setTimeoutSpy.andCallFake((timeout, callback) => callback())
+      @setTimeoutSpy.andCallFake((callback, timeout) => callback())
       Mercury.uploader.hide()
-      expect($('#test .mercury-uploader').css('opacity')).toEqual('0')
-      expect($('#test .mercury-uploader-overlay').css('opacity')).toEqual('0')
+      expect($('.mercury-uploader', fixture.el).css('opacity')).toEqual('0')
+      expect($('.mercury-uploader-overlay', fixture.el).css('opacity')).toEqual('0')
 
     it "calls reset", ->
-      @setTimeoutSpy.andCallFake((timeout, callback) => callback())
+      @setTimeoutSpy.andCallFake((callback, timeout) => callback())
       spy = spyOn(Mercury.uploader, 'reset').andCallFake(=>)
       Mercury.uploader.hide()
       expect(spy.callCount).toEqual(1)
 
     it "sets visible to false", ->
-      @setTimeoutSpy.andCallFake((timeout, callback) => callback())
+      @setTimeoutSpy.andCallFake((callback, timeout) => callback())
       Mercury.uploader.hide()
       expect(Mercury.uploader.visible).toEqual(false)
 
     it "focuses the frame", ->
-      @setTimeoutSpy.andCallFake((timeout, callback) => callback())
+      @setTimeoutSpy.andCallFake((callback, timeout) => callback())
       spy = spyOn(Mercury, 'trigger').andCallFake(=>)
       Mercury.uploader.hide()
       expect(spy.callCount).toEqual(1)
@@ -302,20 +316,20 @@ describe "Mercury.uploader", ->
   describe "#reset", ->
 
     beforeEach ->
-      Mercury.uploader.options = {appendTo: '#test'}
+      Mercury.uploader.options = {appendTo: fixture.el}
       Mercury.uploader.build()
 
     it "removes the preview image", ->
-      $('#test .mercury-uploader-indicator div').html('foo')
+      $('.mercury-uploader-indicator div', fixture.el).html('foo')
       Mercury.uploader.reset()
-      expect($('#test .mercury-uploader-preview b').html()).toEqual('')
+      expect($('.mercury-uploader-preview b', fixture.el).html()).toEqual('')
 
     it "resets the progress back to 0", ->
-      $('#test .mercury-uploader-indicator div').css({width: '50%'})
-      $('#test .mercury-uploader-indicator b').html('50%')
+      $('.mercury-uploader-indicator div', fixture.el).css({width: '50%'})
+      $('.mercury-uploader-indicator b', fixture.el).html('50%')
       Mercury.uploader.reset()
-      expect($('#test .mercury-uploader-indicator div').css('width')).toEqual('0px')
-      expect($('#test .mercury-uploader-indicator b').html()).toEqual('0%')
+      expect($('.mercury-uploader-indicator div', fixture.el).css('width')).toEqual('0px')
+      expect($('.mercury-uploader-indicator b', fixture.el).html()).toEqual('0%')
 
     it "sets the status back to 'Processing...' for next time", ->
       spy = spyOn(Mercury.uploader, 'updateStatus').andCallFake(=>)

data/spec/javascripts/spec_helper.coffee

@@ -0,0 +1,4 @@
+#= require jquery-1.7
+#= require support/event_simulation
+#
+#= require mercury

data/spec/javascripts/{spec_helper.js → support/event_simulation.js}

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

data/spec/teabag_env.rb

@@ -0,0 +1,32 @@
+# This file allows you to override various Teabag configuration directives when running from the command line. It is not
+# required from within the Rails environment, so overriding directives that have been defined within the initializer
+# is not possible.
+#
+# Set RAILS_ROOT and load the environment.
+ENV["RAILS_ROOT"] = File.expand_path("../dummy", __FILE__)
+require File.expand_path("../dummy/config/environment", __FILE__)
+
+# Provide default configuration.
+#
+# You can override various configuration directives defined here by using arguments with the teabag command.
+#
+# teabag --driver=selenium --suppress-log
+# rake teabag DRIVER=selenium SUPPRESS_LOG=false
+Teabag.setup do |config|
+  # Driver
+  #config.driver           = "phantomjs" # available: phantomjs, selenium
+
+  # Behaviors
+  #config.server_timeout   = 20 # timeout for starting the server
+  #config.server_port      = nil # defaults to any open port unless specified
+  #config.fail_fast        = true # abort after the first failing suite
+
+  # Output
+  #config.formatters       = "dot" # available: dot, tap_y, swayze_or_oprah
+  config.suppress_log      = true # suppress logs coming from console[log/error/debug]
+  #config.color            = true
+
+  # Coverage (requires istanbul -- https://github.com/gotwarlost/istanbul)
+  #config.coverage         = true
+  #config.coverage_reports = "text,html,cobertura"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kiteditor
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -268,6 +268,38 @@ 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
@@ -278,19 +310,25 @@ 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
@@ -311,85 +349,125 @@ 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/controllers/mercury/images_controller.rb
+- 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_controller.rb
-- app/models/mercury/image.rb
+- app/helpers/mercury_helper.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
@@ -409,42 +487,116 @@ files:
 - app/views/mercury/selects/style.html
 - app/views/mercury/snippets/example/options.html.erb
 - app/views/mercury/snippets/example/preview.html.erb
-- db/migrate/20110526035601_create_mercury_images.rb
+- app/views/mercury/snippets/no_options/preview.html.erb
 - 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/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/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/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/javascripts/mercury/dialog_spec.js.coffee
+- 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/dialogs/backcolor_spec.js.coffee
 - spec/javascripts/mercury/dialogs/forecolor_spec.js.coffee
 - spec/javascripts/mercury/dialogs/formatblock_spec.js.coffee
@@ -465,9 +617,11 @@ 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/editable_spec.js.coffee
-- spec/javascripts/mercury/regions/markupable_spec.js.coffee
-- spec/javascripts/mercury/regions/snippetable_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/select_spec.js.coffee
 - spec/javascripts/mercury/snippet_spec.js.coffee
 - spec/javascripts/mercury/snippet_toolbar_spec.js.coffee
@@ -479,38 +633,9 @@ 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.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
+- spec/javascripts/spec_helper.coffee
+- spec/javascripts/support/event_simulation.js
+- spec/teabag_env.rb
 homepage: http://github.com/dsc-os/kiteditor
 licenses:
 - MIT
@@ -537,39 +662,111 @@ 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/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/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/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/javascripts/mercury/dialog_spec.js.coffee
+- 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/dialogs/backcolor_spec.js.coffee
 - spec/javascripts/mercury/dialogs/forecolor_spec.js.coffee
 - spec/javascripts/mercury/dialogs/formatblock_spec.js.coffee
@@ -590,9 +787,11 @@ 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/editable_spec.js.coffee
-- spec/javascripts/mercury/regions/markupable_spec.js.coffee
-- spec/javascripts/mercury/regions/snippetable_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/select_spec.js.coffee
 - spec/javascripts/mercury/snippet_spec.js.coffee
 - spec/javascripts/mercury/snippet_toolbar_spec.js.coffee
@@ -604,35 +803,6 @@ 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.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
+- spec/javascripts/spec_helper.coffee
+- spec/javascripts/support/event_simulation.js
+- spec/teabag_env.rb