jbundle 0.0.7 → 0.0.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jbundle (0.0.7)
+    jbundle (0.0.8)
       closure-compiler
 
 GEM

data/README.md

@@ -23,7 +23,7 @@ Define a set of javascript files to bundle and minify
       
       # Filters can be use for string substitution
       filter do |src, config|
-        src.gsub!(/<VERSION>/, config.version)
+        src.gsub(/<VERSION>/, config.version)
       end
       
       target_dir 'dist'
@@ -74,6 +74,29 @@ You can bundle licenses in bundles. Licenses will not be minified even though th
     
 All defined filters will run on the src for all these cases.
 
+## Filters
+
+You can filter both minified and un-minified source and license content with the filter method
+
+    # Filters can be use for string substitution
+    filter do |src, config|
+      src.gsub(/<VERSION>/, config.version)
+    end
+
+You can declare filters that run on un-minified output only
+
+    filter :src do |src, config|
+      src.gsub(/<SRC_MODE>/, 'full source')
+    end
+
+... And minified output only
+
+    filter :min do |src, config|
+      src.gsub(/<SRC_MODE>/, 'minified source')
+    end
+    
+All filters must return a copy of the source, so use src.gsub instead of src.gsub!
+
 ## Jfile
 
 You can add configuration in a Jfile in the root of your project.

data/lib/jbundle/builder.rb

@@ -8,8 +8,8 @@ module JBundle
     
     attr_reader :name, :src_dir, :dir
     
-    def initialize(name, file_list, src_dir = 'src')
-      @file_list, @src_dir = file_list, src_dir
+    def initialize(name, file_list, config)
+      @config, @file_list, @src_dir = config, file_list, config.src_dir
       @name, @dir = parse_name(name)
     end
     
@@ -23,11 +23,19 @@ module JBundle
     end
     
     def src
-      @src ||= licenses + raw_src
+      @src ||= filter(filtered_licenses + filtered_src, :src)
     end
     
     def min
-      @min ||= licenses + Closure::Compiler.new.compile(raw_src)
+      @min ||= filter(filtered_licenses, :min) + Closure::Compiler.new.compile(filter(filtered_src, :min))
+    end
+    
+    def filtered_licenses
+      @filtered_licenses ||= filter(licenses, :all)
+    end
+    
+    def filtered_src
+      @filtered_src ||= filter(raw_src, :all)
     end
     
     def min_name
@@ -65,6 +73,13 @@ module JBundle
       [n,d]
     end
     
+    def filter(content, mode)
+      @config.filters[mode].each do |filter|
+        content = filter.call(content, @config)
+      end
+      content
+    end
+    
   end
   
   
@@ -82,12 +97,7 @@ module JBundle
     end
     
     def build_one(f)
-      compiler = Compiler.new(f.name, f, @config.src_dir)
-      @config.filters.each do |filter|
-        filter.call(compiler.licenses, @config)
-        filter.call(compiler.raw_src, @config)
-      end
-      compiler
+      Compiler.new(f.name, f, @config)
     end
     
   end

data/lib/jbundle/config.rb

@@ -7,7 +7,7 @@ module JBundle
     def initialize
       @bundles = []
       @files = []
-      @filters = []
+      @filters = {:all => [], :min => [], :src => []}
       @after_write_blocks = []
     end
     
@@ -40,8 +40,8 @@ module JBundle
       @files << JBundle::File.new(f)
     end
     
-    def filter(&block)
-      filters << block
+    def filter(mode = :all, &block)
+      filters[mode.to_sym] << block
     end
     
     def after_write(&block)

data/lib/jbundle/version.rb

@@ -1,3 +1,3 @@
 module JBundle
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/JFile

@@ -22,8 +22,19 @@ file 'nested/foo.txt'
 
 file 'nested/foo.txt' => 'flat_foo.txt'
 
+# Filter all
 filter do |src, config|
-  src.gsub!(/<VERSION>/, config.version.full)
+  src.gsub(/<VERSION>/, config.version.full)
+end
+
+# filter full src only
+filter :src do |src, config|
+  src.gsub(/<SRC_MODE>/, 'src')
+end
+
+# filter minified src only
+filter :min do |src, config|
+  src.gsub(/<SRC_MODE>/, 'min')
 end
 
 after_write do |config|

data/spec/jbundle_spec.rb

@@ -22,7 +22,7 @@ describe "JBundle" do
     
     it 'should build single bundles' do
       JBundle.build('foo.js').src.should == "var VERSION = '1.6.1';\nvar a1 = 1;\nvar a2 = 2;\n"
-      JBundle.build('file4.js').min.should == "var a4=4;\n"
+      JBundle.build('file4.js').min.should == "var a4=4,src_mode=\"min\";\n"
     end
     
     it 'should bundle bundles' do
@@ -32,9 +32,9 @@ describe "JBundle" do
       JBundle.output[0].min.should == "var VERSION=\"1.6.1\",a1=1,a2=2;\n"
     end
     
-    it 'should not minify licenses' do
-      JBundle.build('foo2.js').src.should == "/* Version: 1.6.1\nThis is a license\n-----------------------*/\nvar a3 = 3;\nvar a4 = 4;\n"
-      JBundle.build('foo2.js').min.should == "/* Version: 1.6.1\nThis is a license\n-----------------------*/\nvar a3=3,a4=4;\n"
+    it 'should not minify licenses and run min and src filters' do
+      JBundle.build('foo2.js').src.should == "/* Version: 1.6.1. This is the src version.\nThis is a license\n-----------------------*/\nvar a3 = 3;\nvar a4 = 4;\nvar src_mode = 'src';\n"
+      JBundle.build('foo2.js').min.should == "/* Version: 1.6.1. This is the min version.\nThis is a license\n-----------------------*/\nvar a3=3,a4=4,src_mode=\"min\";\n"
     end
     
   end

data/spec/test_src/file4.js

@@ -1 +1,2 @@
-var a4 = 4;
+var a4 = 4;
+var src_mode = '<SRC_MODE>';

data/spec/test_src/license.txt

@@ -1,3 +1,3 @@
-/* Version: <VERSION>
+/* Version: <VERSION>. This is the <SRC_MODE> version.
 This is a license
 -----------------------*/

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jbundle
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Ismael Celis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-20 00:00:00 -03:00
+date: 2011-01-21 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency