zfben_libjs 0.0.9 → 0.0.10

data/lib/zfben_libjs/lib.coffee

@@ -77,11 +77,13 @@ lib = ->
   
   if pending_css.length > 0
     loading_css = []
+
     if lib.defaults.version
       for url in pending_css
         loading_css.push url + lib.defaults.version
     else
       loading_css = pending_css
+
     LazyLoad.css(loading_css, ->
       for url in pending_css
         delete pending_urls[url]
@@ -97,13 +99,15 @@ lib = ->
       pending_urls[url] = true
       pending_js.push url
   
-  if js.length > 0
+  if pending_js.length > 0
     loading_js = []
+
     if lib.defaults.version
       for url in pending_js
         loading_js.push url + lib.defaults.version
     else
       loading_js = pending_js
+
     LazyLoad.js(loading_js, ->
       for url in pending_js
         delete pending_urls[url]
@@ -114,7 +118,8 @@ lib = ->
   # put funcs to pending_funcs
   if funcs.length > 0
     pending_funcs[urls.join(' ')] = funcs
-    run_funcs()
+  
+  run_funcs()
   
   return {
     css: css
@@ -161,4 +166,39 @@ lib.libs = (new_libs)->
 
 lib.defaults = {}
 
+# Route
+routes = {}
+last_location = ''
+
+path2regex = (path)->
+  if path[0] is '/' && path[path.length - 1] is '/'
+    path = path[1..(path.length - 2)]
+  return path
+
+lib.routes = (method, args)->
+  switch method
+    when 'add'
+      for path, lib_name of args
+        routes[path2regex(path)] = lib_name
+      last_location = ''
+    when 'del'
+      for path, lib_name of args
+        delete(routes[path2regex(path)])
+  return routes
+
+Location_watch = ->
+  location_path = location.hostname + location.pathname + location.hash
+  if location_path isnt last_location
+    libs_name = []
+    for path, lib_name of routes
+      if RegExp(path).test location_path
+        libs_name.push lib_name
+    if libs_name.length > 0
+      lib(libs_name.join(' '))
+    last_location = location_path
+  setTimeout(->
+    Location_watch()
+  , 200)
+
 window.lib = lib
+Location_watch()

data/lib/zfben_libjs.rb

@@ -71,6 +71,8 @@ module Zfben_libjs
       
       @bundle = @data['bundle']
       
+      @routes = @data['routes']
+      
       @preload = @data['preload']
       
       if @config.has_key?('before')
@@ -202,10 +204,14 @@ module Zfben_libjs
             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]) << '")'
+                  filename = File.basename(f.match(reg)[1])
+                  if File.exists?(File.join(@config['src/images'], filename))
+                    if @config['url'] == ''
+                      url = '../images/' << File.basename(f.match(reg)[1])
+                    else
+                      url = @config['url/images'] + File.basename(f.match(reg)[1])
+                    end
+                    f = 'url("' << url << '")'
                   end
                 end
                 f
@@ -314,6 +320,15 @@ module Zfben_libjs
         libjs << "\n/* bundle */\nlib.libs(#{@bundle.to_json});"
       end
       
+      if defined?(@routes)
+        routes = {}
+        @routes.each do |path, lib_name|
+          lib_name = lib_name.join ' ' if lib_name.class == Array
+          routes[path] = lib_name
+        end
+        libjs << "\n/* routes */\nlib.routes('add', #{routes.to_json});"
+      end
+      
       if @preload.class == Array && @preload.length > 0
         libjs << "\n/* preload */\nlib('#{@preload.join(' ')}');"
       end
@@ -334,10 +349,11 @@ module Zfben_libjs
   if defined?(Rails)
     module Rails
       module ActionView::Helpers::AssetTagHelper
-        def lib *opt
+        def lib *opts
+          p opts
           html = '<script src="/javascripts/lib.js' + Lib_version + '"></script>'
-          unless opt[0].blank?
-            html += '<script>lib("' + opt[0].to_s + '");</script>'
+          unless opts.blank?
+            html += "<script>lib('#{opts.join(' ')}')</script>"
           end
           return html
         end

data/test/javascript/lib_test.js

@@ -51,7 +51,9 @@ test('lib.libs', 6, function(){
       '/javascripts/support_filetype.js'
     ],
     unload: [ '/javascripts/unload.js' ],
-    load_times: [ '/javascripts/load_times.js' ]
+    load_times: [ '/javascripts/load_times.js' ],
+    route_string: [ '/javascripts/route_string.js' ],
+    route_regexp: [ '/javascripts/route_regexp.js' ]
   }, 'lib.libs is ok');
   
   equal(typeof lib.lazyload, 'function', 'lib.lazyload is a function');
@@ -64,6 +66,8 @@ test('lib.libs', 6, function(){
     ],
     unload: [ '/javascripts/unload.js' ],
     load_times: [ '/javascripts/load_times.js' ],
+    route_string: [ '/javascripts/route_string.js' ],
+    route_regexp: [ '/javascripts/route_regexp.js' ],
     test: 'test'
   }, "lib.libs({test: 'test'}) has been added");
   
@@ -76,7 +80,9 @@ test('lib.libs', 6, function(){
       '/javascripts/support_filetype.js'
     ],
     unload: [ '/javascripts/unload.js' ],
-    load_times: [ '/javascripts/load_times.js' ]
+    load_times: [ '/javascripts/load_times.js' ],
+    route_string: [ '/javascripts/route_string.js' ],
+    route_regexp: [ '/javascripts/route_regexp.js' ]
   }, "lib.libs({test: null}) has been deleted");
   
   equal(typeof lib.test, 'undefined', 'lib.test is undefined');
@@ -108,10 +114,10 @@ module('support_filetype');
 
 asyncTest('stylesheet', 4, function() {
   lib.support_filetype(function(){
-    equal($('.css').css('font-size'), '1px', 'css file loaded');
-    equal($('.sass').css('font-size'), '2px', 'sass file loaded');
-    equal($('.scss').css('font-size'), '3px', 'scss file loaded');
-    equal($('.rb_css').css('font-size'), '4px', 'rb_css file loaded');
+    equal($('.css').css('color'), 'rgb(0, 0, 1)', 'css file loaded');
+    equal($('.sass').css('color'), 'rgb(0, 0, 2)', 'sass file loaded');
+    equal($('.scss').css('color'), 'rgb(0, 0, 3)', 'scss file loaded');
+    equal($('.rb_css').css('color'), 'rgb(0, 0, 4)', 'rb_css file loaded');
     start();
   });
 });
@@ -124,3 +130,24 @@ asyncTest('javascript', 3, function() {
     start();
   });
 });
+
+
+module('lib.routes');
+
+asyncTest('String route', 1, function(){
+  location.hash = '#Test_StringRoute';
+  
+  setTimeout(function(){
+    ok(route_string, 'String route is applied');
+    start();
+  }, 1000);
+});
+
+asyncTest('RegExp route', 1, function(){
+  location.hash = '#Test_RegExpRoute';
+  
+  setTimeout(function(){
+    ok(route_regexp, 'RegExp route is applied');
+    start();
+  }, 1000);
+});

data/test/route_regexp.js

@@ -0,0 +1 @@
+route_regexp = true;

data/test/route_string.js

@@ -0,0 +1 @@
+route_string = true;

data/test/support_filetype/css.css

@@ -1 +1 @@
-.css{ font-size: 1px }
+.css{ color: rgb(0,0,1) !important }

data/test/support_filetype/rb_css.rb

@@ -1 +1 @@
-{ :css => '.rb_css{ font-size: 4px }' }
+{ :css => '.rb_css{ color: rgb(0,0,4) !important }' }

data/test/support_filetype/sass.sass

@@ -1,2 +1,2 @@
 .sass
-  font-size: 2px
+  color: rgb(0,0,2) !important

data/test/support_filetype/scss.scss

@@ -1,3 +1,3 @@
 .scss{
-  font-size: 3px
+  color: rgb(0,0,3) !important
 }

data/test.yml

@@ -8,9 +8,16 @@ config:
 
 # Files to be download and writen in lib.js
 libs:
-  support_filetype:
-    - test/support_filetype/*
-  unload:
-    - test/unload.js
-  load_times:
-    - test/load_times.js
+  support_filetype: test/support_filetype/*
+  
+  unload: test/unload.js
+  
+  load_times: test/load_times.js
+  
+  route_string: test/route_string.js
+  
+  route_regexp: test/route_regexp.js
+
+routes:
+  "#Test_StringRoute": route_string
+  "/#Test_RegExpRoute/": route_regexp

data/zfben_libjs.gemspec

@@ -2,8 +2,8 @@
 $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
-  s.name        = "zfben_libjs"
-  s.version     = '0.0.9'
+  s.name        = 'zfben_libjs'
+  s.version     = '0.0.10'
   s.authors     = ["Ben"]
   s.email       = ["ben@zfben.com"]
   s.homepage    = "https://github.com/benz303/zfben_libjs"
@@ -18,8 +18,6 @@ Gem::Specification.new do |s|
 ********************************************************************************
 }
 
-  s.rubyforge_project = "zfben_libjs"
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zfben_libjs
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-18 00:00:00.000000000Z
+date: 2011-08-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &9024340 !ruby/object:Gem::Requirement
+  requirement: &17698840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9024340
+  version_requirements: *17698840
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &9023880 !ruby/object:Gem::Requirement
+  requirement: &17698380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9023880
+  version_requirements: *17698380
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &9023460 !ruby/object:Gem::Requirement
+  requirement: &17697960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9023460
+  version_requirements: *17697960
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &9023040 !ruby/object:Gem::Requirement
+  requirement: &17697540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9023040
+  version_requirements: *17697540
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &9022620 !ruby/object:Gem::Requirement
+  requirement: &17697120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9022620
+  version_requirements: *17697120
 description: ''
 email:
 - ben@zfben.com
@@ -88,6 +88,8 @@ files:
 - test/javascript/lib_test.js
 - test/javascript/templates/test_case.erb
 - test/load_times.js
+- test/route_regexp.js
+- test/route_string.js
 - test/support_filetype/coffee.coffee
 - test/support_filetype/css.css
 - test/support_filetype/js.js
@@ -118,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: zfben_libjs
+rubyforge_project: 
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3