spontaneous 0.2.0.beta7 → 0.2.0.beta8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37102d6cbb9bfed6dc5d0360590d78f569ca3194
-  data.tar.gz: ae60e964be4ae4a4f9fbfd94154c28c1766be9ce
+  metadata.gz: 1fbce2b0e756da55c854fb535ed8454a1aed9aed
+  data.tar.gz: 9a3d4faf5726570997d13c3786246768c3c3495e
 SHA512:
-  metadata.gz: a05914ff42c526f549a6e0367d9df545e700b233eb0312bb570448eeb0e48434764c7c6f8b83088c34680ce2bc51bb2e9f27665165947ce3b1546532dcf6a044
-  data.tar.gz: b0ca442ffa7eef22df25a7df9813f6d8c1263ec359fffff1eb4b6e3ad6cc6c73bb4a5d9f2265e949778fd07b639891fb2635dc076fd6bdcbf444cf32514fcc87
+  metadata.gz: 71decdd38247bc06e094eec89575a899b8e95a4156f4a8b431548b58a591f3721ee585b134a420faa773beed01be88c9ca70470db1d425d61bd5fdba8d7167d3
+  data.tar.gz: 08ddbb0a24ccf19d7b2a76ab72e0d677ade2106d259deb00a3c9884aaa84454ac1073ee29d56eebc78fdca3e4886898c1477f792deb49ad66e5dffb7b823bd42

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.2.0.beta8, released 2014-10-29
+
+#### Fixes
+
+- Include `-webkit` prefixed versions of all flexbox properties to fix display in Safari
+- Fix image drag & drop in Chrome -- revoking blob URLs immediately now results in a broken image
+- Remove all references to `Page#path` in initialization to avoid trying to resolve the full path before the pages' parents have been assigned
+- Explicitly copy compiled assets to the new published revision using a new core publish step rather than hijack the asset compilation/resolution step. This ensures that dependencies are copied on a second publish.
+- Fix layout of box tabs by using appropriate mixins to apply `-webkit` prefixed styles
+
 ## 0.2.0.beta7, released 2014-09-03
 
 #### Fixes

data/application/css/core.css.scss

@@ -659,17 +659,17 @@
 	height: 100%;
 
 	.slot-tabs {
+		@include display-box;
+		@include box-orient(row);
 		min-height: 32px;
 		vertical-align: top;
 		@include vertical-gradient(#666666, #4d4d4d);
 		padding-left: $container-padding;
 		padding-right: $container-padding;
-		display: flex;
-		flex-direction: row;
 		li {
 			@include box-sizing;
 			@include interface;
-			flex: 1 1 auto;
+			@include box-flex(1);
 			font-size: 11px;
 			color: #dddddd;
 			display: block;
@@ -1669,7 +1669,7 @@
 
 @media all and (max-width: 1000px) {
   .fields-preview-text li {
-	  flex-direction: column;
+  	@include box-orient(column);
   }
 }
 @import "top.css.scss";

data/application/css/definitions.css.scss

@@ -115,6 +115,7 @@ $target-name-size: 14px;
   // display: -webkit-box;
   // display: -moz-box;
   display: flex;
+  display: -webkit-flex;
 }
 @mixin box-sizing($model: border-box) {
   -webkit-box-sizing: $model;
@@ -124,15 +125,19 @@ $target-name-size: 14px;
 
 @mixin box-orient($direction: row) {
   flex-direction: $direction;
+  -webkit-flex-direction: $direction;
 }
 @mixin box-pack($packing: center) {
   justify-content: $packing;
+  -webkit-justify-content: $packing;
 }
 @mixin box-align($aligning: start) {
   align-items: $aligning;
+  -webkit-align-items: $aligning;
 }
 @mixin box-flex($flex: 1) {
-	flex-grow: $flex;
+  flex-grow: $flex;
+	-webkit-flex-grow: $flex;
 }
 
 @mixin no-select {

data/application/css/dialogue.css.scss

@@ -413,6 +413,7 @@ $dialogue-title-height: 32px;
 			background-color: rgba(33, 33, 33, 0.9);
 			color: #aaaaaa;
 			font-size: 0.7em;
+			z-index: 1;
 			.lock-state {
 				overflow: auto;
 				padding: $unit/2;

data/application/js/field/file.js

@@ -4,6 +4,10 @@ Spontaneous.Field.File = (function($, S) {
 	var FileField = new JS.Class(Spontaneous.Field.String, {
 		selected_files: false,
 
+		initialize: function(dialogue, conflict) {
+			this.blobs = [];
+			this.callSuper();
+		},
 		currentValue: function() {
 			var pending, v = this.get('value');
 			if ((pending = v.__pending__)) {
@@ -111,10 +115,16 @@ Spontaneous.Field.File = (function($, S) {
 			dialogue.open();
 		},
 		unload: function() {
-			this.callSuper();
 			this.input = null;
 			this._progress_bar = null;
+			this.freeBlobs();
 			Spontaneous.UploadManager.unregister(this);
+			this.callSuper();
+		},
+		freeBlobs: function() {
+			this.blobs.forEach(function(url) {
+				window.URL.revokeObjectURL(url);
+			});
 		},
 		upload_complete: function(values) {
 			this.set('value', values.processed_value);
@@ -146,6 +156,12 @@ Spontaneous.Field.File = (function($, S) {
 			return true;
 		},
 
+		createObjectURL: function(file) {
+			var url = window.URL.createObjectURL(file);
+			this.blobs.push(url);
+			return url;
+		},
+
 		edit: function() {
 			var self = this;
 			var wrap = dom.div('.file-field', {'style':'position:relative;'});
@@ -164,10 +180,9 @@ Spontaneous.Field.File = (function($, S) {
 
 			var files_selected = function(files) {
 				if (files.length > 0) {
-					var file = files[0], url = window.URL.createObjectURL(file);
+					var file = files[0], url = this.createObjectURL(file);
 					this.selected_files = files;
 					this._edited_value = url;
-					window.URL.revokeObjectURL(url);
 					set_info(File.filename(file), file.fileSize);
 				}
 			}.bind(this);

data/application/js/field/image.js

@@ -160,7 +160,7 @@ Spontaneous.Field.Image = (function($, S) {
 				if (files.length > 0) {
 					this.select_files(files);
 					var file = files[0],
-					url = window.URL.createObjectURL(file)
+					url = this.createObjectURL(file)
 					, image = this.image;
 					this._edited_value = url;
 					image.__start_upload = true;
@@ -177,8 +177,6 @@ Spontaneous.Field.Image = (function($, S) {
 						}
 					}.bind(this));
 					image.attr('src', url);
-					// see http://www.htmlfivewow.com/slide25
-					window.URL.revokeObjectURL(url);
 				}
 				return false;
 			}.bind(this);
@@ -306,13 +304,12 @@ Spontaneous.Field.Image = (function($, S) {
 
 			var files_selected = function(files) {
 				if (files.length > 0) {
-					var file = files[0], url = window.URL.createObjectURL(file);
+					var file = files[0], url = this.createObjectURL(file);
 					img.attr('src', url).removeClass('empty');
 					this.select_files(files);
 					img.attr('src', url);
 					this._edited_value = url;
 					this.image.attr('src', url);
-					window.URL.revokeObjectURL(url);
 					set_info(File.filename(file), file.fileSize, null, null);
 				}
 			}.bind(this);

data/db/migrations/20140514090204_add_content_hash.rb

@@ -1,12 +1,21 @@
 # encoding: UTF-8
 
 Sequel.migration do
+  no_transaction
   up do
-    [:content, :spontaneous_content_archive, :spontaneous_content_history].each do |table|
-      alter_table table do
-        add_column :content_hash, :varchar, size: 32
-        add_column :published_content_hash, :varchar, size: 32
-        add_column :content_hash_changed, :boolean, default: true
+    [:content, :spontaneous_content_history, :spontaneous_content_archive].each do |table|
+      begin
+        alter_table table do
+          add_column :content_hash, :varchar, size: 32
+          add_column :published_content_hash, :varchar, size: 32
+          add_column :content_hash_changed, :boolean, default: true
+        end
+      rescue ::Sequel::DatabaseError => e
+        # because syncing ignores the content_archive table
+        # if we run this migration, then sync, then re-run it
+        # (in the case where the production db is behind the dev db)
+        # this one table will throw an error
+        raise unless table == :spontaneous_content_archive
       end
     end
     alter_table :content do
@@ -15,32 +24,34 @@ Sequel.migration do
 
     # testing environment
     if defined?(Content)
+      transaction do
 
-      self.logger = nil
+        self.logger = nil
 
-      state = Spontaneous::State.first
+        state = Spontaneous::State.first
 
-      published_revision = state.nil? ? nil : state[:published_revision]
+        published_revision = state.nil? ? nil : state[:published_revision]
 
-      content_hash = published_content_hash = nil
+        content_hash = published_content_hash = nil
 
-      model = Spontaneous::Model(:content)
+        model = Spontaneous::Model(:content)
 
-      update_content_hashes = Proc.new do |content|
-        published_content_hash = nil
-        content_hash = content.calculate_content_hash!
-        if published_revision
-          model.mapper.scope(published_revision, false) do
-            published = model[content.id]
-            published_content_hash = published.calculate_content_hash! if published
+        update_content_hashes = Proc.new do |content|
+          published_content_hash = nil
+          content_hash = content.calculate_content_hash!
+          if published_revision
+            model.mapper.scope(published_revision, false) do
+              published = model[content.id]
+              published_content_hash = published.calculate_content_hash! if published
+            end
           end
+          p [content.id, content.class, content.path, content_hash, published_content_hash] #if published_content_hash != content_hash
+          model.dataset.unfiltered.where(id: content.id).update(content_hash: content_hash, published_content_hash: published_content_hash, content_hash_changed: (content_hash != published_content_hash))
         end
-        p [content.id, content.class, content.path, content_hash, published_content_hash] #if published_content_hash != content_hash
-        model.dataset.unfiltered.where(id: content.id).update(content_hash: content_hash, published_content_hash: published_content_hash, content_hash_changed: (content_hash != published_content_hash))
-      end
 
-      Content::Piece.dataset.order(Sequel.desc(:depth)).each(&update_content_hashes)
-      Content::Page.dataset.order(Sequel.desc(:depth)).each(&update_content_hashes)
+        Content::Piece.dataset.order(Sequel.desc(:depth)).each(&update_content_hashes)
+        Content::Page.dataset.order(Sequel.desc(:depth)).each(&update_content_hashes)
+      end
     end
   end
 

data/db/migrations/20140519150253_add_content_hash_timestamp.rb

@@ -1,12 +1,23 @@
 # encoding: UTF-8
 
 Sequel.migration do
+  no_transaction
   up do
     [:content, :spontaneous_content_archive, :spontaneous_content_history].each do |table|
-      alter_table table do
-        add_column :content_hash_changed_at, :timestamp
+      begin
+        alter_table table do
+          add_column :content_hash_changed_at, :timestamp
+        end
+      rescue ::Sequel::DatabaseError => e
+        # because syncing ignores the content_archive table
+        # if we run this migration, then sync, then re-run it
+        # (in the case where the production db is behind the dev db)
+        # this one table will throw an error
+        raise unless table == :spontaneous_content_archive
+      end
+      transaction do
+        self[table].update(content_hash_changed_at: :modified_at)
       end
-      self[table].update(content_hash_changed_at: :modified_at)
     end
   end
 

data/lib/spontaneous/asset/environment.rb

@@ -5,12 +5,16 @@ module Spontaneous::Asset
   module Environment
     def self.new(context)
       if context.publishing?
-        Publish.new(context.site, context.revision, context.development?)
+        publishing(context.site, context.revision, context.development?)
       else
-        Preview.new(context.site)
+        preview(context.site)
       end
     end
 
+    def self.publishing(site, revision, development)
+      Publish.new(site, revision, development)
+    end
+
     def self.preview(site = Spontaneous::Site.instance)
       Preview.new(site)
     end
@@ -125,11 +129,19 @@ module Spontaneous::Asset
 
       def to_url(asset, body = false)
         return asset if asset.is_a?(String)
+        query = {}
+        query['body'] = 1 if body
+        query[asset.digest] = nil if dynamic_fingerprint?
         path = asset.logical_path
-        path = "#{path}?body=1" if body
+        path = "#{path}?#{Rack::Utils.build_query(query)}" unless query.empty?
         "/" << asset_mount_point << "/" << path
       end
 
+      # include the asset fingerprint as a query param for cache busting
+      def dynamic_fingerprint?
+        true
+      end
+
       def asset_mount_point
         "assets"
       end
@@ -175,6 +187,11 @@ module Spontaneous::Asset
         @development || false
       end
 
+      # include the asset fingerprint as a query param for cache busting
+      def dynamic_fingerprint?
+        false
+      end
+
       # A proxy to the sprockets manifest that compiles assets on the first run
       # then re-uses them on the second
       class Manifest
@@ -202,29 +219,10 @@ module Spontaneous::Asset
           unless (args.all? { |key| assets.key?(key) })
             compile!(*args)
           end
-          copy_assets_to_revision(args)
         end
 
         def compile!(*args)
           @manifest.compile(*args)
-          copy_assets_to_revision(args)
-        end
-
-        def copy_assets_to_revision(logical_paths)
-          assets = @manifest.assets
-          paths = logical_paths.map { |a| assets[a] }.compact
-          source, dest = shared_asset_dir, revision_asset_dir
-          paths.each do |asset|
-            copy_asset_to_revision(source, dest, asset)
-          end
-        end
-
-        def copy_asset_to_revision(source, dest, asset)
-          to = dest + asset
-          return if to.exist?
-          from = source + asset
-          to.dirname.mkpath
-          FileUtils.cp(from, to)
         end
 
         def asset_compilation_dir

data/lib/spontaneous/model/core.rb

@@ -70,7 +70,14 @@ module Spontaneous::Model
       #   => [#<ContentClass...>, #<ContentClass...>]
       #
       def to_proc
-        Proc.new { |obj| self === obj }
+        Proc.new { |obj| self.===(obj) }
+      end
+
+      # Expands type testing to include peeking inside PagePiece instances
+      def ===(other)
+        return true if super
+        return (self == other.content_class) if other.respond_to?(:content_class)
+        false
       end
     end
 
@@ -148,6 +155,10 @@ module Spontaneous::Model
 
     alias_method :is_page?, :page?
 
+    def content_class
+      self
+    end
+
     # Do not overwrite this method directly.
     # If you want a page to render the content of another configure
     # the type using Content::render

data/lib/spontaneous/model/page/paths.rb

@@ -30,11 +30,6 @@ module Spontaneous::Model::Page
 
     private :__create_private_root=, :__create_private_root?
 
-    def after_initialize
-      super
-      set_generated_slug
-    end
-
     def before_create
       place_in_page_tree
       set_slug_from_dynamic_value
@@ -46,11 +41,6 @@ module Spontaneous::Model::Page
       fix_generated_slug_conflicts
     end
 
-    def set_generated_slug
-      return unless slug.nil?
-      self.slug = generate_default_slug
-    end
-
     def fix_generated_slug_conflicts
       o = s = slug || generate_default_slug
       n = 0
@@ -183,9 +173,13 @@ module Spontaneous::Model::Page
       end
     end
 
+    def initialized_slug
+      return slug unless slug.nil?
+      self.slug = generate_default_slug
+    end
 
     def calculate_path
-      calculate_path_with_slug(slug)
+      calculate_path_with_slug(initialized_slug)
     end
 
     def calculate_path_with_slug(slug)

data/lib/spontaneous/page_piece.rb

@@ -32,6 +32,12 @@ module Spontaneous
       target
     end
 
+    # Used by Spontaneous::Model::Core::=== to look inside PagePiece objects
+    # and test against the class of the target, not of the proxy
+    def content_class
+      target.class
+    end
+
     def id
       target.id
     end

data/lib/spontaneous/publishing/steps.rb

@@ -132,6 +132,7 @@ module Spontaneous::Publishing
       :create_revision_directory,
       :render_revision,
       :generate_search_indexes,
+      :copy_assets,
       :copy_static_files,
       :generate_rackup_file,
       :activate_revision,
@@ -148,6 +149,7 @@ require 'spontaneous/publishing/steps/create_revision_directory'
 require 'spontaneous/publishing/steps/render_revision'
 require 'spontaneous/publishing/steps/generate_search_indexes'
 require 'spontaneous/publishing/steps/copy_static_files'
+require 'spontaneous/publishing/steps/copy_assets'
 require 'spontaneous/publishing/steps/generate_rackup_file'
 require 'spontaneous/publishing/steps/activate_revision'
 require 'spontaneous/publishing/steps/write_revision_file'

data/lib/spontaneous/publishing/steps/copy_assets.rb

@@ -0,0 +1,77 @@
+module Spontaneous::Publishing::Steps
+  class CopyAssets < BaseStep
+
+    def count
+      assets.length
+    end
+
+    def call
+      @progress.stage("copying assets")
+      ensure_asset_dir
+      assets.each do |logical_path, asset|
+        copy_asset(asset)
+        @progress.step(1, "'#{logical_path}' => '#{asset}'")
+      end
+    end
+
+    def rollback
+      FileUtils.rm_r(revision_asset) if File.exists?(revision_asset)
+    end
+
+    def ensure_asset_dir
+      dir = revision_asset
+    end
+
+    def copy_asset(asset)
+      ['', '.gz'].each do |suffix|
+        copy_asset_file(asset + suffix)
+      end
+    end
+
+    def copy_asset_file(asset)
+      source = File.join(manifest.asset_compilation_dir, asset)
+      if File.exist?(source)
+        dest = ensure_dir File.join(revision_asset, asset)
+        link_file(source, dest)
+      end
+    end
+
+    def link_file(source, dest)
+      src_dev = File::stat(source).dev
+      dst_dev = File::stat(File.dirname(dest)).dev
+      if (src_dev == dst_dev)
+        FileUtils.ln(source, dest, :force => true)
+      else
+        FileUtils.cp(source, dest)
+      end
+    end
+
+    def revision_asset
+      @asset_dest ||= Pathname.new(Spontaneous.revision_dir(revision) / 'assets').tap do |path|
+        FileUtils.mkdir_p(path) unless File.exists?(path)
+      end
+    end
+
+    def ensure_dir(path)
+      dir = File.dirname(path)
+      FileUtils.mkdir_p(dir) unless File.exist?(dir)
+      path
+    end
+
+    def assets
+      manifest.assets
+    end
+
+    def manifest
+      environment.manifest
+    end
+
+    def environment
+      @environment ||= Spontaneous::Asset::Environment.publishing(site, revision, development?)
+    end
+
+    def development?
+      Spontaneous.development?
+    end
+  end
+end

data/lib/spontaneous/version.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
 module Spontaneous
-  VERSION = "0.2.0.beta7"
+  VERSION = "0.2.0.beta8"
   GEM = false
 end

data/test/fixtures/example_application/assets/css/site.css.scss

@@ -0,0 +1,6 @@
+$width: 23px;
+
+.something {
+  width: $width;
+  background-image: asset_url('i/sine_waves.png');
+}

data/test/functional/test_back.rb

@@ -1110,7 +1110,7 @@ describe "Back" do
     it "render SASS templates" do
       get "/assets/css/sass_template.css"
       assert last_response.ok?, "Should return 200 but got #{last_response.status}"
-      last_response.body.must_match /color: #ffeeff/
+      last_response.body.must_match /color: #fef/
     end
 
     it "compile CoffeeScript" do

data/test/unit/test_asset_bundler.rb

@@ -53,10 +53,10 @@ describe "AssetBundler" do
       compiled_css_path = Dir["#{@site.root}/public/@spontaneous/assets/*.css"].first
       css = File.read(compiled_css_path)
       css.must_match /\.simple \{\s+color: #aaa/
-      css.must_match /\.basic \{\s+color: #aabbcc/
-      css.must_match /\.complex \{\s+color: #ddeeff;\s*width: #{Date.today.day}px/
+      css.must_match /\.basic \{\s+color: #abc/
+      css.must_match /\.complex \{\s+color: #def;\s*width: #{Date.today.day}px/
       css.must_match /\.subdir\.simple \{\s+color: #000;/
-      css.must_match /\.subdir\.complex \{\s+color: #aaaaaa;\s+height: #{Date.today.day}px/
+      css.must_match /\.subdir\.complex \{\s+color: #aaa;\s+height: #{Date.today.day}px/
     end
 
     it "produce compressed CSS by default" do
@@ -65,10 +65,10 @@ describe "AssetBundler" do
       compiled_css_path = Dir["#{@site.root}/public/@spontaneous/assets/spontaneous*.css"].first
       css = File.read(compiled_css_path)
       css.must_match /\.simple\{color:#aaa\}/
-      css.must_match /\.basic\{color:#aabbcc\}/
-      css.must_match /\.complex\{color:#ddeeff;width:#{Date.today.day}px\}/
+      css.must_match /\.basic\{color:#abc\}/
+      css.must_match /\.complex\{color:#def;width:#{Date.today.day}px\}/
       css.must_match /\.subdir\.simple\{color:#000\}/
-      css.must_match /\.subdir\.complex\{color:#aaaaaa;height:#{Date.today.day}px\}/
+      css.must_match /\.subdir\.complex\{color:#aaa;height:#{Date.today.day}px\}/
     end
   end
 

data/test/unit/test_assets.rb

@@ -6,9 +6,7 @@ require 'ostruct'
 describe "Assets" do
   include RackTestMethods
 
-  def app
-    Spontaneous::Rack::Back.application(site)
-  end
+  let(:app) {Spontaneous::Rack::Back.application(site)}
 
   module LiveSimulation
     # simulate a production + publishing environment
@@ -59,6 +57,13 @@ describe "Assets" do
     end
   end
 
+  def asset_digest(asset_relative_path)
+    digest = context.asset_environment.environment.digest
+    digest.update(File.read(File.join(fixture_root, asset_relative_path)))
+    digest.hexdigest
+  end
+
+  let(:y_png_digest) { asset_digest('public2/i/y.png') }
 
   start do
     fixture_root = File.expand_path("../../fixtures/assets", __FILE__)
@@ -136,16 +141,32 @@ describe "Assets" do
   describe "development" do
     let(:context) { development_context }
 
+    let(:a_js_digest) { asset_digest('public1/js/a.js') }
+    let(:b_js_digest) { asset_digest('public2/js/b.js') }
+    let(:c_js_digest) { asset_digest('public2/js/c.js') }
+    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(:a_css_digest) { '7b04d295476986c24d8c77245943e5b9' }
+    let(:b_css_digest) { '266643993e14da14f2473d45f003bd2c' }
+    let(:c_css_digest) { 'fc8ba0d0aae64081dc00b8444a198fb8' }
+    let(:x_css_digest) { '2560aec2891794825eba770bf84823fb' }
+    let(:all_css_digest) { 'cf61c624b91b9ea126804291ac55bd5d' }
+
     it "includes all js dependencies" do
       result = context.scripts('js/all', 'js/m', 'js/c', 'x')
       result.must_equal [
-        '<script type="text/javascript" src="/assets/js/a.js?body=1"></script>',
-        '<script type="text/javascript" src="/assets/js/b.js?body=1"></script>',
-        '<script type="text/javascript" src="/assets/js/n.js?body=1"></script>',
-        '<script type="text/javascript" src="/assets/js/all.js?body=1"></script>',
-        '<script type="text/javascript" src="/assets/js/m.js?body=1"></script>',
-        '<script type="text/javascript" src="/assets/js/c.js?body=1"></script>',
-        '<script type="text/javascript" src="/assets/x.js?body=1"></script>'
+        %|<script type="text/javascript" src="/assets/js/a.js?body=1&#{a_js_digest}"></script>|,
+        %|<script type="text/javascript" src="/assets/js/b.js?body=1&#{b_js_digest}"></script>|,
+        %|<script type="text/javascript" src="/assets/js/n.js?body=1&#{n_js_digest}"></script>|,
+        %|<script type="text/javascript" src="/assets/js/all.js?body=1&#{all_js_digest}"></script>|,
+        %|<script type="text/javascript" src="/assets/js/m.js?body=1&#{m_js_digest}"></script>|,
+        %|<script type="text/javascript" src="/assets/js/c.js?body=1&#{c_js_digest}"></script>|,
+        %|<script type="text/javascript" src="/assets/x.js?body=1&#{x_js_digest}"></script>|
       ].join("\n")
     end
 
@@ -158,11 +179,11 @@ describe "Assets" do
     it "includes all css dependencies" do
       result = context.stylesheets('css/all', 'css/c', 'x')
       result.must_equal [
-        '<link rel="stylesheet" href="/assets/css/b.css?body=1" />',
-        '<link rel="stylesheet" href="/assets/css/a.css?body=1" />',
-        '<link rel="stylesheet" href="/assets/css/all.css?body=1" />',
-        '<link rel="stylesheet" href="/assets/css/c.css?body=1" />',
-        '<link rel="stylesheet" href="/assets/x.css?body=1" />'
+        %|<link rel="stylesheet" href="/assets/css/b.css?body=1&#{b_css_digest}" />|,
+        %|<link rel="stylesheet" href="/assets/css/a.css?body=1&#{a_css_digest}" />|,
+        %|<link rel="stylesheet" href="/assets/css/all.css?body=1&#{all_css_digest}" />|,
+        %|<link rel="stylesheet" href="/assets/css/c.css?body=1&#{c_css_digest}" />|,
+        %|<link rel="stylesheet" href="/assets/x.css?body=1&#{x_css_digest}" />|
       ].join("\n")
     end
 
@@ -183,14 +204,24 @@ 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(:n_js_digest) { '74f175e03a4bdc8c807aba4ae0314938' }
+    let(:m_js_digest) { 'dd35b142dc75b6ec15b2138e9e91c0c3' }
+    let(:all_js_digest) { 'cd1f681752f5038421be0bc5ea0e855d' }
+
+    let(:c_css_digest) { 'fc8ba0d0aae64081dc00b8444a198fb8' }
+    let(:x_css_digest) { '2560aec2891794825eba770bf84823fb' }
+    let(:all_css_digest) { 'bb2c289a27b3d5d4467dde6d60722fd3' }
+
     describe "javascript" do
-      it "include scripts as separate files" do
+      it "include scripts as separate files with finger prints" do
         result = context.scripts('js/all', 'js/m.js', 'js/c.js', 'x')
         result.must_equal [
-          '<script type="text/javascript" src="/assets/js/all.js"></script>',
-          '<script type="text/javascript" src="/assets/js/m.js"></script>',
-          '<script type="text/javascript" src="/assets/js/c.js"></script>',
-          '<script type="text/javascript" src="/assets/x.js"></script>'
+          %|<script type="text/javascript" src="/assets/js/all.js?#{all_js_digest}"></script>|,
+          %|<script type="text/javascript" src="/assets/js/m.js?#{m_js_digest}"></script>|,
+          %|<script type="text/javascript" src="/assets/js/c.js?#{c_js_digest}"></script>|,
+          %|<script type="text/javascript" src="/assets/x.js?#{x_js_digest}"></script>|
         ].join("\n")
       end
 
@@ -199,15 +230,15 @@ describe "Assets" do
       it "handles urls passed as an array" do
         result = context.scripts(['js/all', 'js/m.js'])
         result.must_equal [
-          '<script type="text/javascript" src="/assets/js/all.js"></script>',
-          '<script type="text/javascript" src="/assets/js/m.js"></script>'
+          %|<script type="text/javascript" src="/assets/js/all.js?#{all_js_digest}"></script>|,
+          %|<script type="text/javascript" src="/assets/js/m.js?#{m_js_digest}"></script>|
         ].join("\n")
       end
 
       it "should ignore missing files" do
         result = context.scripts('js/all', 'js/missing')
         result.must_equal [
-          '<script type="text/javascript" src="/assets/js/all.js"></script>',
+          %|<script type="text/javascript" src="/assets/js/all.js?#{all_js_digest}"></script>|,
           '<script type="text/javascript" src="js/missing.js"></script>'
         ].join("\n")
       end
@@ -244,7 +275,7 @@ describe "Assets" do
         context = preview_context
         result = context.scripts('js/all', '//use.typekit.com/abcde', 'http://cdn.google.com/jquery.js', 'https://cdn.google.com/jquery.js')
         result.must_equal [
-          '<script type="text/javascript" src="/assets/js/all.js"></script>',
+          %|<script type="text/javascript" src="/assets/js/all.js?#{all_js_digest}"></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="https://cdn.google.com/jquery.js"></script>'
@@ -256,18 +287,18 @@ describe "Assets" do
       it "include css files as separate links" do
         result = context.stylesheets('css/all', 'css/c', 'x')
         result.must_equal [
-          '<link rel="stylesheet" href="/assets/css/all.css" />',
-          '<link rel="stylesheet" href="/assets/css/c.css" />',
-          '<link rel="stylesheet" href="/assets/x.css" />'
+          %|<link rel="stylesheet" href="/assets/css/all.css?#{all_css_digest}" />|,
+          %|<link rel="stylesheet" href="/assets/css/c.css?#{c_css_digest}" />|,
+          %|<link rel="stylesheet" href="/assets/x.css?#{x_css_digest}" />|
         ].join("\n")
       end
 
       it "allows passing scripts as an array" do
         result = context.stylesheets(['css/all', 'css/c', 'x'])
         result.must_equal [
-          '<link rel="stylesheet" href="/assets/css/all.css" />',
-          '<link rel="stylesheet" href="/assets/css/c.css" />',
-          '<link rel="stylesheet" href="/assets/x.css" />'
+          %|<link rel="stylesheet" href="/assets/css/all.css?#{all_css_digest}" />|,
+          %|<link rel="stylesheet" href="/assets/css/c.css?#{c_css_digest}" />|,
+          %|<link rel="stylesheet" href="/assets/x.css?#{x_css_digest}" />|
         ].join("\n")
       end
 
@@ -327,11 +358,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.png"
+        result.must_equal "/assets/i/y.png?#{y_png_digest}"
       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.png)"
+        result.must_equal "url(/assets/i/y.png?#{y_png_digest})"
       end
     end
   end
@@ -340,11 +371,17 @@ describe "Assets" do
     let(:app) { Spontaneous::Rack::Front.application(site) }
     let(:context) { live_context }
     let(:revision) { site.revision(context.revision) }
+    let(:progress) { Spontaneous::Publishing::Progress::Silent.new }
+
+    def publish_assets(revision)
+      context.asset_environment.manifest.compile!
+      Spontaneous::Publishing::Steps::CopyAssets.new(site, revision, [], progress).call
+    end
 
     before do
       FileUtils.rm_f(Spontaneous.revision_dir) if File.exist?(Spontaneous.revision_dir)
       system "ln -nfs #{revision.root} #{Spontaneous.revision_dir}"
-      # FileUtils.ln_s(revision.root, Spontaneous.revision_dir)
+      publish_assets(context.revision)
     end
 
     after do
@@ -352,14 +389,14 @@ describe "Assets" do
     end
 
     describe "javascript" do
-      let(:all_sha) { "b1d3d85feff4d68e16d2b4da97717aa0" }
-      let(:x_sha) { "cf638f60cff3ce84f156cb4621a914b4" }
+      let(:all_sha) { "ed62549e8edc1f61a1e27136602f01d9" }
+      let(:x_sha) { "66e92be1e412458f6ff02f4c5dd9beb1" }
       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-424bd92768589875beac31e333399631.js"></script>',
-          '<script type="text/javascript" src="/assets/js/c-ac0d40982cc84fc656234ef2a57e09e8.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/x-#{x_sha}.js"></script>)
         ].join("\n")
       end
@@ -413,6 +450,7 @@ describe "Assets" do
           context = live_context
           def context.revision; 100 end
           revision = site.revision(context.revision)
+          publish_assets(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|
@@ -426,14 +464,14 @@ describe "Assets" do
     end
 
     describe "css" do
-      let(:all_sha) { "2468ffc5102b6bfcaf69a4fc8db59fdd" }
-      let(:x_sha)   { "ae3ee1dc79a34d24e28456118c1b9623" }
+      let(:all_sha) { "2e17f25ddeba996223a6cd1e28e7a319" }
+      let(:x_sha)   { "2560aec2891794825eba770bf84823fb" }
 
       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-35b26d0cd9c7ebff494c8627e0d4ed14.css" />',
+          '<link rel="stylesheet" href="/assets/css/a-0164c6d5b696ec2f2c5e70cade040da8.css" />',
           %(<link rel="stylesheet" href="/assets/x-#{x_sha}.css" />)
         ].join("\n")
       end
@@ -457,7 +495,7 @@ describe "Assets" do
         ].join("\n")
       end
 
-      it "makes bundled scripts available under /assets" do
+      it "makes bundled stylesheets available under /assets" do
         path = context.stylesheet_urls('css/all').first
         get path
         asset_path = revision.path(path)
@@ -499,17 +537,15 @@ 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-#{y_sha}\.png\)}
+        result.must_match %r{background:url\(/assets/i/y-#{y_png_digest}\.png\)}
 
-        asset_path = revision.path("/assets/i/y-#{y_sha}.png")
+        asset_path = revision.path("/assets/i/y-#{y_png_digest}.png")
         assert asset_path.exist?
       end
 
@@ -526,8 +562,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-#{y_sha}\.png\?query=true#hash\)}
-        asset_path = revision.path("/assets/i/y-#{y_sha}.png")
+        result.must_match %r{background:url\(/assets/i/y-#{y_png_digest}\.png\?query=true#hash\)}
+        asset_path = revision.path("/assets/i/y-#{y_png_digest}.png")
         assert asset_path.exist?
       end
     end
@@ -537,11 +573,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-#{y_sha}.png"
+        result.must_equal "/assets/i/y-#{y_png_digest}.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-#{y_sha}.png)"
+        result.must_equal "url(/assets/i/y-#{y_png_digest}.png)"
       end
     end
   end

data/test/unit/test_content.rb

@@ -344,5 +344,15 @@ describe "Content" do
     it "provides a to_proc method that makes filtering by class easy" do
       @instances.select(&C).map(&:class).must_equal [C, C]
     end
+
+    it "can filter pagepieces that point to an object of the given type" do
+      pps = @instances.map { |i| Spontaneous::PagePiece.new(nil, i, nil)}
+      pps.select(&P).map { |i| i.to_page.class }.must_equal [P, P]
+    end
+
+    it "can filter content instances out a list POROs" do
+      pps = [Object.new, Object.new, @instances.first]
+      pps.select(&P).map { |i| i.to_page.class }.must_equal [P]
+    end
   end
 end

data/test/unit/test_publishing_pipeline.rb

@@ -469,6 +469,80 @@ describe "Publishing Pipeline" do
     end
   end
 
+  describe "CopyAssets" do
+    let(:step) { Spontaneous::Publishing::Steps::CopyAssets }
+    let(:application_path) { Pathname.new(File.expand_path("../../fixtures/example_application", __FILE__)) }
+    let(:fixtures_path) { application_path + "assets" }
+    let(:revision_root) { @site.revision_dir(revision) }
+    let(:environment)   { Spontaneous::Asset::Environment.publishing(@site, revision, false) }
+    let(:manifest)      { environment.manifest }
+    let(:assets)        { environment.manifest.assets }
+
+    def assert_assets(revision)
+      revision_root = @site.revision_dir(revision)
+      assets.length.must_equal 3
+      assets.each do |logical_path, asset|
+        assert File.exist?(File.join(revision_root, 'assets', asset)), "asset '#{asset}' does not exist"
+      end
+    end
+
+    before do
+      FileUtils.cp_r(fixtures_path, @site.root)
+      File.exist?(@site.root / 'assets/css/site.css.scss').must_equal true
+      manifest.compile!('css/site.css', 'i/xes.png')
+    end
+
+    it "has the right shortcut name" do
+      step.to_sym.must_equal :copy_assets
+    end
+
+    it "sets the progress stage to 'copying files'" do
+      progress = mock
+      progress.stubs(:step)
+      progress.expects(:stage).with("copying assets").once
+      run_step(progress)
+    end
+
+    it "steps the progress once" do
+      progress = mock
+      progress.stubs(:stage)
+      progress.expects(:step).with(1, instance_of(String)).times(3)
+      run_step(progress)
+    end
+
+    it "gives its step count as the number of facets" do
+      step.count(@site, revision, nil).must_equal 3
+    end
+
+    it "copies compiled assets to the revision's asset dir" do
+      run_step
+      assert_assets(revision)
+    end
+
+    it "copies compressed assets to the revision's asset dir" do
+      asset = assets.values.first
+      compressed = asset + '.gz'
+      FileUtils.cp(manifest.asset_compilation_dir + asset, manifest.asset_compilation_dir + compressed)
+      run_step
+      assert File.exist?(File.join(revision_root, 'assets', compressed)), "#{compressed} should exist"
+    end
+
+    it "deletes the copied files on rollback" do
+      instance = run_step
+      instance.rollback
+      refute File.exist?(File.join(revision_root, "assets"))
+    end
+
+    it "runs rollback after throwing an exception" do
+      instance = mock
+      step.expects(:new).returns(instance)
+      instance.expects(:call).raises(Exception)
+      instance.expects(:rollback)
+      lambda{ run_step }.must_raise(Exception)
+    end
+
+  end
+
   describe "GenerateRackupFile" do
     let(:step) { Spontaneous::Publishing::Steps::GenerateRackupFile }
     let(:rackup_path) { @site.revision_dir(revision) / "config.ru" }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spontaneous
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta7
+  version: 0.2.0.beta8
 platform: ruby
 authors:
 - Garry Hill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -887,6 +887,7 @@ files:
 - lib/spontaneous/publishing/steps/activate_revision.rb
 - lib/spontaneous/publishing/steps/archive_old_revisions.rb
 - lib/spontaneous/publishing/steps/base_step.rb
+- lib/spontaneous/publishing/steps/copy_assets.rb
 - lib/spontaneous/publishing/steps/copy_static_files.rb
 - lib/spontaneous/publishing/steps/create_revision_directory.rb
 - lib/spontaneous/publishing/steps/generate_rackup_file.rb
@@ -1030,6 +1031,9 @@ files:
 - test/fixtures/example_application/Gemfile
 - test/fixtures/example_application/Gemfile.lock
 - test/fixtures/example_application/Rakefile
+- test/fixtures/example_application/assets/css/site.css.scss
+- test/fixtures/example_application/assets/i/sine_waves.png
+- test/fixtures/example_application/assets/i/xes.png
 - test/fixtures/example_application/config/back.rb
 - test/fixtures/example_application/config/back.ru
 - test/fixtures/example_application/config/back.yml
@@ -1369,6 +1373,9 @@ test_files:
 - test/fixtures/example_application/Gemfile
 - test/fixtures/example_application/Gemfile.lock
 - test/fixtures/example_application/Rakefile
+- test/fixtures/example_application/assets/css/site.css.scss
+- test/fixtures/example_application/assets/i/sine_waves.png
+- test/fixtures/example_application/assets/i/xes.png
 - test/fixtures/example_application/config/back.rb
 - test/fixtures/example_application/config/back.ru
 - test/fixtures/example_application/config/back.yml