zfben_libjs 0.0.7 → 0.0.8

data/bin/libjs

@@ -17,7 +17,7 @@ else
       tip "Create #{folder}/libjs.yml\nYou can change it then use `libjs #{folder}/libjs` to build it"
     end
   else
-    lib = Libjs.new(args[0])
+    lib = Zfben_libjs::Libjs.new(args[0])
     if args.length == 1
       lib.build!
     end

data/lib/zfben_libjs.rb

@@ -17,313 +17,332 @@ def tip msg
   STDOUT.print "#{msg}\n".color(:green)
 end
 
-class Libjs
-  def initialize config_file
-    @config_file = File.exists?(config_file) && !File.directory?(config_file) ? [config_file] : Dir[config_file + '*'].select{ |f| !File.directory?(f) }
-    if @config_file.length == 0
-      err config_file + ' is not exist!'
-    else
-      @config_file = @config_file[0]
-    end
-    
-    begin
-      @data = YAML.load(File.read(@config_file))
-    rescue => e
-      err "#{@config_file} load filed!\n#{e}"
-    end
-    
-    @path_gem = File.realpath(File.join(File.dirname(__FILE__), 'zfben_libjs'))
-    @path_lib = File.realpath('.')
-    
-    tip "#{@config_file} load success!"
-  end
-  
-  def build!
-    tip '== Starting Build @' + @config_file
-
-    # Merge default config
-    @config = {
-      'src' => 'src',
-      'download' => false,
-      'minify' => true,
-      'url' => ''
-    }.merge(@data['config'])
-    
-    @config['src'] = File.join(File.dirname(@config_file), @config['src'])
-    system('mkdir ' + @config['src']) unless File.exists?(@config['src'])
-    
-    ['source'].each do |path|
-      @config['src/' + path] = File.join(@config['src'], '.' + path) unless @config.has_key?('src/' + path)
-      system('mkdir ' + @config['src/' + path]) unless File.exists?(@config['src/' + path])
+module Zfben_libjs
+  class Libjs
+    def initialize config_file
+      @config_file = File.exists?(config_file) && !File.directory?(config_file) ? [config_file] : Dir[config_file + '*'].select{ |f| !File.directory?(f) }
+      if @config_file.length == 0
+        err config_file + ' is not exist!'
+      else
+        @config_file = @config_file[0]
+      end
+      
+      begin
+        @data = YAML.load(File.read(@config_file))
+      rescue => e
+        err "#{@config_file} load filed!\n#{e}"
+      end
+      
+      @path_gem = File.realpath(File.join(File.dirname(__FILE__), 'zfben_libjs'))
+      @path_lib = File.realpath('.')
+      
+      tip "#{@config_file} load success!"
     end
     
-    ['javascripts', 'stylesheets', 'images'].each do |path|
-      @config['url/' + path] = @config['url'] + '/' + path unless @config.has_key?('url/' + path)
-      @config['src/' + path] = File.join(@config['src'], path) unless @config.has_key?('src/' + path)
-      system('mkdir ' + @config['src/' + path]) unless File.exists?(@config['src/' + path])
-    end
+    def build!
+      tip '== Starting Build @' + @config_file
 
-    # Merge default libs
-    @libs = {
-      'lazyload' => 'https://raw.github.com/rgrove/lazyload/master/lazyload.js'
-    }.merge(@data['libs'])
-    
-    @bundle = @data['bundle']
-    
-    @preload = @data['preload']
-    
-    if @config.has_key?('before')
-      load @config['before']
-    end
-    
-    
-    tip '== [1/2] Starting Progress Source =='
-    length = @libs.length
-    num = 0
-    @libs.each do |name, urls|
-      num = num + 1
-      tip "[#{num}/#{length}] #{name}"
-      urls = [urls] unless urls.class == Array
-      urls = urls.map{ |url|
-        if url.include?('*')
-          url = Dir[url]
-        end
-        url
-      }.flatten.uniq.compact
-      lib = []
-      urls.each do |url|
-        if @libs.has_key?(url) && name != url
-          lib.push(url)
-        else
-          p path = File.join(@config['src/source'], name, File.basename(url))
-          dir = File.dirname(path)
-          system('mkdir ' + dir) unless File.exists?(dir)
-          download url, path
-          case get_filetype(path)
-            when 'css'
-              css = "/* @import #{url} */\n" << css_import(url, dir)
-              File.open(path, 'w'){ |f| f.write(css) }
-              images = download_images(name, url, path)
-              if images.length > 0
-                lib.push images
-              end
-            when 'js'
-              js = "/* @import #{url} */\n" << File.read(path)
-              File.open(path, 'w'){ |f| f.write(js) }
-            when 'rb'
-              script = eval(File.read(path))
-              css = ''
-              js = ''
-              script.each do | type, content |
-                case type
-                  when :css
-                    css << content
-                  when :js
-                    js << content
-                end
-              end
-              if css != ''
-                path = File.join(dir, File.basename(path, '.rb') << '.css')
-                File.open(path, 'w'){ |f| f.write("/* @import #{url} */\n" + css) }
-              elsif js != ''
-                path = File.join(dir, File.basename(path, '.rb') << '.js')
-                File.open(path, 'w'){ |f| f.write("/* @import #{url} */\n" + js) }
-              end
-            when 'sass'
-              options = { :syntax => :sass, :cache => false }.merge(Compass.sass_engine_options)
-              options[:load_paths].push File.dirname(path), File.dirname(url)
-              css = "/* @import #{url} */\n" + Sass::Engine.new(File.read(path), options).render
-              path = File.join(dir, File.basename(path) << '.css')
-              File.open(path, 'w'){ |f| f.write(css) }
-            when 'scss'
-              options = { :syntax => :scss, :cache => false }.merge(Compass.sass_engine_options)
-              options[:load_paths].push File.dirname(path), File.dirname(url)
-              css = "/* @import #{url} */\n" + Sass::Engine.new(File.read(path), options).render
-              path = File.join(dir, File.basename(path) << '.css')
-              File.open(path, 'w'){ |f| f.write(css) }
-            when 'coffee'
-              js = "/* @import #{url} */\n" + CoffeeScript.compile(File.read(path))
-              path = File.join(dir, File.basename(path) << '.js')
-              File.open(path, 'w'){ |f| f.write(js) }
-            else
-              lib.push url
-          end
-          lib.push(path)
-        end
+      # Merge default config
+      @config = {
+        'src' => 'src',
+        'download' => false,
+        'minify' => true,
+        'url' => ''
+      }.merge(@data['config'])
+      
+      @config['src'] = File.join(File.dirname(@config_file), @config['src'])
+      system('mkdir ' + @config['src']) unless File.exists?(@config['src'])
+      
+      ['source'].each do |path|
+        @config['src/' + path] = File.join(@config['src'], '.' + path) unless @config.has_key?('src/' + path)
+        system('mkdir ' + @config['src/' + path]) unless File.exists?(@config['src/' + path])
       end
-      lib = lib.flatten.uniq
       
-      css = ''
-      js = ''
-      lib = lib.map{ |file|
-        if File.exists?(file)
-          content = "/* @import #{file} */\n" + File.read(file)
-          case File.extname(file)
-            when '.css'
-              css << content
-              file = nil
-            when '.js'
-              js << content << ';'
-              file = nil
-          end
-        end
-        file
-      }.compact
-      if css != ''
-        file = File.join(@config['src/source'], name + '.css')
-        File.open(file, 'w'){ |f| f.write(css) }
-        lib.push(file)
+      ['javascripts', 'stylesheets', 'images'].each do |path|
+        @config['url/' + path] = @config['url'] + '/' + path unless @config.has_key?('url/' + path)
+        @config['src/' + path] = File.join(@config['src'], path) unless @config.has_key?('src/' + path)
+        system('mkdir ' + @config['src/' + path]) unless File.exists?(@config['src/' + path])
       end
-      if js != ''
-        file = File.join(@config['src/source'], name + '.js')
-        File.open(file, 'w'){ |f| f.write(js) }
-        lib.push(file)
+
+      # Merge default libs
+      @libs = {
+        'lazyload' => 'https://raw.github.com/rgrove/lazyload/master/lazyload.js'
+      }.merge(@data['libs'])
+      
+      @bundle = @data['bundle']
+      
+      @preload = @data['preload']
+      
+      if @config.has_key?('before')
+        load @config['before']
       end
       
-      @libs[name] = lib.map{ |file|
-        if File.exists?(file)
-          case File.extname(file)
-            when '.js'
-              type = 'javascripts'
-            when '.css'
-              type = 'stylesheets'
-            else
-              type = 'images'
+      
+      tip '== [1/2] Starting Progress Source =='
+      length = @libs.length
+      num = 0
+      @libs.each do |name, urls|
+        num = num + 1
+        tip "[#{num}/#{length}] #{name}"
+        urls = [urls] unless urls.class == Array
+        urls = urls.map{ |url|
+          if url.include?('*')
+            url = Dir[url]
           end
-          
-          path = File.join(@config['src/' + type], File.basename(file))
-          
-          tip '=> ' + path
-          
-          system('cp ' + file + ' ' + path)
-          
-          reg = /url\("?'?([^'")]+)'?"?\)/
-          if type == 'stylesheets' && @config['changeImageUrl'] && reg =~ File.read(path)
-            css = File.read(path).partition_all(reg).map{ |f|
-              if reg =~ f
-                if @config['url'] == ''
-                  f = 'url("../images/' << File.basename(f.match(reg)[1]) << '")'
-                else
-                  f = 'url("' + @config['url/images'] + File.basename(f.match(reg)[1]) << '")'
+          url
+        }.flatten.uniq.compact
+        lib = []
+        urls.each do |url|
+          if @libs.has_key?(url) && name != url
+            lib.push(url)
+          else
+            p path = File.join(@config['src/source'], name, File.basename(url))
+            dir = File.dirname(path)
+            system('mkdir ' + dir) unless File.exists?(dir)
+            download url, path
+            case get_filetype(path)
+              when 'css'
+                css = "/* @import #{url} */\n" << css_import(url, dir)
+                File.open(path, 'w'){ |f| f.write(css) }
+                images = download_images(name, url, path)
+                if images.length > 0
+                  lib.push images
                 end
-              end
-              f
-            }.join('')
-            File.open(path, 'w'){ |f| f.write(css) }
-          end
-          if type == 'images'
-            path = nil
-          end
-          
-          if @config['minify']
-            if type == 'stylesheets'
-              min = minify(File.read(path), :css)
-              File.open(path, 'w'){ |f| f.write(min) }
-            end
-            if type == 'javascripts'
-              min = minify(File.read(path), :js)
-              File.open(path, 'w'){ |f| f.write(min) }
+              when 'js'
+                js = "/* @import #{url} */\n" << File.read(path)
+                File.open(path, 'w'){ |f| f.write(js) }
+              when 'rb'
+                script = eval(File.read(path))
+                css = ''
+                js = ''
+                script.each do | type, content |
+                  case type
+                    when :css
+                      css << content
+                    when :js
+                      js << content
+                  end
+                end
+                if css != ''
+                  path = File.join(dir, File.basename(path, '.rb') << '.css')
+                  File.open(path, 'w'){ |f| f.write("/* @import #{url} */\n" + css) }
+                elsif js != ''
+                  path = File.join(dir, File.basename(path, '.rb') << '.js')
+                  File.open(path, 'w'){ |f| f.write("/* @import #{url} */\n" + js) }
+                end
+              when 'sass'
+                options = { :syntax => :sass, :cache => false }.merge(Compass.sass_engine_options)
+                options[:load_paths].push File.dirname(path), File.dirname(url)
+                css = "/* @import #{url} */\n" + Sass::Engine.new(File.read(path), options).render
+                path = File.join(dir, File.basename(path) << '.css')
+                File.open(path, 'w'){ |f| f.write(css) }
+              when 'scss'
+                options = { :syntax => :scss, :cache => false }.merge(Compass.sass_engine_options)
+                options[:load_paths].push File.dirname(path), File.dirname(url)
+                css = "/* @import #{url} */\n" + Sass::Engine.new(File.read(path), options).render
+                path = File.join(dir, File.basename(path) << '.css')
+                File.open(path, 'w'){ |f| f.write(css) }
+              when 'coffee'
+                js = "/* @import #{url} */\n" + CoffeeScript.compile(File.read(path))
+                path = File.join(dir, File.basename(path) << '.js')
+                File.open(path, 'w'){ |f| f.write(js) }
+              else
+                lib.push url
             end
+            lib.push(path)
           end
-        else
-          path = @libs[file]
-        end
-        path
-      }.compact.flatten.uniq
-      @libs[name] = @libs[name][0] if @libs[name].length == 1
-    end
-    
-    tip '== [2/2] Generate lib.js =='
-    
-    libjs = File.read(@libs['lazyload']) << ';'
-    
-    libjs_core = File.read(File.join(@path_gem, 'lib.coffee'))
-    
-    libjs_core = CoffeeScript.compile(libjs_core)
-
-    libjs << libjs_core << ';'
-    
-    @urls = {}
-    
-    @libs.each do |lib, path|
-      path = [path] unless path.class == Array
-      path = path.map{ |url|
-        case File.extname(url)
-          when '.css'
-            url = @config['url/stylesheets'] + '/' + File.basename(url)
-          when '.js'
-            url = @config['url/javascripts'] + '/' + File.basename(url)
-          else
-            url = nil
         end
-        url
-      }.compact.uniq
-      @urls[lib] = path
-    end
-    
-    libjs << "\n/* libs */\nlib.libs(#{@urls.to_json});lib.loaded('add', 'lazyload');"
-    
-    if @config['autoVersion']
-      libjs << Time.now.strftime('lib.defaults.version = "?%s";')
-    end
-    
-    if @bundle != nil && @bundle.length > 0
-      @bundle.each do |name, libs|
+        lib = lib.flatten.uniq
+        
         css = ''
         js = ''
-        files = []
-        libs.each do |lib|
-          lib = @libs[lib] if @libs.has_key?(lib)
-          lib = [lib] unless lib.class == Array
-          lib.each do |file|
-            files.push(file)
+        lib = lib.map{ |file|
+          if File.exists?(file)
+            content = "/* @import #{file} */\n" + File.read(file)
             case File.extname(file)
               when '.css'
-                css << File.read(file)
+                css << content
+                file = nil
               when '.js'
-                js << File.read(file) << ';'
+                js << content << ';'
+                file = nil
             end
           end
-        end
-        
-        path = []
-        
+          file
+        }.compact
         if css != ''
-          file = File.join(@config['src/stylesheets'], name + '.css')
+          file = File.join(@config['src/source'], name + '.css')
           File.open(file, 'w'){ |f| f.write(css) }
-          path.push(@config['url/stylesheets'] + '/' + File.basename(file))
+          lib.push(file)
         end
-        
         if js != ''
-          files_url = files.map{ |f| @config['url/javascripts'] + '/' + File.basename(f) }.join("','")
-          js << "\nif(typeof lib === 'function'){lib.loaded('add', '#{files_url}');}"
-          file = File.join(@config['src/javascripts'], name + '.js')
+          file = File.join(@config['src/source'], name + '.js')
           File.open(file, 'w'){ |f| f.write(js) }
-          path.push(@config['url/javascripts'] + '/' + File.basename(file))
+          lib.push(file)
         end
         
-        if path.length > 0
-          path = path[0] if path.length == 0
-          @bundle[name] = path
-        else
-          @bundle.delete(name)
+        @libs[name] = lib.map{ |file|
+          if File.exists?(file)
+            case File.extname(file)
+              when '.js'
+                type = 'javascripts'
+              when '.css'
+                type = 'stylesheets'
+              else
+                type = 'images'
+            end
+            
+            path = File.join(@config['src/' + type], File.basename(file))
+            
+            tip '=> ' + path
+            
+            system('cp ' + file + ' ' + path)
+            
+            reg = /url\("?'?([^'")]+)'?"?\)/
+            if type == 'stylesheets' && @config['changeImageUrl'] && reg =~ File.read(path)
+              css = File.read(path).partition_all(reg).map{ |f|
+                if reg =~ f
+                  if @config['url'] == ''
+                    f = 'url("../images/' << File.basename(f.match(reg)[1]) << '")'
+                  else
+                    f = 'url("' + @config['url/images'] + File.basename(f.match(reg)[1]) << '")'
+                  end
+                end
+                f
+              }.join('')
+              File.open(path, 'w'){ |f| f.write(css) }
+            end
+            if type == 'images'
+              path = nil
+            end
+            
+            if @config['minify']
+              if type == 'stylesheets'
+                min = minify(File.read(path), :css)
+                File.open(path, 'w'){ |f| f.write(min) }
+              end
+              if type == 'javascripts'
+                min = minify(File.read(path), :js)
+                File.open(path, 'w'){ |f| f.write(min) }
+              end
+            end
+          else
+            path = @libs[file]
+          end
+          path
+        }.compact.flatten.uniq
+        @libs[name] = @libs[name][0] if @libs[name].length == 1
+      end
+      
+      tip '== [2/2] Generate lib.js =='
+      
+      libjs = File.read(@libs['lazyload']) << ';'
+      
+      libjs_core = File.read(File.join(@path_gem, 'lib.coffee'))
+      
+      libjs_core = CoffeeScript.compile(libjs_core)
+
+      libjs << libjs_core << ';'
+      
+      @urls = {}
+      
+      @libs.each do |lib, path|
+        path = [path] unless path.class == Array
+        path = path.map{ |url|
+          case File.extname(url)
+            when '.css'
+              url = @config['url/stylesheets'] + '/' + File.basename(url)
+            when '.js'
+              url = @config['url/javascripts'] + '/' + File.basename(url)
+            else
+              url = nil
+          end
+          url
+        }.compact.uniq
+        @urls[lib] = path
+      end
+      
+      libjs << "\n/* libs */\nlib.libs(#{@urls.to_json});lib.loaded('add', 'lazyload');"
+      
+      if @config['autoVersion']
+        libjs << Time.now.strftime('lib.defaults.version = "?%s";')
+      end
+      
+      if @bundle != nil && @bundle.length > 0
+        @bundle.each do |name, libs|
+          css = ''
+          js = ''
+          files = []
+          libs.each do |lib|
+            lib = @libs[lib] if @libs.has_key?(lib)
+            lib = [lib] unless lib.class == Array
+            lib.each do |file|
+              files.push(file)
+              case File.extname(file)
+                when '.css'
+                  css << File.read(file)
+                when '.js'
+                  js << File.read(file) << ';'
+              end
+            end
+          end
+          
+          path = []
+          
+          if css != ''
+            file = File.join(@config['src/stylesheets'], name + '.css')
+            File.open(file, 'w'){ |f| f.write(css) }
+            path.push(@config['url/stylesheets'] + '/' + File.basename(file))
+          end
+          
+          if js != ''
+            files_url = files.map{ |f| @config['url/javascripts'] + '/' + File.basename(f) }.join("','")
+            js << "\nif(typeof lib === 'function'){lib.loaded('add', '#{files_url}');}"
+            file = File.join(@config['src/javascripts'], name + '.js')
+            File.open(file, 'w'){ |f| f.write(js) }
+            path.push(@config['url/javascripts'] + '/' + File.basename(file))
+          end
+          
+          if path.length > 0
+            path = path[0] if path.length == 0
+            @bundle[name] = path
+          else
+            @bundle.delete(name)
+          end
         end
+        
+        libjs << "\n/* bundle */\nlib.libs(#{@bundle.to_json});"
       end
       
-      libjs << "\n/* bundle */\nlib.libs(#{@bundle.to_json});"
-    end
-    
-    if @preload.class == Array && @preload.length > 0
-      libjs << "\n/* preload */\nlib('#{@preload.join(' ')}');"
+      if @preload.class == Array && @preload.length > 0
+        libjs << "\n/* preload */\nlib('#{@preload.join(' ')}');"
+      end
+      
+      libjs = minify(libjs, :js) if @config['minify']
+      File.open(File.join(@config['src/javascripts'], 'lib.js'), 'w'){ |f| f.write(libjs) }
+      
+      if @config.has_key?('after')
+        load @config['after']
+      end
+      
+      tip '== End Build =='
     end
-    
-    libjs = minify(libjs, :js) if @config['minify']
-    File.open(File.join(@config['src/javascripts'], 'lib.js'), 'w'){ |f| f.write(libjs) }
-    
-    if @config.has_key?('after')
-      load @config['after']
+  end
+  
+  Lib_version ||= Time.now.strftime('?%s')
+  
+  if Rails
+    module Rails
+      module ActionView::Helpers::AssetTagHelper
+        def lib *opt
+          html = '<script src="/javascripts/lib.js' + Lib_version + '"></script>'
+          unless opt[0].blank?
+            html += '<script>lib("' + opt[0].to_s + '");</script>'
+          end
+          return html
+        end
+      end
     end
-    
-    tip '== End Build =='
   end
 end
+

data/zfben_libjs.gemspec

@@ -1,10 +1,9 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "zfben_libjs/version"
 
 Gem::Specification.new do |s|
   s.name        = "zfben_libjs"
-  s.version     = ZfbenLibjs::VERSION
+  s.version     = '0.0.8'
   s.authors     = ["Ben"]
   s.email       = ["ben@zfben.com"]
   s.homepage    = "https://github.com/benz303/zfben_libjs"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zfben_libjs
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-15 00:00:00.000000000Z
+date: 2011-08-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &10618860 !ruby/object:Gem::Requirement
+  requirement: &17935120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10618860
+  version_requirements: *17935120
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &10618340 !ruby/object:Gem::Requirement
+  requirement: &17934660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10618340
+  version_requirements: *17934660
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &10617920 !ruby/object:Gem::Requirement
+  requirement: &17934240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10617920
+  version_requirements: *17934240
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &10604080 !ruby/object:Gem::Requirement
+  requirement: &17933820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10604080
+  version_requirements: *17933820
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &10603660 !ruby/object:Gem::Requirement
+  requirement: &17933400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10603660
+  version_requirements: *17933400
 description: ''
 email:
 - ben@zfben.com
@@ -82,7 +82,6 @@ files:
 - lib/zfben_libjs/lib.coffee
 - lib/zfben_libjs/lib.rb
 - lib/zfben_libjs/libjs.yml
-- lib/zfben_libjs/version.rb
 - test.yml
 - test/javascript/assets/callback.js
 - test/javascript/fixtures/lib_fixtures.html

data/lib/zfben_libjs/version.rb

@@ -1,3 +0,0 @@
-module ZfbenLibjs
-  VERSION = "0.0.7"
-end