zfben_libjs 0.0.11 → 0.0.12

data/README.rdoc

@@ -73,6 +73,11 @@ support before and after events
   <%= lib %>
   # => <script src="/javascripts/lib.js?12345678"></script>
   
-  # OR
   <%= lib :home %>
-  # => <script src="/javascripts/lib.js?12345678"></script><script>lib('home')</script>
+  # => <script src="/javascripts/lib.js?12345678"></script><script>lib('home')</script>
+
+  <%= lib 'home.css' %>
+  # => <script src="/javascripts/lib.js?12345678"></script><link rel="stylesheet" href="/stylesheets/home.css?12345678" />
+
+  <%= lib 'home.js' %>
+  # => <script src="/javascripts/lib.js?12345678"></script><script src="/javascripts/home.js?12345678"></script>

data/Rakefile

@@ -12,4 +12,11 @@ namespace :test do
 
     t.setup(sources_directory, test_cases, browsers)
   end
+  
+  desc 'Runs all the Ruby tests'
+  task :ruby do
+    require File.realpath('lib/zfben_libjs.rb')
+    require 'test/unit'
+    Dir['test/ruby/*_test.rb'].each{ |f| require File.realpath(f) }
+  end
 end

data/lib/zfben_libjs/initialize.rb

@@ -0,0 +1,98 @@
+class Zfben_libjs::Libjs
+  Lib_version = Time.now.strftime('?%s')
+  Default_options = {
+    :config => {
+      
+      'src' => 'src',
+      'src/source' => 'src/.source',
+      'src/javascripts' => 'src/javascripts',
+      'src/images' => 'src/images',
+      'src/stylesheets' => 'src/stylesheets',
+
+      'url' => '',
+      'url/javascripts' => 'url/javascripts',
+      'url/images' => 'url/images',
+      'url/stylesheets' => 'url/stylesheets',
+      
+      'download' => false,
+      'minify' => true,
+      'changeImageUrl' => true
+      
+    },
+    :libs => {
+      'lazyload' => 'https://raw.github.com/rgrove/lazyload/master/lazyload.js'
+    },
+    :bundle => {},
+    :routes => {},
+    :preload => {}
+  }
+
+  def initialize *opts
+    
+    # recive path or hash options
+    case opts[0].class.to_s
+      when 'String'
+        opts = read_config_file(opts[0])
+      when 'Hash'
+        opts = opts[0]
+      else
+        opts = {}
+    end
+    
+    @opts = merge_and_convert_options opts
+    
+    @path_gem = File.realpath(File.dirname(__FILE__))
+    
+    # config
+    ['src', 'src/source', 'src/javascripts', 'src/images', 'src/stylesheets'].each do |path|
+      FileUtils.mkdir(@opts[:config][path]) unless File.exists?(@opts[:config][path])
+    end
+
+    # Merge default libs
+    @libs = {
+      'lazyload' => 'https://raw.github.com/rgrove/lazyload/master/lazyload.js'
+    }
+    @libs = @libs.merge(@opts[:libs]) if @opts.has_key?(:libs)
+  end
+  
+  def opts
+    return @opts.clone
+  end
+  
+  def self.defaults
+    return Default_options.clone
+  end
+  
+  private
+  
+  def read_config_file filepath
+    config_file = File.exists?(filepath) && !File.directory?(filepath) ? [filepath] : Dir[filepath + '*'].select{ |f| !File.directory?(f) }
+    if config_file.length == 0
+      err config_file + ' is not exist!'
+    end
+    
+    begin
+      data = YAML.load(File.read(config_file[0]))
+    rescue Exception => e
+      data = {}
+    end
+    
+    return data
+  end
+  
+  def merge_and_convert_options opts
+    options = Default_options.clone
+    
+    [:config, :libs, :bundle, :routes, :preload].each do |name|
+      if opts.has_key?(name)
+        options[name] = options[name].merge(opts[name])
+      else
+        if opts.has_key?(name.to_s)
+          options[name] = options[name].merge(opts[name.to_s])
+        end
+      end
+    end
+    
+    return options
+  end
+end

data/lib/zfben_libjs/lib.rb

@@ -13,7 +13,7 @@ def get_filetype path
 end
 
 def download url, path
-  if url =~ /:\/\// && (@config['download'] == true || !File.exists?(path))
+  if url =~ /:\/\// && (@opts[:config]['download'] == true || !File.exists?(path))
     unless system 'wget ' + url + ' -O ' + path + ' -N'
       p url + ' download fail!'
       system('rm ' + path)

data/lib/zfben_libjs/railtie.rb

@@ -0,0 +1,43 @@
+if defined?(Rails)
+  Lib_version = Time.now.strftime('?%s')
+  module Rails
+    module ActionView::Helpers::AssetTagHelper
+      def lib *opts
+        html = lib_js('lib.js')
+        unless opts.blank?
+          preload = []
+          lib_preload = []
+          opts.each do |name|
+            name = name.to_s
+            if name.end_with?('.css') || name.end_with?('.js')
+              preload.push name
+            else
+              lib_preload.push name
+            end
+          end
+          if preload.length > 0
+            preload.each do |url|
+              if url.end_with?('.css')
+                html << lib_css(url)
+              else
+                html << lib_js(url)
+              end
+            end
+          end
+          if lib_preload.length > 0
+            html << "<script>lib('#{lib_preload.join(' ')}')</script>"
+          end
+        end
+        return html
+      end
+
+      def lib_js url
+        return "<script src='/javascripts/#{url}#{Lib_version}'></script>"
+      end
+
+      def lib_css url
+        return "<link rel='stylesheet' href='/stylesheets/#{url}#{Lib_version}' />"
+      end
+    end
+  end
+end

data/lib/zfben_libjs.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'fileutils'
 require 'rainbow'
 require 'json'
 require 'compass'
@@ -6,7 +7,14 @@ require 'coffee-script'
 require 'uglifier'
 require 'yaml'
 require 'sass/css'
-require File.join(File.dirname(__FILE__), 'zfben_libjs', 'lib.rb')
+require 'active_support/core_ext'
+
+module Zfben_libjs
+  class Libjs
+  end
+end
+
+['lib.rb', 'initialize.rb', 'railtie.rb'].each { |f| require File.join(File.dirname(__FILE__), 'zfben_libjs', f) }
   
 def err msg
   STDERR.print "#{msg}\n".color(:red)
@@ -19,64 +27,12 @@ end
 
 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
     
     def build!
-      tip '== Starting Build @' + @config_file
-
-      # Merge default config
-      @config = {
-        'src' => 'src',
-        'download' => false,
-        'minify' => true,
-        'url' => ''
-      }.merge(@data['config'])
+      tip '== Starting Build'
       
-      @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
-      
-      ['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
-
-      # Merge default libs
-      @libs = {
-        'lazyload' => 'https://raw.github.com/rgrove/lazyload/master/lazyload.js'
-      }.merge(@data['libs'])
-      
-      @bundle = @data['bundle']
-      
-      @routes = @data['routes']
-      
-      @preload = @data['preload']
-      
-      if @config.has_key?('before')
-        load @config['before']
+      if @opts[:config].has_key?('before')
+        load @opts[:config]['before']
       end
       
       
@@ -98,7 +54,7 @@ module Zfben_libjs
           if @libs.has_key?(url) && name != url
             lib.push(url)
           else
-            p path = File.join(@config['src/source'], name, File.basename(url))
+            p path = File.join(@opts[:config]['src/source'], name, File.basename(url))
             dir = File.dirname(path)
             system('mkdir ' + dir) unless File.exists?(dir)
             download url, path
@@ -173,12 +129,12 @@ module Zfben_libjs
           file
         }.compact
         if css != ''
-          file = File.join(@config['src/source'], name + '.css')
+          file = File.join(@opts[:config]['src/source'], name + '.css')
           File.open(file, 'w'){ |f| f.write(css) }
           lib.push(file)
         end
         if js != ''
-          file = File.join(@config['src/source'], name + '.js')
+          file = File.join(@opts[:config]['src/source'], name + '.js')
           File.open(file, 'w'){ |f| f.write(js) }
           lib.push(file)
         end
@@ -194,22 +150,22 @@ module Zfben_libjs
                 type = 'images'
             end
             
-            path = File.join(@config['src/' + type], File.basename(file))
+            path = File.join(@opts[:config]['src/' + type], File.basename(file))
             
             tip '=> ' + path
             
             system('cp ' + file + ' ' + path)
             
             reg = /url\("?'?([^'")]+)'?"?\)/
-            if type == 'stylesheets' && @config['changeImageUrl'] && reg =~ File.read(path)
+            if type == 'stylesheets' && @opts[:config]['changeImageUrl'] && reg =~ File.read(path)
               css = File.read(path).partition_all(reg).map{ |f|
                 if reg =~ f
                   filename = File.basename(f.match(reg)[1])
-                  if File.exists?(File.join(@config['src/images'], filename))
-                    if @config['url'] == ''
+                  if File.exists?(File.join(@opts[:config]['src/images'], filename))
+                    if @opts[:config]['url'] == ''
                       url = '../images/' << File.basename(f.match(reg)[1])
                     else
-                      url = @config['url/images'] + File.basename(f.match(reg)[1])
+                      url = @opts[:config]['url/images'] + File.basename(f.match(reg)[1])
                     end
                     f = 'url("' << url << '")'
                   end
@@ -222,7 +178,7 @@ module Zfben_libjs
               path = nil
             end
             
-            if @config['minify']
+            if @opts[:config]['minify']
               if type == 'stylesheets'
                 min = minify(File.read(path), :css)
                 File.open(path, 'w'){ |f| f.write(min) }
@@ -257,9 +213,9 @@ module Zfben_libjs
         path = path.map{ |url|
           case File.extname(url)
             when '.css'
-              url = @config['url/stylesheets'] + '/' + File.basename(url)
+              url = @opts[:config]['url/stylesheets'] + '/' + File.basename(url)
             when '.js'
-              url = @config['url/javascripts'] + '/' + File.basename(url)
+              url = @opts[:config]['url/javascripts'] + '/' + File.basename(url)
             else
               url = nil
           end
@@ -269,13 +225,11 @@ module Zfben_libjs
       end
       
       libjs << "\n/* libs */\nlib.libs(#{@urls.to_json});lib.loaded('add', 'lazyload');"
+      libjs << Time.now.strftime('lib.defaults.version = "?%s";')
       
-      if @config['autoVersion']
-        libjs << Time.now.strftime('lib.defaults.version = "?%s";')
-      end
-      
-      if @bundle != nil && @bundle.length > 0
-        @bundle.each do |name, libs|
+      if @opts.has_key?(:bundle)
+        bundle = {}
+        @opts[:bundle].each do |name, libs|
           css = ''
           js = ''
           files = []
@@ -296,69 +250,50 @@ module Zfben_libjs
           path = []
           
           if css != ''
-            file = File.join(@config['src/stylesheets'], name + '.css')
+            file = File.join(@opts[:config]['src/stylesheets'], name + '.css')
             File.open(file, 'w'){ |f| f.write(css) }
-            path.push(@config['url/stylesheets'] + '/' + File.basename(file))
+            path.push(@opts[:config]['url/stylesheets'] + '/' + File.basename(file))
           end
           
           if js != ''
-            files_url = files.map{ |f| @config['url/javascripts'] + '/' + File.basename(f) }.join("','")
+            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(@config['src/javascripts'], name + '.js')
+            file = File.join(@opts[:config]['src/javascripts'], name + '.js')
             File.open(file, 'w'){ |f| f.write(js) }
-            path.push(@config['url/javascripts'] + '/' + File.basename(file))
+            path.push(@opts[: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)
+            bundle[name] = path
           end
         end
         
-        libjs << "\n/* bundle */\nlib.libs(#{@bundle.to_json});"
+        libjs << "\n/* bundle */\nlib.libs(#{bundle.to_json});"
       end
       
-      if defined?(@routes) && !@routes.nil?
+      if @opts.has_key?(:routes)
         routes = {}
-        @routes.each do |path, lib_name|
+        @opts[: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(' ')}');"
+      if @opts.has_key?(:preload)
+        preload = @opts[:preload].class == Array ? @opts[:preload] : [ @opts[:preload] ]
+        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) }
+      libjs = minify(libjs, :js) if @opts[:config]['minify']
+      File.open(File.join(@opts[:config]['src/javascripts'], 'lib.js'), 'w'){ |f| f.write(libjs) }
       
-      if @config.has_key?('after')
-        load @config['after']
+      if @opts[:config].has_key?('after')
+        load @opts[:config]['after']
       end
       
       tip '== End Build =='
     end
   end
-  
-  Lib_version ||= Time.now.strftime('?%s')
-  
-  if defined?(Rails)
-    module Rails
-      module ActionView::Helpers::AssetTagHelper
-        def lib *opts
-          p opts
-          html = '<script src="/javascripts/lib.js' + Lib_version + '"></script>'
-          unless opts.blank?
-            html += "<script>lib('#{opts.join(' ')}')</script>"
-          end
-          return html
-        end
-      end
-    end
-  end
 end
-

data/test/ruby/initialize_test.rb

@@ -0,0 +1,6 @@
+class TestLibjs < Test::Unit::TestCase
+  def test
+    assert_equal Zfben_libjs::Libjs.new.opts, Zfben_libjs::Libjs.defaults
+    assert_equal Zfben_libjs::Libjs.new('test').opts, Zfben_libjs::Libjs.new('t').opts
+  end
+end

data/test.yml

@@ -4,7 +4,6 @@ config:
   download: false       # if file isn't exists, it will be downloaded always
   minify: false         # use uglifier and sass engine to minify files
   changeImageUrl: true  # change image urls in css
-  autoVersion: true     # add version to files url
 
 # Files to be download and writen in lib.js
 libs:

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.11'
+  s.version     = '0.0.12'
   s.authors     = ["Ben"]
   s.email       = ["ben@zfben.com"]
   s.homepage    = "https://github.com/benz303/zfben_libjs"
@@ -30,5 +30,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'compass'
   s.add_dependency 'coffee-script'
   s.add_dependency 'uglifier'
+  s.add_dependency 'active_support'
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zfben_libjs
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-21 00:00:00.000000000Z
+date: 2011-08-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &17831320 !ruby/object:Gem::Requirement
+  requirement: &20317000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17831320
+  version_requirements: *20317000
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &17830860 !ruby/object:Gem::Requirement
+  requirement: &20316540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17830860
+  version_requirements: *20316540
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &17830440 !ruby/object:Gem::Requirement
+  requirement: &20316120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17830440
+  version_requirements: *20316120
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &17830020 !ruby/object:Gem::Requirement
+  requirement: &20315700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17830020
+  version_requirements: *20315700
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &17829600 !ruby/object:Gem::Requirement
+  requirement: &20315280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17829600
+  version_requirements: *20315280
+- !ruby/object:Gem::Dependency
+  name: active_support
+  requirement: &20314860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *20314860
 description: ''
 email:
 - ben@zfben.com
@@ -79,9 +90,11 @@ files:
 - Rakefile
 - bin/libjs
 - lib/zfben_libjs.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
 - test.yml
 - test/javascript/assets/callback.js
 - test/javascript/fixtures/lib_fixtures.html
@@ -90,6 +103,7 @@ files:
 - test/load_times.js
 - test/route_regexp.js
 - test/route_string.js
+- test/ruby/initialize_test.rb
 - test/support_filetype/coffee.coffee
 - test/support_filetype/css.css
 - test/support_filetype/js.js