zfben_libjs 0.0.25 → 0.0.26

data/lib/zfben_libjs/support_source/css.rb

@@ -11,7 +11,7 @@ class Zfben_libjs::Css < Zfben_libjs::Source
     if @remote_path || @filepath
       remote_url = File.dirname(@remote_path || @filepath)
       @source = import_remote_css @source, remote_url
-      download_images! remote_url
+      @source = download_images! remote_url
     end
   end
   
@@ -40,17 +40,14 @@ class Zfben_libjs::Css < Zfben_libjs::Source
       if REGEXP_REMOTE_IMAGE =~ line
         path = line.match(REGEXP_REMOTE_IMAGE)[1]
         filename = File.basename(path)
-        if File.exists?(File.join(@options['src/images'], filename))
-          if @options['url'] == ''
-            url = '../images/' + filename
-          else
-            url = @options['url/images'] + '/' + filename
-          end
+        path = File.join(@options['src/images'], filename)
+        if File.exists?(path)
+          url = @options['url/images'] + '/' + filename
           line = 'url("' << url << '")'
         end
       end
       line
-    }.join ''
+    }.join "\n"
   end
   
   private
@@ -73,20 +70,18 @@ class Zfben_libjs::Css < Zfben_libjs::Source
   end
   
   def download_images! remote_url
-    @source = @source.partition_all(REGEXP_REMOTE_IMAGE).map{ |line|
-      if REGEXP_REMOTE_IMAGE =~ line
-        url = REGEXP_REMOTE_IMAGE.match(line)[1]
-        path = File.join(@options['src/source'], '.download', self.name + '_' + File.basename(url))
-        unless File.exists?(url) && File.exists?(path)
-          url = File.join(remote_url, url)
-          download(url, path)
-        else
-          path = url
-        end
-        @images.push path
-        line = 'url(../' + File.basename(path) + ')'
+    @source = @source.gsub(REGEXP_REMOTE_IMAGE){ |line|
+      url = REGEXP_REMOTE_IMAGE.match(line)[1]
+      path = File.join(@options['src/source'], '.download', self.name + '_' + File.basename(url))
+      unless File.exists?(path)
+        url = File.join(remote_url, url)
+        download(url, path)
+      end
+      if File.exists?(path)
+        line = "url('#{path}')"
+        @images.push File.realpath(path)
       end
       line
-    }.join("\n")
+    }
   end
 end

data/zfben_libjs.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'zfben_libjs'
-  s.version     = '0.0.25'
+  s.version     = '0.0.26'
   s.authors     = ["Ben"]
   s.email       = ["ben@zfben.com"]
   s.homepage    = "https://github.com/benz303/zfben_libjs"
@@ -32,5 +32,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'coffee-script'
   s.add_dependency 'uglifier'
   s.add_dependency 'activesupport'
+
+  s.add_development_dependency 'zfben_hanoi'
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zfben_libjs
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-20 00:00:00.000000000Z
+date: 2011-09-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &18608060 !ruby/object:Gem::Requirement
+  requirement: &13459540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18608060
+  version_requirements: *13459540
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &18607000 !ruby/object:Gem::Requirement
+  requirement: &13455860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18607000
+  version_requirements: *13455860
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &18606140 !ruby/object:Gem::Requirement
+  requirement: &13386320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18606140
+  version_requirements: *13386320
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &18605540 !ruby/object:Gem::Requirement
+  requirement: &13383200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18605540
+  version_requirements: *13383200
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &18604920 !ruby/object:Gem::Requirement
+  requirement: &13381060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18604920
+  version_requirements: *13381060
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &18604220 !ruby/object:Gem::Requirement
+  requirement: &13348780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18604220
+  version_requirements: *13348780
+- !ruby/object:Gem::Dependency
+  name: zfben_hanoi
+  requirement: &13346760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *13346760
 description: ''
 email:
 - ben@zfben.com