bagger 0.1.1 → 0.1.2

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## v 0.1.2
+
+* Hotfix for problems with multiple urls per background directive (Horia Dragomir)
+
 ## v 0.1.1
 
 * Do not version cache manifest (http://diveintohtml5.org/offline.html)

data/lib/bagger/packager.rb

@@ -85,7 +85,7 @@ module Bagger
     end
 
     def rewrite_urls_in_css(stylesheet_path)
-      url_regex = /(^|[{;])(.*?url\(\s*['"]?)(.*?)(['"]?\s*\).*?)([;}]|$)/ui
+      url_regex = /(^|[{;,])(.*?url\(\s*['"]?)(.*?)(['"]?\s*\).*?)([,;}]|$)/ui
       behavior_regex = /behavior:\s*url/ui
       data_regex = /^\s*data:/ui
       input = File.open(File.join(@target_dir, stylesheet_path)){|f| f.read}

data/lib/bagger/version.rb

@@ -1,3 +1,3 @@
 module Bagger
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/bagger_test.rb

@@ -176,6 +176,12 @@ class BaggerTest < Test::Unit::TestCase
         #relativeUrl {
             background: url("../images/relative.png") top center;
         }
+
+        #multipleUrls {
+            background-image: url("../images/relative.png"),
+                              url("/images/multiple.png");
+        }
+
         #absoluteUrl {
             background: url('http://localhost/absolute.png') top center;
         }
@@ -183,7 +189,7 @@ class BaggerTest < Test::Unit::TestCase
         write_file(File.join(@css_dir, "urled.css"), css)
         @config[:stylesheets][0][:files] << 'css/urled.css'
         FileUtils.mkdir_p(File.join(@source_dir, 'images'))
-        %w(root relative absolute).each do |type|
+        %w(root relative multiple absolute).each do |type|
           FileUtils.touch(File.join(@source_dir, 'images', "#{type}.png"))
         end
       end
@@ -208,6 +214,17 @@ class BaggerTest < Test::Unit::TestCase
         assert combined_css.include?(manifest['/images/relative.png'])
       end
 
+      should 'rewrite multiple urls in one line' do
+        Bagger.bagit!(
+          :source_dir => @source_dir,
+          :target_dir => @target_dir,
+          :combine => @config
+        )
+        combined_css = File.open(File.join(@target_dir, manifest['/css/combined.css'])){|f| f.read}
+        assert combined_css.include?(manifest['/images/relative.png'])
+        assert combined_css.include?(manifest['/images/multiple.png'])
+      end
+
       should 'not rewrite absolute urls' do
         Bagger.bagit!(
           :source_dir => @source_dir,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bagger
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-02 00:00:00.000000000 Z
+date: 2011-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70212879727180 !ruby/object:Gem::Requirement
+  requirement: &70168919709800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70212879727180
+  version_requirements: *70168919709800
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70212879721620 !ruby/object:Gem::Requirement
+  requirement: &70168919709360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70212879721620
+  version_requirements: *70168919709360
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &70212879718780 !ruby/object:Gem::Requirement
+  requirement: &70168919708920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70212879718780
+  version_requirements: *70168919708920
 - !ruby/object:Gem::Dependency
   name: rainpress
-  requirement: &70212879718260 !ruby/object:Gem::Requirement
+  requirement: &70168919708460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70212879718260
+  version_requirements: *70168919708460
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70212879717020 !ruby/object:Gem::Requirement
+  requirement: &70168919707920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212879717020
+  version_requirements: *70168919707920
 - !ruby/object:Gem::Dependency
   name: shoulda-context
-  requirement: &70212879716160 !ruby/object:Gem::Requirement
+  requirement: &70168919707480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212879716160
+  version_requirements: *70168919707480
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70212879715420 !ruby/object:Gem::Requirement
+  requirement: &70168919707000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212879715420
+  version_requirements: *70168919707000
 description: ! 'A framework agnostic packaging solution for your assets: version files,
   combine them, minify them and create a manifest'
 email: