zfben_libjs 0.0.21 → 0.0.22

data/lib/zfben_libjs/helpers.rb

@@ -1,7 +1,7 @@
 module Zfben_libjs::Helpers
   Lib_version = Time.now.strftime('?%s')
   def lib *opts
-    html = lib_js 'lib.js'
+    html = ''
     unless opts.blank?
       preload = []
       lib_preload = []
@@ -24,6 +24,8 @@ module Zfben_libjs::Helpers
         end
       end
 
+      html << lib_js('lib.js')
+
       if lib_preload.length > 0
         html << "<script>lib('#{lib_preload.join(' ')}')</script>"
       end

data/lib/zfben_libjs/lib.coffee

@@ -177,29 +177,36 @@ lib.defaults = {}
 routes = {}
 last_location = ''
 
-path2regex = (path)->
+path2regexp = (path)->
+  if typeof path['test'] is 'function'
+    return path
   if path[0] is '/' && path[path.length - 1] is '/'
     path = path[1..(path.length - 2)]
-  return path
+  return RegExp(path)
 
 lib.routes = (method, args)->
   switch method
     when 'add'
       for path, lib_name of args
-        routes[path2regex(path)] = lib_name
+        routes[path2regexp(path).toString()] = lib_name
       last_location = ''
     when 'del'
       for path, lib_name of args
-        delete(routes[path2regex(path)])
+        delete(routes[path2regexp(path).toString()])
   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
+    for regexp, lib_name of routes
+      test = location_path.match(path2regexp(regexp))
+      if test isnt null
+        if typeof libs_name is 'string'
+          libs_name.push lib_name
+        else
+          if typeof lib_name is 'function'
+            lib_name test
     if libs_name.length > 0
       lib(libs_name.join(' '))
     last_location = location_path

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