zfben_libjs 0.0.22 → 0.0.23

data/.gitignore

@@ -1,6 +1,7 @@
 *.gem
 .bundle
 *.lock
+.sass-cache
 pkg/*
 src/*
 test/javascript/tmp

data/lib/zfben_libjs/collection.rb

@@ -1,5 +1,5 @@
 class Zfben_libjs::Collection
-  attr_accessor :name, :sources, :options, :css, :js, :images, :css_path, :js_path, :images_path
+  attr_accessor :name, :sources, :options, :libs, :css, :js, :images, :css_path, :js_path, :images_path
   
   def initialize name, sources, libs, options
     sources = [sources] unless sources.class.to_s != 'Array'
@@ -9,6 +9,7 @@ class Zfben_libjs::Collection
     
     @options = options
     
+    @libs = []
     @css = []
     @js = []
     @images = []
@@ -60,8 +61,12 @@ class Zfben_libjs::Collection
     else
       @js_path = nil
     end
+
+    if @libs.length > 0
+      @libs = @libs.flatten.uniq
+    end
     
-    return [@css_path, @js_path].compact
+    return @libs + [@css_path, @js_path].compact
   end
   
   private
@@ -69,7 +74,7 @@ class Zfben_libjs::Collection
   def process_sources sources, libs
     sources.each do |source|
       if libs.has_key?(source)
-        process_sources libs[source], libs
+        @libs.push(libs[source])
       elsif source.respond_to?(:to_css)
         @css.push source
         @images = @images + source.images if source.respond_to?(:images)

data/lib/zfben_libjs/lib.coffee

@@ -202,7 +202,7 @@ Location_watch = ->
     for regexp, lib_name of routes
       test = location_path.match(path2regexp(regexp))
       if test isnt null
-        if typeof libs_name is 'string'
+        if typeof lib_name is 'string'
           libs_name.push lib_name
         else
           if typeof lib_name is 'function'

data/lib/zfben_libjs/support_source/scss.rb

@@ -2,7 +2,7 @@ class Zfben_libjs::Scss < Zfben_libjs::Source
   def after_initialize
     @options = @options.merges({ :syntax => :scss, :cache => false }, Compass.sass_engine_options)
     @options[:load_paths].push File.dirname(@filepath)
-    @source = "@import compass\n" + @source
+    @source = "@import \"compass\";\n" + @source
   end
 
   def to_css

data/lib/zfben_libjs.rb

@@ -38,128 +38,128 @@ class Zfben_libjs::Libjs
     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
-            source = Zfben_libjs.get_source(url, @opts[:config])
-            lib.push(source)
-          end
+    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
+          source = Zfben_libjs.get_source(url, @opts[:config])
+          lib.push(source)
         end
-        lib = lib.flatten.uniq.compact
-        
-        @libs[name] = Zfben_libjs::Collection.new(name, lib, @libs, @opts[:config]).write_files!
       end
+      lib = lib.flatten.uniq.compact
+        
+      @libs[name] = Zfben_libjs::Collection.new(name, lib, @libs, @opts[:config]).write_files!
+    end
 
-      tip '== [2/2] Generate lib.js =='
+    tip '== [2/2] Generate lib.js =='
       
-      libjs = File.read(@libs['lazyload'][0]) << ";\n"
+    libjs = File.read(@libs['lazyload'][0]) << ";\n"
       
-      libjs_core = File.read(File.join(@path_gem, 'lib.coffee'))
+    libjs_core = File.read(File.join(@path_gem, 'lib.coffee'))
       
-      libjs_core = CoffeeScript.compile(libjs_core)
+    libjs_core = CoffeeScript.compile(libjs_core)
 
-      libjs << libjs_core << ";\n"
+    libjs << libjs_core << ";\n"
       
-      @urls = {}
+    @urls = {}
      
-      @libs.each do |lib, path|
-        path = [path] unless path.class == Array
-        path = path.map{ |url|
-          case File.extname(url)
-            when '.css'
-              url = @opts[:config]['url/stylesheets'] + '/' + File.basename(url)
-            when '.js'
-              url = @opts[: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');\n"
-      libjs << Time.now.strftime("lib.defaults.version = '?%s';\n")
-      
-      if @opts.has_key?(:bundle)
-        bundle = {}
-        @opts[: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) << ";\n"
-              end
+    @libs.each do |lib, path|
+      path = [path] unless path.class == Array
+      path = path.map{ |url|
+        case File.extname(url)
+          when '.css'
+            url = @opts[:config]['url/stylesheets'] + '/' + File.basename(url)
+          when '.js'
+            url = @opts[: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');\n"
+    libjs << Time.now.strftime("lib.defaults.version = '?%s';\n")
+  
+    if @opts.has_key?(:bundle)
+      bundle = {}
+      @opts[: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) << ";\n"
             end
           end
-          
-          path = []
-          
-          if css != ''
-            file = File.join(@opts[:config]['src/stylesheets'], name + '.css')
-            File.open(file, 'w'){ |f| f.write(css) }
-            path.push(@opts[:config]['url/stylesheets'] + '/' + File.basename(file))
-          end
-          
-          if js != ''
-            files_url = files.map{ |f| @opts[:config]['url/javascripts'] + '/' + File.basename(f) }.join("','")
-            js << "\nif(typeof lib === 'function'){lib.loaded('add', '#{files_url}');}"
-            file = File.join(@opts[:config]['src/javascripts'], name + '.js')
-            File.open(file, 'w'){ |f| f.write(js) }
-            path.push(@opts[:config]['url/javascripts'] + '/' + File.basename(file))
-          end
-          
-          if path.length > 0
-            path = path[0] if path.length == 0
-            bundle[name] = path
-          end
         end
-        
-        libjs << "\n/* bundle */\nlib.libs(#{bundle.to_json});\n"
-      end
-      
-      if @opts.has_key?(:routes)
-        routes = {}
-        @opts[:routes].each do |path, lib_name|
-          lib_name = lib_name.join ' ' if lib_name.class == Array
-          routes[path] = lib_name
+
+        path = []
+
+        if css != ''
+          file = File.join(@opts[:config]['src/stylesheets'], name + '.css')
+          File.open(file, 'w'){ |f| f.write(css) }
+          path.push(@opts[:config]['url/stylesheets'] + '/' + File.basename(file))
+        end
+
+        if js != ''
+          files_url = files.map{ |f| @opts[:config]['url/javascripts'] + '/' + File.basename(f) }.join("','")
+          js << "\nif(typeof lib === 'function'){lib.loaded('add', '#{files_url}');}"
+          file = File.join(@opts[:config]['src/javascripts'], name + '.js')
+          File.open(file, 'w'){ |f| f.write(js) }
+          path.push(@opts[:config]['url/javascripts'] + '/' + File.basename(file))
+        end
+
+        if path.length > 0
+          path = path[0] if path.length == 0
+          bundle[name] = path
         end
-        libjs << "\n/* routes */\nlib.routes('add', #{routes.to_json});\n"
-      end
-      
-      if @opts.has_key?(:preload)
-        preload = @opts[:preload].class == Array ? @opts[:preload] : [ @opts[:preload] ]
-        libjs << "\n/* preload */\nlib('#{preload.join(' ')}');\n"
       end
-      
-      libjs = minify(libjs, :js) if @opts[:config]['minify']
-      File.open(File.join(@opts[:config]['src/javascripts'], 'lib.js'), 'w'){ |f| f.write(libjs) }
-      
-      if @opts[:config].has_key?('after')
-        load @opts[:config]['after']
+
+      libjs << "\n/* bundle */\nlib.libs(#{bundle.to_json});\n"
+    end
+
+    if @opts.has_key?(:routes)
+      routes = {}
+      @opts[:routes].each do |path, lib_name|
+        lib_name = lib_name.join ' ' if lib_name.class == Array
+        routes[path] = lib_name
       end
-      
-      tip '== End Build =='
+      libjs << "\n/* routes */\nlib.routes('add', #{routes.to_json});\n"
+    end
+
+    if @opts.has_key?(:preload)
+      preload = @opts[:preload].class == Array ? @opts[:preload] : [ @opts[:preload] ]
+      libjs << "\n/* preload */\nlib('#{preload.join(' ')}');\n"
     end
+
+    libjs = minify(libjs, :js) if @opts[:config]['minify']
+    File.open(File.join(@opts[:config]['src/javascripts'], 'lib.js'), 'w'){ |f| f.write(libjs) }
+
+    if @opts[:config].has_key?('after')
+      load @opts[:config]['after']
+    end
+
+    tip '== End Build =='
+  end
 end

data/test/javascript/lib_test.js

@@ -16,8 +16,8 @@ test('lib.loaded', 3, function(){
     'http://code.jquery.com/jquery.min.js': true,
     'http://code.jquery.com/qunit/qunit-git.css': true,
     'http://code.jquery.com/qunit/qunit-git.js': true,
-    'http://localhost:4711/callback.js': true,
-    'http://localhost:4711/javascripts/lib.js': true,
+    '/callback.js': true,
+    '/javascripts/lib.js': true,
     '/javascripts/lazyload.js': true
   }, 'lib.loaded files are ok');
   
@@ -25,8 +25,8 @@ test('lib.loaded', 3, function(){
     'http://code.jquery.com/jquery.min.js': true,
     'http://code.jquery.com/qunit/qunit-git.css': true,
     'http://code.jquery.com/qunit/qunit-git.js': true,
-    'http://localhost:4711/callback.js': true,
-    'http://localhost:4711/javascripts/lib.js': true,
+    '/callback.js': true,
+    '/javascripts/lib.js': true,
     '/javascripts/lazyload.js': true,
     'test': true
   }, "lib.loaded('add', 'test') has been added");
@@ -35,8 +35,8 @@ test('lib.loaded', 3, function(){
     'http://code.jquery.com/jquery.min.js': true,
     'http://code.jquery.com/qunit/qunit-git.css': true,
     'http://code.jquery.com/qunit/qunit-git.js': true,
-    'http://localhost:4711/callback.js': true,
-    'http://localhost:4711/javascripts/lib.js': true,
+    '/callback.js': true,
+    '/javascripts/lib.js': true,
     '/javascripts/lazyload.js': true
   }, "lib.loaded('del', 'test') has been deleted");
 
@@ -55,7 +55,7 @@ test('lib.libs', 6, function(){
     route_string: [ '/javascripts/route_string.js' ],
     route_regexp: [ '/javascripts/route_regexp.js' ],
     jquery: [ '/javascripts/jquery.js' ],
-    jqueryui: [ '/stylesheets/jqueryui.css', '/javascripts/jqueryui.js' ]
+    jqueryui: [ '/javascripts/jquery.js', '/stylesheets/jqueryui.css', '/javascripts/jqueryui.js' ]
   }, 'lib.libs is ok');
   
   equal(typeof lib.lazyload, 'function', 'lib.lazyload is a function');
@@ -71,7 +71,7 @@ test('lib.libs', 6, function(){
     route_string: [ '/javascripts/route_string.js' ],
     route_regexp: [ '/javascripts/route_regexp.js' ],
     jquery: [ '/javascripts/jquery.js' ],
-    jqueryui: [ '/stylesheets/jqueryui.css', '/javascripts/jqueryui.js' ],
+    jqueryui: [ '/javascripts/jquery.js', '/stylesheets/jqueryui.css', '/javascripts/jqueryui.js' ],
     test: 'test'
   }, "lib.libs({test: 'test'}) has been added");
   
@@ -88,7 +88,7 @@ test('lib.libs', 6, function(){
     route_string: [ '/javascripts/route_string.js' ],
     route_regexp: [ '/javascripts/route_regexp.js' ],
     jquery: [ '/javascripts/jquery.js' ],
-    jqueryui: [ '/stylesheets/jqueryui.css', '/javascripts/jqueryui.js' ]
+    jqueryui: [ '/javascripts/jquery.js', '/stylesheets/jqueryui.css', '/javascripts/jqueryui.js' ]
   }, "lib.libs({test: null}) has been deleted");
   
   equal(typeof lib.test, 'undefined', 'lib.test is undefined');

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.22'
+  s.version     = '0.0.23'
   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.22
+  version: 0.0.23
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-15 00:00:00.000000000Z
+date: 2011-09-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &6040240 !ruby/object:Gem::Requirement
+  requirement: &10800640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6040240
+  version_requirements: *10800640
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &6039100 !ruby/object:Gem::Requirement
+  requirement: &10798980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6039100
+  version_requirements: *10798980
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &5960500 !ruby/object:Gem::Requirement
+  requirement: &10796720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *5960500
+  version_requirements: *10796720
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &5959440 !ruby/object:Gem::Requirement
+  requirement: &10794440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *5959440
+  version_requirements: *10794440
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &5958880 !ruby/object:Gem::Requirement
+  requirement: &10792860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *5958880
+  version_requirements: *10792860
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &5958340 !ruby/object:Gem::Requirement
+  requirement: &10789880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *5958340
+  version_requirements: *10789880
 description: ''
 email:
 - ben@zfben.com