mercury-rails 0.2.0 → 0.2.3

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

@@ -12,16 +12,16 @@ describe "Mercury", ->
 
   describe "#bind", ->
 
-    it "binds an event prefixed with 'mercury:' to document", ->
+    it "binds an event prefixed with 'mercury:' to the top window", ->
       callCount = 0
       Mercury.bind('test', -> callCount += 1)
-      $(document).trigger("mercury:test")
+      $(top).trigger("mercury:test")
       expect(callCount).toEqual(1)
 
 
   describe "#trigger", ->
 
-    it "triggers an event prefixed with 'mercury:' on document", ->
+    it "triggers an event prefixed with 'mercury:' on the top window", ->
       argsForCall = []
       callCount = 0
       Mercury.bind('test', -> argsForCall[callCount] = arguments; callCount += 1)

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

@@ -11,8 +11,8 @@ describe "Mercury.modal", ->
   afterEach ->
     Mercury.modal.initialized = false
     Mercury.modal.visible = false
-    $(document).unbind('mercury:refresh')
-    $(document).unbind('mercury:resize')
+    $(window).unbind('mercury:refresh')
+    $(window).unbind('mercury:resize')
     $(document).unbind('keydown')
 
   describe "singleton method", ->

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

@@ -15,30 +15,6 @@ describe "String", ->
       expect('rgb(255, 255, 0)'.toHex()).toEqual('#FFFF00')
 
 
-  describe "#singleDiff", ->
-
-    it "takes a string to compare against, and returns the first diff it comes to", ->
-      expect('abcdefg'.singleDiff('ab[diff]cdefg')).toEqual('[diff]')
-      expect('abcd/e\\f.g'.singleDiff('ab[diff]cd/e\\f.g')).toEqual('[diff]')
-
-
-  describe "#regExpEscape", ->
-
-    it "escapes characters used in regular expressions", ->
-      expect('/.*+?|()[]{}\\'.regExpEscape()).toEqual('\\/\\.\\*\\+\\?\\|\\(\\)\\[\\]\\{\\}\\\\')
-
-  describe "#sanitizeHTML", ->
-
-    it "removes style tags", ->
-      expect('123<style></style>456'.sanitizeHTML()).toEqual('123456')
-
-    it "removes comment tags", ->
-      expect('123<!--this is a comment-->456'.sanitizeHTML()).toEqual('123456')
-
-    it "replaces new lines with br tags", ->
-      expect('123\n456'.sanitizeHTML()).toEqual('123<br/>456')
-
-
 describe "Number", ->
 
   describe "#toHex", ->

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

@@ -4,17 +4,20 @@ describe "Mercury.PageEditor", ->
 
   template 'mercury/page_editor.html'
 
+  beforeEach ->
+    Mercury.config.regionClass = 'custom-region-class'
+
   afterEach ->
     @pageEditor = null
     delete(@pageEditor)
     window.mercuryInstance = null
-    $(document).unbind('mercury:initialize:frame')
-    $(document).unbind('mercury:focus:frame')
-    $(document).unbind('mercury:focus:window')
-    $(document).unbind('mercury:toggle:interface')
-    $(document).unbind('mercury:action')
-    $(document).unbind('mousedown')
+    $(window).unbind('mercury:initialize:frame')
+    $(window).unbind('mercury:focus:frame')
+    $(window).unbind('mercury:focus:window')
+    $(window).unbind('mercury:toggle:interface')
+    $(window).unbind('mercury:action')
     $(window).unbind('resize')
+    $(document).unbind('mousedown')
 
   describe "constructor", ->
 
@@ -76,7 +79,7 @@ describe "Mercury.PageEditor", ->
 
     it "builds a focusable element (so we can get focus off the iframe)", ->
       @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test')})
-      expect($('input[type=text]').length).toEqual(1)
+      expect($('input.mercury-focusable[type=text]').length).toEqual(1)
 
     it "builds an iframe", ->
       @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test')})
@@ -130,7 +133,13 @@ describe "Mercury.PageEditor", ->
     it "injects mercury namespace into the iframe", ->
       @finalizeInterfaceSpy.andCallFake(=>)
       @pageEditor.initializeFrame()
-      expect(@pageEditor.iframe.get(0).contentWindow.Mercury).toEqual(Mercury)
+      expect(@pageEditor.iframe.get(0).contentWindow.Mercury).toEqual(window.Mercury)
+
+    it "provides the iframe with History (history.js)", ->
+      @finalizeInterfaceSpy.andCallFake(=>)
+      window.History = {Adapter: 'foo'}
+      @pageEditor.initializeFrame()
+      expect(@pageEditor.iframe.get(0).contentWindow.History).toEqual(window.History)
 
     it "calls bindEvents", ->
       @finalizeInterfaceSpy.andCallFake(=>)
@@ -152,13 +161,37 @@ describe "Mercury.PageEditor", ->
       @pageEditor.initializeFrame()
       expect(@finalizeInterfaceSpy.callCount).toEqual(1)
 
-    it "fires the ready event", ->
+    it "fires the ready event (Mercury.trigger)", ->
       spy = spyOn(Mercury, 'trigger').andCallFake(=>)
       @finalizeInterfaceSpy.andCallFake(=>)
       @pageEditor.initializeFrame()
       expect(spy.callCount).toEqual(1)
       expect(spy.argsForCall[0]).toEqual(['ready'])
 
+    it "fires the ready event (jQuery.trigger)", ->
+      spy = spyOn(jQuery.fn, 'trigger').andCallFake(=>)
+      @finalizeInterfaceSpy.andCallFake(=>)
+      @pageEditor.initializeFrame()
+      expect(spy.callCount).toEqual(2)
+      expect(spy.argsForCall[0]).toEqual(['mercury:ready', undefined])
+
+    it "fires the ready event (Event.fire)", ->
+      @finalizeInterfaceSpy.andCallFake(=>)
+      iframeWindow = @pageEditor.iframe.get(0).contentWindow
+      iframeWindow.Event = {fire: ->}
+      spy = spyOn(iframeWindow.Event, 'fire').andCallFake(=>)
+      @pageEditor.initializeFrame()
+      expect(spy.callCount).toEqual(1)
+      expect(spy.argsForCall[0][1]).toEqual('mercury:ready')
+
+    it "calls onMercuryReady in the iframe", ->
+      @finalizeInterfaceSpy.andCallFake(=>)
+      iframeWindow = @pageEditor.iframe.get(0).contentWindow
+      iframeWindow.onMercuryReady = ->
+      spy = spyOn(iframeWindow, 'onMercuryReady').andCallFake(=>)
+      @pageEditor.initializeFrame()
+      expect(spy.callCount).toEqual(1)
+
     it "shows the iframe", ->
       @pageEditor.iframe.css({visibility: 'visible'})
       @finalizeInterfaceSpy.andCallFake(=>)
@@ -228,7 +261,11 @@ describe "Mercury.PageEditor", ->
       @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test')})
       @highjackLinksAndFormsSpy = spyOn(Mercury.PageEditor.prototype, 'hijackLinksAndForms').andCallFake(=>)
 
-    it "it builds a snippetToolbar", ->
+    it "injects an sanitizing element used for sanitizing content", ->
+      @pageEditor.finalizeInterface()
+      expect($('#mercury_sanitizer[contenteditable]').length).toEqual(1)
+
+    it "builds a snippetToolbar", ->
       @pageEditor.finalizeInterface()
       expect(@pageEditor.snippetToolbar).toEqual({snippetToolbar: true})
 
@@ -403,7 +440,6 @@ describe "Mercury.PageEditor", ->
 
     it "resizes the iframe", ->
       @pageEditor.resize()
-      expect($('.mercury-iframe').css('top')).toEqual('100px')
       expect($('.mercury-iframe').css('height')).toEqual("#{500 - 100}px")
 
     it "triggers a resize event", ->
@@ -486,7 +522,7 @@ describe "Mercury.PageEditor", ->
       expect(@pageEditor.beforeUnload()).toEqual(null)
 
 
-  describe "#save", ->
+  describe "#getRegionByName", ->
 
     beforeEach ->
       Mercury.PageEditor.prototype.initializeInterface = ->
@@ -494,69 +530,114 @@ describe "Mercury.PageEditor", ->
       @iframeSrcSpy = spyOn(Mercury.PageEditor.prototype, 'iframeSrc').andCallFake(=> '/foo/baz')
       @ajaxSpy = spyOn($, 'ajax')
 
-    it "makes an ajax request", ->
-      @ajaxSpy.andCallFake(=>)
-      @pageEditor.save()
-      expect(@ajaxSpy.callCount).toEqual(1)
-
-    it "uses the save url passed in via options, the configured save url, or the iframe src", ->
-      @ajaxSpy.andCallFake(=>)
-      @pageEditor.saveUrl = '/foo/bar'
-      @pageEditor.save()
-      expect(@ajaxSpy.argsForCall[0][0]).toEqual('/foo/bar')
-
-      @pageEditor.saveUrl = null
-      Mercury.saveURL = '/foo/bit'
-      @pageEditor.save()
-      expect(@ajaxSpy.argsForCall[1][0]).toEqual('/foo/bit')
-
-      @pageEditor.saveUrl = null
-      Mercury.saveURL = null
-      @pageEditor.save()
-      expect(@ajaxSpy.argsForCall[2][0]).toEqual('/foo/baz')
-
-    it "serializes the data in json", ->
-      @ajaxSpy.andCallFake(=>)
-      Mercury.config.saveStyle = 'json'
-      spyOn(Mercury.PageEditor.prototype, 'serialize').andCallFake(=> {region1: 'region1'})
-      @pageEditor.save()
-      expect(@ajaxSpy.argsForCall[0][1]['data']).toEqual({content: '{"region1":"region1"}' })
-
-    it "can serialize as form values", ->
-      @ajaxSpy.andCallFake(=>)
-      @pageEditor.options.saveStyle = 'form'
-      spyOn(Mercury.PageEditor.prototype, 'serialize').andCallFake(=> {region1: 'region1'})
-      @pageEditor.save()
-      expect(@ajaxSpy.argsForCall[0][1]['data']).toEqual({content: {region1: 'region1'}})
-
-    it "sets headers by calling #saveHeaders", ->
-      @ajaxSpy.andCallFake(=>)
-      spyOn(Mercury.PageEditor.prototype, 'serialize').andCallFake(=> {region1: 'region1'})
-      spy = spyOn(Mercury.PageEditor.prototype, 'saveHeaders').andCallFake(=> {'X-CSRFToken': 'f00'})
-      @pageEditor.save()
-      expect(@ajaxSpy.argsForCall[0][1]['headers']).toEqual({'X-CSRFToken': 'f00'})
-
-    describe "on successful ajax request", ->
+    it "returns the region if a match is found", ->
+      @pageEditor.regions = [{name: 'foo'}, {name: 'bar'}, {name: 'baz'}]
+      expect(@pageEditor.getRegionByName('foo')).toEqual(@pageEditor.regions[0])
+      expect(@pageEditor.getRegionByName('baz')).toEqual(@pageEditor.regions[2])
 
-      beforeEach ->
-        @ajaxSpy.andCallFake((url, options) => options.success('data') )
+    it "returns null if no match was found", ->
+      @pageEditor.regions = [{name: 'bar'}]
+      expect(@pageEditor.getRegionByName('foo')).toEqual(null)
 
-      it "sets changes back to false", ->
-        Mercury.changes = true
-        @pageEditor.save()
-        expect(Mercury.changes).toEqual(false)
 
-    describe "on failed ajax request", ->
+  describe "#save", ->
 
+    describe "POST", ->
       beforeEach ->
-        @ajaxSpy.andCallFake((url, options) => options.error() )
+        Mercury.PageEditor.prototype.initializeInterface = ->
+        @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test'), saveDataType: 'text'})
+        @iframeSrcSpy = spyOn(Mercury.PageEditor.prototype, 'iframeSrc').andCallFake(=> '/foo/baz')
+        @ajaxSpy = spyOn($, 'ajax')
+
+      it "doesn't set the _method in the request data", ->
+        @ajaxSpy.andCallFake(=>)
+        spyOn(Mercury.PageEditor.prototype, 'serialize').andCallFake(=> {region1: 'region1'})
+        @pageEditor.save()
+        expect(@ajaxSpy.argsForCall[0][1]['data']['_method']).toEqual(undefined)
 
-      it "alerts with the url", ->
-        spy = spyOn(window, 'alert').andCallFake(=>)
+      it "makes an ajax request", ->
+        @ajaxSpy.andCallFake(=>)
+        @pageEditor.save()
+        expect(@ajaxSpy.callCount).toEqual(1)
+
+      it "uses the save url passed in via options, the configured save url, or the iframe src", ->
+        @ajaxSpy.andCallFake(=>)
         @pageEditor.saveUrl = '/foo/bar'
         @pageEditor.save()
-        expect(spy.callCount).toEqual(1)
-        expect(spy.argsForCall[0]).toEqual(['Mercury was unable to save to the url: /foo/bar'])
+        expect(@ajaxSpy.argsForCall[0][0]).toEqual('/foo/bar')
+
+        @pageEditor.saveUrl = null
+        Mercury.saveURL = '/foo/bit'
+        @pageEditor.save()
+        expect(@ajaxSpy.argsForCall[1][0]).toEqual('/foo/bit')
+
+        @pageEditor.saveUrl = null
+        Mercury.saveURL = null
+        @pageEditor.save()
+        expect(@ajaxSpy.argsForCall[2][0]).toEqual('/foo/baz')
+
+      it "serializes the data in json", ->
+        @ajaxSpy.andCallFake(=>)
+        Mercury.config.saveStyle = 'json'
+        spyOn(Mercury.PageEditor.prototype, 'serialize').andCallFake(=> {region1: 'region1'})
+        @pageEditor.save()
+        expect(@ajaxSpy.argsForCall[0][1]['data']).toEqual({content: '{"region1":"region1"}' })
+
+      it "can serialize as form values", ->
+        @ajaxSpy.andCallFake(=>)
+        @pageEditor.options.saveStyle = 'form'
+        spyOn(Mercury.PageEditor.prototype, 'serialize').andCallFake(=> {region1: 'region1'})
+        @pageEditor.save()
+        expect(@ajaxSpy.argsForCall[0][1]['data']).toEqual({content: {region1: 'region1'}})
+
+      it "sets headers by calling #saveHeaders", ->
+        @ajaxSpy.andCallFake(=>)
+        spyOn(Mercury.PageEditor.prototype, 'serialize').andCallFake(=> {region1: 'region1'})
+        spy = spyOn(Mercury.PageEditor.prototype, 'saveHeaders').andCallFake(=> {'X-CSRFToken': 'f00'})
+        @pageEditor.save()
+        expect(@ajaxSpy.argsForCall[0][1]['headers']).toEqual({'X-CSRFToken': 'f00'})
+
+      it "sets the data type from options", ->
+        @ajaxSpy.andCallFake(=>)
+        spyOn(Mercury.PageEditor.prototype, 'serialize').andCallFake(=> {region1: 'region1'})
+        @pageEditor.save()
+        expect(@ajaxSpy.argsForCall[0][1]['dataType']).toEqual('text')
+
+      describe "on successful ajax request", ->
+
+        beforeEach ->
+          @ajaxSpy.andCallFake((url, options) => options.success('data') )
+
+        it "sets changes back to false", ->
+          Mercury.changes = true
+          @pageEditor.save()
+          expect(Mercury.changes).toEqual(false)
+
+      describe "on failed ajax request", ->
+
+        beforeEach ->
+          @ajaxSpy.andCallFake((url, options) => options.error() )
+
+        it "alerts with the url", ->
+          spy = spyOn(window, 'alert').andCallFake(=>)
+          @pageEditor.saveUrl = '/foo/bar'
+          @pageEditor.save()
+          expect(spy.callCount).toEqual(1)
+          expect(spy.argsForCall[0]).toEqual(['Mercury was unable to save to the url: /foo/bar'])
+
+    describe "PUT", ->
+
+      beforeEach ->
+        Mercury.PageEditor.prototype.initializeInterface = ->
+        @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test'), saveMethod: 'PUT'})
+        @iframeSrcSpy = spyOn(Mercury.PageEditor.prototype, 'iframeSrc').andCallFake(=> '/foo/baz')
+        @ajaxSpy = spyOn($, 'ajax')
+
+      it "sets the _method in the request", ->
+        @ajaxSpy.andCallFake(=>)
+        spyOn(Mercury.PageEditor.prototype, 'serialize').andCallFake(=> {region1: 'region1'})
+        @pageEditor.save()
+        expect(@ajaxSpy.argsForCall[0][1]['data']['_method']).toEqual('PUT')
 
 
   describe "#serialize", ->

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

@@ -11,8 +11,8 @@ describe "Mercury.Panel", ->
   afterEach ->
     @panel = null
     delete(@panel)
-    $(document).unbind('mercury:resize')
-    $(document).unbind('mercury:hide:panels')
+    $(window).unbind('mercury:resize')
+    $(window).unbind('mercury:hide:panels')
 
   describe "#build", ->
 

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

@@ -4,12 +4,15 @@ describe "Mercury.Region", ->
 
   template 'mercury/region.html'
 
+  beforeEach ->
+    Mercury.config.regionClass = 'custom-region-class'
+
   afterEach ->
     @region = null
     delete(@region)
-    $(document).unbind('mercury:mode')
-    $(document).unbind('mercury:focus:frame')
-    $(document).unbind('mercury:action')
+    $(window).unbind('mercury:mode')
+    $(window).unbind('mercury:focus:frame')
+    $(window).unbind('mercury:action')
 
   describe "constructor", ->
 
@@ -185,8 +188,8 @@ describe "Mercury.Region", ->
         expect(@region.previewing).toEqual(true)
 
       it "swaps classes on the element", ->
-        expect(@region.element.hasClass('mercury-region')).toEqual(false)
-        expect(@region.element.hasClass('mercury-region-preview')).toEqual(true)
+        expect(@region.element.hasClass('custom-region-class')).toEqual(false)
+        expect(@region.element.hasClass('custom-region-class-preview')).toEqual(true)
 
       it "triggers a blur event", ->
         expect(@triggerSpy.callCount).toEqual(1)
@@ -202,8 +205,8 @@ describe "Mercury.Region", ->
         expect(@region.previewing).toEqual(false)
 
       it "swaps classes on the element", ->
-        expect(@region.element.hasClass('mercury-region-preview')).toEqual(false)
-        expect(@region.element.hasClass('mercury-region')).toEqual(true)
+        expect(@region.element.hasClass('custom-region-class-preview')).toEqual(false)
+        expect(@region.element.hasClass('custom-region-class')).toEqual(true)
 
       it "calls focus if it's the active region", ->
         expect(@focusSpy.callCount).toEqual(1)

data/spec/javascripts/mercury/regions/editable_spec.js.coffee

@@ -326,26 +326,6 @@ describe "Mercury.Regions.Editable", ->
 
   describe "#handlePaste", ->
 
-    it "removes any regions that might have been pasted", ->
-
-    describe "when it looks like MS word content", ->
-
-      it "calls the native undo to remove the pasted content", ->
-
-      it "inserts the cleaned content (which is the text version of what was pasted)", ->
-
-      describe "when undo throws an exception", ->
-
-        it "sets the content to what it was before the paste", ->
-
-        it "opens a modal (featuring clippy)", ->
-
-    describe "when it's configured to strip styles", ->
-
-      it "calls the native undo to remove the pasted content", ->
-
-      it "strips style attributes from the pasted content and inserts the cleaned html", ->
-
 
 
 describe "Mercury.Regions.Editable.actions", ->

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

@@ -10,8 +10,8 @@ describe "Mercury.SnippetToolbar", ->
   afterEach ->
     @snippetToolbar = null
     delete(@snippetToolbar)
-    $(document).unbind('mercury:hide:toolbar')
-    $(document).unbind('mercury:show:toolbar')
+    $(window).unbind('mercury:hide:toolbar')
+    $(window).unbind('mercury:show:toolbar')
 
   describe "constructor", ->
 

data/spec/javascripts/mercury/toolbar.button_group_spec.js.coffee

@@ -14,7 +14,7 @@ describe "Mercury.Toolbar.ButtonGroup", ->
   afterEach ->
     @buttonGroup = null
     delete(@buttonGroup)
-    $(document).unbind('mercury:region:update')
+    $(window).unbind('mercury:region:update')
 
   describe "constructor", ->