spontaneous 0.2.0.beta8 → 0.2.0.beta9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fbce2b0e756da55c854fb535ed8454a1aed9aed
-  data.tar.gz: 9a3d4faf5726570997d13c3786246768c3c3495e
+  metadata.gz: c521e3b9b35cfba180daf3fcc24894af352ca2eb
+  data.tar.gz: 5f3fb38da829759b10dd33a2b4224a7bae9dfbdc
 SHA512:
-  metadata.gz: 71decdd38247bc06e094eec89575a899b8e95a4156f4a8b431548b58a591f3721ee585b134a420faa773beed01be88c9ca70470db1d425d61bd5fdba8d7167d3
-  data.tar.gz: 08ddbb0a24ccf19d7b2a76ab72e0d677ade2106d259deb00a3c9884aaa84454ac1073ee29d56eebc78fdca3e4886898c1477f792deb49ad66e5dffb7b823bd42
+  metadata.gz: c82fea8cd02838425f8f20eb2b21eab9ae3084414dcce39c1d72351e5292d7c9d09483729a9610e2e66cabedeb8bf7afb70570110b0582515ba87ae27e8b2d82
+  data.tar.gz: 2f1a515a14f373b3535c864084529894d12878d8601b5c2f86e99267342816a30989acf5b0dd479369c0301ee56134b7996eb286304029d509715876f93166fe

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.0.beta9, released 2014-10-30
+
+#### Fixes
+
+- Revert some changes to the asset compilation step to fix publishing in development mode.
+
 ## 0.2.0.beta8, released 2014-10-29
 
 #### Fixes

data/lib/spontaneous/asset/environment.rb

@@ -219,10 +219,29 @@ 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/publishing/steps/copy_assets.rb

@@ -2,10 +2,26 @@ module Spontaneous::Publishing::Steps
   class CopyAssets < BaseStep
 
     def count
+      return 0 if development?
       assets.length
     end
 
     def call
+      case development?
+      when true
+        development_mode
+      when false
+        production_mode
+      end
+    end
+
+    def development_mode
+      # In development the asset manifest isn't cached and the compilation
+      # done by the asset environment is sufficient to copy all the assets into
+      # place
+    end
+
+    def production_mode
       @progress.stage("copying assets")
       ensure_asset_dir
       assets.each do |logical_path, asset|

data/lib/spontaneous/version.rb

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

data/test/unit/test_assets.rb

@@ -371,17 +371,10 @@ 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}"
-      publish_assets(context.revision)
     end
 
     after do
@@ -450,7 +443,6 @@ 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|

data/test/unit/test_changesets.rb

@@ -276,7 +276,7 @@ describe "Change" do
     page1.reload
 
     later = @now + 10
-    Timecop.travel(later)
+    Timecop.freeze(later)
     page1.hide!
 
 

data/test/unit/test_fields.rb

@@ -976,7 +976,7 @@ describe "Fields" do
       @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, UK"
+      @field.value(:formatted_address).must_equal "Cambridge, Cambridge, UK"
 
       @field.latitude.must_equal 52.2053370
       @field.longitude.must_equal 0.1218170
@@ -984,7 +984,7 @@ describe "Fields" do
       @field.lng.must_equal 0.1218170
 
       @field.country.must_equal "United Kingdom"
-      @field.formatted_address.must_equal "Cambridge, UK"
+      @field.formatted_address.must_equal "Cambridge, Cambridge, UK"
     end
   end
 

data/test/unit/test_publishing_pipeline.rb

@@ -474,7 +474,8 @@ describe "Publishing Pipeline" do
     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(:development)   { false }
+    let(:environment)   { Spontaneous::Asset::Environment.publishing(@site, revision, development) }
     let(:manifest)      { environment.manifest }
     let(:assets)        { environment.manifest.assets }
 
@@ -510,7 +511,7 @@ describe "Publishing Pipeline" do
       run_step(progress)
     end
 
-    it "gives its step count as the number of facets" do
+    it "gives its step count as the number of assets" do
       step.count(@site, revision, nil).must_equal 3
     end
 
@@ -541,6 +542,25 @@ describe "Publishing Pipeline" do
       lambda{ run_step }.must_raise(Exception)
     end
 
+    describe 'development' do
+      let(:development) { true }
+
+      before do
+        Spontaneous.stubs(:development?).returns(true)
+      end
+
+      it "gives its step count as zero" do
+        step.count(@site, revision, nil).must_equal 0
+      end
+
+      it "never steps the progress" do
+        progress = mock
+        progress.stubs(:stage)
+        progress.expects(:step).with(1, instance_of(String)).never
+        run_step(progress)
+      end
+    end
+
   end
 
   describe "GenerateRackupFile" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spontaneous
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta8
+  version: 0.2.0.beta9
 platform: ruby
 authors:
 - Garry Hill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport