asset-trip 0.1.0 → 0.1.1

data/History.txt

@@ -1,3 +1,13 @@
+== 0.1.1 / 2009-11-09
+
+* 1 minor enhancement
+
+  * Allow ENV["FORCE"] to override mtime checking
+
+* 1 bug fix
+
+  * Correctly rewrite relative paths in SSL stylesheets
+
 == 0.1.0 / 2009-11-05
 
 * 1 major enhancement

data/asset-trip.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{asset-trip}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bryan Helmkamp"]
-  s.date = %q{2009-11-05}
+  s.date = %q{2009-11-09}
   s.description = %q{Asset Trip bundles JavaScript and CSS files at deploy time. The assets are
 then served from a Git-esque object store in the application's public
 directory.}
@@ -48,6 +48,7 @@ directory.}
     "spec/asset_trip/load_path_spec.rb",
     "spec/asset_trip/manifest_writer_spec.rb",
     "spec/asset_trip/middleware_spec.rb",
+    "spec/asset_trip/ssl_stylesheet_spec.rb",
     "spec/asset_trip/stylesheet_spec.rb",
     "spec/asset_trip/url_rewriter_spec.rb",
     "spec/asset_trip_spec.rb",
@@ -81,6 +82,7 @@ directory.}
     "spec/asset_trip/load_path_spec.rb",
     "spec/asset_trip/manifest_writer_spec.rb",
     "spec/asset_trip/middleware_spec.rb",
+    "spec/asset_trip/ssl_stylesheet_spec.rb",
     "spec/asset_trip/stylesheet_spec.rb",
     "spec/asset_trip/url_rewriter_spec.rb",
     "spec/asset_trip_spec.rb",

data/lib/asset_trip.rb

@@ -25,7 +25,7 @@ module AssetTrip
   class NoManifestError < StandardError
   end
 
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 
   mattr_accessor :bundle
   self.bundle = true

data/lib/asset_trip/asset.rb

@@ -14,33 +14,39 @@ module AssetTrip
       instance_eval(&block) if block_given?
     end
 
+    def bundle!
+      FileWriter.new(path).write!(contents) if expired?
+    end
+
     def contents
       compressor.compress(joined_contents)
     end
+    memoize :contents
 
     def paths
       files.map do |file|
         @config.resolve_file(asset_type, file)
       end
     end
+    memoize :paths
 
-    def bundle!
+    def md5sum
       if expired?
-        FileWriter.new(path).write!(contents)
+        Digest::MD5.hexdigest(contents)
       else
-        last_package = packaged_files.sort_by { |path| File.mtime(path) }.last
-        @md5sum = File.dirname(last_package).last(12).gsub(/\//, '')
+        File.dirname(last_package).to_s.last(12).gsub("/", "")
       end
     end
-
-    def md5sum
-      @md5sum ||= Digest::MD5.hexdigest(contents)
-    end
+    memoize :md5sum
 
   private
 
+    def last_package
+      packaged_files.sort_by { |path| File.mtime(path) }.last
+    end
+
     def expired?
-      packaged_files.empty? || generated_at <= last_change_at
+      ENV["FORCE"] || packaged_files.empty? || generated_at <= last_change_at
     end
 
     def generated_at

data/lib/asset_trip/ssl_stylesheet.rb

@@ -7,8 +7,8 @@ module AssetTrip
 
   private
 
-    def url_rewriter(path)
-      UrlRewriter.new("https", path)
+    def url_scheme
+      "https"
     end
 
   end

data/lib/asset_trip/stylesheet.rb

@@ -25,10 +25,10 @@ module AssetTrip
       public_path = AssetTrip.app_root.join("public")
 
       if filesystem_path.to_s.starts_with?(public_path)
-        foo = Pathname.new("/").join(filesystem_path.relative_path_from(public_path))
-        UrlRewriter.new("http", foo)
+        public_path = Pathname.new("/").join(filesystem_path.relative_path_from(public_path))
+        UrlRewriter.new(url_scheme, public_path)
       else
-        UrlRewriter.new("http")
+        UrlRewriter.new(url_scheme)
       end
     end
 
@@ -36,6 +36,10 @@ module AssetTrip
       :stylesheets
     end
 
+    def url_scheme
+      "http"
+    end
+
     def extension
       ".css"
     end

data/spec/asset_trip/ssl_stylesheet_spec.rb

@@ -0,0 +1,11 @@
+require "spec_helper"
+require "asset_trip/stylesheet_spec"
+
+describe AssetTrip::SSLStylesheet do
+  let(:url_scheme) { "https" }
+  it_should_behave_like "an Asset that rewrites URLs"
+end
+
+describe AssetTrip::SSLStylesheet do
+  it_should_behave_like "an Asset that compresses"
+end

data/spec/asset_trip/stylesheet_spec.rb

@@ -1,51 +1,64 @@
 require "spec_helper"
 
-describe AssetTrip::Stylesheet do
-  describe "#contents" do
-    setup_sandbox_app!
+describe "an Asset that rewrites URLs", :shared => true do
+  setup_sandbox_app!
 
-    before do
-      AssetTrip::Compressor.stub!(:new => compressor)
-      File.stub!(:read => "contents")
-    end
+  let(:url_rewriter) { stub(:rewrite => "rewritten") }
 
-    let(:compressor)   { stub(:compress => "compressed") }
-    let(:url_rewriter) { stub(:rewrite => "rewritten") }
+  before do
+    AssetTrip::Compressor.stub!(:new => stub(:compress => "compressed"))
+    File.stub!(:read => "contents")
+  end
 
-    it "compresses the contents" do
-      AssetTrip::Compressor.should_receive(:new).with("css")
-      asset = AssetTrip::Stylesheet.new(stub(), "all.css")
-      asset.contents.should == "compressed"
-    end
+  it "rewrites the URLs" do
+    AssetTrip::UrlRewriter.stub(:new => url_rewriter)
+    url_rewriter.should_receive(:rewrite).with("contents")
+    described_class.new(stub(:resolve_file => "/fonts.css"), "all", ["fonts"]).contents
+  end
 
-    it "only runs the Compressor once for the package" do
-      compressor.should_receive(:compress).exactly(:once)
-      asset = AssetTrip::Stylesheet.new(stub(), "all.css")
-      asset.contents.should == "compressed"
+  context "when the stylesheet is in the public directory" do
+    it "does not initialize the UrlRewriter with a path" do
+      AssetTrip::UrlRewriter.should_receive(:new).with(url_scheme).and_return(url_rewriter)
+      described_class.new(stub(:resolve_file => "/fonts.css"), "all", ["fonts"]).contents
     end
+  end
 
-    it "rewrites the URLs" do
-      AssetTrip::UrlRewriter.stub(:new => url_rewriter)
-      url_rewriter.should_receive(:rewrite).with("contents")
-      asset = AssetTrip::Stylesheet.new(stub(:resolve_file => "/fonts.css"), "all", ["fonts"])
-      asset.contents
+  context "when the stylesheet is not in the public directory" do
+    it "initializes the UrlRewriter with a path" do
+      AssetTrip::UrlRewriter.should_receive(:new).with(url_scheme, Pathname.new("/fonts.css")).and_return(url_rewriter)
+      public_path = fixture_app.join("public", "fonts.css")
+      described_class.new(stub(:resolve_file => public_path), "all", ["fonts"]).contents
     end
+  end
+end
 
-    context "when the stylesheet is in the public directory" do
-      it "does not initialize the UrlRewriter with a path" do
-        AssetTrip::UrlRewriter.should_receive(:new).with("http").and_return(url_rewriter)
-        asset = AssetTrip::Stylesheet.new(stub(:resolve_file => "/fonts.css"), "all", ["fonts"])
-        asset.contents
-      end
-    end
+describe "an Asset that compresses", :shared => true do
+  setup_sandbox_app!
 
-    context "when the stylesheet is not in the public directory" do
-      it "initializes the UrlRewriter with a path" do
-        AssetTrip::UrlRewriter.should_receive(:new).with("http", Pathname.new("/fonts.css")).and_return(url_rewriter)
-        public_path = fixture_app.join("public", "fonts.css")
-        asset = AssetTrip::Stylesheet.new(stub(:resolve_file => public_path), "all", ["fonts"])
-        asset.contents
-      end
-    end
+  let(:compressor) { stub(:compress => "compressed") }
+
+  before do
+    AssetTrip::Compressor.stub!(:new => compressor)
+    File.stub!(:read => "contents")
+  end
+
+  it "compresses the contents" do
+    AssetTrip::Compressor.should_receive(:new).with("css")
+    described_class.new(stub, "all.css").contents.should == "compressed"
+  end
+
+  it "only runs the Compressor once for the package" do
+    compressor.should_receive(:compress).exactly(:once)
+    described_class.new(stub, "all.css").contents.should == "compressed"
   end
 end
+
+describe AssetTrip::Stylesheet do
+  let(:url_scheme) { "http" }
+  it_should_behave_like "an Asset that rewrites URLs"
+end
+
+describe AssetTrip::Stylesheet do
+  it_should_behave_like "an Asset that compresses"
+end
+

data/spec/integration/bundle_spec.rb

@@ -152,40 +152,59 @@ describe "rake asset_trip:bundle" do
     end
 
     it "does not write a new bundle if the package has not expired" do
-      install_config <<-CONFIG
-        js_asset "signup" do
-          include "main.js"
-        end
-      CONFIG
-      AssetTrip.bundle!
-
-      asset_mtime = 5.minutes.ago
-      source_mtime = 10.minutes.ago
-      asset("signup.js").utime(asset_mtime, asset_mtime)
-      app_javascript("main.js").utime(source_mtime, source_mtime)
-
-      AssetTrip.bundle!
-      asset("signup.js").mtime.to_i.should == asset_mtime.to_i
+      Time.freeze do
+        install_config <<-CONFIG
+          js_asset "signup" do
+            include "main.js"
+          end
+        CONFIG
+        AssetTrip.bundle!
+
+        asset("signup.js").utime(5.minutes.ago, 5.minutes.ago)
+        app_javascript("main.js").utime(10.minutes.ago, 10.minutes.ago)
+
+        AssetTrip.bundle!
+        asset("signup.js").mtime.to_i.should == 5.minutes.ago.to_i
+      end
     end
 
-    it "should use the most recent package to detect mtimes for expiry" do
-      install_config <<-CONFIG
-        js_asset "signup" do
-          include "main.js"
-        end
-      CONFIG
-      AssetTrip.bundle!
+    it "writes a new bundle when forced even when the package is not expired" do
+      Time.freeze do
+        install_config <<-CONFIG
+          js_asset "signup" do
+            include "main.js"
+          end
+        CONFIG
+        AssetTrip.bundle!
 
-      asset_mtime = 5.minutes.ago
-      source_mtime = 10.minutes.ago
-      oldest_asset_mtime = 15.minutes.ago
+        asset("signup.js").utime(5.minutes.ago, 5.minutes.ago)
+        app_javascript("main.js").utime(10.minutes.ago, 10.minutes.ago)
 
-      asset("signup.js").utime(asset_mtime, asset_mtime)
-      app_javascript("main.js").utime(source_mtime, source_mtime)
-      create_asset("46/123431bdc/signup.js", :mtime => oldest_asset_mtime)
+        with_env("FORCE", "1") do
+          AssetTrip.bundle!
+        end
+        asset("signup.js").mtime.to_i.should > 5.minutes.ago.to_i
+      end
+    end
 
-      AssetTrip.bundle!
-      assets("signup.js").map { |asset| asset.mtime.to_i }.sort.should == [oldest_asset_mtime.to_i, asset_mtime.to_i]
+    it "should use the most recent package to detect mtimes for expiry" do
+      Time.freeze do
+        install_config <<-CONFIG
+          js_asset "signup" do
+            include "main.js"
+          end
+        CONFIG
+        AssetTrip.bundle!
+
+        asset("signup.js").utime(5.minutes.ago, 5.minutes.ago)
+        app_javascript("main.js").utime(10.minutes.ago, 10.minutes.ago)
+        create_asset("46/123431bdc/signup.js", :mtime => 15.minutes.ago)
+
+        AssetTrip.bundle!
+        assets("signup.js").map { |asset|
+          asset.mtime.to_i
+        }.sort.should == [15.minutes.ago.to_i, 5.minutes.ago.to_i]
+      end
     end
   end
 

data/spec/support/core_extensions.rb

@@ -11,3 +11,25 @@ module AssetTrip
     Pathname.send(:include, PathnameExtensions)
   end
 end
+
+class Time
+  class << self
+    alias_method :orig_new, :new
+
+    undef :now
+    def now
+      defined?(@time) ? @time || orig_new : orig_new
+    end
+
+    alias_method :new, :now
+
+    undef :freeze
+    def freeze
+      @time = now
+      yield
+    ensure
+      @time = nil
+    end
+
+  end
+end

data/spec/support/helpers.rb

@@ -2,6 +2,13 @@ module AssetTrip
   module Spec
     module Helpers
 
+      def with_env(key, value)
+        old, ENV[key] = ENV[key], value
+        yield
+      ensure
+        old ? ENV[key] = old : ENV.delete(key)
+      end
+
       def install_config(config_source, filename = "assets.rb")
         FileUtils.mkdir_p(fixture_app)
         File.open(fixture_app("config", "asset_trip", filename), 'w') do |f|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: asset-trip
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-05 00:00:00 -05:00
+date: 2009-11-09 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -58,6 +58,7 @@ files:
 - spec/asset_trip/load_path_spec.rb
 - spec/asset_trip/manifest_writer_spec.rb
 - spec/asset_trip/middleware_spec.rb
+- spec/asset_trip/ssl_stylesheet_spec.rb
 - spec/asset_trip/stylesheet_spec.rb
 - spec/asset_trip/url_rewriter_spec.rb
 - spec/asset_trip_spec.rb
@@ -114,6 +115,7 @@ test_files:
 - spec/asset_trip/load_path_spec.rb
 - spec/asset_trip/manifest_writer_spec.rb
 - spec/asset_trip/middleware_spec.rb
+- spec/asset_trip/ssl_stylesheet_spec.rb
 - spec/asset_trip/stylesheet_spec.rb
 - spec/asset_trip/url_rewriter_spec.rb
 - spec/asset_trip_spec.rb