mercury-rails 0.3.1 → 0.5.0

data/spec/dummy/script/rails

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require File.expand_path('../../config/boot',  __FILE__)
+require 'rails/commands'

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

@@ -4,6 +4,7 @@ describe "Mercury.PageEditor", ->
 
   beforeEach ->
     Mercury.config.regions.className = 'custom-region-class'
+    Date.prototype.getTime = -> 1234
 
   afterEach ->
     @pageEditor = null
@@ -36,9 +37,9 @@ describe "Mercury.PageEditor", ->
       expect(window.mercuryInstance).toEqual(@pageEditor)
 
     it "accepts a saveUrl, and options", ->
-      @pageEditor = new Mercury.PageEditor('/foo/1', {foo: 'bar'})
+      @pageEditor = new Mercury.PageEditor('/foo/1', {foo: 'bar', saveDataType: 'text'})
       expect(@pageEditor.saveUrl).toEqual('/foo/1')
-      expect(@pageEditor.options).toEqual({foo: 'bar', visible: true})
+      expect(@pageEditor.options).toEqual({foo: 'bar', saveDataType: 'text', visible: true})
 
     it "sets the visible option to true unless it's set", ->
       @pageEditor = new Mercury.PageEditor('/foo/1', {foo: 'bar', visible: false})
@@ -96,6 +97,16 @@ describe "Mercury.PageEditor", ->
       @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test')})
       expect(@resizeSpy.callCount).toEqual(1)
 
+    it "binds to iframe load event", ->
+      initializeFrameSpy = spyOn(Mercury.PageEditor.prototype, 'initializeFrame')
+      bindEventsSpy = spyOn(Mercury.PageEditor.prototype, 'bindEvents')
+
+      @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test')})
+      @pageEditor.iframe.trigger('load')
+
+      expect(initializeFrameSpy.callCount).toEqual(1)
+      expect(bindEventsSpy.callCount).toEqual(1)
+
 
   describe "#initializeFrame", ->
 
@@ -139,11 +150,6 @@ describe "Mercury.PageEditor", ->
       @pageEditor.initializeFrame()
       expect(@pageEditor.iframe.get(0).contentWindow.History).toEqual(window.History)
 
-    it "calls bindEvents", ->
-      @finalizeInterfaceSpy.andCallFake(=>)
-      @pageEditor.initializeFrame()
-      expect(@bindEventsSpy.callCount).toEqual(1)
-
     it "calls resize", ->
       @finalizeInterfaceSpy.andCallFake(=>)
       @pageEditor.initializeFrame()
@@ -325,6 +331,7 @@ describe "Mercury.PageEditor", ->
       @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test')})
       @pageEditor.document = $(document)
       @pageEditor.bindEvents()
+      @pageEditor.bindDocumentEvents()
 
     describe "custom event: initialize:frame", ->
 
@@ -537,8 +544,33 @@ describe "Mercury.PageEditor", ->
       Mercury.config.editorUrlRegEx = original
 
     it "adds query params", ->
-      expect(@pageEditor.iframeSrc('http://foo.com/editor/path', true)).toEqual('http://foo.com/path?mercury_frame=true')
-      expect(@pageEditor.iframeSrc('http://foo.com/editor/path?something=true', true)).toEqual('http://foo.com/path?something=true&mercury_frame=true')
+      expect(@pageEditor.iframeSrc('http://foo.com/editor/path', true)).toEqual('http://foo.com/path?mercury_frame=true&_=1234')
+      expect(@pageEditor.iframeSrc('http://foo.com/editor/path?something=true', true)).toEqual('http://foo.com/path?something=true&mercury_frame=true&_=1234')
+
+
+  describe "#loadIframeSrc", ->
+
+    beforeEach ->
+      Mercury.PageEditor.prototype.initializeFrame = ->
+      @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test')})
+
+    it 'unbinds events to @document', ->
+      @pageEditor.document = {off: ->}
+      documentSpy = spyOn(@pageEditor.document, 'off')
+      @pageEditor.loadIframeSrc()
+      expect(documentSpy).toHaveBeenCalled()
+
+    it 'resets the iframe loaded data attribute', ->
+      @pageEditor.iframe.data('loaded', true)
+      @pageEditor.loadIframeSrc()
+      expect(@pageEditor.iframe.data('loaded')).toEqual(false)
+
+    it 'sets the iframe source', ->
+      iframe = {contentWindow: {document: {location: {}}}}
+      @pageEditor.iframe = {data: (->), get: -> iframe}
+      @pageEditor.loadIframeSrc('boo')
+      expect(iframe.contentWindow.document.location.href).toEqual('boo?mercury_frame=true&_=1234')
+
 
 
   describe "#hijackLinksAndForms", ->
@@ -650,12 +682,12 @@ describe "Mercury.PageEditor", ->
         expect(@ajaxSpy.argsForCall[0][0]).toEqual('/foo/bar')
 
         @pageEditor.saveUrl = null
-        Mercury.saveURL = '/foo/bit'
+        Mercury.saveUrl = '/foo/bit'
         @pageEditor.save()
         expect(@ajaxSpy.argsForCall[1][0]).toEqual('/foo/bit')
 
         @pageEditor.saveUrl = null
-        Mercury.saveURL = null
+        Mercury.saveUrl = null
         @pageEditor.save()
         expect(@ajaxSpy.argsForCall[2][0]).toEqual('/foo/baz')
 
@@ -711,14 +743,21 @@ describe "Mercury.PageEditor", ->
       describe "on failed ajax request", ->
 
         beforeEach ->
-          @ajaxSpy.andCallFake((url, options) => options.error() )
+          @ajaxSpy.andCallFake((url, options) => options.error({'response': 'object'}) )
+
+        it "alerts and triggers save_failed with the url", ->
+          alert_spy = spyOn(window, 'alert').andCallFake(=>)
+          trigger_spy = spyOn(Mercury, 'trigger').andCallFake(=>)
 
-        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'])
+
+          expect(alert_spy.callCount).toEqual(1)
+          expect(alert_spy.argsForCall[0]).toEqual(['Mercury was unable to save to the url: /foo/bar'])
+
+          expect(trigger_spy.callCount).toEqual(1)
+          expect(trigger_spy.argsForCall[0][0]).toEqual('save_failed')
+          expect(trigger_spy.argsForCall[0][1]).toBeDefined()
 
     describe "PUT", ->
 

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

@@ -22,7 +22,7 @@ describe "Mercury.Panel", ->
       html = $('<div>').html(@panel.element).html()
       expect(html).toContain('class="mercury-panel loading"')
       expect(html).toContain('style="display:none;"')
-      expect(html).toContain('<h1>foo panel</h1><div class="mercury-panel-pane"></div>')
+      expect(html).toContain('<h1><span>foo panel</span></h1><div class="mercury-panel-pane"></div>')
       expect(html).not.toContain('class="mercury-panel-close"')
 
     it "appends to any element", ->
@@ -159,16 +159,14 @@ describe "Mercury.Panel", ->
     it "sets the element html to be the data passed to it", ->
       @panel.loadContent('<span>hello world!</span>')
       html = @panel.element.html()
-      expect(html).toContain('<h1>foo panel</h1>')
       expect(html).toContain('class="mercury-panel-pane"')
       expect(html).toContain('style="visibility: hidden;')
       expect(html).toContain('hello world!')
 
-    it "sets the element html to be the data passed to it", ->
+    it "sets the element html to be the data passed to it -- translated", ->
       Mercury.config.localization.enabled = true
       @panel.loadContent('<span>hello world!</span>')
       html = @panel.element.html()
-      expect(html).toContain('<h1>foo panel</h1>')
       expect(html).toContain('class="mercury-panel-pane"')
       expect(html).toContain('style="visibility: hidden;')
       expect(html).toContain('bork! bork!')

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

@@ -0,0 +1,34 @@
+describe "Mercury.Regions.Image", ->
+
+  template 'mercury/regions/image.html'
+
+  beforeEach ->
+    @regionElement = $('#editable_region1')
+
+  describe "constructor", ->
+
+     beforeEach ->
+       @buildSpy = spyOn(Mercury.Regions.Image.prototype, 'build').andCallFake(=>)
+       @bindEventsSpy = spyOn(Mercury.Regions.Image.prototype, 'bindEvents').andCallFake(=>)
+
+     it "expects an element and window", ->
+       @region = new Mercury.Regions.Image(@regionElement, window)
+       expect(@region.element.get(0)).toEqual($('#editable_region1').get(0))
+       expect(@region.window).toEqual(window)
+
+     it "accepts options", ->
+       @region = new Mercury.Regions.Image(@regionElement, window, {foo: 'something'})
+       expect(@region.options).toEqual({foo: 'something'})
+
+     it "sets it's type", ->
+       @region = new Mercury.Regions.Image(@regionElement, window)
+       expect(@region.type).toEqual('image')
+
+     it "calls build", ->
+       @region = new Mercury.Regions.Image(@regionElement, window)
+       expect(@buildSpy.callCount).toEqual(1)
+
+     it "calls bindEvents", ->
+       @region = new Mercury.Regions.Image(@regionElement, window)
+       expect(@bindEventsSpy.callCount).toEqual(1)
+

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

@@ -0,0 +1,33 @@
+describe "Mercury.Regions.Simple", ->
+
+  template 'mercury/regions/simple.html'
+
+  beforeEach ->
+    @regionElement = $('#editable_region1')
+
+  describe "constructor", ->
+
+     beforeEach ->
+       @buildSpy = spyOn(Mercury.Regions.Simple.prototype, 'build').andCallFake(=>)
+       @bindEventsSpy = spyOn(Mercury.Regions.Simple.prototype, 'bindEvents').andCallFake(=>)
+
+     it "expects an element and window", ->
+       @region = new Mercury.Regions.Simple(@regionElement, window)
+       expect(@region.element.get(0)).toEqual($('#editable_region1').get(0))
+       expect(@region.window).toEqual(window)
+
+     it "accepts options", ->
+       @region = new Mercury.Regions.Simple(@regionElement, window, {foo: 'something'})
+       expect(@region.options).toEqual({foo: 'something'})
+
+     it "sets it's type", ->
+       @region = new Mercury.Regions.Simple(@regionElement, window)
+       expect(@region.type).toEqual('simple')
+
+     it "calls build", ->
+       @region = new Mercury.Regions.Simple(@regionElement, window)
+       expect(@buildSpy.callCount).toEqual(1)
+
+     it "calls bindEvents", ->
+       @region = new Mercury.Regions.Simple(@regionElement, window)
+       expect(@bindEventsSpy.callCount).toEqual(1)

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

@@ -312,7 +312,7 @@ describe "Mercury.Regions.Snippetable.actions", ->
 
       it "finds the snippet by it's identity and replaces it with the new snippet", ->
         @actions['insertSnippet'].call(@region, {value: Mercury.Snippet.find('snippet_1')})
-        expect($('#snippetable_region2').html()).toContain('class="mercury-snippet"')
+        expect($('#snippetable_region2').html()).toContain('class="mercury-snippet example-snippet"')
         expect($('#snippetable_region2').html()).toContain('contenteditable="false"')
         expect($('#snippetable_region2').html()).toContain('data-version="1"')
         expect($('#snippetable_region2').html()).toContain('data-snippet="snippet_1"')

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

@@ -35,7 +35,7 @@ describe "Mercury.Snippet", ->
     it "builds an element (in whatever context is provided", ->
       ret = @snippet.getHTML($(document))
       html = $('<div>').html(ret).html()
-      expect(html).toContain('class="mercury-snippet"')
+      expect(html).toContain('class="mercury-snippet foo-snippet"')
       expect(html).toContain('contenteditable="false"')
       expect(html).toContain('data-snippet="identity"')
       expect(html).toContain('data-version="1"')
@@ -53,6 +53,13 @@ describe "Mercury.Snippet", ->
       @snippet.getHTML($(document), callback)
       expect(@loadPreviewSpy.argsForCall[0][1]).toEqual(callback)
 
+    it "wraps the snippet in the specified wrapperTag", ->
+      @snippet.wrapperTag = 'li'
+      ret = @snippet.getHTML($(document))
+      container = $('<div>')
+      container.html(ret)
+      expect($(container.children()[0]).is('li')).toEqual(true)
+
 
   describe "#getText", ->
 
@@ -142,6 +149,11 @@ describe "Mercury.Snippet", ->
       @snippet.setOptions({foo: 'baz'})
       expect(@snippet.history.stack.length).toEqual(2)
 
+    it "can set the wrapperTag attribute from options", ->
+      expect(@snippet.wrapperTag).toEqual('div')
+      @snippet.setOptions({wrapperTag: 'li'})
+      expect(@snippet.wrapperTag).toEqual('li')
+
 
   describe "#setVersion", ->
 
@@ -201,6 +213,11 @@ describe "Mercury.Snippet class methods", ->
       Mercury.Snippet.displayOptionsFor('foo')
       expect(Mercury.snippet).toEqual(null)
 
+    it "can pass options to the modal", ->
+      Mercury.Snippet.displayOptionsFor('foo', {option1: 'option1'})
+      expect(@modalSpy.callCount).toEqual(1)
+      expect(@modalSpy.argsForCall[0]).toEqual(["/mercury/snippets/foo/options.html", {title: 'Snippet Options', handler: 'insertSnippet', snippetName: 'foo', option1: 'option1'}])
+
 
   describe ".create", ->
 
@@ -218,7 +235,15 @@ describe "Mercury.Snippet class methods", ->
     it "pushes into the collection array", ->
       Mercury.Snippet.create('foo', {foo: 'bar'})
       expect(Mercury.Snippet.all.length).toEqual(1)
-
+      
+    describe "when an snuppet exist with an identical identity", ->
+      it "generates a unique identity", ->
+        Mercury.Snippet.load
+          snippet_1: {name: 'foo', options: {foo: 'bar'}}
+          snippet_2: {name: 'bar', options: {baz: 'pizza'}}
+
+        ret = Mercury.Snippet.create('noobie', {noobie: 'one'})
+        expect(ret.identity).toEqual('snippet_0')
 
   describe ".find", ->
 

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

@@ -82,6 +82,19 @@ describe "Mercury.SnippetToolbar", ->
         jasmine.simulate.mouseout($('#test .mercury-snippet-toolbar').get(0))
         expect(spy.callCount).toEqual(1)
 
+    describe "releasing events", ->
+
+      it 'makes the following events releasable', ->
+        events = (eventName for [target, eventName, handler] in @snippetToolbar._boundEvents)
+        expect(events).toEqual(['show:toolbar', 'hide:toolbar', 'scroll'])
+
+      it 'calls off to unbind the events on release', ->
+        targets = (target for [target, eventName, handler] in @snippetToolbar._boundEvents)
+        # we bind to Mercury twice so pop the first one off for spying
+        targets.shift()
+        spys = (spyOn(target, 'off') for target in targets)
+        @snippetToolbar.release()
+        expect(spy).toHaveBeenCalled() for spy in spys
 
   describe "#show", ->
 
@@ -113,10 +126,10 @@ describe "Mercury.SnippetToolbar", ->
     it "positions itself based on the snippet", ->
       @snippetToolbar.element.show()
       @snippetToolbar.position()
-      if $.browser.webkit
-        expect(@snippetToolbar.element.offset()).toEqual({top: 18, left : 200})
-      else
-        expect(@snippetToolbar.element.offset()).toEqual({top: 14, left : 200})
+      # use a tolerance since there are measurement differences between browsers we want it between 14-18
+      expect(@snippetToolbar.element.offset().top).toBeLessThan(19)
+      expect(@snippetToolbar.element.offset().top).toBeGreaterThan(13)
+      expect(@snippetToolbar.element.offset().left).toEqual(200)
 
 
   describe "#appear", ->
@@ -143,6 +156,8 @@ describe "Mercury.SnippetToolbar", ->
     beforeEach ->
       @snippetToolbar = new Mercury.SnippetToolbar($('document'), {appendTo: '#test'})
 
+    afterEach -> @snippetToolbar.release()
+
     it "it clears the hide timeout", ->
       spy = spyOn(window, 'clearTimeout').andCallFake(=>)
       @snippetToolbar.hide()
@@ -182,3 +197,4 @@ describe "Mercury.SnippetToolbar", ->
         @setTimeoutSpy.andCallFake((timeout, callback) => callback())
         @snippetToolbar.hide()
         expect(@snippetToolbar.visible).toEqual(false)
+

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

@@ -87,6 +87,22 @@ describe "Mercury.Toolbar.Button", ->
       jasmine.simulate.click(@button.get(0))
       expect(@button.hasClass('pressed')).toEqual(false)
 
+    it "builds a panel button with a custom panel object", ->
+      namespace = {}
+      namespace.customPanel = ->
+      namespace.customPanel::toggle = ->
+        'toggled'
+      handler = (name)->
+        new namespace.customPanel()
+
+      constructorSpy = spyOn(namespace, 'customPanel').andCallThrough()
+      panelSpy = spyOn(Mercury, 'Panel')
+
+      @button = new Mercury.Toolbar.Button('customFoo', 'title', 'summary', {panel: handler}, {appendDialogsTo: $('#test')})
+      expect(constructorSpy).toHaveBeenCalled()
+      expect(panelSpy).wasNotCalled()
+
+
     it "builds palette buttons", ->
       @button = new Mercury.Toolbar.Button('foo', 'title', 'summary', {palette: '/blank.html'}, {appendDialogsTo: $('#test')})
       expect($('#test .mercury-palette').length).toEqual(1)
@@ -268,6 +284,20 @@ describe "Mercury.Toolbar.Button", ->
         jasmine.simulate.click(@button.get(0))
         expect(spy.callCount).toEqual(2)
 
+    it "shows and hides the custom panel", ->
+      namespace = {}
+      namespace.customPanel = ->
+      namespace.customPanel::toggle = ->
+        'toggled'
+      handler = (name)->
+        new namespace.customPanel()
+
+      toggleSpy = spyOn(namespace.customPanel.prototype, 'toggle')
+      @button = new Mercury.Toolbar.Button('foo', 'title', 'summary', {panel: handler}, {appendDialogsTo: $('#test')})
+
+      jasmine.simulate.click(@button.get(0))
+      expect(toggleSpy).toHaveBeenCalled()
+
 
 describe "Mercury.Toolbar.Button.contexts", ->
 

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

@@ -4,6 +4,8 @@ describe "Mercury.uploader", ->
 
   beforeEach ->
     Mercury.config.uploading.enabled = true
+    @fileReaderSupport = spyOn(Mercury.uploader, 'fileReaderSupported')
+    @fileReaderSupport.andCallFake(=> true)
     $.fx.off = true
     @mockFile = {
       size: 1024
@@ -220,6 +222,7 @@ describe "Mercury.uploader", ->
       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", ->
@@ -235,6 +238,19 @@ describe "Mercury.uploader", ->
       Mercury.uploader.loadImage()
       expect(spy.callCount).toEqual(1)
 
+  describe "#loadImage without FileReader", ->
+
+    beforeEach ->
+      Mercury.uploader.options = {appendTo: '#test'}
+      Mercury.uploader.file = new Mercury.uploader.File(@mockFile)
+      Mercury.uploader.build()
+      @fileReaderSupport.andCallFake(=> false)
+
+    it "calls upload", ->
+      spy = spyOn(Mercury.uploader, 'upload').andCallFake(=>)
+      Mercury.uploader.loadImage()
+      expect(spy.callCount).toEqual(1)
+
 
   describe "#upload", ->
 

data/spec/javascripts/templates/mercury/regions/image.html

@@ -0,0 +1 @@
+<img id="editable_region1" src="foo.jpg" />

data/spec/javascripts/templates/mercury/regions/simple.html

@@ -0,0 +1,3 @@
+<div id="editable_region1">
+
+</div>