rapper 0.4.0 → 0.5.0

data/README.markdown

@@ -72,6 +72,27 @@ The above definition will create two asset files: `public/assets/base.js` and `p
 
 **Note:** Definition files are YAML ordered mapping documents. This is so that version updates (which involves rapper updating the version numbers and writing out the updated definition as YAML) don't change the order of the file. This is especially useful when using git and merging branches because it prevents nasty merge conflicts.
 
+## Combining bundles
+
+Rapper allows you to combine bundles by referring to the other bundle with a "+"
+prefix in the files list:
+
+    - assets: !omap
+        - base: !omap
+            - files: 
+              - mootools
+            - version: 7b06
+        - extras: !omap
+            - files: 
+              - mootools-more
+              - protovis
+            - version: 25c1
+        - full: !omap
+            - files: 
+              - +base
+              - +extras
+            - version: db62
+
 ## View helpers
 
 Rapper provides helper methods to generate HTML include tags for your assets in the `Rapper::ViewHelpers` module. Simply `include` it in the appropriate place for your web app / framework / widget / spaceship / row boat / whatever. It's automaticallly included for Merb because Merb people are notoriously lazy.
@@ -129,6 +150,7 @@ Rapper's got a Gemfile. You know what to do.
 
 ## Version history
 
+* **0.5.0** - Added ability to nest bundles.
 * **0.4.0** - Switching to YUI Compressor for JavaScript compression due to its better handling of local variable compressing in scopes with eval() usage (I'm looking at you, ExtJS). Adding `component_tag_root` and `asset_tag_root` options to allow better control over URLs.
 * **0.3.0** - Remove hard Closure Compiler dependency (it will still need to be installed to compress JS), shorter view helper method names.
 * **0.2.4** - Add tag_paths() to get all file paths for a given asset.

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/lib/rapper/definition.rb

@@ -3,6 +3,8 @@ module Rapper
   # easier.
   class Definition
     
+    COMBINATION_PREFIX = /^\+/
+    
     def initialize( path )
       @path = path
       @type = File.basename( path, ".yml" )
@@ -104,9 +106,14 @@ module Rapper
       end
       
       ( spec["files"] || [] ).map do |file|
-        file_name = "#{file}.#{self.suffix}"
-        File.join( root, file_name )
-      end
+        if file =~ COMBINATION_PREFIX
+          asset_name = file.sub( COMBINATION_PREFIX, "" )
+          self.component_paths( asset_name, root )
+        else
+          file_name = "#{file}.#{self.suffix}"
+          File.join( root, file_name )
+        end
+      end.flatten
     end
   end
 end

data/lib/rapper/utils.rb

@@ -15,7 +15,7 @@ module Rapper
     # 
     # @param [String] destination_file Destination for concatenated output.
     def join_files( source_files, destination_file )
-      source_files = Array( source_files ).uniq
+      source_files = Array( source_files )
       source_files.any? do |path|
         unless File.exists?( path )
           raise Rapper::Errors::MissingComponentFile, "#{path} doesn't exist."

data/rapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rapper}
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tyson Tate"]
-  s.date = %q{2011-04-08}
+  s.date = %q{2011-09-02}
   s.description = %q{Static asset packager and compressor with versioning and built-in view helpers. Compresses files only when they need compressing.}
   s.email = %q{tyson@tysontate.com}
   s.extra_rdoc_files = [
@@ -44,9 +44,16 @@ Gem::Specification.new do |s|
     "spec/fixtures/config/asset_definitions/missing_file/stylesheets.yml",
     "spec/fixtures/config/assets.yml",
     "spec/fixtures/javascripts/simple_1.js",
-    "spec/fixtures/javascripts/simple_2.js",
+    "spec/fixtures/javascripts/subfolder/simple_2.js",
     "spec/fixtures/stylesheets/simple_1.css",
     "spec/fixtures/stylesheets/simple_2.css",
+    "spec/fixtures/test_cases/combination/assets.yml",
+    "spec/fixtures/test_cases/combination/definitions/css.yml",
+    "spec/fixtures/test_cases/combination/definitions/js.yml",
+    "spec/fixtures/test_cases/combination/expected/javascripts/base.js",
+    "spec/fixtures/test_cases/combination/expected/javascripts/base_combined.js",
+    "spec/fixtures/test_cases/combination/expected/stylesheets/base.css",
+    "spec/fixtures/test_cases/combination/expected/stylesheets/base_combined.css",
     "spec/fixtures/test_cases/compression/assets.yml",
     "spec/fixtures/test_cases/compression/definitions/css.yml",
     "spec/fixtures/test_cases/compression/definitions/js.yml",

data/spec/fixtures/config/asset_definitions/base/javascripts.yml

@@ -11,5 +11,5 @@
     - multiple_files: !omap 
         - files: 
           - simple_1
-          - simple_2
+          - subfolder/simple_2
         - version: f3d9

data/spec/fixtures/config/asset_definitions/custom_destination/javascripts.yml

@@ -8,5 +8,5 @@
     - multiple_files: !omap 
         - files: 
           - simple_1
-          - simple_2
+          - subfolder/simple_2
         - version: f3d9

data/spec/fixtures/test_cases/combination/assets.yml

@@ -0,0 +1,5 @@
+test:
+  definition_root: spec/fixtures/test_cases/combination/definitions
+  bundle: true
+  compress: true
+  version: false

data/spec/fixtures/test_cases/combination/definitions/css.yml

@@ -0,0 +1,16 @@
+--- !omap 
+- root: spec/fixtures/stylesheets
+- asset_tag_root: /stylesheets/assets
+- component_tag_root: /stylesheets
+- suffix: css
+- assets: !omap 
+    - base: !omap 
+        - files: 
+          - simple_1
+          - simple_2
+        - version: 683e
+    - base_combined: !omap 
+        - files: 
+          - +base
+          - simple_1
+        - version: 0bb9

data/spec/fixtures/test_cases/combination/definitions/js.yml

@@ -0,0 +1,16 @@
+--- !omap 
+- root: spec/fixtures/javascripts
+- asset_tag_root: /javascripts/assets
+- component_tag_root: /javascripts
+- suffix: js
+- assets: !omap 
+    - base: !omap 
+        - files: 
+          - simple_1
+          - subfolder/simple_2
+        - version: f3d9
+    - base_combined: !omap 
+        - files: 
+          - subfolder/simple_2
+          - +base
+        - version: ccfc

data/spec/fixtures/test_cases/combination/expected/javascripts/base.js

@@ -0,0 +1 @@
+var x=1;var y=2;function a(){return true}a=1;b=2;function b(){return false};

data/spec/fixtures/test_cases/combination/expected/javascripts/base_combined.js

@@ -0,0 +1 @@
+a=1;b=2;function b(){return false}var x=1;var y=2;function a(){return true}a=1;b=2;function b(){return false};

data/spec/fixtures/test_cases/combination/expected/stylesheets/base.css

@@ -0,0 +1 @@
+body{margin:0;color:#333}*{margin:0;color:#fff}

data/spec/fixtures/test_cases/combination/expected/stylesheets/base_combined.css

@@ -0,0 +1 @@
+body{margin:0;color:#333}*{margin:0;color:#fff}body{margin:0;color:#333}

data/spec/fixtures/test_cases/compression/definitions/js.yml

@@ -7,10 +7,10 @@
     - base: !omap
         - files: 
           - simple_1
-          - simple_2
+          - subfolder/simple_2
         - version: 683e
     - base_reversed: !omap
         - files: 
-          - simple_2
+          - subfolder/simple_2
           - simple_1
         - version: 4a04

data/spec/fixtures/test_cases/concatenation/definitions/js.yml

@@ -7,10 +7,10 @@
     - base: !omap 
         - files: 
           - simple_1
-          - simple_2
+          - subfolder/simple_2
         - version: f3d9
     - base_reversed: !omap 
         - files: 
-          - simple_2
+          - subfolder/simple_2
           - simple_1
         - version: fcfe

data/spec/rapper_spec.rb

@@ -62,7 +62,7 @@ describe Rapper do
           ["version", "98bc"]]
         ],
         ["multiple_files", [
-          ["files", ["simple_1", "simple_2"]],
+          ["files", ["simple_1", "subfolder/simple_2"]],
           ["version", "f3d9"]]
         ]
       ]
@@ -113,7 +113,7 @@ describe Rapper do
         ["version", "98bc"]
       ]
       rapper.definitions["javascripts"].assets["multiple_files"].should == [
-        ["files", ["simple_1", "simple_2"]],
+        ["files", ["simple_1", "subfolder/simple_2"]],
         ["version", "f3d9"]
       ]
     end
@@ -155,7 +155,7 @@ describe Rapper do
     
     it "doesn't use the defaut '/assets' tag root" do
       @rapper.js_tag( "javascripts", "multiple_files" ).should ==
-        "<script src=\"/javascripts/components/simple_1.js?v=f3d9\"></script>\n<script src=\"/javascripts/components/simple_2.js?v=f3d9\"></script>"
+        "<script src=\"/javascripts/components/simple_1.js?v=f3d9\"></script>\n<script src=\"/javascripts/components/subfolder/simple_2.js?v=f3d9\"></script>"
     end
   end
   
@@ -167,7 +167,7 @@ describe Rapper do
       
       rapper = Rapper::Engine.new( "spec/fixtures/config/assets.yml", "test_tag_paths_no_bundle" )
       rapper.tag_paths( "javascripts", "multiple_files" ).should ==
-        ["/javascripts/simple_1.js?v=f3d9", "/javascripts/simple_2.js?v=f3d9"]
+        ["/javascripts/simple_1.js?v=f3d9", "/javascripts/subfolder/simple_2.js?v=f3d9"]
     end
   end
   
@@ -235,7 +235,7 @@ describe Rapper do
       @controller.include_javascripts( :single_file ).should ==
         "<script src=\"/javascripts/simple_1.js\"></script>"
       @controller.include_javascripts( :multiple_files ).should ==
-        "<script src=\"/javascripts/simple_1.js\"></script>\n<script src=\"/javascripts/simple_2.js\"></script>"
+        "<script src=\"/javascripts/simple_1.js\"></script>\n<script src=\"/javascripts/subfolder/simple_2.js\"></script>"
     end
     
     it "returns tags for asset when bundling is on" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rapper
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Tyson Tate
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-08 00:00:00 -07:00
+date: 2011-09-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -167,9 +167,16 @@ files:
 - spec/fixtures/config/asset_definitions/missing_file/stylesheets.yml
 - spec/fixtures/config/assets.yml
 - spec/fixtures/javascripts/simple_1.js
-- spec/fixtures/javascripts/simple_2.js
+- spec/fixtures/javascripts/subfolder/simple_2.js
 - spec/fixtures/stylesheets/simple_1.css
 - spec/fixtures/stylesheets/simple_2.css
+- spec/fixtures/test_cases/combination/assets.yml
+- spec/fixtures/test_cases/combination/definitions/css.yml
+- spec/fixtures/test_cases/combination/definitions/js.yml
+- spec/fixtures/test_cases/combination/expected/javascripts/base.js
+- spec/fixtures/test_cases/combination/expected/javascripts/base_combined.js
+- spec/fixtures/test_cases/combination/expected/stylesheets/base.css
+- spec/fixtures/test_cases/combination/expected/stylesheets/base_combined.css
 - spec/fixtures/test_cases/compression/assets.yml
 - spec/fixtures/test_cases/compression/definitions/css.yml
 - spec/fixtures/test_cases/compression/definitions/js.yml