spontaneous 0.2.0.beta9 → 0.2.0.beta10

data/test/unit/test_assets.rb

@@ -147,15 +147,15 @@ describe "Assets" do
     let(:x_js_digest) { asset_digest('public1/x.js') }
     # these are compiled so fairly complex to calculate their digests
     # not impossible, but annoying
-    let(:n_js_digest) { '74f175e03a4bdc8c807aba4ae0314938' }
-    let(:m_js_digest) { 'dd35b142dc75b6ec15b2138e9e91c0c3' }
-    let(:all_js_digest) { 'd406fc3c21d90828a2f0a718c89e8d99' }
+    let(:n_js_digest) { 'a5c86b004242d16e0dbf818068bbb248' }
+    let(:m_js_digest) { 'c0f2e1c2a7d1cc9666ccb48cc9fd610e' }
+    let(:all_js_digest) { '9759f54463d069b39d9c04c3e1d63745' }
 
-    let(:a_css_digest) { '7b04d295476986c24d8c77245943e5b9' }
-    let(:b_css_digest) { '266643993e14da14f2473d45f003bd2c' }
-    let(:c_css_digest) { 'fc8ba0d0aae64081dc00b8444a198fb8' }
-    let(:x_css_digest) { '2560aec2891794825eba770bf84823fb' }
-    let(:all_css_digest) { 'cf61c624b91b9ea126804291ac55bd5d' }
+    let(:a_css_digest) { 'b4ec507466566b839328b924893e80fb' }
+    let(:b_css_digest) { '97b252913f48c160b1eed120f7544203' }
+    let(:c_css_digest) { '3fcc1da2378a42e97cbd11cb85b8115a' }
+    let(:x_css_digest) { '88b3052bb5d7723b6a6a8b628fbee34e' }
+    let(:all_css_digest) { '9bac5a609f816594005b07a3a8aa2368' }
 
     it "includes all js dependencies" do
       result = context.scripts('js/all', 'js/m', 'js/c', 'x')
@@ -204,15 +204,15 @@ describe "Assets" do
     let(:app) { Spontaneous::Rack::Back.application(site) }
     let(:context) { preview_context }
 
-    let(:c_js_digest) { 'f669550dd7e10e9646ad781f44756950' }
-    let(:x_js_digest) { '6b4c9176b2838a4949a18284543fc19c' }
+    let(:c_js_digest) { '3ab39368d6e128169ac2401bc49fcdb2' }
+    let(:x_js_digest) { 'e755ffcead8090406c04b2813b9bdce9' }
     let(:n_js_digest) { '74f175e03a4bdc8c807aba4ae0314938' }
-    let(:m_js_digest) { 'dd35b142dc75b6ec15b2138e9e91c0c3' }
-    let(:all_js_digest) { 'cd1f681752f5038421be0bc5ea0e855d' }
+    let(:m_js_digest) { 'c0f2e1c2a7d1cc9666ccb48cc9fd610e' }
+    let(:all_js_digest) { 'd782ef6abb69b1eb3e4c503478a660db' }
 
-    let(:c_css_digest) { 'fc8ba0d0aae64081dc00b8444a198fb8' }
-    let(:x_css_digest) { '2560aec2891794825eba770bf84823fb' }
-    let(:all_css_digest) { 'bb2c289a27b3d5d4467dde6d60722fd3' }
+    let(:c_css_digest) { '3fcc1da2378a42e97cbd11cb85b8115a' }
+    let(:x_css_digest) { '88b3052bb5d7723b6a6a8b628fbee34e' }
+    let(:all_css_digest) { '4b837b285d3a1998c48e1811e62292d8' }
 
     describe "javascript" do
       it "include scripts as separate files with finger prints" do
@@ -382,14 +382,14 @@ describe "Assets" do
     end
 
     describe "javascript" do
-      let(:all_sha) { "ed62549e8edc1f61a1e27136602f01d9" }
-      let(:x_sha) { "66e92be1e412458f6ff02f4c5dd9beb1" }
+      let(:all_sha) { "29ced6e75f651ea6963bd2f2ffdd745e" }
+      let(:x_sha) { "2b8678f6d71dc1fc0e44ad9f6a5811b3" }
       it "bundles & fingerprints local scripts" do
         result = context.scripts('js/all', 'js/m.js', 'js/c.js', 'x')
         result.must_equal [
           %(<script type="text/javascript" src="/assets/js/all-#{all_sha}.js"></script>),
-          '<script type="text/javascript" src="/assets/js/m-a5be7324bc314d5cf470a59c3732ef10.js"></script>',
-          '<script type="text/javascript" src="/assets/js/c-c24bcbb4f9647b078cc919746aa7fc3a.js"></script>',
+          '<script type="text/javascript" src="/assets/js/m-66885c19e856373c6b9dab3a41885dbf.js"></script>',
+          '<script type="text/javascript" src="/assets/js/c-0201f986795c0d9b4fb850236496359f.js"></script>',
           %(<script type="text/javascript" src="/assets/x-#{x_sha}.js"></script>)
         ].join("\n")
       end
@@ -456,14 +456,14 @@ describe "Assets" do
     end
 
     describe "css" do
-      let(:all_sha) { "2e17f25ddeba996223a6cd1e28e7a319" }
-      let(:x_sha)   { "2560aec2891794825eba770bf84823fb" }
+      let(:all_sha) { "a72e3c2850e95f5c89930cae40a66c29" }
+      let(:x_sha)   { "88b3052bb5d7723b6a6a8b628fbee34e" }
 
       it "bundles & fingerprints local stylesheets" do
         result = context.stylesheets('css/all', 'css/a.css', 'x')
         result.must_equal [
           %(<link rel="stylesheet" href="/assets/css/all-#{all_sha}.css" />),
-          '<link rel="stylesheet" href="/assets/css/a-0164c6d5b696ec2f2c5e70cade040da8.css" />',
+          '<link rel="stylesheet" href="/assets/css/a-46541ee6e70fb12c030698e0addc2c79.css" />',
           %(<link rel="stylesheet" href="/assets/x-#{x_sha}.css" />)
         ].join("\n")
       end

data/test/unit/test_boxes.rb

@@ -370,25 +370,46 @@ describe "Boxes" do
       instance.box3.contents.map { |e| e.label }.must_equal ["0", "1", "c", "2", "3"]
     end
 
+    it 'should be available as a list of ids' do
+      BlankContent.box :box3
+      instance = BlankContent.new
+      contents = 3.times.map { instance.words << StyledContent.new }
+      3.times.map { instance.images << StyledContent.new }
+      instance.save
+      contents.each(&:save)
+      ids = contents.map(&:id)
+      instance.words.ids.must_equal ids
+    end
+
+    it 'should be clearable' do
+      instance = BlankContent.create
+      box = instance.images
+      count = 4
+      count.times { |n| box << StyledContent.new(:label => n)}
+      instance.save
+      instance.images.clear!
+      instance.reload.images.length.must_equal 0
+    end
+
   end
 
   describe "Allowed types" do
     before do
-      class ::Allowed1 < Content
+      class ::Allowed1 < Piece
         style :frank
         style :freddy
       end
-      class ::Allowed2 < Content
+      class ::Allowed2 < Piece
         style :john
         style :paul
         style :ringo
         style :george
       end
-      class ::Allowed3 < Content
+      class ::Allowed3 < Piece
         style :arthur
         style :lancelot
       end
-      class ::Allowed4 < Content; end
+      class ::Allowed4 < Piece; end
 
       class ::Allowed11 < ::Allowed1; end
       class ::Allowed111 < ::Allowed1; end
@@ -402,7 +423,7 @@ describe "Boxes" do
       class ::ChildClass < ::Parent
       end
 
-      class ::Allowable < Content
+      class ::Allowable < Piece
         box :parents, :type => :Parent
       end
 
@@ -566,14 +587,14 @@ describe "Boxes" do
       @b = ::B.new
       @c = ::C.new
       [@a, @b, @c].each do |instance|
-        instance.boxes[:a].stubs(:render).with(anything).returns("[a]")
-        instance.boxes[:b].stubs(:render).with(anything).returns("[b]")
-        instance.boxes[:c].stubs(:render).with(anything).returns("[c]")
-        instance.boxes[:d].stubs(:render).with(anything).returns("[d]")
-      end
-      @b.boxes[:e].stubs(:render).with(anything).returns("[e]")
-      @c.boxes[:e].stubs(:render).with(anything).returns("[e]")
-      @c.boxes[:f].stubs(:render).with(anything).returns("[f]")
+        instance.boxes[:a].stubs(:render_inline).with(anything).returns("[a]")
+        instance.boxes[:b].stubs(:render_inline).with(anything).returns("[b]")
+        instance.boxes[:c].stubs(:render_inline).with(anything).returns("[c]")
+        instance.boxes[:d].stubs(:render_inline).with(anything).returns("[d]")
+      end
+      @b.boxes[:e].stubs(:render_inline).with(anything).returns("[e]")
+      @c.boxes[:e].stubs(:render_inline).with(anything).returns("[e]")
+      @c.boxes[:f].stubs(:render_inline).with(anything).returns("[f]")
     end
 
     after do

data/test/unit/test_changesets.rb

@@ -78,6 +78,7 @@ describe "Change" do
   it "not list new pieces as available for publish" do
     root = Page.create(:title => "root")
     Content.publish(@revision)
+    root.reload
     root.things << Piece.new
     root.save.reload
     result = outstanding_changes[:changes]

data/test/unit/test_extensions.rb

@@ -42,5 +42,22 @@ describe "Extensions" do
       result.must_equal [["js"], ["coffee", "coffee"], ["js"], ["coffee"]]
     end
   end
+
+  describe "Array" do
+    it 'responds to #render by calling #render_inline on the contents' do
+      array = 3.times.map { mock }
+      array.each do |m|
+        m.expects(:render_inline).returns("x")
+      end
+      array.render.must_equal 'xxx'
+    end
+    it 'responds to #render_using by calling #render_inline_using on the contents' do
+      array = 3.times.map { mock }
+      array.each do |m|
+        m.expects(:render_inline_using).returns("x")
+      end
+      array.render_using(mock).must_equal 'xxx'
+    end
+  end
 end
 

data/test/unit/test_fields.rb

@@ -510,87 +510,6 @@ describe "Fields" do
     end
   end
 
-  describe "String Fields" do
-    before do
-      @content_class = Class.new(::Piece) do
-        field :title, :string
-      end
-      @instance = @content_class.new
-      @field = @instance.title
-    end
-
-    it "should escape ampersands for the html format" do
-      @field.value = "This & That"
-      @field.value(:html).must_equal "This & That"
-    end
-  end
-
-  describe "Markdown fields" do
-    before do
-      class ::MarkdownContent < Piece
-        field :text1, :markdown
-        field :text2, :richtext
-        field :text3, :markup
-      end
-      @instance = MarkdownContent.new
-    end
-    after do
-      Object.send(:remove_const, :MarkdownContent)
-    end
-
-    it "be available as the :markdown type" do
-      assert MarkdownContent.field_prototypes[:text1].field_class < Spontaneous::Field::Markdown
-    end
-    it "be available as the :richtext type" do
-      assert MarkdownContent.field_prototypes[:text2].field_class < Spontaneous::Field::Markdown
-    end
-    it "be available as the :markup type" do
-      assert MarkdownContent.field_prototypes[:text3].field_class < Spontaneous::Field::Markdown
-    end
-
-    it "process input into HTML" do
-      @instance.text1 = "*Hello* **World**"
-      @instance.text1.value.must_equal "<p><em>Hello</em> <strong>World</strong></p>\n"
-    end
-
-    it "use more sensible linebreaks" do
-      @instance.text1 = "With\nLinebreak"
-      @instance.text1.value.must_equal "<p>With<br />\nLinebreak</p>\n"
-      @instance.text2 = "With  \nLinebreak"
-      @instance.text2.value.must_equal "<p>With<br />\nLinebreak</p>\n"
-    end
-  end
-
-  describe "LongString fields" do
-    before do
-      class ::LongStringContent < Piece
-        field :long1, :longstring
-        field :long2, :long_string
-        field :long3, :text
-      end
-      @instance = LongStringContent.new
-    end
-    after do
-      Object.send(:remove_const, :LongStringContent)
-    end
-
-    it "is available as the :longstring type" do
-      assert LongStringContent.field_prototypes[:long1].field_class < Spontaneous::Field::LongString
-    end
-
-    it "is available as the :long_string type" do
-      assert LongStringContent.field_prototypes[:long2].field_class < Spontaneous::Field::LongString
-    end
-
-    it "is available as the :text type" do
-      assert LongStringContent.field_prototypes[:long3].field_class < Spontaneous::Field::LongString
-    end
-
-    it "translates newlines to <br/> tags" do
-      @instance.long1 = "this\nlong\nstring"
-      @instance.long1.value.must_equal "this<br />\nlong<br />\nstring"
-    end
-  end
 
   describe "Editor classes" do
     it "be defined in base types" do
@@ -741,568 +660,6 @@ describe "Fields" do
     end
   end
 
-  describe "String fields" do
-    it "be aliased to the :title type" do
-      @content_class = Class.new(::Piece) do
-        field :title, default: "Right"
-        field :something, :title
-      end
-      instance = @content_class.new
-      assert instance.fields.title.class.ancestors.include?(Spontaneous::Field::String), ":title type should inherit from StringField"
-      instance.title.value.must_equal "Right"
-    end
-  end
-
-  describe "WebVideo fields" do
-    before do
-      @content_class = Class.new(::Piece) do
-        field :video, :webvideo
-      end
-      @content_class.stubs(:name).returns("ContentClass")
-      @instance = @content_class.new
-      @field = @instance.video
-    end
-
-    it "have their own editor type" do
-      @content_class.fields.video.export(nil)[:type].must_equal "Spontaneous.Field.WebVideo"
-      @instance.video = "http://www.youtube.com/watch?v=_0jroAM_pO4&feature=feedrec_grec_index"
-      fields  = @instance.export(nil)[:fields]
-      fields[0][:processed_value].must_equal @instance.video.src
-    end
-
-    it "recognise youtube URLs" do
-      @instance.video = "http://www.youtube.com/watch?v=_0jroAM_pO4&feature=feedrec_grec_index"
-      @instance.video.value.must_equal "http://www.youtube.com/watch?v=_0jroAM_pO4&amp;feature=feedrec_grec_index"
-      @instance.video.video_id.must_equal "_0jroAM_pO4"
-      @instance.video.provider_id.must_equal "youtube"
-    end
-
-    it "recognise Vimeo URLs" do
-      @instance.video = "http://vimeo.com/31836285"
-      @instance.video.value.must_equal "http://vimeo.com/31836285"
-      @instance.video.video_id.must_equal "31836285"
-      @instance.video.provider_id.must_equal "vimeo"
-    end
-
-    it "recognise Vine URLs" do
-      @instance.video = "https://vine.co/v/brI7pTPb3qU"
-      @instance.video.value.must_equal "https://vine.co/v/brI7pTPb3qU"
-      @instance.video.video_id.must_equal "brI7pTPb3qU"
-      @instance.video.provider_id.must_equal "vine"
-    end
-
-    it "silently handles unknown providers" do
-      @instance.video = "https://idontdovideo.com/video?id=brI7pTPb3qU"
-      @instance.video.value.must_equal "https://idontdovideo.com/video?id=brI7pTPb3qU"
-      @instance.video.video_id.must_equal "https://idontdovideo.com/video?id=brI7pTPb3qU"
-      @instance.video.provider_id.must_equal nil
-    end
-
-
-    it "use the YouTube api to extract video metadata" do
-      youtube_info = {"thumbnail_large" => "http://i.ytimg.com/vi/_0jroAM_pO4/hqdefault.jpg", "thumbnail_small"=>"http://i.ytimg.com/vi/_0jroAM_pO4/default.jpg", "title" => "Hilarious QI Moment - Cricket", "description" => "Rob Brydon makes a rather embarassing choice of words whilst discussing the relationship between a cricket's chirping and the temperature. Taken from QI XL Series H episode 11 - Highs and Lows", "user_name" => "morthasa", "upload_date" => "2011-01-14 19:49:44", "tags" => "Hilarious, QI, Moment, Cricket, fun, 11, stephen, fry, alan, davies, Rob, Brydon, SeriesH, Fred, MacAulay, Sandi, Toksvig", "duration" => 78, "stats_number_of_likes" => 297, "stats_number_of_plays" => 53295, "stats_number_of_comments" => 46}#.symbolize_keys
-
-      response_xml_file = File.expand_path("../../fixtures/fields/youtube_api_response.xml", __FILE__)
-      connection = mock()
-      Spontaneous::Field::WebVideo::YouTube.any_instance.expects(:open).with("http://gdata.youtube.com/feeds/api/videos/_0jroAM_pO4?v=2").returns(connection)
-      doc = Nokogiri::XML(File.open(response_xml_file))
-      Nokogiri.expects(:XML).with(connection).returns(doc)
-      @field.value = "http://www.youtube.com/watch?v=_0jroAM_pO4"
-      @field.values.must_equal youtube_info.merge(:video_id => "_0jroAM_pO4", :provider => "youtube", :html => "http://www.youtube.com/watch?v=_0jroAM_pO4")
-    end
-
-    it "use the Vimeo api to extract video metadata" do
-      vimeo_info = {"id"=>29987529, "title"=>"Neon Indian Plays The UO Music Shop", "description"=>"Neon Indian plays electronic instruments from the UO Music Shop, Fall 2011. Read more at blog.urbanoutfitters.com.", "url"=>"http://vimeo.com/29987529", "upload_date"=>"2011-10-03 18:32:47", "mobile_url"=>"http://vimeo.com/m/29987529", "thumbnail_small"=>"http://b.vimeocdn.com/ts/203/565/203565974_100.jpg", "thumbnail_medium"=>"http://b.vimeocdn.com/ts/203/565/203565974_200.jpg", "thumbnail_large"=>"http://b.vimeocdn.com/ts/203/565/203565974_640.jpg", "user_name"=>"Urban Outfitters", "user_url"=>"http://vimeo.com/urbanoutfitters", "user_portrait_small"=>"http://b.vimeocdn.com/ps/251/111/2511118_30.jpg", "user_portrait_medium"=>"http://b.vimeocdn.com/ps/251/111/2511118_75.jpg", "user_portrait_large"=>"http://b.vimeocdn.com/ps/251/111/2511118_100.jpg", "user_portrait_huge"=>"http://b.vimeocdn.com/ps/251/111/2511118_300.jpg", "stats_number_of_likes"=>85, "stats_number_of_plays"=>26633, "stats_number_of_comments"=>0, "duration"=>100, "width"=>1280, "height"=>360, "tags"=>"neon indian, analog, korg, moog, theremin, micropiano, microkorg, kaossilator, kaossilator pro", "embed_privacy"=>"anywhere"}.symbolize_keys
-
-      connection = mock()
-      connection.expects(:read).returns(Spontaneous.encode_json([vimeo_info]))
-      Spontaneous::Field::WebVideo::Vimeo.any_instance.expects(:open).with("http://vimeo.com/api/v2/video/29987529.json").returns(connection)
-      @field.value = "http://vimeo.com/29987529"
-      @field.values.must_equal vimeo_info.merge(:video_id => "29987529", :provider => "vimeo", :html => "http://vimeo.com/29987529")
-    end
-
-    describe "with player settings" do
-      before do
-        @content_class.field :video2, :webvideo, :player => {
-          :width => 680, :height => 384,
-          :fullscreen => true, :autoplay => true, :loop => true,
-          :showinfo => false,
-          :youtube => { :theme => 'light', :hd => true, :controls => false },
-          :vimeo => { :color => "ccc", :api => true }
-        }
-        @instance = @content_class.new
-        @field = @instance.video2
-      end
-
-      it "use the configuration in the youtube player HTML" do
-        @field.value = "http://www.youtube.com/watch?v=_0jroAM_pO4&feature=feedrec_grec_index"
-        html = @field.render(:html)
-        html.must_match /^<iframe/
-        html.must_match %r{src="//www\.youtube\.com/embed/_0jroAM_pO4}
-        html.must_match /width="680"/
-        html.must_match /height="384"/
-        html.must_match /theme=light/
-        html.must_match /hd=1/
-        html.must_match /fs=1/
-        html.must_match /controls=0/
-        html.must_match /autoplay=1/
-        html.must_match /showinfo=0/
-        html.must_match /showsearch=0/
-        @field.render(:html, :youtube => {:showsearch => 1}).must_match /showsearch=1/
-        @field.render(:html, :youtube => {:theme => 'dark'}).must_match /theme=dark/
-        @field.render(:html, :width => 100).must_match /width="100"/
-        @field.render(:html, :loop => true).must_match /loop=1/
-      end
-
-      it "use the configuration in the Vimeo player HTML" do
-        @field.value = "http://vimeo.com/31836285"
-        html = @field.render(:html)
-        html.must_match /^<iframe/
-        html.must_match %r{src="//player\.vimeo\.com/video/31836285}
-        html.must_match /width="680"/
-        html.must_match /height="384"/
-        html.must_match /color=ccc/
-        html.must_match /webkitAllowFullScreen="yes"/
-        html.must_match /allowFullScreen="yes"/
-        html.must_match /autoplay=1/
-        html.must_match /title=0/
-        html.must_match /byline=0/
-        html.must_match /portrait=0/
-        html.must_match /api=1/
-        @field.render(:html, :vimeo => {:color => 'f0abcd'}).must_match /color=f0abcd/
-        @field.render(:html, :loop => true).must_match /loop=1/
-        @field.render(:html, :title => true).must_match /title=1/
-        @field.render(:html, :title => true).must_match /byline=0/
-      end
-
-      it "provide a version of the YouTube player params in JSON/JS format" do
-        @field.value = "http://www.youtube.com/watch?v=_0jroAM_pO4&feature=feedrec_grec_index"
-        json = Spontaneous::JSON.parse(@field.render(:json))
-        json[:"tagname"].must_equal "iframe"
-        json[:"tag"].must_equal "<iframe/>"
-        attr = json[:"attr"]
-        attr.must_be_instance_of(Hash)
-        attr[:"src"].must_match %r{^//www\.youtube\.com/embed/_0jroAM_pO4}
-        attr[:"src"].must_match /theme=light/
-        attr[:"src"].must_match /hd=1/
-        attr[:"src"].must_match /fs=1/
-        attr[:"src"].must_match /controls=0/
-        attr[:"src"].must_match /autoplay=1/
-        attr[:"src"].must_match /showinfo=0/
-        attr[:"src"].must_match /showsearch=0/
-        attr[:"width"].must_equal 680
-        attr[:"height"].must_equal 384
-        attr[:"frameborder"].must_equal "0"
-        attr[:"type"].must_equal "text/html"
-      end
-
-      it "provide a version of the Vimeo player params in JSON/JS format" do
-        @field.value = "http://vimeo.com/31836285"
-        json = Spontaneous::JSON.parse(@field.render(:json))
-        json[:"tagname"].must_equal "iframe"
-        json[:"tag"].must_equal "<iframe/>"
-        attr = json[:"attr"]
-        attr.must_be_instance_of(Hash)
-        attr[:"src"].must_match /color=ccc/
-        attr[:"src"].must_match /autoplay=1/
-        attr[:"src"].must_match /title=0/
-        attr[:"src"].must_match /byline=0/
-        attr[:"src"].must_match /portrait=0/
-        attr[:"src"].must_match /api=1/
-        attr[:"webkitAllowFullScreen"].must_equal "yes"
-        attr[:"allowFullScreen"].must_equal "yes"
-        attr[:"width"].must_equal 680
-        attr[:"height"].must_equal 384
-        attr[:"frameborder"].must_equal "0"
-        attr[:"type"].must_equal "text/html"
-      end
-
-
-      it "can properly embed a Vine video" do
-        @field.value = "https://vine.co/v/brI7pTPb3qU"
-        embed = @field.render(:html)
-        embed.must_match %r(iframe)
-        embed.must_match %r(src=["']//vine\.co/v/brI7pTPb3qU/card["'])
-        # Vine videos are square
-        embed.must_match %r(width=["']680["'])
-        embed.must_match %r(height=["']680["'])
-      end
-
-      it "falls back to a simple iframe for unknown providers xxx" do
-        @field.value = "https://unknownprovider.net/xx/brI7pTPb3qU"
-        embed = @field.render(:html)
-        embed.must_match %r(iframe)
-        embed.must_match %r(src=["']https://unknownprovider.net/xx/brI7pTPb3qU["'])
-        embed.must_match %r(width=["']680["'])
-        embed.must_match %r(height=["']384["'])
-      end
-    end
-
-  end
-
-  describe "HTML fields" do
-    before do
-      @content_class = Class.new(::Piece) do
-        field :raw, :html
-      end
-      @content_class.stubs(:name).returns("ContentClass")
-      @instance = @content_class.new
-      @field = @instance.raw
-    end
-
-    it "does no escaping of input" do
-      @field.value = "<script>\n</script>"
-      @field.value(:html).must_equal "<script>\n</script>"
-    end
-  end
-
-  describe "Location fields" do
-    before do
-      @content_class = Class.new(::Piece) do
-        field :location
-      end
-      @content_class.stubs(:name).returns("ContentClass")
-      @instance = @content_class.new
-      @field = @instance.location
-    end
-
-    it "use a standard string editor" do
-      @content_class.fields.location.export(nil)[:type].must_equal "Spontaneous.Field.String"
-    end
-
-    it "successfully geolocate an address" do
-      # TODO: use mocking to avoid an external API request to googles geolocation service
-      @field.value = "Cambridge, England"
-      @field.value(:lat).must_equal 52.2053370
-      @field.value(:lng).must_equal 0.1218170
-      @field.value(:country).must_equal "United Kingdom"
-      @field.value(:formatted_address).must_equal "Cambridge, Cambridge, UK"
-
-      @field.latitude.must_equal 52.2053370
-      @field.longitude.must_equal 0.1218170
-      @field.lat.must_equal 52.2053370
-      @field.lng.must_equal 0.1218170
-
-      @field.country.must_equal "United Kingdom"
-      @field.formatted_address.must_equal "Cambridge, Cambridge, UK"
-    end
-  end
-
-  describe "Option fields" do
-    before do
-      @content_class = Class.new(::Piece) do
-        field :options, :select, :options => [
-          ["a", "Value A"],
-          ["b", "Value B"],
-          ["c", "Value C"]
-        ]
-      end
-      @content_class.stubs(:name).returns("ContentClass")
-      @instance = @content_class.new
-      @field = @instance.options
-    end
-
-    it "use a specific editor class" do
-      @content_class.fields.options.export(nil)[:type].must_equal "Spontaneous.Field.Select"
-    end
-
-    it "select the options class for fields named options" do
-      @content_class.field :type, :select, :options => [["a", "A"]]
-      assert @content_class.fields.options.instance_class.ancestors.include?(Spontaneous::Field::Select)
-    end
-
-    it "accept a list of strings as options" do
-      @content_class.field :type, :select, :options => ["a", "b"]
-      @instance = @content_class.new
-      @instance.type.option_list.must_equal [["a", "a"], ["b", "b"]]
-    end
-
-    it "accept a json string as a value and convert it properly" do
-      @field.value = %(["a", "Value A"])
-      @field.value.must_equal "a"
-      @field.value(:label).must_equal "Value A"
-      @field.label.must_equal "Value A"
-      @field.unprocessed_value.must_equal %(["a", "Value A"])
-    end
-  end
-
-  describe "File fields" do
-    let(:path) { File.expand_path("../../fixtures/images/vimlogo.pdf", __FILE__) }
-
-    before do
-      assert File.exists?(path), "Test file #{path} does not exist"
-      @content_class = Class.new(::Piece)
-      @prototype = @content_class.field :file
-      @content_class.stubs(:name).returns("ContentClass")
-      @instance = @content_class.create
-      @field = @instance.file
-    end
-
-    it "have a distinct editor class" do
-      @prototype.instance_class.editor_class.must_equal "Spontaneous.Field.File"
-    end
-
-    it "adopt any field called 'file'" do
-      assert @field.is_a?(Spontaneous::Field::File), "Field should be an instance of FileField but instead has the following ancestors #{ @prototype.instance_class.ancestors }"
-    end
-
-    it "copy files to the media folder" do
-      File.open(path, 'rb') do |file|
-        @field.value = {
-          :tempfile => file,
-          :type => "application/pdf",
-          :filename => "vimlogo.pdf"
-        }
-      end
-      url = @field.value
-      path = File.join File.dirname(Spontaneous.media_dir), url
-      assert File.exist?(path), "Media file should have been copied into place"
-    end
-
-    it "generate the requisite file metadata" do
-      File.open(path, 'rb') do |file|
-        @field.value = {
-          :tempfile => file,
-          :type => "application/pdf",
-          :filename => "vimlogo.pdf"
-        }
-      end
-      @field.value(:html).must_match %r{/media/.+/vimlogo.pdf$}
-      @field.value.must_match %r{/media/.+/vimlogo.pdf$}
-      @field.path.must_equal @field.value
-      @field.value(:filesize).must_equal 2254
-      @field.filesize.must_equal 2254
-      @field.value(:filename).must_equal "vimlogo.pdf"
-      @field.filename.must_equal "vimlogo.pdf"
-    end
-
-    it "just accept the given value if passed a path to a non-existant file" do
-      @field.value = "/images/nosuchfile.rtf"
-      @field.value.must_equal  "/images/nosuchfile.rtf"
-      @field.filename.must_equal "nosuchfile.rtf"
-      @field.filesize.must_equal 0
-    end
-
-    it "copy the given file if passed a path to an existing file" do
-      @field.value = path
-      @field.value.must_match %r{/media/.+/vimlogo.pdf$}
-      @field.filename.must_equal "vimlogo.pdf"
-      @field.filesize.must_equal 2254
-    end
-
-    it "sets the unprocessed value to a JSON encoded array of MD5 hash & filename" do
-      @field.value = path
-      @instance.save
-      @field.unprocessed_value.must_equal ["vimlogo.pdf", "1de7e866d69c2f56b4a3f59ed1c98b74"].to_json
-    end
-
-    it "sets the field hash to the MD5 hash of the file" do
-      @field.value = path
-      @field.file_hash.must_equal "1de7e866d69c2f56b4a3f59ed1c98b74"
-    end
-
-    it "sets the original filename of the file" do
-      @field.value = path
-      @field.original_filename.must_equal "vimlogo.pdf"
-    end
-
-    it "doesn't set the hash of a file that can't be found" do
-      @field.value = "/images/nosuchfile.rtf"
-      @field.file_hash.must_equal ""
-    end
-
-    it "sets the original filename of a file that can't be found" do
-      @field.value = "/images/nosuchfile.rtf"
-      @field.original_filename.must_equal "/images/nosuchfile.rtf"
-    end
-
-    describe "clearing" do
-      def assert_file_field_empty
-        @field.value.must_equal ''
-        @field.filename.must_equal ''
-        @field.filesize.must_equal 0
-      end
-
-      before do
-        path = File.expand_path("../../fixtures/images/vimlogo.pdf", __FILE__)
-        @field.value = path
-      end
-
-      it "clears the value if set to the empty string" do
-        @field.value = ''
-        assert_file_field_empty
-      end
-    end
-
-    describe "with cloud storage" do
-      before do
-        ::Fog.mock!
-      @aws_credentials = {
-        :provider=>"AWS",
-        :aws_secret_access_key=>"SECRET_ACCESS_KEY",
-        :aws_access_key_id=>"ACCESS_KEY_ID"
-      }
-        @storage = S::Media::Store::Cloud.new(@aws_credentials, "media.example.com")
-        @site.expects(:storage).returns(@storage)
-      end
-
-      it "sets the content-disposition header if defined as an 'attachment'" do
-        prototype = @content_class.field :attachment, :file, attachment: true
-        field = @instance.attachment
-        path = File.expand_path("../../fixtures/images/vimlogo.pdf", __FILE__)
-        @storage.expects(:copy).with(path, is_a(Array), { content_type: "application/pdf", content_disposition: 'attachment; filename=vimlogo.pdf'})
-        field.value = path
-      end
-    end
-  end
-  describe "Date fields" do
-    before do
-      @content_class = Class.new(::Piece)
-      @prototype = @content_class.field :date
-      @content_class.stubs(:name).returns("ContentClass")
-      @instance = @content_class.create
-      @field = @instance.date
-    end
-
-    it "have a distinct editor class" do
-      @prototype.instance_class.editor_class.must_equal "Spontaneous.Field.Date"
-    end
-
-    it "adopt any field called 'date'" do
-      assert @field.is_a?(Spontaneous::Field::Date), "Field should be an instance of DateField but instead has the following ancestors #{ @prototype.instance_class.ancestors }"
-    end
-
-    it "default to an empty string" do
-      @field.value(:html).must_equal ""
-      @field.value(:plain).must_equal ""
-    end
-
-    it "correctly parse strings" do
-      @field.value = "Friday, 8 June, 2012"
-      @field.value(:html).must_equal %(<time datetime="2012-06-08">Friday, 8 June, 2012</time>)
-      @field.value(:plain).must_equal %(Friday, 8 June, 2012)
-      @field.date.must_equal Date.parse("Friday, 8 June, 2012")
-    end
-
-    it "allow for setting a custom default format" do
-      prototype = @content_class.field :datef, :date, :format => "%d %b %Y, %a"
-      instance = @content_class.new
-      field = instance.datef
-      field.value = "Friday, 8 June, 2012"
-      field.value(:html).must_equal %(<time datetime="2012-06-08">08 Jun 2012, Fri</time>)
-      field.value(:plain).must_equal %(08 Jun 2012, Fri)
-    end
-  end
-
-  describe "Tag list fields" do
-    before do
-      @content_class = Class.new(::Piece)
-      @prototype = @content_class.field :tags
-      @content_class.stubs(:name).returns("ContentClass")
-      @instance = @content_class.create
-      @field = @instance.tags
-    end
-
-    it "has a distinct editor class" # eventually...
-
-    it "adopts any field called 'tags'" do
-      assert @field.is_a?(Spontaneous::Field::Tags), "Field should be an instance of TagsField but instead has the following ancestors #{ @prototype.instance_class.ancestors }"
-    end
-
-    it "defaults to an empty list" do
-      @field.value(:html).must_equal ""
-      @field.value(:tags).must_equal []
-    end
-
-    it "correctly parses strings" do
-      @field.value = 'this that "the other" more'
-      @field.value(:html).must_equal 'this that "the other" more'
-      @field.value(:tags).must_equal ["this", "that", "the other", "more"]
-    end
-
-    it "includes Enumerable" do
-      @field.value = 'this that "the other" more'
-      @field.map(&:upcase).must_equal  ["THIS", "THAT", "THE OTHER", "MORE"]
-    end
-
-    it "allows for tags with commas" do
-      @field.value = %(this that "the, other" more)
-      @field.map(&:upcase).must_equal  ["THIS", "THAT", "THE, OTHER", "MORE"]
-    end
-  end
-
-  describe "Boolean fields" do
-
-    before do
-      @content_class = Class.new(::Piece)
-      @prototype = @content_class.field :switch
-      @content_class.stubs(:name).returns("ContentClass")
-      @instance = @content_class.create
-      @field = @instance.switch
-    end
-
-    it "has a distinct editor class" do
-      @prototype.instance_class.editor_class.must_equal "Spontaneous.Field.Boolean"
-    end
-
-    it "adopts any field called 'switch'" do
-      assert @field.is_a?(Spontaneous::Field::Boolean), "Field should be an instance of Boolean but instead has the following ancestors #{ @prototype.instance_class.ancestors }"
-    end
-
-    it "defaults to true" do
-      @field.value.must_equal true
-      @field.value(:html).must_equal "Yes"
-      @field.value(:string).must_equal "Yes"
-    end
-
-    it "changes string value to 'No'" do
-      @field.value = false
-      @field.value(:string).must_equal "No"
-    end
-
-    it "flags itself as 'empty' if false" do # I think...
-      @field.empty?.must_equal false
-      @field.value = false
-      @field.empty?.must_equal true
-    end
-
-    it "uses the given state labels" do
-      prototype = @content_class.field :boolean, true: "Enabled", false: "Disabled"
-      field = prototype.to_field(@instance)
-      field.value.must_equal true
-      field.value(:string).must_equal "Enabled"
-      field.value = false
-      field.value(:string).must_equal "Disabled"
-      field.value(:html).must_equal "Disabled"
-    end
-
-    it "uses the given default" do
-      prototype = @content_class.field :boolean, default: false, true: "On", false: "Off"
-      field = prototype.to_field(@instance)
-      field.value.must_equal false
-      field.value(:string).must_equal "Off"
-    end
-
-    it "returns the string value from #to_s" do
-      prototype = @content_class.field :boolean, default: false, true: "On", false: "Off"
-      field = prototype.to_field(@instance)
-      field.to_s.must_equal "Off"
-    end
-
-    it "has shortcut accessors" do
-      state = @field.value(:boolean)
-      @field.on?.must_equal state
-      @field.checked?.must_equal state
-      @field.enabled?.must_equal state
-    end
-
-    it "exports the labels to the interface" do
-      prototype = @content_class.field :boolean, default: false, true: "Yes Please", false: "No Thanks"
-      exported = prototype.instance_class.export(nil)
-      exported.must_equal({:labels=>{:true=>"Yes Please", :false=>"No Thanks"}})
-    end
-  end
-
   describe "Asynchronous processing" do
     before do
       @site.background_mode = :simultaneous
@@ -1427,6 +784,7 @@ describe "Fields" do
           :version => 1,
           :value => {
             :width=>50, :height=>67, :dimensions => [50,67], :filesize=>3951,
+            :storage_name=>"default",
             :type=>"image/gif", :format => "gif",
             :tempfile=>"#{@site.root}/cache/media/tmp/#{field.media_id}/something.gif",
           :filename=>"something.gif",
@@ -1453,6 +811,7 @@ describe "Fields" do
           :version => 1,
           :value => {
             :width=>50, :height=>67, :dimensions => [50,67], :filesize=>3951,
+            :storage_name=>"default",
             :type=>"image/gif", :format => "gif",
             :tempfile=>"#{@site.root}/cache/media/tmp/#{field.media_id}/something.gif",
           :filename=>"something.gif",
@@ -1498,6 +857,7 @@ describe "Fields" do
           :version => 1,
           :value => {
             :width=>50, :height=>67, :dimensions => [50,67], :filesize=>3951,
+            :storage_name=>"default",
             :type=>"image/gif", :format => "gif",
             :tempfile=>"#{@site.root}/cache/media/tmp/#{field.media_id}/something.gif",
           :filename=>"something.gif",
@@ -1522,6 +882,7 @@ describe "Fields" do
           :version => 1,
           :value => {
             :width=>50, :height=>67, :dimensions => [50,67], :filesize=>3951,
+            :storage_name=>"default",
             :type=>"image/gif", :format => "gif",
             :tempfile=>"#{@site.root}/cache/media/tmp/#{field.media_id}/something.gif",
           :filename=>"something.gif",
@@ -1607,6 +968,22 @@ describe "Fields" do
       end
     end
 
+    it "includes a local temp url for fields with pending values" do
+      field = @instance.image
+      Spontaneous::Simultaneous.expects(:fire).with(:update_fields, {
+        "fields" => [field.id]
+      })
+      File.open(@image, "r") do |file|
+        field.pending_version.must_equal 0
+        Spontaneous::Field.set(@site, field, {:tempfile => file, :filename => "something.gif", :type => "image/gif"}, nil, true)
+        export = field.export
+        values = export[:processed_value]
+        assert values.key?(:__pending__)
+        pending = values[:__pending__][:value]
+        pending[:src].must_match %r{^/media/}
+      end
+    end
+
     describe "page locks" do
       before do
         @now = Time.now