rails2_asset_pipeline 0.1.7 → 0.1.8

data/Gemfile.lock

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

data/Readme.md

@@ -7,7 +7,7 @@ Familiar asset handling for those stuck on Rails 2.
  - application-MD5.js for production  (and development without config.ru)
  - old asset versions can stay around during deploys
  - converter for jammit asset.yml
- - no monkey-patching, everything is opt-in
+ - no forced monkey-patching, everything is opt-in
 
 [Example application](https://github.com/grosser/rails2_asset_pipeline_exmaple)
 
@@ -21,8 +21,11 @@ rake assets:convert_jammit  # reads config/assets.yml and converts packs into `a
 ```
 
 ```Erb
-<%= stylesheet_link_tag pipeline_path("application.css") %>
-<%= javascript_include_tag pipeline_path("application.js") %>
+With ViewHelpers included you can:
+<%= stylesheet_link_tag "application" %>
+<%= javascript_include_tag "application" %>
+From good old public <%= javascript_include_tag "/javascripts/application.js" %>
+Just a path: <%= asset_path "application.js" %>
 ```
 
 
@@ -80,6 +83,9 @@ module ApplicationHelper
 end
 ```
 
+### Static code
+You can also use `Rails2AssetPipeline::ViewHelpers.asset_path("application.js")`
+
 ### Sass
  - add `sass` to your gems for sass parsing
  - add `sprockets-sass` to your gems for sass @import support

data/lib/rails2_asset_pipeline/version.rb

@@ -1,3 +1,3 @@
 module Rails2AssetPipeline
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/lib/rails2_asset_pipeline/view_helpers.rb

@@ -1,6 +1,19 @@
 module Rails2AssetPipeline
   module ViewHelpers
-    def pipeline_path(asset)
+    # Overwrite rails helper to use pipeline path for all relative assets
+    # args: source, 'javascripts', 'js'
+    def compute_public_path(*args)
+      source = args[0]
+      source_is_relative = (source.is_a?(String) and source =~ /^[a-z]+(\/|\.|$)/) # xxx or xxx.js or xxx/yyy, not /xxx or http://
+      if source_is_relative
+        source = "#{source}.#{args[2]}" unless source.include?(".")
+        super(asset_path(source), *args[1..-1])
+      else
+        super
+      end
+    end
+
+    def asset_path(asset)
       data = Rails2AssetPipeline.env[asset]
       return "/assets/NOT_FOUND" unless data
       asset = "/assets/#{asset}"
@@ -11,5 +24,6 @@ module Rails2AssetPipeline
         "#{asset}?#{data.mtime.to_i}"
       end
     end
+    module_function :asset_path
   end
 end

data/spec/rails2_asset_pipeline/view_helpers_spec.rb

@@ -1,33 +1,41 @@
 require 'spec_helper'
 
 describe Rails2AssetPipeline::ViewHelpers do
+  module FakeSuper
+    def compute_public_path(*args)
+      @compute_public_path = args
+      :super
+    end
+  end
+
+  include FakeSuper
   include Rails2AssetPipeline::ViewHelpers
 
-  describe "#pipeline_path" do
-    let(:env){ {} }
+  let(:env){ {} }
 
-    before do
-      Rails2AssetPipeline.stub(:env).and_return env
-      Rails2AssetPipeline.dynamic_assets_available = true
-      env["xxx.js"] = mock(:digest => "abc", :mtime => Time.at(123456))
+  before do
+    Rails2AssetPipeline.stub(:env).and_return env
+    Rails2AssetPipeline.dynamic_assets_available = true
+    env["xxx.js"] = mock(:digest => "abc", :mtime => Time.at(123456))
+  end
+
+  describe "#asset" do
+    it "is also static" do
+      Rails2AssetPipeline::ViewHelpers.asset_path("xxx.js").should_not == nil
     end
 
     it "silently fails with unfound assets" do
-      pipeline_path("yyy.js").should == "/assets/NOT_FOUND"
+      asset_path("yyy.js").should == "/assets/NOT_FOUND"
     end
 
     context "development" do
-      before do
-        Rails.env = "development"
-      end
-
       it "returns a path with query" do
-        pipeline_path("xxx.js").should == "/assets/xxx.js?123456"
+        asset_path("xxx.js").should == "/assets/xxx.js?123456"
       end
 
       it "returns a path with digest when dynamic loader is not available" do
         Rails2AssetPipeline.dynamic_assets_available = false
-        pipeline_path("xxx.js").should == "/assets/xxx-abc.js"
+        asset_path("xxx.js").should == "/assets/xxx-abc.js"
       end
     end
 
@@ -37,13 +45,46 @@ describe Rails2AssetPipeline::ViewHelpers do
       end
 
       it "returns a path with md5" do
-        pipeline_path("xxx.js").should == "/assets/xxx-abc.js"
+        asset_path("xxx.js").should == "/assets/xxx-abc.js"
       end
 
       it "returns a path with md5 on production and complicated file" do
         env["xxx.yy.js"] = env["xxx.js"]
-        pipeline_path("xxx.yy.js").should == "/assets/xxx-abc.yy.js"
+        asset_path("xxx.yy.js").should == "/assets/xxx-abc.yy.js"
       end
     end
   end
+
+  describe "#compute_public_path" do
+    it "does nothing for symbols" do
+      compute_public_path(:xxx, "a", "b").should == :super
+      @compute_public_path.should == [:xxx, "a", "b"]
+    end
+
+    it "does nothing for paths starting with /" do
+      compute_public_path("/xxx", "a", "b").should == :super
+      @compute_public_path.should == ["/xxx", "a", "b"]
+    end
+
+    it "does nothing for urls" do
+      compute_public_path("http://xxx", "a", "b").should == :super
+      @compute_public_path.should == ["http://xxx", "a", "b"]
+    end
+
+    it "converts relative, nested paths without extension" do
+      env["xxx/yyy.js"] = env["xxx.js"]
+      compute_public_path("xxx/yyy", "a", "js").should == :super
+      @compute_public_path.should == ["/assets/xxx/yyy.js?123456", "a", "js"]
+    end
+
+    it "converts relative paths with extension" do
+      compute_public_path("xxx.js", "a", "b").should == :super
+      @compute_public_path.should == ["/assets/xxx.js?123456", "a", "b"]
+    end
+
+    it "converts relative paths without extension" do
+      compute_public_path("xxx", "a", "js").should == :super
+      @compute_public_path.should == ["/assets/xxx.js?123456", "a", "js"]
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ RSpec.configure do |config|
   config.before do
     # cleanup
     Rails2AssetPipeline.dynamic_assets_available = false
+    Rails.env = "development"
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails2_asset_pipeline
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-23 00:00:00.000000000 Z
+date: 2012-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -67,7 +67,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4546564198370306690
+      hash: 3123271431630063706
 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: 4546564198370306690
+      hash: 3123271431630063706
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24