mercury-rails 0.8.0 → 0.9.0

data/{features → lib/mercury/cucumber}/support/mercury_contents.rb

@@ -15,7 +15,7 @@ module MercuryContentsHelpers
   def parse_snippet_options_from(options_string)
     json = []
     options_string.scan(/(?:,\s)?([^:]*): ("[^"]*")/).each do |pair|
-      json << %Q{'options[#{pair[0]}]': #{pair[1]}}
+      json << %Q{'#{pair[0]}': #{pair[1]}}
     end
 
     "{#{json.join(', ')}}"

data/{features → lib/mercury/cucumber}/support/mercury_selectors.rb

@@ -123,26 +123,6 @@ module MercurySelectorsHelpers
     end
   end
 
-  def region_selector_for(locator)
-    case locator.downcase
-
-      when 'the first full region', 'the full region' then '#full_1'
-      when 'the first markdown region', 'the markdown region' then '#markdown_1'
-      when 'the first snippets region', 'the first snippet region', 'the snippets region', 'the snippet region' then '#snippets_1'
-
-      else locator
-    end
-  end
-
-  def snippet_name_for(locator)
-    case locator.downcase
-
-      when 'the example snippet' then 'example'
-
-      else locator
-    end
-  end
-
 end
 
 World(MercurySelectorsHelpers)

data/lib/mercury/rails.rb

@@ -1,4 +1,5 @@
 module Mercury
+  require 'coffee_script'
   require 'mercury/version'
   require 'mercury/engine'
 end

data/lib/mercury/version.rb

@@ -1,3 +1,3 @@
 module Mercury
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

data/spec/dummy/config/application.rb

@@ -1,6 +1,9 @@
 require File.expand_path('../boot', __FILE__)
 
-require 'rails/all'
+require 'action_controller/railtie'
+require 'active_record/railtie'
+require 'action_mailer/railtie'
+require 'sprockets/railtie'
 
 Bundler.require
 require "mercury-rails"

data/spec/dummy/config/database.yml

@@ -0,0 +1,10 @@
+development:
+  adapter: sqlite3
+  database: db/development.sqlite3
+  pool: 5
+  timeout: 5000
+
+test:
+  adapter: sqlite3
+  database: ":memory:"
+  timeout: 500

data/spec/dummy/public/index.html

@@ -22,6 +22,8 @@
 
       // preload snippets
       Event.observe(window, "mercury:ready", function() {
+        Mercury.config.regions.dataAttributes = ['information'];
+
         Mercury.saveURL = '/contents';
         Mercury.Snippet.load({
           snippet_0:  {name: 'example', options: {'options[favorite_beer]': "Bells Hopslam", 'options[first_name]': "00"}},
@@ -39,6 +41,15 @@
           snippet_12: {name: 'example', options: {'options[favorite_beer]': "Bells Hopslam", 'options[first_name]': "12"}},
           snippet_13: {name: 'example', options: {'options[favorite_beer]': "Bells Hopslam", 'options[first_name]': "13"}}
         });
+
+        Mercury.PageEditor.prototype.save = function() {
+          var data = this.serialize();
+          var lightview = Mercury.lightview(null, {title: 'Saving', closeButton: true});
+          setTimeout(function() {
+            var textarea = '<textarea style="width:100%;height:300px" wrap="off">' + top.JSON.stringify(data, null, '  ') + '</textarea>';
+            lightview.loadContent('<div style="width:500px">Saving in the demo is disabled, but you can see what would be sent to the server below.' + textarea + '</div>');
+          }, 500);
+        };
       });
 
       var newRegionIndex = 1;
@@ -109,7 +120,7 @@
 
     <!-- begin full region 1 -->
     <h1>Full region</h1>
-    <div id="full_1" data-mercury="full">
+    <div id="full_1" data-mercury="full" data-information="foo">
       If the first line of content isn't wrapped in an element you can't set justification (mozilla only bug).
 
       <h2>text with a meta tag (that will be removed)</h2>
@@ -192,7 +203,7 @@
 
     <!-- begin simple region 1 -->
     <h1>Simple region (h1 tag)</h1>
-    <h1 id="simple_1" data-mercury="simple">This is a simple region</h1>
+    <h1 id="simple_1" data-mercury="simple" data-information="foo">This is a simple region</h1>
     <!-- end simple region 1 -->
 
     <!-- begin simple region 2 -->

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

@@ -28,7 +28,7 @@ describe "Mercury.lightview", ->
     it "returns an instance", ->
       ret = Mercury.lightview('/foo')
       expect(ret).toEqual(Mercury.lightview.instance)
-      expect(ret).toEqual(new Mercury.Lightview('/foo'))
+      expect(ret.show).toEqual(Mercury.Lightview.prototype.show)
 
 
   describe "#show", ->
@@ -38,6 +38,14 @@ describe "Mercury.lightview", ->
       @updateSpy = spyOn(Mercury.Lightview.prototype, 'update').andCallFake(=>)
       @appearSpy = spyOn(Mercury.Lightview.prototype, 'appear').andCallFake(=>)
 
+    it "sets options.ujsHandling to true unless set to false", ->
+      instance = new Mercury.Lightview()
+      instance.show()
+      expect(instance.options.ujsHandling).toEqual(true)
+      instance = new Mercury.Lightview('', {ujsHandling: false})
+      instance.show()
+      expect(instance.options.ujsHandling).toEqual(false)
+
     it "triggers the focus:window event", ->
       spy = spyOn(Mercury, 'trigger').andCallFake(=>)
       new Mercury.Lightview().show()
@@ -441,6 +449,12 @@ describe "Mercury.lightview", ->
       @lightview.loadContent('<span>foo</span>')
       expect($('.mercury-lightview-content').html()).toEqual('<span>Bork!</span>')
 
+    it "makes any element with the lightview-close class close the lightview", ->
+      spy = spyOn(@lightview, 'hide').andCallFake(=>)
+      @lightview.loadContent('<span class="lightview-close">foo</span>')
+      jasmine.simulate.click(@lightview.contentElement.find('.lightview-close').get(0))
+      expect(spy.callCount).toEqual(1)
+
     it "calls resize", ->
       @lightview.loadContent('content')
       expect(@resizeSpy.callCount).toEqual(1)
@@ -458,6 +472,24 @@ describe "Mercury.lightview", ->
       expect($('.mercury-lightview-title span').html()).toEqual('new title')
 
 
+  describe "#serializeForm", ->
+
+    beforeEach ->
+      spyOn(Mercury.Lightview.prototype, 'appear').andCallFake(=>)
+      @lightview = Mercury.lightview('/blank.html', {appendTo: $('#test'), title: 'title'})
+
+    describe "without a form", ->
+
+      it "returns an empty object", ->
+        expect(@lightview.serializeForm()).toEqual({})
+
+    describe "with a form", ->
+
+      it "returns an object of the serialized form", ->
+        @lightview.loadContent('<form><input name="options[foo]" value="bar"/></form>')
+        expect(@lightview.serializeForm()).toEqual({options: {foo: 'bar'}})
+
+
   describe "#reset", ->
 
     beforeEach ->

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

@@ -16,7 +16,7 @@ describe "Mercury.modal", ->
     $(window).unbind('mercury:resize')
     $(document).unbind('keydown')
 
-  describe "singleton method", ->
+  describe "builder method", ->
 
     beforeEach ->
       @showSpy = spyOn(Mercury.Modal.prototype, 'show').andCallFake(=>)
@@ -27,8 +27,8 @@ describe "Mercury.modal", ->
 
     it "returns an instance", ->
       ret = Mercury.modal('/foo')
-      expect(ret).toEqual(Mercury.modal.instance)
-      expect(ret).toEqual(new Mercury.Modal('/foo'))
+      expect(ret.constructor).toEqual(Mercury.Modal)
+      expect(ret.show).toEqual(Mercury.Modal.prototype.show)
 
 
   describe "#show", ->
@@ -38,6 +38,14 @@ describe "Mercury.modal", ->
       @updateSpy = spyOn(Mercury.Modal.prototype, 'update').andCallFake(=>)
       @appearSpy = spyOn(Mercury.Modal.prototype, 'appear').andCallFake(=>)
 
+    it "sets options.ujsHandling to true unless set to false", ->
+      instance = new Mercury.Modal()
+      instance.show()
+      expect(instance.options.ujsHandling).toEqual(true)
+      instance = new Mercury.Modal('', {ujsHandling: false})
+      instance.show()
+      expect(instance.options.ujsHandling).toEqual(false)
+
     it "triggers the focus:window event", ->
       spy = spyOn(Mercury, 'trigger').andCallFake(=>)
       new Mercury.Modal().show()
@@ -433,6 +441,12 @@ describe "Mercury.modal", ->
       @modal.loadContent('<span>foo</span>')
       expect($('.mercury-modal-content').html()).toEqual('<span>Bork!</span>')
 
+    it "makes any element with the modal-close class close the modal", ->
+      spy = spyOn(@modal, 'hide').andCallFake(=>)
+      @modal.loadContent('<span class="modal-close">foo</span>')
+      jasmine.simulate.click(@modal.contentElement.find('.modal-close').get(0))
+      expect(spy.callCount).toEqual(1)
+
     it "calls resize", ->
       @modal.loadContent('content')
       expect(@resizeSpy.callCount).toEqual(1)
@@ -456,6 +470,24 @@ describe "Mercury.modal", ->
       expect($('.mercury-modal-title a').css('display')).toEqual('none')
 
 
+  describe "#serializeForm", ->
+
+    beforeEach ->
+      spyOn(Mercury.Modal.prototype, 'appear').andCallFake(=>)
+      @modal = Mercury.modal('/blank.html', {appendTo: $('#test'), title: 'title'})
+
+    describe "without a form", ->
+
+      it "returns an empty object", ->
+        expect(@modal.serializeForm()).toEqual({})
+
+    describe "with a form", ->
+
+      it "returns an object of the serialized form", ->
+        @modal.loadContent('<form><input name="options[foo]" value="bar"/></form>')
+        expect(@modal.serializeForm()).toEqual({options: {foo: 'bar'}})
+
+
   describe "#reset", ->
 
     beforeEach ->

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

@@ -22,7 +22,7 @@ describe "Mercury.modalHandlers.htmlEditor", ->
       spy = spyOn(Mercury, 'trigger').andCallFake(=>)
       jasmine.simulate.click($('#submit').get(0))
       expect(spy.callCount).toEqual(1)
-      expect(spy.argsForCall[0]).toEqual(['action', {action: 'replaceHTML', value: '<span>html content</span>'}])
+      expect(spy.argsForCall[0]).toEqual(['action', {action: 'replaceHTML', value: '<span>html \ncontent</span>'}])
 
     it "hides the modal", ->
       spy = spyOn(@modal, 'hide').andCallFake(=>)

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

@@ -53,7 +53,7 @@ describe "Mercury.modalHandlers.insertMedia", ->
 
       beforeEach ->
         @focusSpy = spyOn($.fn, 'focus').andCallThrough()
-        @selection = {is: -> $('<img>', {src: '/foo.gif', align: 'right'})}
+        @selection = {is: -> $('<img>', {src: '/foo.gif', align: 'right', style: 'float: left;'})}
         Mercury.region = selection: => @selection
         @insertMedia.initialize()
 
@@ -67,6 +67,9 @@ describe "Mercury.modalHandlers.insertMedia", ->
       it "sets the image alignment option", ->
         expect($('#media_image_alignment').val()).toEqual('right')
 
+      it "sets the image float option", ->
+        expect($('#media_image_float').val()).toEqual('left')
+
     describe "an existing youtube video", ->
 
       beforeEach ->
@@ -176,13 +179,14 @@ describe "Mercury.modalHandlers.insertMedia", ->
       beforeEach ->
         $('#media_image_url').val('http://domain/foo.gif')
         $('#media_image_alignment').val('right')
+        $('#media_image_float').val('left')
 
       it "triggers an action with the proper values", ->
         jasmine.simulate.click($('input[type=submit]').get(0))
         expect(@triggerSpy.callCount).toEqual(1)
         expect(@triggerSpy.argsForCall[0][0]).toEqual('action')
         expect(@triggerSpy.argsForCall[0][1]['action']).toEqual('insertImage')
-        expect(@triggerSpy.argsForCall[0][1]['value']).toEqual({src: 'http://domain/foo.gif', align: 'right'})
+        expect(@triggerSpy.argsForCall[0][1]['value']).toEqual({src: 'http://domain/foo.gif', align: 'right', style: 'float: left;'})
 
     describe "a youtube video", ->
 

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

@@ -118,6 +118,11 @@ describe "Mercury.modalHandlers.insertTable", ->
       jasmine.simulate.keyup($('#table_border').get(0))
       expect($('table').attr('border')).toEqual('2')
 
+    it "removes the property if empty value specified", ->
+      $('#table_border').val('')
+      jasmine.simulate.keyup($('#table_border').get(0))
+      expect($('table').attr('border')).toEqual(undefined)
+
 
   describe "changing the cellspacing", ->
 
@@ -134,6 +139,11 @@ describe "Mercury.modalHandlers.insertTable", ->
       jasmine.simulate.keyup($('#table_spacing').get(0))
       expect($('table').attr('cellspacing')).toEqual('12')
 
+    it "removes the property if empty value specified", ->
+      $('#table_spacing').val('')
+      jasmine.simulate.keyup($('#table_spacing').get(0))
+      expect($('table').attr('cellspacing')).toEqual(undefined)
+
 
   describe "submitting", ->
 

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

@@ -440,6 +440,7 @@ describe "Mercury.PageEditor", ->
       Mercury.Toolbar = -> {
         toolbar: true,
         height: (-> 100),
+        top: (-> 0),
         show: (=> spec.toolbarShowCallCount += 1),
         hide: (=> spec.toolbarHideCallCount += 1)
       }
@@ -509,19 +510,19 @@ describe "Mercury.PageEditor", ->
   describe "#resize", ->
 
     beforeEach ->
-      Mercury.Toolbar = -> {toolbar: true, height: -> 100}
+      Mercury.Toolbar = -> {toolbar: true, height: (-> 100), top: (-> 50)}
       Mercury.Statusbar = -> {statusbar: true, top: -> 500}
       Mercury.PageEditor.prototype.initializeFrame = ->
       @pageEditor = new Mercury.PageEditor('', {appendTo: $('#test')})
 
     it "sets the display rectangle to displayRect", ->
       @pageEditor.resize()
-      expect(Mercury.displayRect.top).toEqual(100)
-      expect(Mercury.displayRect.height).toEqual(500 - 100)
+      expect(Mercury.displayRect.top).toEqual(100+50)
+      expect(Mercury.displayRect.height).toEqual(500 - (100+50))
 
     it "resizes the iframe", ->
       @pageEditor.resize()
-      expect($('.mercury-iframe').css('height')).toEqual("#{500 - 100}px")
+      expect($('.mercury-iframe').css('height')).toEqual("#{500 - (100+50)}px")
 
     it "triggers a resize event", ->
       spy = spyOn(Mercury, 'trigger').andCallFake(=>)
@@ -739,7 +740,7 @@ describe "Mercury.PageEditor", ->
           spy = spyOn(Mercury, 'trigger').andCallFake(=>)
           @pageEditor.save()
           expect(spy.callCount).toEqual(1)
-          expect(spy.argsForCall[0]).toEqual(['saved'])
+          expect(spy.argsForCall[0]).toEqual(['saved', 'data'])
 
       describe "on failed ajax request", ->
 

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

@@ -268,6 +268,10 @@ describe "Mercury.Region", ->
       @region.element.attr('data-version', 2)
       expect(@region.dataAttributes()).toEqual({scope: 'scope', version: '2'})
 
+    it "looks to @container if it's set", ->
+      @region.container = $('<div>').attr('data-version', 3)
+      expect(@region.dataAttributes()).toEqual({scope: undefined, version: '3'})
+
 
   describe "#serialize", ->
 

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

@@ -189,7 +189,7 @@ describe "Mercury.Snippet", ->
 
     it "returns an object with name and options", ->
       ret = @snippet.serialize()
-      expect(ret).toEqual({name: 'foo', options: {foo: 'bar'}})
+      expect(ret).toEqual({name: 'foo', foo: 'bar'})
 
 
 
@@ -202,21 +202,45 @@ describe "Mercury.Snippet class methods", ->
 
     beforeEach ->
       @modalSpy = spyOn(Mercury, 'modal').andCallFake(=>)
+      @triggerSpy = spyOn(Mercury, 'trigger').andCallFake(=>)
 
-    it "opens a modal with the name in the url", ->
-      Mercury.Snippet.displayOptionsFor('foo')
-      expect(@modalSpy.callCount).toEqual(1)
-      expect(@modalSpy.argsForCall[0]).toEqual(["/mercury/snippets/foo/options.html", {title: 'Snippet Options', handler: 'insertSnippet', snippetName: 'foo'}])
+    describe "with options", ->
 
-    it "sets the snippet back to nothing", ->
-      Mercury.snippet = 'foo'
-      Mercury.Snippet.displayOptionsFor('foo')
-      expect(Mercury.snippet).toEqual(null)
+      it "opens a modal with the name in the url", ->
+        Mercury.Snippet.displayOptionsFor('foo')
+        expect(@modalSpy.callCount).toEqual(1)
+        expect(@modalSpy.argsForCall[0]).toEqual(["/mercury/snippets/foo/options.html", {title: 'Snippet Options', handler: 'insertSnippet', snippetName: 'foo', loadType : 'POST'}])
 
-    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'}])
+      it "sets the snippet back to nothing", ->
+        Mercury.snippet = 'foo'
+        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', loadType: 'POST', option1: 'option1'}])
+
+      it "doesn't trigger an event to insert the snippet", ->
+        Mercury.Snippet.displayOptionsFor('foo')
+        expect(@triggerSpy.callCount).toEqual(0)
+
+    describe "without options", ->
+
+      it "triggers an event to insert the snippet", ->
+        Mercury.Snippet.displayOptionsFor('foo', {}, false)
+        expect(@triggerSpy.callCount).toEqual(1)
+        expect(@triggerSpy.argsForCall[0][0]).toEqual('action')
+        expect(@triggerSpy.argsForCall[0][1]['action']).toEqual('insertSnippet')
+
+      it "doesn't open a modal", ->
+        Mercury.Snippet.displayOptionsFor('foo', {}, false)
+        expect(@modalSpy.callCount).toEqual(0)
+
+      it "sets the snippet back to nothing", ->
+        Mercury.snippet = 'foo'
+        Mercury.Snippet.displayOptionsFor('foo', {}, false)
+        expect(Mercury.snippet).toEqual(null)
 
 
   describe ".create", ->
@@ -235,15 +259,31 @@ 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", ->
+
+    describe "when a snippet 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'}}
+          snippet_0: {name: 'foo0', options: {foo: 'bar'}}
+          snippet_1: {name: 'foo1', options: {foo: 'bar'}}
+          snippet_3: {name: 'bar3', options: {baz: 'pizza'}}
 
         ret = Mercury.Snippet.create('noobie', {noobie: 'one'})
-        expect(ret.identity).toEqual('snippet_0')
+        expect(ret.identity).toEqual('snippet_2')
+
+      it "generates a unique identity with an un-ordered snippet list", ->
+        Mercury.Snippet.load
+          snippet_0: {name: 'foo0', options: {foo: 'bar'}}
+          snippet_1: {name: 'foo1', options: {foo: 'bar'}}
+          snippet_2: {name: 'foo2', options: {foo: 'bar'}}
+          snippet_12: {name: 'bar12', options: {baz: 'pizza'}}
+          snippet_6: {name: 'bar6', options: {baz: 'pizza'}}
+          snippet_7: {name: 'bar7', options: {baz: 'pizza'}}
+          snippet_3: {name: 'foo3', options: {foo: 'bar'}}
+          snippet_4: {name: 'foo4', options: {foo: 'bar'}}
+          snippet_5: {name: 'foo5', options: {foo: 'bar'}}
+
+        ret = Mercury.Snippet.create('noobie', {noobie: 'one'})
+        expect(ret.identity).toEqual('snippet_8')
 
   describe ".find", ->
 
@@ -261,10 +301,14 @@ describe "Mercury.Snippet class methods", ->
 
     beforeEach ->
       @snippets = {
-        snippet_1: {name: 'foo', options: {foo: 'bar'}}
-        snippet_2: {name: 'bar', options: {baz: 'pizza'}}
+        snippet_1: {name: 'foo', something: {foo: 'bar'}}
+        snippet_2: {name: 'bar', something: {baz: 'pizza'}}
       }
+      Mercury.Snippet.load(@snippets)
 
     it "creates a new instance for each item in the collection", ->
-      Mercury.Snippet.load(@snippets)
       expect(Mercury.Snippet.all.length).toEqual(2)
+
+    it 'sets the options', ->
+      expect(Mercury.Snippet.find('snippet_1').options.something.foo).toEqual('bar')
+