uki 1.1.2 → 1.1.3

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/bin/uki

@@ -118,7 +118,7 @@ command :build do |c|
   c.syntax = 'uki build [file1 [, file2]]'
   c.summary = 'Build current project'
   c.description = 'Merges and compresses javascript files.
-    Merges all include() and include_css() in js files. Merged output
+    Merges all include() and include_text() in js files. Merged output
     is processed through google clousure compiler. Supports .js and .html 
     files as parameters. 
     

data/lib/uki/include_js.rb

@@ -1,9 +1,13 @@
 require 'json'
+require 'base64'
 
 module Uki
   
-  INCLUDE_REGEXP = %r{((?:^|\n)[^\n]\W|^|\n)\s*include\s*\(\s*['"]([^"']+)["']\s*\)(?:\s*;)?(.*?\r?\n|$)}
-  INCLUDE_CSS_REGEXP = %r{include_css\s*\(\s*['"]([^"']+)["']\s*\)}
+  INCLUDE_REGEXP = %r{(^|^[^\n]*[^\w\n])include\s*\(\s*['"]([^"']+)["']\s*\)(?:\s*;)?(.*?\r?\n|$)}
+  INCLUDE_TEXT_REGEXP = %r{include_(?:text|css)\s*\(\s*['"]([^"']+)["']\s*\)}
+  
+  BACKGROUND_URL_REGEXP = %r{url\s*\(\s*['"]?([^"'\)]+)["']?\s*\)}
+  DATA_URI_REGEXP = %r{/\*!\s*data:([^\s\*]*)\s*\*/['"]?([^"']+)['"]}
   
   #
   # Preprocesses include() calls in js files
@@ -18,7 +22,14 @@ module Uki
     end
     
     included[path] = true
-    code.gsub(INCLUDE_REGEXP) do |match|
+    code.gsub(INCLUDE_TEXT_REGEXP) do |match|
+      include_text File.join(base, $1), &block
+      
+    end.gsub(DATA_URI_REGEXP) do |match|
+      uri = to_data_uri File.join(base, $2), $1
+      "'#{uri}'"
+      
+    end.gsub(INCLUDE_REGEXP) do |match|
       if $1.include? '//' # include commented out 
         match
       else
@@ -29,16 +40,35 @@ module Uki
           $1 + $3
         end
       end
-    end.gsub(INCLUDE_CSS_REGEXP) do |match|
-      include_css File.join(base, $1), &block
     end
   end
   
-  def self.include_css path, &block
+  def self.to_data_uri path, type = nil
+    if !type || type.empty?
+      ext = File.extname(path)
+      if ext == '.png'
+        type = 'image/png'
+      elsif ext == '.gif'
+        type = 'image/gif'
+      else
+        type = 'text/plain'
+      end
+    end
+    "data:#{type};base64," + Base64.encode64(File.read(path)).gsub("\n", '')
+  end
+  
+  def self.include_text path, &block
     code = if block_given? 
       yield path 
     else 
-      File.read(path) 
+      File.read(path).gsub(BACKGROUND_URL_REGEXP) do |match|
+        url = $1;
+        unless url =~ %r{^(/|\w+://)}
+          filename = File.join(File.dirname(path), url);
+          url = self.to_data_uri(filename)
+        end
+        "url(#{url})";
+      end
     end
     (code || '').to_json
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: uki
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Vladimir Kolesnikov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-18 00:00:00 +04:00
+date: 2011-01-05 00:00:00 -08:00
 default_executable: uki
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,7 +73,6 @@ extensions: []
 extra_rdoc_files: 
 - LICENSE
 files: 
-- .gitignore
 - .gitmodules
 - LICENSE
 - Rakefile
@@ -437,8 +436,8 @@ homepage: http://github.com/voloko/uki
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -462,7 +461,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: uki development tools

data/.gitignore

@@ -1,7 +0,0 @@
-*.log
-*.pid
-tmp*
-.DS_Store
-*~
-pkg/
-*.swp