rails2_asset_pipeline 0.2.0 → 0.3.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails2_asset_pipeline (0.2.0)
+    rails2_asset_pipeline (0.3.0)
       sprockets
 
 GEM
@@ -10,19 +10,19 @@ GEM
     bump (0.3.9)
     diff-lcs (1.1.3)
     hike (1.2.1)
-    json (1.7.3)
+    json (1.7.6)
     multi_json (1.5.0)
-    rack (1.4.3)
-    rake (0.9.2)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    sprockets (2.4.3)
+    rack (1.4.4)
+    rake (10.0.3)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.1)
+    sprockets (2.8.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)

data/Readme.md

@@ -62,6 +62,9 @@ if Rails.env.development? # dynamic asset compilation needs these
   require 'sprockets/source_url' # sprockets-source_url for debugable assets in chrome
 end
 
+# Use a different path for assets (as in config.assets.prefix from ")
+# Rails2AssetPipeline.prefix = 'static_assets'
+
 Rails2AssetPipeline.setup do |sprockets|
   # ... additional config ...
 end
@@ -150,19 +153,16 @@ Rails2AssetPipeline.manifest = Rails.root.join("spec/fixtures/empty_manifest.jso
  - add `sass` to your gems for sass parsing
  - add `sprockets-sass` to your gems for sass @import support
 
-
 # Todo
  - read config from Rails 3 style config.assets
- - make output location configurable in .setup and use it for manifest location and rake tasks
-
-
-
+ - sprockets 2.8 wants to use manifest-digest.json, had to overwrite that, find out if nonpstatic manifest makes sense for us and potentially have an option to turn it on
 
 Author
 ======
 
 ### [Contributors](https://github.com/grosser/rails2_asset_pipeline/contributors)
  - [Michael Peteuil](https://github.com/mpeteuil)
+ - [Elia Schito](https://github.com/elia)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/lib/rails2_asset_pipeline.rb

@@ -5,7 +5,7 @@ module Rails2AssetPipeline
   STATIC_ENVIRONMENTS = ["production", "staging"]
 
   class << self
-    attr_accessor :dynamic_assets_available, :manifest
+    attr_accessor :dynamic_assets_available, :manifest, :prefix
   end
 
   def self.env
@@ -24,10 +24,12 @@ module Rails2AssetPipeline
 
   def self.config_ru(rack)
     unless STATIC_ENVIRONMENTS.include?(Rails.env)
+      prefix = Rails2AssetPipeline.prefix
+
       Rails2AssetPipeline.dynamic_assets_available = true
 
       rack.instance_eval do
-        map "/assets" do
+        map "/#{prefix}" do
           run Rails2AssetPipeline.env
         end
       end
@@ -50,6 +52,10 @@ module Rails2AssetPipeline
     @manifest ||= "#{Rails.root}/public/assets/manifest.json"
   end
 
+  def self.prefix
+    @prefix ||= 'assets'
+  end
+
   def self.warn_user_about_misconfiguration!
     return unless Rails2AssetPipeline.static?
     return if @manifest_exists ||= File.exist?(manifest)

data/lib/rails2_asset_pipeline/jammit_converter.rb

@@ -2,6 +2,8 @@ require 'yaml'
 
 module Rails2AssetPipeline
   module JammitConverter
+    extend Rake::DSL
+
     def self.convert
       move_to_app
       cleanup_scss

data/lib/rails2_asset_pipeline/tasks.rb

@@ -7,7 +7,10 @@ namespace :assets do
     namespace :r2ap do
       Rake::SprocketsTask.new do |t|
         t.environment = Rails2AssetPipeline.env
-        t.output = "./public/assets"
+        t.output = "./public/#{Rails2AssetPipeline.prefix}"
+        if t.respond_to?(:manifest=) # sprockets 2.8+ ?
+          t.manifest = Sprockets::Manifest.new(t.environment.index, "./public/#{Rails2AssetPipeline.prefix}/manifest.json")
+        end
         t.assets = t.environment.paths.map{|p| Dir["#{p.sub(Rails.root.to_s,"")}/**/*"] }.flatten
         t.log_level = Logger::ERROR
         t.keep = 2

data/lib/rails2_asset_pipeline/version.rb

@@ -1,3 +1,3 @@
 module Rails2AssetPipeline
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/rails2_asset_pipeline/view_helpers.rb

@@ -23,8 +23,12 @@ module Rails2AssetPipeline
       end
     end
 
+    def assets_prefix
+      Rails2AssetPipeline.prefix
+    end
+
     def rails_asset_id(file)
-      if file.start_with?("/assets/")
+      if file.start_with?("/#{assets_prefix}/")
         nil
       else
         super
@@ -42,8 +46,8 @@ module Rails2AssetPipeline
         data ? "#{asset}?#{data.mtime.to_i}" : "DID_NOT_FIND_#{asset}_IN_ASSETS"
       end
 
-      "/assets/#{asset_with_id}"
+      "/#{assets_prefix}/#{asset_with_id}"
     end
-    module_function :asset_path
+    module_function :assets_prefix, :asset_path
   end
 end

data/spec/rails2_asset_pipeline/tasks_spec.rb

@@ -31,7 +31,19 @@ describe "Rails2AssetPipeline Tasks" do
   describe "assets:precompile" do
     it "compiles" do
       run "rake assets:precompile"
-      run("ls public/assets").should == "application-ceff92e831a69f6e164737670664e886.js\nmanifest.json\n"
+      run("ls public/assets").should == "application-09565e705ecd8821e8ca69c50e3e2bae.js\nmanifest.json\n"
+    end
+
+    context "with a custom prefix" do
+      after do
+        run "rm -rf public/static-assets"
+      end
+
+      it "compiles" do
+        write "config/initializers/rails2_asset_pipeline.rb", "Rails2AssetPipeline.prefix = 'static-assets'"
+        run "rake assets:precompile"
+        run("ls public/static-assets").should == "application-09565e705ecd8821e8ca69c50e3e2bae.js\nmanifest.json\n"
+      end
     end
   end
 

data/spec/rails2_asset_pipeline/view_helpers_spec.rb

@@ -19,6 +19,7 @@ describe Rails2AssetPipeline::ViewHelpers do
   let(:env){
     env = {}
     env.stub(:logger).and_return mock()
+    env.stub(:is_a?).with(Sprockets::Base).and_return true
     env
   }
 
@@ -90,6 +91,16 @@ describe Rails2AssetPipeline::ViewHelpers do
       end
     end
 
+    context "with a custom prefix" do
+      before do
+        Rails2AssetPipeline.prefix = 'static-assets'
+      end
+
+      it "returns a path with digest" do
+        asset_path("xxx.js").should == "/static-assets/xxx.js?123456"
+      end
+    end
+
     context "with no way of resolving assets" do
       before do
         Rails.env = "production"

data/spec/rails2_asset_pipeline_spec.rb

@@ -52,6 +52,12 @@ describe Rails2AssetPipeline do
       @mapped.should == nil
       (!!result).should == false
     end
+
+    it "respects the prefix" do
+      Rails2AssetPipeline.prefix = "static-assets"
+      Rails2AssetPipeline.config_ru(self)
+      @mapped.should == ["/static-assets"]
+    end
   end
 
   describe ".manifest" do
@@ -90,4 +96,15 @@ describe Rails2AssetPipeline do
       Rails2AssetPipeline.with_dynamic_assets_available(false){ 5 }.should == 5
     end
   end
+
+  describe '.prefix' do
+    it 'can be set' do
+      Rails2AssetPipeline.prefix = "xxx"
+      Rails2AssetPipeline.prefix.should == "xxx"
+    end
+
+    it 'is there' do
+      Rails2AssetPipeline.prefix.should == 'assets'
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -10,6 +10,7 @@ RSpec.configure do |config|
     Rails2AssetPipeline::ViewHelpers.ignored_folders = nil
     Rails2AssetPipeline.class_eval{ @manifest_exists = nil }
     Rails2AssetPipeline.manifest = nil
+    Rails2AssetPipeline.prefix = nil
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails2_asset_pipeline
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-01-16 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: 3234184968952417120
+      hash: 4425275783523912848
 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: 3234184968952417120
+      hash: 4425275783523912848
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24