zfben_libjs 0.0.23 → 0.0.24

data/lib/zfben_libjs/initialize.rb

@@ -24,19 +24,22 @@ class Zfben_libjs::Libjs
   
   Default_options[:support_source] = Dir[File.join(File.dirname(__FILE__), 'support_source', '*.rb')]
 
-  def initialize *opts
-    
+  def initialize *options
     # recive path or hash options
-    case opts[0].class.to_s
+    case options[0].class.to_s
       when 'String'
-        opts = read_config_file(opts[0])
+        opts = read_config_file(options[0])
       when 'Hash'
-        opts = opts[0]
+        opts = options[0]
       else
-        opts = {}
+        opts = Default_options.clone
     end
     
     @opts = merge_and_convert_options(opts)
+
+    if options[1].class.to_s == 'Hash'
+      @opts = @opts.deep_merge(options[1])
+    end
     
     @path_gem = File.realpath(File.dirname(__FILE__))
     
@@ -49,8 +52,6 @@ class Zfben_libjs::Libjs
       @opts[:config]['url/' + path] = @opts[:config]['url'] + '/' + path unless @opts[:config].has_key?('url/' + path)
     end
 
-    p @opts
-
     # Merge default libs
     @libs = {
       'lazyload' => 'https://raw.github.com/rgrove/lazyload/master/lazyload.js'
@@ -71,7 +72,7 @@ class Zfben_libjs::Libjs
   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!'
+      err filepath + ' is not exist!'
     end
     
     begin

data/lib/zfben_libjs/support_source/css.rb

@@ -1,6 +1,6 @@
 class Zfben_libjs::Css < Zfben_libjs::Source
 
-  REGEXP_REMOTE_CSS = /@import[^"]+"([^"]+)"/
+  REGEXP_REMOTE_CSS = /@import[^"]+"([^"]+)"\)?;?/
   REGEXP_REMOTE_IMAGE = /url\("?'?([^'")]+)'?"?\)/
   
   def after_initialize

data/lib/zfben_libjs/support_source/sass.rb

@@ -1,6 +1,6 @@
 class Zfben_libjs::Sass < Zfben_libjs::Source
   def after_initialize
-    @options = @options.merges({ :syntax => :sass, :cache => false }, Compass.sass_engine_options)
+    @options = @options.merges({ :syntax => :sass }, Compass.sass_engine_options)
     @options[:load_paths].push File.dirname(@filepath)
     @source = "@import compass\n" + @source
   end

data/lib/zfben_libjs/support_source/scss.rb

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

data/test/ruby/initialize_test.rb

@@ -1,6 +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
+    assert_equal Zfben_libjs::Libjs.new('test', :config => { 'minify' => false} ).opts[:config]['minify'], false
   end
 end

data/test/support_filetype/css.css

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

data/test.yml

@@ -2,7 +2,6 @@
 config:
   src: src              # which folder to save files
   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
 
 # Files to be download and writen in lib.js

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.23'
+  s.version     = '0.0.24'
   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.23
+  version: 0.0.24
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &10800640 !ruby/object:Gem::Requirement
+  requirement: &11622880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10800640
+  version_requirements: *11622880
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &10798980 !ruby/object:Gem::Requirement
+  requirement: &11621900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10798980
+  version_requirements: *11621900
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &10796720 !ruby/object:Gem::Requirement
+  requirement: &11621000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10796720
+  version_requirements: *11621000
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &10794440 !ruby/object:Gem::Requirement
+  requirement: &11620380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10794440
+  version_requirements: *11620380
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &10792860 !ruby/object:Gem::Requirement
+  requirement: &11619760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10792860
+  version_requirements: *11619760
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &10789880 !ruby/object:Gem::Requirement
+  requirement: &11619060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10789880
+  version_requirements: *11619060
 description: ''
 email:
 - ben@zfben.com