rails2_asset_pipeline 0.1.2 → 0.1.3

data/Gemfile.lock

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

data/Readme.md

@@ -6,15 +6,18 @@ Familiar asset handling for those stuck on Rails 2.
  - application.js?time for development
  - application-MD5.js for production
  - old asset versions can stay around during deploys
+ - converter for jammit asset.yml
  - no monkey-patching, everything is opt-in
 
+[Example application](https://github.com/grosser/rails2_asset_pipeline_exmaple)
+
 # Usage
 
 ```
 rake assets:precompile
 rake assets:clean
-rake assets:remove_old
-rake assets:convert_jammit
+rake assets:remove_old      # Keeps current + 2 older versions in public/assets
+rake assets:convert_jammit  # reads config/assets.yml and converts packs into `app/assets/<type>/<pack>.js` with `//= require <dependency>`
 ```
 
 ```Erb
@@ -30,14 +33,7 @@ rake assets:convert_jammit
     # config/environment.rb
     config.gem "rails2_asset_pipeline"
 
-    # Rakefile
-    begin
-      require "rails2_asset_pipeline/tasks"
-    rescue LoadError
-      puts "rails2_asset_pipeline is not installed, you probably should run 'rake gems:install' or 'bundle install'."
-    end
-
-## Initializer
+### Initializer
 Here you can do additional configuration of sprockets.
 
 ```Ruby
@@ -47,7 +43,16 @@ Rails2AssetPipeline.setup do |sprockets|
 end
 ```
 
-## config.ru
+### Tasks
+
+    # Rakefile
+    begin
+      require "rails2_asset_pipeline/tasks"
+    rescue LoadError
+      puts "rails2_asset_pipeline is not installed, you probably should run 'rake gems:install' or 'bundle install'."
+    end
+
+### Dynamic assets for development
 Setup a config.ru so development has dynamic assets
 
 ```Ruby
@@ -65,7 +70,7 @@ map '/' do
 end
 ```
 
-## View helpers
+### View helpers
 ```
 # app/helpers/application_helper.rb
 require 'rails2_asset_pipeline/view_helpers'
@@ -76,14 +81,7 @@ end
 ```
 
 
-# Tasks
-
-    rake assets:precompile
-    rake assets:clean
-    rake assets:remove_old # Keeps current + 2 older versions in public/assets
-    rake assets:convert_jammit # reads config/assets.yml and converts packs into `app/assets/<type>/<pack>.js` with `//= require <dependency>`
-
-## Todo
+# Todo
  - read config from Rails 3 style config.assets
  - asset image helpers for inside css/scss
 

data/lib/rails2_asset_pipeline/jammit_converter.rb

@@ -0,0 +1,71 @@
+require 'yaml'
+
+module Rails2AssetPipeline
+  module JammitConverter
+    def self.convert
+      move_to_app
+      cleanup_scss
+      convert_javascript_packs
+      convert_stylesheet_packs
+    end
+
+    private
+
+    def self.jammit
+      @jammit ||= YAML.load_file("config/assets.yml")
+    end
+
+    def self.cleanup_scss
+      stylesheets = Dir["app/assets/stylesheets/**/*"].select{|f| File.file?(f) and f =~ /\.s?css$/ }
+
+      # cleanup import of .scss
+      stylesheets.each do |file|
+        content = File.read(file)
+        rex = /^(@import ['"].*).scss(['"]);/
+        if content =~ rex
+          File.open(file, 'w'){|f| f.write content.gsub(rex, "\\1.css\\2;") }
+        end
+      end
+
+      # cleanup .scss -> .css.scss
+      stylesheets.each do |file|
+        sh "mv #{file} #{file.sub(".scss", ".css.scss")}" if file =~ /\.scss$/ and not file =~ /\.css\.scss$/
+      end
+    end
+
+    def self.convert_javascript_packs
+      # convert javascript packs
+      jammit["javascripts"].each do |pack, assets|
+        File.open("app/assets/javascripts/#{pack}.js", "w") do |f|
+          assets.each do |file|
+            fuzzy = /[\/*]+$/
+            f.puts "//= #{file =~ fuzzy ? "require_tree" : "require"} #{file.sub("public/javascripts/", "").sub(".js","").sub(fuzzy,"")}"
+          end
+        end
+      end
+    end
+
+    def self.convert_stylesheet_packs
+      jammit["stylesheets"].each do |pack, assets|
+        File.open("app/assets/stylesheets/#{pack}.css", "w") do |f|
+          f.puts "/*"
+          assets.each do |file|
+            f.puts " *= require #{file.sub("public/stylesheets/", "").sub(/.s?css$/,"")}"
+          end
+          f.puts " */"
+        end
+      end
+    end
+
+    # TODO only move .js/.css/.scss, no images
+    def self.move_to_app
+      sh "mkdir app/assets" unless File.exist?("app/assets")
+      folders = ["javascripts", "stylesheets"]
+      folders.each do |folder|
+        target = "app/assets/#{folder}"
+        raise "Remove #{target} before proceeding, I'm not merging!" if File.exist?(target)
+      end
+      folders.each{|f| sh "mv public/#{f} app/assets/#{f}" }
+    end
+  end
+end

data/lib/rails2_asset_pipeline/tasks.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'rake/sprocketstask'
 
 namespace :assets do
@@ -32,30 +33,7 @@ namespace :assets do
 
   desc "converts project from jammit based assets.yml"
   task :convert_jammit do
-    require 'yaml'
-
-    sh "mkdir app/assets" unless File.exist?("app/assets")
-    sh "mv public/javascripts app/assets/javascripts"
-    sh "mv public/stylesheets app/assets/stylesheets"
-
-    jammit = YAML.load_file("config/assets.yml")
-
-    jammit["javascripts"].each do |pack, assets|
-      File.open("app/assets/javascripts/#{pack}.js", "w") do |f|
-        assets.each do |file|
-          f.puts "//= require #{file.sub("public/javascripts", "").sub(".js","")}"
-        end
-      end
-    end
-
-    jammit["stylesheets"].each do |pack, assets|
-      File.open("app/assets/stylesheets/#{pack}.css", "w") do |f|
-        f.puts "/*"
-        assets.each do |file|
-          f.puts "//= require #{file.sub("public/stylesheets", "").sub(".css","")}"
-        end
-        f.puts " */"
-      end
-    end
+    require 'rails2_asset_pipeline/jammit_converter'
+    Rails2AssetPipeline::JammitConverter.convert
   end
 end

data/lib/rails2_asset_pipeline/version.rb

@@ -1,3 +1,3 @@
 module Rails2AssetPipeline
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/spec/fake_rails/config/assets.yml

@@ -2,6 +2,7 @@ javascripts:
   pack:
     - public/javascripts/a.js
     - public/javascripts/b.js
+    - public/javascripts/c/**/*
 
 stylesheets:
   pack:

data/spec/rails2_asset_pipeline/tasks_spec.rb

@@ -67,18 +67,43 @@ describe "Rails2AssetPipeline Tasks" do
       write "public/stylesheets/b.css", "A"
     end
 
+    it "fails when folders already exist" do
+      run "mkdir -p app/assets/javascripts"
+      expect{
+        puts run "rake assets:convert_jammit"
+      }.to raise_error
+    end
+
     it "moves and combines javascripts" do
       run "rake assets:convert_jammit"
       run("ls app/assets").should == "javascripts\nstylesheets\n"
       run("ls app/assets/javascripts").should == "a.js\nb.js\npack.js\n"
-      run("cat app/assets/javascripts/pack.js").should == "//= require /a\n//= require /b\n"
+      run("cat app/assets/javascripts/pack.js").should == "//= require a\n//= require b\n//= require_tree c\n"
     end
 
     it "moves and combines stylesheets" do
       run "rake assets:convert_jammit"
       run("ls app/assets").should == "javascripts\nstylesheets\n"
       run("ls app/assets/stylesheets").should == "a.css\nb.css\npack.css\n"
-      run("cat app/assets/stylesheets/pack.css").should == "/*\n//= require /a\n//= require /b\n */\n"
+      run("cat app/assets/stylesheets/pack.css").should == "/*\n *= require a\n *= require b\n */\n"
+    end
+
+    it "renames .scss to .css.scss" do
+      write "public/stylesheets/c.scss", "C"
+      run "rake assets:convert_jammit"
+      run("ls app/assets/stylesheets").should include("\nc.css.scss\n")
+    end
+
+    it "does not renames .css.scss to .css.css.scss" do
+      write "public/stylesheets/c.css.scss", "C"
+      run "rake assets:convert_jammit"
+      run("ls app/assets/stylesheets").should include("\nc.css.scss\n")
+    end
+
+    it "fixes broken inputs" do
+      write "public/stylesheets/c.css.scss", "a{}\n@import \"../global/_tables.scss\";\na{}"
+      run "rake assets:convert_jammit"
+      run("cat app/assets/stylesheets/c.css.scss").should == "a{}\n@import \"../global/_tables.css\";\na{}"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails2_asset_pipeline
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-22 00:00:00.000000000 Z
+date: 2012-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -39,6 +39,7 @@ files:
 - Rakefile
 - Readme.md
 - lib/rails2_asset_pipeline.rb
+- lib/rails2_asset_pipeline/jammit_converter.rb
 - lib/rails2_asset_pipeline/tasks.rb
 - lib/rails2_asset_pipeline/version.rb
 - lib/rails2_asset_pipeline/view_helpers.rb
@@ -66,7 +67,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2199684529747267224
+      hash: 2378466707075981159
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -75,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2199684529747267224
+      hash: 2378466707075981159
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24