spontaneous 0.2.0.beta5 → 0.2.0.beta6

data/test/functional/test_front.rb

@@ -44,10 +44,12 @@ describe "Front" do
     end
 
     class ::DynamicRequestParams < ::Page
+      singleton
       layout(:html) { "{{ params[:horse] }}*{{ equine }}" }
     end
 
     class ::DynamicRenderParams < ::Page
+      singleton
       add_output :mobile
       add_output :session
       add_output :params
@@ -101,6 +103,8 @@ describe "Front" do
 
     Content.delete_revision(1) rescue nil
 
+    site.publish_steps = Spontaneous::Publishing::Steps.default
+
     Spontaneous.logger.silent! {
       site.publish_all
     }
@@ -271,7 +275,7 @@ describe "Front" do
           get { render "caterpillars" }
         end
         get '/dynamic-render-params'
-        assert last_response.status == 404
+        assert last_response.status == 404, "Expected 404 but got #{last_response.status}"
       end
 
       it "return the right status code" do
@@ -325,7 +329,7 @@ describe "Front" do
 
       it "allows setting status code and passing parameters to the show call" do
         DynamicRenderParams.controller do
-          get { render "$dynamic_render_params", 401, :teeth => "white" }
+          get { render DynamicRenderParams, 401, :teeth => "white" }
         end
         get '/dynamic-render-params'
         assert last_response.status == 401
@@ -334,7 +338,7 @@ describe "Front" do
 
       it "allows passing parameters to the render call" do
         DynamicRenderParams.controller do
-          get { render "$dynamic_render_params", :teeth => "white" }
+          get { render DynamicRenderParams, :teeth => "white" }
         end
         get '/dynamic-render-params'
         assert last_response.status == 200

data/test/test_helper.rb

@@ -17,6 +17,7 @@ $:.unshift(test_path) if File.directory?(test_path) && !$:.include?(test_path)
 $:.unshift(spot_path) if File.directory?(spot_path) && !$:.include?(spot_path)
 
 require 'rack'
+require 'timecop'
 require 'logger'
 
 Sequel.extension :migration
@@ -25,38 +26,46 @@ Sequel.extension :migration
 # The scissors plugin adds class methods for update, delete, and destroy
 Sequel::Model.plugin :scissors
 
-# for future integration with travis
-ENV["SPOT_ADAPTER"] ||= "postgres"
+ENV["SPOT_ADAPTER"] ||= "sqlite"
 
 jruby = case RUBY_PLATFORM
-           when "java"
-             true
-           else
-             false
-           end
+when "java"
+  true
+else
+  false
+end
 
 
 connection_string = \
-  case ENV["SPOT_ADAPTER"]
-  when "postgres"
-    if jruby
-      require 'jdbc/postgres'
-      Jdbc::Postgres.load_driver
-      "jdbc:postgresql:///spontaneous2_test"
-    else
-      require 'pg'
-      "postgres:///spontaneous2_test"
-    end
-  when "mysql"
-    if jruby
-      require 'jdbc/mysql'
-      Jdbc::MySQL.load_driver
-      "jdbc:mysql://localhost/spontaneous2_test?user=root"
-    else
-      require 'mysql2'
-      "mysql2://root@localhost/spontaneous2_test"
-    end
+case ENV["SPOT_ADAPTER"]
+when "postgres"
+  if jruby
+    require 'jdbc/postgres'
+    Jdbc::Postgres.load_driver
+    "jdbc:postgresql:///spontaneous2_test"
+  else
+    require 'pg'
+    "postgres:///spontaneous2_test"
+  end
+when "mysql"
+  if jruby
+    require 'jdbc/mysql'
+    Jdbc::MySQL.load_driver
+    "jdbc:mysql://localhost/spontaneous2_test?user=root"
+  else
+    require 'mysql2'
+    "mysql2://root@localhost/spontaneous2_test"
+  end
+when "sqlite"
+  if jruby
+    require 'jdbc/sqlite3'
+    Jdbc::SQLite3.load_driver
+    "jdbc:sqlite::memory:"
+  else
+    require 'sqlite3'
+    "sqlite:/" # in-memory
   end
+end
 
 puts "SPOT_ADAPTER=#{ENV["SPOT_ADAPTER"]} => #{connection_string}"
 
@@ -240,5 +249,3 @@ class MiniTest::Spec
 end
 
 require 'minitest/autorun'
-
-

data/test/unit/test_alias.rb

@@ -321,9 +321,6 @@ describe "Alias" do
       end
 
 
-      # TODO
-      it "reference the aliases fields before the targets"
-
       it "present their target's fields as their own" do
         assert @a_alias.field?(:a_field1)
         @a_alias.a_field1.value.must_equal a.a_field1.value
@@ -333,6 +330,14 @@ describe "Alias" do
         @a_alias.target.a_field1.value.must_equal a.a_field1.value
       end
 
+      it "provide transparent access target's fields" do
+        @a_alias.a_field1.value.must_equal a.a_field1.value
+      end
+
+      it "provide transparent access target's fields with hash notation" do
+        @a_alias.fields[:a_field1].value.must_equal a.a_field1.value
+      end
+
       it "have their own styles" do
         assert_correct_template(@a_alias,  template_root / 'a_alias/a_alias_style', renderer)
       end
@@ -477,6 +482,18 @@ describe "Alias" do
       bl.path.must_equal "/aliases/newb/newb"
     end
 
+    it "include target values in serialisation" do
+      al = BAlias.create(:target => b)
+      al.export[:target].must_equal b.shallow_export(nil)
+    end
+
+    it "include target values in entry serialisation" do
+      al = BAlias.create(:target => b)
+      aliases.box1 << al
+      aliases.save
+      al.entry.export[:target].must_equal b.shallow_export(nil)
+    end
+
     it "update their path if their parent's path changes" do
       al = BAlias.create(:target => b, :slug => "balias")
       bl = BAlias.create(:target => b, :slug => "balias")

data/test/unit/test_assets.rb

@@ -93,6 +93,8 @@ describe "Assets" do
   end
 
   after do
+    tmp = site.path('assets/tmp')
+    FileUtils.rm_r(tmp) if tmp.exist?
     Content.delete
   end
 
@@ -221,7 +223,7 @@ describe "Assets" do
         result = last_response.body
         result.must_match /var a = 1/
         result.must_match /var b = 2/
-        result.must_match /alert\("I knew it!"\);/
+        result.must_match %r{alert\("I knew it!"\);}
       end
 
       it "should preprocess coffeescript" do
@@ -235,7 +237,7 @@ describe "Assets" do
         get "/assets/x.js"
         assert last_response.ok?, "Recieved #{last_response.status} not 200"
         result = last_response.body
-        result.must_match /var x = 1;/
+        result.must_match %r{var x = 1;}
       end
 
       it "should use absolute URLs when encountered" do
@@ -273,15 +275,15 @@ describe "Assets" do
         get "/assets/css/all.css"
         assert last_response.ok?, "Recieved #{last_response.status} not 200"
         result = last_response.body
-        result.must_match /height: 42px;/
-        result.must_match /width: 8px;/
+        result.must_match %r{height: 42px;}
+        result.must_match %r{width: 8px;}
       end
 
       it "should compile sass" do
         get "/assets/css/b.css"
         assert last_response.ok?, "Recieved #{last_response.status} not 200"
         result = last_response.body
-        result.must_match /height: 42px;/
+        result.must_match %r{height: 42px;}
       end
 
       it "links to images" do
@@ -295,7 +297,7 @@ describe "Assets" do
         get "/assets/css/missing.css"
         assert last_response.ok?, "Recieved #{last_response.status} not 200"
         result = last_response.body
-        result.must_match /background: url\(i\/missing\.png\)/
+        result.must_match %r{background: url\(i\/missing\.png\)}
       end
 
       it "can understand urls with hashes" do
@@ -337,7 +339,7 @@ describe "Assets" do
   describe "publishing" do
     let(:app) { Spontaneous::Rack::Front.application(site) }
     let(:context) { live_context }
-    let(:revision) { S::Revision.new(context.revision) }
+    let(:revision) { site.revision(context.revision) }
 
     before do
       FileUtils.rm_f(Spontaneous.revision_dir) if File.exist?(Spontaneous.revision_dir)
@@ -350,25 +352,27 @@ describe "Assets" do
     end
 
     describe "javascript" do
+      let(:all_sha) { "b1d3d85feff4d68e16d2b4da97717aa0" }
+      let(:x_sha) { "cf638f60cff3ce84f156cb4621a914b4" }
       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-ceb12af81123a85bc4d15f23c2cf1069.js"></script>',
-          '<script type="text/javascript" src="/assets/js/m-262ca357844c1eeaee7688fe5bafa4ca.js"></script>',
-          '<script type="text/javascript" src="/assets/js/c-e405b6a6ea9a29a46905bd10627a53a8.js"></script>',
-          '<script type="text/javascript" src="/assets/x-e613ff07e2bd683e0c9f519c94abcb00.js"></script>'
+          %(<script type="text/javascript" src="/assets/js/all-#{all_sha}.js"></script>),
+          '<script type="text/javascript" src="/assets/js/m-424bd92768589875beac31e333399631.js"></script>',
+          '<script type="text/javascript" src="/assets/js/c-ac0d40982cc84fc656234ef2a57e09e8.js"></script>',
+          %(<script type="text/javascript" src="/assets/x-#{x_sha}.js"></script>)
         ].join("\n")
       end
 
       it "writes bundled assets to the revision directory" do
         result = context.scripts('js/all')
-        asset_path = revision.path("assets/js/all-ceb12af81123a85bc4d15f23c2cf1069.js")
+        asset_path = revision.path("assets/js/all-#{all_sha}.js")
         assert asset_path.exist?
       end
 
       it "compresses local scripts" do
         result = context.scripts('js/all')
-        asset_path = revision.path("assets/js/all-ceb12af81123a85bc4d15f23c2cf1069.js")
+        asset_path = revision.path("assets/js/all-#{all_sha}.js")
         js = asset_path.read
         js.index("\n").must_be_nil
       end
@@ -376,23 +380,23 @@ describe "Assets" do
       it "bundles locals scripts and includes remote ones" do
         result = context.scripts('js/all', '//use.typekit.com/abcde', 'http://cdn.google.com/jquery.js', 'x')
         result.must_equal [
-          '<script type="text/javascript" src="/assets/js/all-ceb12af81123a85bc4d15f23c2cf1069.js"></script>',
+          %(<script type="text/javascript" src="/assets/js/all-#{all_sha}.js"></script>),
           '<script type="text/javascript" src="//use.typekit.com/abcde"></script>',
           '<script type="text/javascript" src="http://cdn.google.com/jquery.js"></script>',
-          '<script type="text/javascript" src="/assets/x-e613ff07e2bd683e0c9f519c94abcb00.js"></script>'
+          %(<script type="text/javascript" src="/assets/x-#{x_sha}.js"></script>)
         ].join("\n")
       end
 
       it "makes bundled scripts available under /assets" do
         context.scripts('js/all')
-        get "/assets/js/all-ceb12af81123a85bc4d15f23c2cf1069.js"
-        asset_path = revision.path("assets/js/all-ceb12af81123a85bc4d15f23c2cf1069.js")
+        get "/assets/js/all-#{all_sha}.js"
+        asset_path = revision.path("assets/js/all-#{all_sha}.js")
         last_response.body.must_equal asset_path.read
       end
 
       it "only bundles & compresses once" do
         context.scripts('js/all')
-        asset_path = revision.path("assets/js/all-ceb12af81123a85bc4d15f23c2cf1069.js")
+        asset_path = revision.path("assets/js/all-#{all_sha}.js")
         assert asset_path.exist?
         asset_path.open("w") do |file|
           file.write("var cached = true;")
@@ -400,22 +404,44 @@ describe "Assets" do
         context.scripts('js/all')
         asset_path.read.must_equal "var cached = true;"
       end
+      describe "re-use" do
+        before do
+          @result = context.scripts('js/all', 'x')
+        end
+
+        it "uses assets from a previous publish if present" do
+          context = live_context
+          def context.revision; 100 end
+          revision = site.revision(context.revision)
+          manifest = Spontaneous::JSON.parse File.read(site.path("assets/tmp") + "manifest.json")
+          compiled = manifest[:assets][:"js/all.js"]
+          ::File.open(site.path("assets/tmp")+compiled, 'w') do |file|
+            file.write("var reused = true;")
+          end
+          result = context.scripts('js/all', 'x')
+          rev = revision.path("assets") + compiled
+          File.read(rev).must_equal "var reused = true;"
+        end
+      end
     end
 
     describe "css" do
+      let(:all_sha) { "2468ffc5102b6bfcaf69a4fc8db59fdd" }
+      let(:x_sha)   { "ae3ee1dc79a34d24e28456118c1b9623" }
+
       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-c80e50bd55af79647f771d421c0e732a.css" />',
-          '<link rel="stylesheet" href="/assets/css/a-2709bcba844511c3afc19fa1805e5834.css" />',
-          '<link rel="stylesheet" href="/assets/x-6c1e7ede5bbe3a4ff80314f43fd6ef57.css" />'
+          %(<link rel="stylesheet" href="/assets/css/all-#{all_sha}.css" />),
+          '<link rel="stylesheet" href="/assets/css/a-35b26d0cd9c7ebff494c8627e0d4ed14.css" />',
+          %(<link rel="stylesheet" href="/assets/x-#{x_sha}.css" />)
         ].join("\n")
       end
 
       it "ignores missing stylesheets" do
         result = context.stylesheets('css/all', '/css/notfound', 'css/notfound')
         result.must_equal [
-          '<link rel="stylesheet" href="/assets/css/all-c80e50bd55af79647f771d421c0e732a.css" />',
+          %(<link rel="stylesheet" href="/assets/css/all-#{all_sha}.css" />),
           '<link rel="stylesheet" href="/css/notfound" />',
           '<link rel="stylesheet" href="css/notfound" />'
         ].join("\n")
@@ -424,10 +450,10 @@ describe "Assets" do
       it "bundles locals scripts and includes remote ones" do
         result = context.stylesheets('css/all.css', '//stylesheet.com/responsive', 'http://cdn.google.com/normalize.css', 'x')
         result.must_equal [
-          '<link rel="stylesheet" href="/assets/css/all-c80e50bd55af79647f771d421c0e732a.css" />',
+          %(<link rel="stylesheet" href="/assets/css/all-#{all_sha}.css" />),
           '<link rel="stylesheet" href="//stylesheet.com/responsive" />',
           '<link rel="stylesheet" href="http://cdn.google.com/normalize.css" />',
-          '<link rel="stylesheet" href="/assets/x-6c1e7ede5bbe3a4ff80314f43fd6ef57.css" />'
+          %(<link rel="stylesheet" href="/assets/x-#{x_sha}.css" />)
         ].join("\n")
       end
 
@@ -473,15 +499,17 @@ describe "Assets" do
       end
     end
 
+    let(:y_sha) { "e2b6a69468b467c7414ae0e12124a66e" }
+
     describe "images" do
       it "bundles images and links using fingerprinted asset url" do
         path = context.stylesheet_urls('css/image1').first
         get path
         assert last_response.ok?, "Recieved #{last_response.status} not 200"
         result = last_response.body
-        result.must_match %r{background:url\(/assets/i/y-e75e0b52344f0e16c0564a3a7b0b8ace\.png\)}
+        result.must_match %r{background:url\(/assets/i/y-#{y_sha}\.png\)}
 
-        asset_path = revision.path("/assets/i/y-e75e0b52344f0e16c0564a3a7b0b8ace.png")
+        asset_path = revision.path("/assets/i/y-#{y_sha}.png")
         assert asset_path.exist?
       end
 
@@ -498,8 +526,8 @@ describe "Assets" do
         get path
         assert last_response.ok?, "Recieved #{last_response.status} not 200"
         result = last_response.body
-        result.must_match %r{background:url\(/assets/i/y-e75e0b52344f0e16c0564a3a7b0b8ace\.png\?query=true#hash\)}
-        asset_path = revision.path("/assets/i/y-e75e0b52344f0e16c0564a3a7b0b8ace.png")
+        result.must_match %r{background:url\(/assets/i/y-#{y_sha}\.png\?query=true#hash\)}
+        asset_path = revision.path("/assets/i/y-#{y_sha}.png")
         assert asset_path.exist?
       end
     end
@@ -509,11 +537,11 @@ describe "Assets" do
 
       it "should allow for embedding asset images into templates" do
         result = renderer.render_string("${ asset_path 'i/y.png' }", @page.output(:html))
-        result.must_equal "/assets/i/y-e75e0b52344f0e16c0564a3a7b0b8ace.png"
+        result.must_equal "/assets/i/y-#{y_sha}.png"
       end
       it "should allow for embedding asset urls into templates" do
         result = renderer.render_string("${ asset_url 'i/y.png' }", @page.output(:html))
-        result.must_equal "url(/assets/i/y-e75e0b52344f0e16c0564a3a7b0b8ace.png)"
+        result.must_equal "url(/assets/i/y-#{y_sha}.png)"
       end
     end
   end

data/test/unit/test_changesets.rb

@@ -9,10 +9,11 @@ describe "Change" do
     @now = Time.now
     @site = setup_site
 
-    stub_time(@now)
+    Timecop.freeze(@now)
     @revision = 1
 
     Content.delete
+    Spontaneous::State.delete
 
     class ::Page
       field :title, :string, :default => "New Page"
@@ -25,6 +26,7 @@ describe "Change" do
   end
 
   after do
+    Timecop.return
     Content.delete_revision(@revision) rescue nil
     Content.delete_revision(@revision+1) rescue nil
     Content.delete
@@ -55,8 +57,9 @@ describe "Change" do
 
   it "list all newly created pages" do
     root = Page.create(:title => "root")
-    root[:first_published_at] = root[:last_published_at] = root.modified_at + 1000
     root.save
+    Content.publish(@revision)
+
 
     5.times { |i| root.things << Page.create(:title => "Page #{i+1}") }
 
@@ -75,9 +78,6 @@ describe "Change" do
   it "not list new pieces as available for publish" do
     root = Page.create(:title => "root")
     Content.publish(@revision)
-    # force root to appear in the modified lists -- need this because otherwise the changes happen
-    # more quickly than the resolution of the timestamps can register
-    root[:first_published_at] = root[:last_published_at] = root.modified_at - 1000
     root.things << Piece.new
     root.save.reload
     result = outstanding_changes[:changes]
@@ -219,11 +219,14 @@ describe "Change" do
     root.reload
     page1 = Page.new(:title => "Page 1")
     root.things << page1
+    root.save.reload
+    page1.save.reload
+    last = Time.now + 100
+    Timecop.travel(last)
     new_child1  = Page.new(:title => "New Child 1")
     page1.things << new_child1
-    root.save
-    last = Time.now + 100
-    ::Content.filter(:id => new_child1.id).update(:modified_at => last)
+    page1.save
+    new_child1.save
     result = outstanding_changes[:changes]
     assert result.first.modified_at > result.last.modified_at, "Change list in incorrect order"
   end
@@ -238,18 +241,21 @@ describe "Change" do
     new_child1  = Page.new(:title => "New Child 1")
     page1.things << new_child1
     root.save
+    new_child1.save
 
     Content.publish(@revision)
+    page1.reload
 
     later = @now + 10
-    stub_time(later)
+    Timecop.travel(later)
     old_slug = page1.slug
     page1.slug = "changed"
-    page1.save
+    page1.save.reload
 
     result = outstanding_changes[:changes]
 
     change = result.detect { |change| change.page.id == page1.id }
+    refute change.nil?
     change.export[:side_effects].must_equal({
       :slug => [{ :count => 1, :created_at => later.httpdate, :old_value => old_slug, :new_value => "changed"}]
     })
@@ -267,14 +273,16 @@ describe "Change" do
     root.save
 
     Content.publish(@revision)
+    page1.reload
 
     later = @now + 10
-    stub_time(later)
+    Timecop.travel(later)
     page1.hide!
 
-    page1.reload
+
     result = outstanding_changes[:changes]
     change = result.detect { |change| change.page.id == page1.id }
+    refute change.nil?
     change.export[:side_effects].must_equal({
       :visibility => [{ :count => 1, :created_at => later.httpdate, :old_value => false, :new_value => true}]
     })