mercury-rails 0.1.1 → 0.1.2

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

@@ -5,8 +5,4 @@
     = csrf_meta_tags
     = stylesheet_link_tag "mercury"
     = javascript_include_tag "mercury"
-    -#:javascript
-    -#  Mercury.Snippet.load({
-    -#    'snippet_1': {name: 'example', options: {'options[favorite_beer]': "miller_lite", 'options[first_name]': "1"}},
-    -#  });
   %body= javascript_tag 'new Mercury.PageEditor()'

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

@@ -1,4 +1,4 @@
-%form#mercury_insertcharacter{ style: 'width:456px' }
+%form#mercury_insertCharacter{ style: 'width:456px' }
 
   .mercury-modal-pane-container
     .mercury-modal-pane

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

@@ -1,4 +1,4 @@
-= semantic_form_for 'htmleditor', { html: { id: 'mercury_htmleditor', style: 'width:650px' } } do |f|
+= semantic_form_for 'htmlEditor', { html: { id: 'mercury_htmlEditor', style: 'width:650px' } } do |f|
 
   %textarea.mercury-modal-pane-container{ rows: '5' }
 

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

@@ -19,23 +19,23 @@
         = f.inputs do
           %li{ class: "select input optional", id: "table_rows_input" }
             %label{ for: "table_rows" } Rows
-            %input{ type: 'button', name: 'insertrowbefore', class: 'action', value: 'Add Before' }/
-            %input{ type: 'button', name: 'insertrowafter', class: 'action', value: 'Add After' }/
-            %input{ type: 'button', name: 'deleterow', class: 'action', value: 'Remove' }/
+            %input{ type: 'button', name: 'insertRowBefore', class: 'action', value: 'Add Before' }/
+            %input{ type: 'button', name: 'insertRowAfter', class: 'action', value: 'Add After' }/
+            %input{ type: 'button', name: 'deleteRow', class: 'action', value: 'Remove' }/
           %li{ class: "select input optional", id: "table_columns_input" }
             %label{ for: "table_columns" } Columns
-            %input{ type: 'button', name: 'insertcolumnbefore', class: 'action', value: 'Add Before' }/
-            %input{ type: 'button', name: 'insertcolumnafter', class: 'action', value: 'Add After' }/
-            %input{ type: 'button', name: 'deletecolumn', class: 'action', value: 'Remove' }/
+            %input{ type: 'button', name: 'insertColumnBefore', class: 'action', value: 'Add Before' }/
+            %input{ type: 'button', name: 'insertColumnAfter', class: 'action', value: 'Add After' }/
+            %input{ type: 'button', name: 'deleteColumn', class: 'action', value: 'Remove' }/
           %hr
           %li{ class: "select input optional", id: "table_row_adjust_input" }
             %label{ for: "table_row_adjust" } Row Span
-            %input{ type: 'button', name: 'increaserowspan', class: 'action', value: '+' }/
-            %input{ type: 'button', name: 'decreaserowspan', class: 'action', value: '-' }/
+            %input{ type: 'button', name: 'increaseRowspan', class: 'action', value: '+' }/
+            %input{ type: 'button', name: 'decreaseRowspan', class: 'action', value: '-' }/
           %li{ class: "select input optional", id: "table_column_adjust_input" }
             %label{ for: "table_column_adjust" } Column Span
-            %input{ type: 'button', name: 'increasecolspan', class: 'action', value: '+' }/
-            %input{ type: 'button', name: 'decreasecolspan', class: 'action', value: '-' }/
+            %input{ type: 'button', name: 'increaseColspan', class: 'action', value: '+' }/
+            %input{ type: 'button', name: 'decreaseColspan', class: 'action', value: '-' }/
 
         = f.inputs 'Options' do
           = f.input :alignment, as: :select, required: false, include_blank: 'None',

data/config/routes.rb

@@ -2,8 +2,8 @@ Rails.application.routes.draw do
 
   resources :images
 
-  match '/edit(/*requested_uri)' => "mercury#edit"
-  namespace :mercury do
+  match '/editor(/*requested_uri)' => "mercury#edit"
+  scope '/mercury' do
     match ':type/:resource' => "mercury#resource"
     match 'snippets/:name/options' => "mercury#snippet_options"
     match 'snippets/:name/preview' => "mercury#snippet_preview"

data/mercury-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mercury-rails}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Jackson"]
-  s.date = %q{2011-06-19}
+  s.date = %q{2011-06-21}
   s.description = %q{A fully featured and advanced HTML5 WYSIWYG editor written in CoffeeScript on top of Rails 3.1}
   s.email = %q{jejacks0n@gmail.com}
   s.extra_rdoc_files = [
@@ -79,7 +79,7 @@ Gem::Specification.new do |s|
     "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/websocket.js.coffee",
+    "app/assets/javascripts/mercury_loader.js",
     "app/assets/stylesheets/mercury.css",
     "app/assets/stylesheets/mercury/dialog.scss",
     "app/assets/stylesheets/mercury/mercury.scss",
@@ -138,8 +138,8 @@ Gem::Specification.new do |s|
     "spec/javascripts/mercury/palette_spec.js.coffee",
     "spec/javascripts/mercury/panel_spec.js.coffee",
     "spec/javascripts/mercury/region_spec.js.coffee",
-    "spec/javascripts/mercury/regions/_editable_.js.coffee",
     "spec/javascripts/mercury/regions/_markupable_.js.coffee",
+    "spec/javascripts/mercury/regions/editable_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",
@@ -170,6 +170,7 @@ Gem::Specification.new do |s|
     "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",
@@ -183,12 +184,8 @@ Gem::Specification.new do |s|
     "spec/javascripts/templates/mercury/tooltip.html",
     "spec/javascripts/templates/mercury/uploader.html",
     "vendor/assets/javascripts/jquery-1.6.js",
-    "vendor/assets/javascripts/jquery-ui-1.8.13.custom.min.js",
-    "vendor/assets/javascripts/jquery-ui-1.8.13.sortable.custom.js",
-    "vendor/assets/javascripts/jquery.easing.js",
-    "vendor/assets/javascripts/jquery.json2.js",
-    "vendor/assets/javascripts/jquery.serialize_object.js",
-    "vendor/assets/javascripts/jquery.ujs.js",
+    "vendor/assets/javascripts/jquery-ui-1.8.13.custom.js",
+    "vendor/assets/javascripts/jquery.additions.js",
     "vendor/assets/javascripts/liquidmetal.js",
     "vendor/assets/javascripts/showdown.js"
   ]
@@ -203,47 +200,47 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, ["= 3.1.0.rc4"])
-      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
-      s.add_runtime_dependency(%q<sqlite3>, [">= 0"])
       s.add_runtime_dependency(%q<paperclip>, [">= 0"])
       s.add_runtime_dependency(%q<formtastic>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<sass-rails>, ["~> 3.1.0.rc"])
       s.add_runtime_dependency(%q<coffee-script>, [">= 0"])
-      s.add_runtime_dependency(%q<uglifier>, [">= 0"])
       s.add_runtime_dependency(%q<haml>, [">= 0"])
-      s.add_runtime_dependency(%q<jquery-rails>, [">= 0"])
+      s.add_development_dependency(%q<uglifier>, [">= 0"])
+      s.add_development_dependency(%q<jquery-rails>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<thin>, [">= 0"])
       s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
       s.add_development_dependency(%q<evergreen>, [">= 0"])
     else
       s.add_dependency(%q<rails>, ["= 3.1.0.rc4"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<paperclip>, [">= 0"])
       s.add_dependency(%q<formtastic>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<sass-rails>, ["~> 3.1.0.rc"])
       s.add_dependency(%q<coffee-script>, [">= 0"])
-      s.add_dependency(%q<uglifier>, [">= 0"])
       s.add_dependency(%q<haml>, [">= 0"])
+      s.add_dependency(%q<uglifier>, [">= 0"])
       s.add_dependency(%q<jquery-rails>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<thin>, [">= 0"])
       s.add_dependency(%q<ruby-debug19>, [">= 0"])
       s.add_dependency(%q<evergreen>, [">= 0"])
     end
   else
     s.add_dependency(%q<rails>, ["= 3.1.0.rc4"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<paperclip>, [">= 0"])
     s.add_dependency(%q<formtastic>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<sass-rails>, ["~> 3.1.0.rc"])
     s.add_dependency(%q<coffee-script>, [">= 0"])
-    s.add_dependency(%q<uglifier>, [">= 0"])
     s.add_dependency(%q<haml>, [">= 0"])
+    s.add_dependency(%q<uglifier>, [">= 0"])
     s.add_dependency(%q<jquery-rails>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<thin>, [">= 0"])
     s.add_dependency(%q<ruby-debug19>, [">= 0"])
     s.add_dependency(%q<evergreen>, [">= 0"])

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

@@ -1,12 +1,12 @@
 require '/assets/mercury/mercury.js'
 
-describe "Mercury.dialogHandlers.backcolor", ->
+describe "Mercury.dialogHandlers.backColor", ->
 
   template 'mercury/dialogs/backcolor.html'
 
   beforeEach ->
     @dialog = {element: $('#test'), button: $('#button')}
-    Mercury.dialogHandlers.backcolor.call(@dialog)
+    Mercury.dialogHandlers.backColor.call(@dialog)
 
   describe "when a .picker or .last-picked element is clicked", ->
 
@@ -28,7 +28,7 @@ describe "Mercury.dialogHandlers.backcolor", ->
       spy = spyOn(Mercury, 'trigger').andCallFake(=>)
       jasmine.simulate.click($('#white').get(0))
       expect(spy.callCount).toEqual(1)
-      expect(spy.argsForCall[0]).toEqual(['action', {action: 'backcolor', value: 'rgb(255, 255, 255)'}])
+      expect(spy.argsForCall[0]).toEqual(['action', {action: 'backColor', value: 'rgb(255, 255, 255)'}])
 
 
   describe "when any other element is clicked", ->

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

@@ -1,12 +1,12 @@
 require '/assets/mercury/mercury.js'
 
-describe "Mercury.dialogHandlers.forecolor", ->
+describe "Mercury.dialogHandlers.foreColor", ->
 
   template 'mercury/dialogs/forecolor.html'
 
   beforeEach ->
     @dialog = {element: $('#test'), button: $('#button')}
-    Mercury.dialogHandlers.forecolor.call(@dialog)
+    Mercury.dialogHandlers.foreColor.call(@dialog)
 
   describe "when a .picker or .last-picked element is clicked", ->
 
@@ -28,7 +28,7 @@ describe "Mercury.dialogHandlers.forecolor", ->
       spy = spyOn(Mercury, 'trigger').andCallFake(=>)
       jasmine.simulate.click($('#white').get(0))
       expect(spy.callCount).toEqual(1)
-      expect(spy.argsForCall[0]).toEqual(['action', {action: 'forecolor', value: 'rgb(255, 255, 255)'}])
+      expect(spy.argsForCall[0]).toEqual(['action', {action: 'foreColor', value: 'rgb(255, 255, 255)'}])
 
 
   describe "when any other element is clicked", ->

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

@@ -1,12 +1,12 @@
 require '/assets/mercury/mercury.js'
 
-describe "Mercury.dialogHandlers.backcolor", ->
+describe "Mercury.dialogHandlers.backColor", ->
 
   template 'mercury/dialogs/objectspanel.html'
 
   beforeEach ->
     @dialog = {element: $('#test'), button: $('#button')}
-    Mercury.dialogHandlers.objectspanel.call(@dialog)
+    Mercury.dialogHandlers.objectsPanel.call(@dialog)
 
   describe "filter", ->
 
@@ -29,4 +29,4 @@ describe "Mercury.dialogHandlers.backcolor", ->
 
   describe "dragging an image with a data-snippet attribute", ->
 
-    it "sets the active snippet", ->
+    it "sets the active snippet", ->

data/spec/javascripts/mercury/modals/htmleditor_spec.js.coffee

@@ -1,6 +1,6 @@
 require '/assets/mercury/mercury.js'
 
-describe "Mercury.modalHandlers.htmleditor", ->
+describe "Mercury.modalHandlers.htmlEditor", ->
 
   template 'mercury/modals/htmleditor.html'
 
@@ -9,8 +9,8 @@ describe "Mercury.modalHandlers.htmleditor", ->
       element: $('#test')
       hide: ->
     Mercury.region =
-      html: -> '<span>html \ncontent</span>'
-    Mercury.modalHandlers.htmleditor.call(@modal)
+      content: -> '<span>html \ncontent</span>'
+    Mercury.modalHandlers.htmlEditor.call(@modal)
 
   describe "loading", ->
 
@@ -29,4 +29,4 @@ describe "Mercury.modalHandlers.htmleditor", ->
     it "hides the modal", ->
       spy = spyOn(@modal, 'hide').andCallFake(=>)
       jasmine.simulate.click($('#submit').get(0))
-      expect(spy.callCount).toEqual(1)
+      expect(spy.callCount).toEqual(1)

data/spec/javascripts/mercury/modals/insertcharacter_spec.js.coffee

@@ -1,6 +1,6 @@
 require '/assets/mercury/mercury.js'
 
-describe "Mercury.modalHandlers.insertcharacter", ->
+describe "Mercury.modalHandlers.insertCharacter", ->
 
   template 'mercury/modals/insertcharacter.html'
 
@@ -8,7 +8,7 @@ describe "Mercury.modalHandlers.insertcharacter", ->
     @modal =
       element: $('#test')
     @modalHideSpy = spyOn(Mercury.modal, 'hide').andCallFake(=>)
-    Mercury.modalHandlers.insertcharacter.call(@modal)
+    Mercury.modalHandlers.insertCharacter.call(@modal)
 
   describe "clicking on a character", ->
 

data/spec/javascripts/mercury/modals/insertlink_spec.js.coffee

@@ -1,6 +1,6 @@
 require '/assets/mercury/mercury.js'
 
-describe "Mercury.modalHandlers.insertlink", ->
+describe "Mercury.modalHandlers.insertLink", ->
 
   template 'mercury/modals/insertlink.html'
 
@@ -15,7 +15,7 @@ describe "Mercury.modalHandlers.insertlink", ->
   describe "initializing", ->
 
     beforeEach ->
-      Mercury.modalHandlers.insertlink.call(@modal)
+      Mercury.modalHandlers.insertLink.call(@modal)
 
     it "loads all links with a name into the existing bookmarks pulldown", ->
       options = $('#link_existing_bookmark').html()
@@ -27,7 +27,7 @@ describe "Mercury.modalHandlers.insertlink", ->
   describe "clicking on a radio button (in a label)", ->
 
     beforeEach ->
-      Mercury.modalHandlers.insertlink.call(@modal)
+      Mercury.modalHandlers.insertLink.call(@modal)
 
     it "focuses the next input with a selectable class", ->
       spy = spyOn($.fn, 'focus').andCallFake(=>)
@@ -38,7 +38,7 @@ describe "Mercury.modalHandlers.insertlink", ->
   describe "focusing an input", ->
 
     beforeEach ->
-      Mercury.modalHandlers.insertlink.call(@modal)
+      Mercury.modalHandlers.insertLink.call(@modal)
 
     it "checks the corresponding checkbox", ->
       $('#link_existing_bookmark').focus()
@@ -57,7 +57,7 @@ describe "Mercury.modalHandlers.insertlink", ->
 
       beforeEach ->
         Mercury.region = selection: => {commonAncestor: -> $('<a>', {href: 'http://cnn.com', target: '_top'}).html('foo')}
-        Mercury.modalHandlers.insertlink.call(@modal)
+        Mercury.modalHandlers.insertLink.call(@modal)
 
       it "hides the link text input", ->
         expect($('#link_text_container').css('display')).toEqual('none')
@@ -72,7 +72,7 @@ describe "Mercury.modalHandlers.insertlink", ->
 
       beforeEach ->
         Mercury.region = selection: => {commonAncestor: -> $('<a>', {href: "javascript:void(window.open('http://cnn.com', 'popup_window', 'width=100,height=42,menubar=no,toolbar=no'))"}).html('foo')}
-        Mercury.modalHandlers.insertlink.call(@modal)
+        Mercury.modalHandlers.insertLink.call(@modal)
 
       it "hides the link text input", ->
         expect($('#link_text_container').css('display')).toEqual('none')
@@ -91,7 +91,7 @@ describe "Mercury.modalHandlers.insertlink", ->
 
       beforeEach ->
         Mercury.region = selection: => {commonAncestor: -> $('<a>', {href: '#link2'}).html('foo')}
-        Mercury.modalHandlers.insertlink.call(@modal)
+        Mercury.modalHandlers.insertLink.call(@modal)
 
       it "hides the link text input", ->
         expect($('#link_text_container').css('display')).toEqual('none')
@@ -106,7 +106,7 @@ describe "Mercury.modalHandlers.insertlink", ->
 
       beforeEach ->
         Mercury.region = selection: => {commonAncestor: -> $('<a>', {name: 'link3'}).html('foo')}
-        Mercury.modalHandlers.insertlink.call(@modal)
+        Mercury.modalHandlers.insertLink.call(@modal)
 
       it "hides the link text input", ->
         expect($('#link_text_container').css('display')).toEqual('none')
@@ -123,7 +123,7 @@ describe "Mercury.modalHandlers.insertlink", ->
     describe "a new link", ->
 
       beforeEach ->
-        Mercury.modalHandlers.insertlink.call(@modal)
+        Mercury.modalHandlers.insertLink.call(@modal)
         @triggerSpy = spyOn(Mercury, 'trigger').andCallFake(=>)
         $('#link_text').val('foo')
 
@@ -191,7 +191,7 @@ describe "Mercury.modalHandlers.insertlink", ->
       beforeEach ->
         @existingLink = $('<a>', {name: 'link3'}).html('foo')
         Mercury.region = selection: => {commonAncestor: => @existingLink}
-        Mercury.modalHandlers.insertlink.call(@modal)
+        Mercury.modalHandlers.insertLink.call(@modal)
         @triggerSpy = spyOn(Mercury, 'trigger').andCallFake(=>)
         $('#link_text').val('foo')
 

data/spec/javascripts/mercury/modals/insertmedia_spec.js.coffee

@@ -1,6 +1,6 @@
 require '/assets/mercury/mercury.js'
 
-describe "Mercury.modalHandlers.insertmedia", ->
+describe "Mercury.modalHandlers.insertMedia", ->
 
   template 'mercury/modals/insertmedia.html'
 
@@ -14,7 +14,7 @@ describe "Mercury.modalHandlers.insertmedia", ->
   describe "clicking on a radio button (in a label)", ->
 
     beforeEach ->
-      Mercury.modalHandlers.insertmedia.call(@modal)
+      Mercury.modalHandlers.insertMedia.call(@modal)
 
     it "focuses the next input with a selectable class", ->
       spy = spyOn($.fn, 'focus').andCallFake(=>)
@@ -24,7 +24,7 @@ describe "Mercury.modalHandlers.insertmedia", ->
   describe "focusing an input", ->
 
     beforeEach ->
-      Mercury.modalHandlers.insertmedia.call(@modal)
+      Mercury.modalHandlers.insertMedia.call(@modal)
 
     it "checks the corresponding checkbox", ->
       $('#media_youtube_url').focus()
@@ -53,7 +53,7 @@ describe "Mercury.modalHandlers.insertmedia", ->
         @focusSpy = spyOn($.fn, 'focus').andCallThrough()
         @selection = {is: -> $('<img>', {src: '/foo.gif', align: 'right'})}
         Mercury.region = selection: => @selection
-        Mercury.modalHandlers.insertmedia.call(@modal)
+        Mercury.modalHandlers.insertMedia.call(@modal)
 
       it "pre-fills the image url", ->
         expect($('#media_image_url').val()).toEqual('/foo.gif')
@@ -71,7 +71,7 @@ describe "Mercury.modalHandlers.insertmedia", ->
         @focusSpy = spyOn($.fn, 'focus').andCallThrough()
         @selection = {is: -> $('<iframe>', {src: 'http://www.youtube.com/embed/foo?wmode=transparent', style: 'width:100px;height:42px'})}
         Mercury.region = selection: => @selection
-        Mercury.modalHandlers.insertmedia.call(@modal)
+        Mercury.modalHandlers.insertMedia.call(@modal)
 
       it "pre-fills the url", ->
         expect($('#media_youtube_url').val()).toEqual('http://youtu.be/foo')
@@ -91,7 +91,7 @@ describe "Mercury.modalHandlers.insertmedia", ->
         @focusSpy = spyOn($.fn, 'focus').andCallThrough()
         @selection = {is: -> $('<iframe>', {src: 'http://player.vimeo.com/video/foo?title=1&byline=1&portrait=0&color=ffffff', style: 'width:100px;height:42px'})}
         Mercury.region = selection: => @selection
-        Mercury.modalHandlers.insertmedia.call(@modal)
+        Mercury.modalHandlers.insertMedia.call(@modal)
 
       it "pre-fills the url", ->
         expect($('#media_vimeo_url').val()).toEqual('http://vimeo.com/foo')
@@ -109,7 +109,7 @@ describe "Mercury.modalHandlers.insertmedia", ->
   describe "submitting", ->
 
     beforeEach ->
-      Mercury.modalHandlers.insertmedia.call(@modal)
+      Mercury.modalHandlers.insertMedia.call(@modal)
       @triggerSpy = spyOn(Mercury, 'trigger').andCallFake(=>)
 
     it "hides the modal", ->

data/spec/javascripts/mercury/modals/insertsnippet_spec.js.coffee

@@ -1,6 +1,6 @@
 require '/assets/mercury/mercury.js'
 
-describe "Mercury.modalHandlers.insertsnippet", ->
+describe "Mercury.modalHandlers.insertSnippet", ->
 
   template 'mercury/modals/insertsnippet.html'
 
@@ -13,7 +13,7 @@ describe "Mercury.modalHandlers.insertsnippet", ->
       element: $('#test')
       hide: ->
       options: {snippetName: 'test'}
-    Mercury.modalHandlers.insertsnippet.call(@modal)
+    Mercury.modalHandlers.insertSnippet.call(@modal)
 
   describe "submitting", ->
 
@@ -37,7 +37,7 @@ describe "Mercury.modalHandlers.insertsnippet", ->
         spy = spyOn(Mercury, 'trigger').andCallFake(=>)
         jasmine.simulate.click($('#submit').get(0))
         expect(spy.callCount).toEqual(1)
-        expect(spy.argsForCall[0]).toEqual(['action', {action: 'insertsnippet', value: Mercury.Snippet.all[0]}])
+        expect(spy.argsForCall[0]).toEqual(['action', {action: 'insertSnippet', value: Mercury.Snippet.all[0]}])
 
     describe "if there's no active snippet", ->
 
@@ -51,4 +51,4 @@ describe "Mercury.modalHandlers.insertsnippet", ->
         spy = spyOn(Mercury, 'trigger').andCallFake(=>)
         jasmine.simulate.click($('#submit').get(0))
         expect(spy.callCount).toEqual(1)
-        expect(spy.argsForCall[0]).toEqual(['action', {action: 'insertsnippet', value: Mercury.Snippet.all[1]}])
+        expect(spy.argsForCall[0]).toEqual(['action', {action: 'insertSnippet', value: Mercury.Snippet.all[1]}])