rails2_asset_pipeline 0.1.11 → 0.1.12

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails2_asset_pipeline (0.1.11)
+    rails2_asset_pipeline (0.1.12)
       sprockets
 
 GEM

data/Readme.md

@@ -4,7 +4,7 @@ Familiar asset handling for those stuck on Rails 2.
 
  - sprockets/coffee/sass etc goodness
  - application.js?time for development
- - application-MD5.js for production  (and development without config.ru)
+ - application-MD5.js for production  (and development without config.ru, read from public/assets/manifest.json)
  - old asset versions can stay around during deploys
  - converter for jammit asset.yml
  - no forced monkey-patching, everything is opt-in
@@ -95,6 +95,7 @@ You can also use `Rails2AssetPipeline::ViewHelpers.asset_path("application.js")`
 # Todo
  - read config from Rails 3 style config.assets
  - asset image helpers for inside css/scss
+ - make output location configurable in .setup and use it for manifest location and rake tasks
 
 Author
 ======

data/lib/rails2_asset_pipeline.rb

@@ -32,4 +32,8 @@ module Rails2AssetPipeline
       end
     end
   end
+
+  def self.static?
+    not Rails2AssetPipeline.dynamic_assets_available or Rails2AssetPipeline::STATIC_ENVIRONMENTS.include?(Rails.env)
+  end
 end

data/lib/rails2_asset_pipeline/version.rb

@@ -1,3 +1,3 @@
 module Rails2AssetPipeline
-  VERSION = '0.1.11'
+  VERSION = '0.1.12'
 end

data/lib/rails2_asset_pipeline/view_helpers.rb

@@ -23,16 +23,26 @@ module Rails2AssetPipeline
       end
     end
 
-    def asset_path(asset)
-      data = Rails2AssetPipeline.env[asset]
-      return "/assets/NOT_FOUND" unless data
-      asset = "/assets/#{asset}"
+    def rails_asset_id(file)
+      if file.start_with?("/assets/")
+        nil
+      else
+        super
+      end
+    end
 
-      if not Rails2AssetPipeline.dynamic_assets_available or Rails2AssetPipeline::STATIC_ENVIRONMENTS.include?(Rails.env)
-        asset.sub(/(\.[\.a-z]+$)/, "-#{data.digest}\\1")
+    def asset_path(asset)
+      asset_with_id = if Rails2AssetPipeline.static?
+        manifest = "#{Rails.root}/public/assets/manifest.json"
+        raise "No dynamic assets available and no manifest found, run rake assets:precompile" unless File.exist?(manifest)
+        @sprockets_manifest ||= Sprockets::Manifest.new(Rails2AssetPipeline.env, manifest)
+        @sprockets_manifest.files[asset] || "NOT_FOUND_IN_MANIFEST"
       else
-        "#{asset}?#{data.mtime.to_i}"
+        data = Rails2AssetPipeline.env[asset]
+        data ? "#{asset}?#{data.mtime.to_i}" : "NOT_FOUND_IN_ASSETS"
       end
+
+      "/assets/#{asset_with_id}"
     end
     module_function :asset_path
   end

data/spec/rails2_asset_pipeline/tasks_spec.rb

@@ -1,18 +1,6 @@
 require 'spec_helper'
 
 describe "Rails2AssetPipeline Tasks" do
-  def run(cmd)
-    result = `#{cmd} 2>&1`
-    raise "FAILED #{cmd} --> #{result}" unless $?.success?
-    result
-  end
-
-  def write(file, content)
-    folder = File.dirname(file)
-    run "mkdir -p #{folder}" unless File.exist?(folder)
-    File.open(file, 'w'){|f| f.write content }
-  end
-
   def cleanup
     run "rm -rf public/assets"
     run "rm -rf public/javascripts"

data/spec/rails2_asset_pipeline/view_helpers_spec.rb

@@ -6,12 +6,21 @@ describe Rails2AssetPipeline::ViewHelpers do
       @compute_public_path = args
       :super
     end
+
+    def rails_asset_id(*args)
+      @rails_asset_id = args
+      :super
+    end
   end
 
   include FakeSuper
   include Rails2AssetPipeline::ViewHelpers
 
-  let(:env){ {} }
+  let(:env){
+    env = {}
+    env.stub(:logger).and_return mock()
+    env
+  }
 
   before do
     Rails2AssetPipeline.stub(:env).and_return env
@@ -19,13 +28,34 @@ describe Rails2AssetPipeline::ViewHelpers do
     env["xxx.js"] = mock(:digest => "abc", :mtime => Time.at(123456))
   end
 
-  describe "#asset" do
+  describe "#asset_path" do
+    let(:manifest){ "#{Rails.root}/public/assets/manifest.json" }
+
+    before do
+      write manifest, <<-JSON
+{
+  "files": {"xxx.js": "xxx-manifest.js"},
+  "assets": {
+    "xxx-manifest.js": {
+      "logical_path": "xxx.js",
+      "mtime": "2011-12-13T21:47:08-06:00",
+      "digest": "manifest"
+    }
+  }
+}
+      JSON
+    end
+
+    after do
+      run "rm -rf public"
+    end
+
     it "is also static" do
       Rails2AssetPipeline::ViewHelpers.asset_path("xxx.js").should_not == nil
     end
 
     it "silently fails with unfound assets" do
-      asset_path("yyy.js").should == "/assets/NOT_FOUND"
+      asset_path("yyy.js").should == "/assets/NOT_FOUND_IN_ASSETS"
     end
 
     context "development" do
@@ -33,9 +63,14 @@ describe Rails2AssetPipeline::ViewHelpers do
         asset_path("xxx.js").should == "/assets/xxx.js?123456"
       end
 
-      it "returns a path with digest when dynamic loader is not available" do
+      it "does not care if manifest is missing" do
+        run "rm #{manifest}"
+        asset_path("xxx.js").should == "/assets/xxx.js?123456"
+      end
+
+      it "is digested when dynamic loader is not available" do
         Rails2AssetPipeline.dynamic_assets_available = false
-        asset_path("xxx.js").should == "/assets/xxx-abc.js"
+        asset_path("xxx.js").should == "/assets/xxx-manifest.js"
       end
     end
 
@@ -44,17 +79,36 @@ describe Rails2AssetPipeline::ViewHelpers do
         Rails.env = "production"
       end
 
-      it "returns a path with md5" do
-        asset_path("xxx.js").should == "/assets/xxx-abc.js"
+      it "returns a path with digest" do
+        asset_path("xxx.js").should == "/assets/xxx-manifest.js"
+      end
+
+      it "fails if file is missing from the manifest" do
+        env["yyy.js"] = env["xxx.js"]
+        asset_path("yyy.js").should == "/assets/NOT_FOUND_IN_MANIFEST"
       end
 
-      it "returns a path with md5 on production and complicated file" do
-        env["xxx.yy.js"] = env["xxx.js"]
-        asset_path("xxx.yy.js").should == "/assets/xxx-abc.yy.js"
+      it "fails if there is no manifest" do
+        run "rm #{manifest}"
+        expect{
+          asset_path("yyy.js")
+        }.to raise_error
       end
     end
   end
 
+  describe "#rails_asset_id" do
+    it "does not return ids for assets" do
+      rails_asset_id("/assets/xxx-abc.js").should == nil
+      @rails_asset_id.should == nil
+    end
+
+    it "does not return ids non-assets" do
+      rails_asset_id("/javascripts/xxx.js").should == :super
+      @rails_asset_id.should == ["/javascripts/xxx.js"]
+    end
+  end
+
   describe "#compute_public_path" do
     it "does nothing for symbols" do
       compute_public_path(:xxx, "a", "b").should == :super

data/spec/spec_helper.rb

@@ -11,6 +11,18 @@ RSpec.configure do |config|
   end
 end
 
+def run(cmd)
+  result = `#{cmd} 2>&1`
+  raise "FAILED #{cmd} --> #{result}" unless $?.success?
+  result
+end
+
+def write(file, content)
+  folder = File.dirname(file)
+  run "mkdir -p #{folder}" unless File.exist?(folder)
+  File.open(file, 'w'){|f| f.write content }
+end
+
 module Rails
   def self.env
     @env || "test"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails2_asset_pipeline
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
   prerelease: 
 platform: ruby
 authors:
@@ -67,7 +67,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2541193725320114517
+      hash: -82409223101824033
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2541193725320114517
+      hash: -82409223101824033
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24