zfben_libjs 0.0.16 → 0.0.17

data/README.rdoc

@@ -81,3 +81,7 @@ support before and after events
 
   <%= lib 'home.js' %>
   # => <script src="/javascripts/home.js?12345678"></script><script src="/javascripts/lib.js?12345678"></script>
+
+== Sinatra
+
+  helpers Zfben_libjs::Helpers

data/lib/zfben_libjs.rb

@@ -17,7 +17,7 @@ module Zfben_libjs
   end
 end
 
-['lib.rb', 'source.rb', 'initialize.rb', 'collection.rb', 'helper.rb', 'railtie.rb', 'sinatra.rb'].each { |f| require File.join(File.dirname(__FILE__), 'zfben_libjs', f) }
+['lib.rb', 'source.rb', 'initialize.rb', 'collection.rb', 'helpers.rb', 'railtie.rb', 'sinatra.rb'].each { |f| require File.join(File.dirname(__FILE__), 'zfben_libjs', f) }
   
 def err msg
   STDERR.print "#{msg}\n".color(:red)
@@ -65,13 +65,13 @@ class Zfben_libjs::Libjs
 
       tip '== [2/2] Generate lib.js =='
       
-      libjs = File.read(@libs['lazyload'][0]) << ';'
+      libjs = File.read(@libs['lazyload'][0]) << ";\n"
       
       libjs_core = File.read(File.join(@path_gem, 'lib.coffee'))
       
       libjs_core = CoffeeScript.compile(libjs_core)
 
-      libjs << libjs_core << ';'
+      libjs << libjs_core << ";\n"
       
       @urls = {}
      
@@ -91,8 +91,8 @@ class Zfben_libjs::Libjs
         @urls[lib] = path
       end
       
-      libjs << "\n/* libs */\nlib.libs(#{@urls.to_json});lib.loaded('add', 'lazyload');"
-      libjs << Time.now.strftime('lib.defaults.version = "?%s";')
+      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 = {}
@@ -109,7 +109,7 @@ class Zfben_libjs::Libjs
                 when '.css'
                   css << File.read(file)
                 when '.js'
-                  js << File.read(file) << ';'
+                  js << File.read(file) << ";\n"
               end
             end
           end
@@ -136,7 +136,7 @@ class Zfben_libjs::Libjs
           end
         end
         
-        libjs << "\n/* bundle */\nlib.libs(#{bundle.to_json});"
+        libjs << "\n/* bundle */\nlib.libs(#{bundle.to_json});\n"
       end
       
       if @opts.has_key?(:routes)
@@ -145,12 +145,12 @@ class Zfben_libjs::Libjs
           lib_name = lib_name.join ' ' if lib_name.class == Array
           routes[path] = lib_name
         end
-        libjs << "\n/* routes */\nlib.routes('add', #{routes.to_json});"
+        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(' ')}');"
+        libjs << "\n/* preload */\nlib('#{preload.join(' ')}');\n"
       end
       
       libjs = minify(libjs, :js) if @opts[:config]['minify']

data/lib/zfben_libjs/collection.rb

@@ -48,7 +48,7 @@ class Zfben_libjs::Collection
     
     merge_js = ''
     @js.each do |js|
-      merge_js << js.to_js + ';'
+      merge_js << js.to_js + ";\n"
     end
     if merge_js != ''
       @js_path = File.join(@options['src/javascripts'], @name + '.js')

data/lib/zfben_libjs/{helper.rb → helpers.rb}

@@ -24,6 +24,8 @@ module Zfben_libjs::Helpers
       end
       if lib_preload.length > 0
         html << lib_js('lib.js') << "<script>lib('#{lib_preload.join(' ')}')</script>"
+      else
+        html << '<script>lib()</script>'
       end
     end
     return html

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.16'
+  s.version     = '0.0.17'
   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.16
+  version: 0.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-04 00:00:00.000000000Z
+date: 2011-09-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &14422280 !ruby/object:Gem::Requirement
+  requirement: &8862080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14422280
+  version_requirements: *8862080
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &14421820 !ruby/object:Gem::Requirement
+  requirement: &8861480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14421820
+  version_requirements: *8861480
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &14421400 !ruby/object:Gem::Requirement
+  requirement: &8860900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14421400
+  version_requirements: *8860900
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &14420980 !ruby/object:Gem::Requirement
+  requirement: &8860320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14420980
+  version_requirements: *8860320
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &14420560 !ruby/object:Gem::Requirement
+  requirement: &8859640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14420560
+  version_requirements: *8859640
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &14420140 !ruby/object:Gem::Requirement
+  requirement: &8858700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14420140
+  version_requirements: *8858700
 description: ''
 email:
 - ben@zfben.com
@@ -91,13 +91,12 @@ files:
 - bin/libjs
 - lib/zfben_libjs.rb
 - lib/zfben_libjs/collection.rb
-- lib/zfben_libjs/helper.rb
+- lib/zfben_libjs/helpers.rb
 - lib/zfben_libjs/initialize.rb
 - lib/zfben_libjs/lib.coffee
 - lib/zfben_libjs/lib.rb
 - lib/zfben_libjs/libjs.yml
 - lib/zfben_libjs/railtie.rb
-- lib/zfben_libjs/sinatra.rb
 - lib/zfben_libjs/source.rb
 - lib/zfben_libjs/support_source/coffee.rb
 - lib/zfben_libjs/support_source/css.rb
@@ -150,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: ''

data/lib/zfben_libjs/sinatra.rb

@@ -1,3 +0,0 @@
-if defined?(Sinatra)
-  helpers Zfben_libjs::Helpers
-end