mercury-rails 0.5.0 → 0.6.0

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

@@ -326,7 +326,7 @@ describe "Mercury.lightview", ->
     describe "on a preloaded view", ->
 
       beforeEach ->
-        @setTimeoutSpy = spyOn(window, 'setTimeout').andCallFake((timeout, callback) => callback())
+        @setTimeoutSpy = spyOn(window, 'setTimeout').andCallFake((callback, timeout) => callback())
         Mercury.preloadedViews = {'/blank.html': 'this is the preloaded content'}
 
       afterEach ->

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

@@ -313,7 +313,7 @@ describe "Mercury.modal", ->
     describe "on a preloaded view", ->
 
       beforeEach ->
-        @setTimeoutSpy = spyOn(window, 'setTimeout').andCallFake((timeout, callback) => callback())
+        @setTimeoutSpy = spyOn(window, 'setTimeout').andCallFake((callback, timeout) => callback())
         Mercury.preloadedViews = {'/blank.html': 'this is the preloaded content'}
 
       afterEach ->

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

@@ -4,7 +4,7 @@ describe "Mercury.modalHandlers.insertMedia", ->
 
   beforeEach ->
     Mercury.region = null
-    spyOn(window, 'setTimeout').andCallFake((timeout, callback) => callback())
+    spyOn(window, 'setTimeout').andCallFake((callback, timeout) => callback())
     @modal =
       element: $('#test')
       hide: ->
@@ -133,12 +133,20 @@ describe "Mercury.modalHandlers.insertMedia", ->
     describe "a youtube video", ->
 
       beforeEach ->
-        $('#media_youtube_url').val('http://youtu.be/foo')
         $('#media_youtube_width').val(100)
         $('#media_youtube_height').val('42')
         $('input[value=youtube_url]').prop('checked', true)
 
+      it "doesn't allow bogus urls", ->
+        $('#media_youtube_url').val('http://example.com')
+        lastAlert = ''
+        spy = spyOn(window, 'alert').andCallFake((msg) -> lastAlert = msg)
+        jasmine.simulate.click($('#submit').get(0))
+        expect(spy.callCount).toEqual(1)
+        expect(lastAlert).toEqual('Error: The provided youtube share url was invalid.')
+
       it "triggers an action with the proper values", ->
+        $('#media_youtube_url').val('http://youtu.be/foo')
         jasmine.simulate.click($('#submit').get(0))
         expect(@triggerSpy.callCount).toEqual(1)
         expect(@triggerSpy.argsForCall[0][0]).toEqual('action')
@@ -148,6 +156,17 @@ describe "Mercury.modalHandlers.insertMedia", ->
         expect(value).toContain('42px')
         expect(value).toContain('src="http://www.youtube.com/embed/foo?wmode=transparent"')
 
+      it "triggers an action with the proper values using https", ->
+        $('#media_youtube_url').val('https://youtu.be/foo')
+        jasmine.simulate.click($('#submit').get(0))
+        expect(@triggerSpy.callCount).toEqual(1)
+        expect(@triggerSpy.argsForCall[0][0]).toEqual('action')
+        expect(@triggerSpy.argsForCall[0][1]['action']).toEqual('insertHTML')
+        value = $('<div>').html(@triggerSpy.argsForCall[0][1]['value']).html()
+        expect(value).toContain('100px')
+        expect(value).toContain('42px')
+        expect(value).toContain('src="https://www.youtube.com/embed/foo?wmode=transparent"')
+
     describe "a vimeo video", ->
 
       beforeEach ->
@@ -156,7 +175,16 @@ describe "Mercury.modalHandlers.insertMedia", ->
         $('#media_vimeo_height').val('42')
         $('input[value=vimeo_url]').prop('checked', true)
 
+      it "doesn't allow bogus urls", ->
+        $('#media_vimeo_url').val('http://example.com')
+        lastAlert = ''
+        spy = spyOn(window, 'alert').andCallFake((msg) -> lastAlert = msg)
+        jasmine.simulate.click($('#submit').get(0))
+        expect(spy.callCount).toEqual(1)
+        expect(lastAlert).toEqual('Error: The provided vimeo url was invalid.')
+
       it "triggers an action with the proper values", ->
+        $('#media_vimeo_url').val('http://vimeo.com/foo')
         jasmine.simulate.click($('#submit').get(0))
         expect(@triggerSpy.callCount).toEqual(1)
         expect(@triggerSpy.argsForCall[0][0]).toEqual('action')
@@ -165,3 +193,14 @@ describe "Mercury.modalHandlers.insertMedia", ->
         expect(value).toContain('100px')
         expect(value).toContain('42px')
         expect(value).toContain('http://player.vimeo.com/video/foo?title=1&amp;byline=1&amp;portrait=0&amp;color=ffffff')
+
+      it "triggers an action with the proper values using https", ->
+        $('#media_vimeo_url').val('https://vimeo.com/foo')
+        jasmine.simulate.click($('#submit').get(0))
+        expect(@triggerSpy.callCount).toEqual(1)
+        expect(@triggerSpy.argsForCall[0][0]).toEqual('action')
+        expect(@triggerSpy.argsForCall[0][1]['action']).toEqual('insertHTML')
+        value = $('<div>').html(@triggerSpy.argsForCall[0][1]['value']).html()
+        expect(value).toContain('100px')
+        expect(value).toContain('42px')
+        expect(value).toContain('https://player.vimeo.com/video/foo?title=1&amp;byline=1&amp;portrait=0&amp;color=ffffff')

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

@@ -3,7 +3,7 @@ describe "Mercury.PageEditor", ->
   template 'mercury/page_editor.html'
 
   beforeEach ->
-    Mercury.config.regions.className = 'custom-region-class'
+    Mercury.config.regions.attribute = 'custom-region-attribute'
     Date.prototype.getTime = -> 1234
 
   afterEach ->
@@ -173,11 +173,13 @@ describe "Mercury.PageEditor", ->
       expect(spy.argsForCall[0]).toEqual(['ready'])
 
     it "fires the ready event (jQuery.trigger)", ->
-      spy = spyOn(jQuery.fn, 'trigger').andCallFake(=>)
+      mock = {trigger: ->}
+      @pageEditor.iframe.get(0).contentWindow.jQuery = -> mock
+      spy = spyOn(mock, 'trigger').andCallFake(=>)
       @finalizeInterfaceSpy.andCallFake(=>)
       @pageEditor.initializeFrame()
-      expect(spy.callCount).toEqual(2)
-      expect(spy.argsForCall[0]).toEqual(['mercury:ready', undefined])
+      expect(spy.callCount).toEqual(1)
+      expect(spy.argsForCall[0]).toEqual(['mercury:ready'])
 
     it "fires the ready event (Event.fire)", ->
       @finalizeInterfaceSpy.andCallFake(=>)
@@ -256,8 +258,8 @@ describe "Mercury.PageEditor", ->
     beforeEach ->
       @resizeSpy = spyOn(Mercury.PageEditor.prototype, 'resize').andCallFake(=>)
       Mercury.PageEditor.prototype.initializeFrame = ->
-      Mercury.Regions.Editable = -> {region: true}
-      Mercury.Regions.Editable.supported = true
+      Mercury.Regions.Full = -> {region: true}
+      Mercury.Regions.Full.supported = true
       @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test')})
 
     it "instantiates the region and pushes it into the regions array", ->
@@ -271,7 +273,7 @@ describe "Mercury.PageEditor", ->
 
     it "throws an exception when the data-type isn't known", ->
       expect(=> @pageEditor.buildRegion($('#region4'))).toThrow('Region type is malformed, no data-type provided, or "Unknown" is unknown for the "region4" region.')
-      $('#region4').attr('data-type', 'foo')
+      $('#region4').attr('custom-region-attribute', 'foo')
       expect(=> @pageEditor.buildRegion($('#region4'))).toThrow('Region type is malformed, no data-type provided, or "Foo" is unknown for the "region4" region.')
 
     it "doesn't re-instantiate the region if the element's already initialized", ->
@@ -282,16 +284,16 @@ describe "Mercury.PageEditor", ->
 
     it "calls togglePreview on the region if in preview mode", ->
       callCount = 0
-      Mercury.Regions.Editable = -> {region: true, togglePreview: -> callCount += 1 }
-      Mercury.Regions.Editable.supported = true
+      Mercury.Regions.Full = -> {region: true, togglePreview: -> callCount += 1 }
+      Mercury.Regions.Full.supported = true
       @pageEditor.previewing = true
       @pageEditor.buildRegion($('#region2'))
       expect(callCount).toEqual(1)
 
     it "doesn't call togglePreview if not in preview mode", ->
       callCount = 0
-      Mercury.Regions.Editable = -> {region: true, togglePreview: -> callCount += 1 }
-      Mercury.Regions.Editable.supported = true
+      Mercury.Regions.Full = -> {region: true, togglePreview: -> callCount += 1 }
+      Mercury.Regions.Full.supported = true
       @pageEditor.buildRegion($('#region2'))
       expect(callCount).toEqual(0)
 
@@ -319,7 +321,7 @@ describe "Mercury.PageEditor", ->
 
     it "fires a mode event to put things into preview mode if it's not visible yet", ->
       spy = spyOn(Mercury, 'trigger').andCallFake(=>)
-      @pageEditor.options.visible = false
+      @pageEditor.visible = false
       @pageEditor.finalizeInterface()
       expect(spy.callCount).toEqual(1)
 
@@ -337,7 +339,7 @@ describe "Mercury.PageEditor", ->
 
       it "calls initializeFrame", ->
         @initializeFrameSpy = spyOn(Mercury.PageEditor.prototype, 'initializeFrame').andCallFake(=>)
-        @setTimeoutSpy = spyOn(window, 'setTimeout').andCallFake((timeout, callback) -> callback())
+        @setTimeoutSpy = spyOn(window, 'setTimeout').andCallFake((callback, timeout) -> callback())
         Mercury.trigger('initialize:frame')
         expect(@initializeFrameSpy.callCount).toEqual(1)
         expect(@setTimeoutSpy.callCount).toEqual(1)
@@ -355,7 +357,7 @@ describe "Mercury.PageEditor", ->
       it "calls focus on a focusable element", ->
         callCount = 0
         @pageEditor.focusableElement = {focus: -> callCount += 1}
-        @setTimeoutSpy = spyOn(window, 'setTimeout').andCallFake((timeout, callback) -> callback())
+        @setTimeoutSpy = spyOn(window, 'setTimeout').andCallFake((callback, timeout) -> callback())
         Mercury.trigger('focus:window')
         expect(callCount).toEqual(1)
 
@@ -467,13 +469,12 @@ describe "Mercury.PageEditor", ->
       beforeEach ->
         @pageEditor.visible = true
 
-      it "triggers an extra preview mode event if currently previewing", ->
-        @pageEditor.previewing = true
+      it "triggers an preview mode event if not currently previewing", ->
+        @pageEditor.previewing = false
         spy = spyOn(Mercury, 'trigger').andCallFake(=>)
         @pageEditor.toggleInterface()
-        expect(spy.callCount).toEqual(3)
+        expect(spy.callCount).toEqual(2)
         expect(spy.argsForCall[0]).toEqual(['mode', {mode: 'preview'}])
-        expect(spy.argsForCall[1]).toEqual(['mode', {mode: 'preview'}])
 
       it "sets visible to false", ->
         @pageEditor.toggleInterface()

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

@@ -3,7 +3,7 @@ describe "Mercury.Region", ->
   template 'mercury/region.html'
 
   beforeEach ->
-    Mercury.config.regions.className = 'custom-region-class'
+    Mercury.config.regions.attribute = 'custom-region-attribute'
     Mercury.config.regions.dataAttributes = []
 
   afterEach ->
@@ -127,17 +127,17 @@ describe "Mercury.Region", ->
 
       it "does nothing if in preview mode", ->
         @region.previewing = true
-        jasmine.simulate.mousemove($('#region_with_snippet .mercury-snippet').get(0))
+        jasmine.simulate.mousemove($('#region_with_snippet .example-snippet').get(0))
         expect(@triggerSpy.callCount).toEqual(0)
 
       it "does nothing if it's not the active region", ->
         Mercury.region = {}
-        jasmine.simulate.mousemove($('#region_with_snippet .mercury-snippet').get(0))
+        jasmine.simulate.mousemove($('#region_with_snippet .example-snippet').get(0))
         expect(@triggerSpy.callCount).toEqual(0)
 
       it "shows the snippet toolbar if a snippet was moused over", ->
         Mercury.region = @region
-        jasmine.simulate.mousemove($('#region_with_snippet .mercury-snippet').get(0))
+        jasmine.simulate.mousemove($('#region_with_snippet .example-snippet').get(0))
         expect(@triggerSpy.callCount).toEqual(1)
         expect(@triggerSpy.argsForCall[0][0]).toEqual('show:toolbar')
 
@@ -166,11 +166,11 @@ describe "Mercury.Region", ->
 
       it "returns the html of the element", ->
         content = @region.content()
-        expect(content).toEqual('contents<div class="mercury-snippet" data-snippet="snippet_1" data-version="1">snippet</div>')
+        expect(content).toEqual('contents<div class="example-snippet" data-snippet="snippet_1" data-version="1">snippet</div>')
 
       it "replaces snippet content with an indentifier if asked", ->
         content = @region.content(null, true)
-        expect(content).toEqual('contents<div class="mercury-snippet" data-snippet="snippet_1">[snippet_1]</div>')
+        expect(content).toEqual('contents<div class="example-snippet" data-snippet="snippet_1">[snippet_1]</div>')
 
     describe "setting html", ->
 
@@ -195,9 +195,8 @@ describe "Mercury.Region", ->
       it "sets previewing to true", ->
         expect(@region.previewing).toEqual(true)
 
-      it "swaps classes on the element", ->
-        expect(@region.element.hasClass('custom-region-class')).toEqual(false)
-        expect(@region.element.hasClass('custom-region-class-preview')).toEqual(true)
+      it "removes the data attribute", ->
+        expect(@region.element.attr('custom-region-attribute')).toEqual(null)
 
       it "triggers a blur event", ->
         expect(@triggerSpy.callCount).toEqual(1)
@@ -212,9 +211,8 @@ describe "Mercury.Region", ->
       it "sets previewing to false", ->
         expect(@region.previewing).toEqual(false)
 
-      it "swaps classes on the element", ->
-        expect(@region.element.hasClass('custom-region-class-preview')).toEqual(false)
-        expect(@region.element.hasClass('custom-region-class')).toEqual(true)
+      it "adds the correct data attribute back", ->
+        expect(@region.element.attr('custom-region-attribute')).toEqual('unknown')
 
       it "calls focus if it's the active region", ->
         expect(@focusSpy.callCount).toEqual(1)
@@ -280,7 +278,7 @@ describe "Mercury.Region", ->
 
       it "returns an object with it's type, value, and snippets", ->
         serialized = @region.serialize()
-        expect(serialized.type).toEqual('region')
+        expect(serialized.type).toEqual('unknown')
         expect(serialized.value).toEqual('contents')
         expect(serialized.snippets).toEqual({})
         expect(serialized.data).toEqual({})
@@ -292,7 +290,7 @@ describe "Mercury.Region", ->
 
       it "returns an object with it's type, value, data and snippets", ->
         serialized = @region.serialize()
-        expect(serialized.type).toEqual('region')
+        expect(serialized.type).toEqual('unknown')
         expect(serialized.value).toEqual('contents')
         expect(serialized.snippets).toEqual({})
         expect(serialized.data).toEqual({scope: 'scope', version: '1'})

data/spec/javascripts/mercury/regions/{editable_spec.js.coffee → full_spec.js.coffee}

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

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

@@ -3,7 +3,7 @@ describe "Mercury.Regions.Image", ->
   template 'mercury/regions/image.html'
 
   beforeEach ->
-    @regionElement = $('#editable_region1')
+    @regionElement = $('#image_region1')
 
   describe "constructor", ->
 
@@ -13,7 +13,7 @@ describe "Mercury.Regions.Image", ->
 
      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.element.get(0)).toEqual($('#image_region1').get(0))
        expect(@region.window).toEqual(window)
 
      it "accepts options", ->
@@ -22,7 +22,7 @@ describe "Mercury.Regions.Image", ->
 
      it "sets it's type", ->
        @region = new Mercury.Regions.Image(@regionElement, window)
-       expect(@region.type).toEqual('image')
+       expect(@region.type()).toEqual('image')
 
      it "calls build", ->
        @region = new Mercury.Regions.Image(@regionElement, window)

data/spec/javascripts/mercury/regions/{markupable_spec.js.coffee → markdown_spec.js.coffee}

@@ -1,42 +1,42 @@
-describe "Mercury.Regions.Markupable", ->
+describe "Mercury.Regions.Markdown", ->
 
-  template 'mercury/regions/markupable.html'
+  template 'mercury/regions/markdown.html'
 
   beforeEach ->
-    @regionElement = $('#markupable_region1')
+    @regionElement = $('#markdown_region1')
 
   describe "constructor", ->
 
      beforeEach ->
-       @buildSpy = spyOn(Mercury.Regions.Markupable.prototype, 'build').andCallFake(=>)
-       @bindEventsSpy = spyOn(Mercury.Regions.Markupable.prototype, 'bindEvents').andCallFake(=>)
-       spyOn(Mercury.Regions.Markupable.prototype, 'pushHistory').andCallFake(=>)
+       @buildSpy = spyOn(Mercury.Regions.Markdown.prototype, 'build').andCallFake(=>)
+       @bindEventsSpy = spyOn(Mercury.Regions.Markdown.prototype, 'bindEvents').andCallFake(=>)
+       spyOn(Mercury.Regions.Markdown.prototype, 'pushHistory').andCallFake(=>)
 
      it "expects an element and window", ->
-       @region = new Mercury.Regions.Markupable(@regionElement, window)
-       expect(@region.element.get(0)).toEqual($('#markupable_region1').get(0))
+       @region = new Mercury.Regions.Markdown(@regionElement, window)
+       expect(@region.element.get(0)).toEqual($('#markdown_region1').get(0))
        expect(@region.window).toEqual(window)
 
      it "accepts options", ->
-       @region = new Mercury.Regions.Markupable(@regionElement, window, {foo: 'something'})
+       @region = new Mercury.Regions.Markdown(@regionElement, window, {foo: 'something'})
        expect(@region.options).toEqual({foo: 'something'})
 
      it "sets it's type", ->
-       @region = new Mercury.Regions.Markupable(@regionElement, window)
-       expect(@region.type).toEqual('markupable')
+       @region = new Mercury.Regions.Markdown(@regionElement, window)
+       expect(@region.type()).toEqual('markdown')
 
      it "creates a markdown converter using Showdown", ->
        spy = spyOn(Showdown, 'converter').andCallFake(=>)
-       @region = new Mercury.Regions.Markupable(@regionElement, window)
+       @region = new Mercury.Regions.Markdown(@regionElement, window)
        expect(spy.callCount).toEqual(1)
        expect(@region.converter).toBeDefined()
 
      it "calls build", ->
-       @region = new Mercury.Regions.Markupable(@regionElement, window)
+       @region = new Mercury.Regions.Markdown(@regionElement, window)
        expect(@buildSpy.callCount).toEqual(1)
 
      it "calls bindEvents", ->
-       @region = new Mercury.Regions.Markupable(@regionElement, window)
+       @region = new Mercury.Regions.Markdown(@regionElement, window)
        expect(@bindEventsSpy.callCount).toEqual(1)
 
 
@@ -266,13 +266,13 @@ describe "Mercury.Regions.Markupable", ->
 
 
 
-describe "Mercury.Regions.Markupable.actions", ->
+describe "Mercury.Regions.Markdown.actions", ->
 
-  template 'mercury/regions/markupable.html'
+  template 'mercury/regions/markdown.html'
 
   beforeEach ->
-    #@region = new Mercury.Regions.Markupable($('#markupable_region1'), window)
-    #@actions = Mercury.Regions.Markupable.actions
+    #@region = new Mercury.Regions.Markdown($('#markdown_region1'), window)
+    #@actions = Mercury.Regions.Markdown.actions
 
   describe ".undo", ->