yui-compressor-ext 0.0.2 → 0.0.3

data/Manifest.txt

@@ -20,11 +20,13 @@ script/generate.cmd
 test/cli/commands/test_all.rb
 test/cli/commands/test_css.rb
 test/cli/commands/test_js.rb
+test/sample/assets/css-1.css
+test/sample/assets/css-2.css
+test/sample/assets/js-1.js
+test/sample/assets/js-2.js
+test/sample/compressed/compiled.css
+test/sample/compressed/compiled.js
 test/sample/config.yml
-test/sample/css-1.css
-test/sample/css-2.css
-test/sample/js-1.js
-test/sample/js-2.js
+test/test_config.rb
 test/test_helper.rb
-test/text_config.rb
 yui-compressor-ext.gemspec

data/README.rdoc

@@ -1,104 +1,31 @@
 = YUI Compressor Extension
 
-* http://osc.matsukei.net/projects/ruby-yui-compressor-ext/wiki
+* {http://osc.matsukei.net/projects/ruby-yui-compressor-ext/wiki}
 
-== DESCRIPTION:
+== DESCRIPTION
 
-YUI Compressor Extension is an enhancing library of {YUI Compressor}[http://github.com/sstephenson/ruby-yui-compressor/] .
+YUI Compressor Extension is an enhancing library of {http://github.com/sstephenson/ruby-yui-compressor/ YUI Compressor}.
 The following functions can be used by this extension.
 * CLI interface
 * Compression and uniting of multiple assets
 
-== REQUIREMENTS:
+== REQUIREMENTS
 
 * yui-compressor
 * cri
 * win32-open3 (Only win32-Platform)
 
-== INSTALL:
+== INSTALL
 
   $ gem install yui-compressor-ext
 
-== Usage
+== DOCUMENTATION
 
-=== First Step
+* {http://osc.matsukei.net/projects/ruby-yui-compressor-ext/wiki/Overview Overview}
+* {http://osc.matsukei.net/projects/ruby-yui-compressor-ext/wiki/Users_Guide Users Guide}
+* {http://osc.matsukei.net/projects/ruby-yui-compressor-ext/wiki/Changelog Changelog}
 
-Please see {here}[http://github.com/sstephenson/ruby-yui-compressor/] about Ruby-YUI Compressor.
-
-=== Basic Concepts
-
-For example, it is assumed that the following files exist.
-
-  /path/to/assets/javascripts/hoge.js
-  /path/to/assets/javascripts/foo.js
-  /path/to/assets/css/base.css
-  /path/to/assets/css/custom.css
-
-Create configuration file to <code>/path/to/assets/config.yml</code> (YAML Format).
-
-  output_dir: /path/to/assets
-  js:
-    base_dir: /path/to/assets/javascripts
-    files:
-      - hoge.js    #=> js:base_dir + hoge.js
-      - foo.js     #=> js:base_dir + foo.js
-    output: min.js #=> output_dir + min.js
-  css:
-    # When do not use "base_dir"
-    files:
-      - /path/to/assets/css/base.css
-      - /path/to/assets/css/custom.css
-    output: min.css #=> output_dir + min.css
-
-Compress and uniting CSS and JavaScripts (All).
-
-  $ cd /path/to/assets
-  $ yuicompress all
-
-Then, JavaScript and the CSS file that the compression uniting is done based on the configuration file as follows are made.
-
-  /path/to/assets/javascripts/hoge.js
-  /path/to/assets/javascripts/foo.js
-  /path/to/assets/min.js <== created
-  /path/to/assets/css/base.css
-  /path/to/assets/css/custom.css
-  /path/to/assets/min.css <== created
-
-To process only CSS or JavaScript, as follows is done.
-
-  $ yuicompress css (or js)
-
-In addition, it is also possible to execute the place of the configuration file specifying it.
-
-  $ yuicompress css /path/to/assets/config.yml
-
-=== Setting to options for YUI Compressor
-
-Optional execution of YUI-Compressor can be described by the configuration file.
-Please see {here}[http://yui.rubyforge.org/classes/YUI/CssCompressor.html] and {here}[http://yui.rubyforge.org/classes/YUI/JavaScriptCompressor.html] about the option that can be set.
-
-  # Global options. It is applied to both of these.
-  options:
-    :charset: utf-8
-    :line_break: 100
-  output_dir: /path/to/assets
-  js:
-    # Options for JavaScript. It is merge to Global options.
-    options:
-      :charset: sjis
-    base_dir: /path/to/assets/javascripts
-    files:
-      - hoge.js
-      - foo.js
-    output: min.js
-  css:
-    # When do not use "base_dir"
-    files:
-      - /path/to/assets/css/base.css
-      - /path/to/assets/css/custom.css
-    output: min.css
-
-== LICENSE:
+== LICENSE
 
 (The MIT License)
 

data/Rakefile

@@ -12,15 +12,13 @@ Hoe.plugin :yard
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
 $hoe = Hoe.spec 'yui-compressor-ext' do
   self.developer 'Matsukei Co.,Ltd', 'osc@matsukei.co.jp'
-  self.description = %q{YUI Compressor Extensions is an enhancing library of YUI Compressor.
-The following functions can be used by this extension.
-* CLI interface
-* Compression and uniting of multiple assets}
-  self.summary     = %q{YUI Compressor Extensions is an enhancing library of YUI Compressor}
-  self.version     = '0.0.2'
+  self.description = %q{YUI Compressor Extension is an enhancing library of YUI Compressor. The functions that CLI interface, Compression and uniting of multiple assets can be used by this extension.}
+  self.summary     = %q{YUI Compressor Extension is an enhancing library of YUI Compressor}
+  self.version     = '0.0.3'
   self.extra_rdoc_files = ['README.rdoc']
   self.extra_deps  = [['yui-compressor','>= 0.9.1'], ['cri','>= 1.0.0'], ['win32-open3', '>= 0.3.2']]
-  self.yard_title  = "YUI-Compressor Extensions (#{self.version})"
+  self.yard_title  = "YUI-Compressor Extension (#{self.version})"
+  self.yard_opts   = ['--main', 'README.rdoc']
 end
 
 require 'newgem/tasks'

data/lib/yui/compressor/ext.rb

@@ -19,7 +19,7 @@ end
 end
 
 module YUI::Compressor::Ext
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end
 
 # Load Ext modules.

data/lib/yui/compressor/ext/config.rb

@@ -1,11 +1,13 @@
 # coding: utf-8
 require 'yaml'
+require 'pathname'
 
 class YUI::Compressor
   class Ext::Config
     DEFAULT = 'config.yml'
 
     class << self
+      
       # @param [String] path
       # @return [Ext::Config]
       def load_file(path)
@@ -21,7 +23,7 @@ class YUI::Compressor
           raise 'Invalid configuration file.'
         end
 
-        new(config)
+        new(config, File.expand_path(path))
       end
 
       private
@@ -32,53 +34,72 @@ class YUI::Compressor
       end
     end
 
+    # @return [Array, Hash]
+    attr_reader :config
+    
+    # @return [Pathname]
+    attr_reader :path
+
     # @param [Array, Hash] config
-    def initialize(config)
+    # @param [String] path
+    def initialize(config, path)
       @config = config
+      @path = Pathname.new(path)
     end
 
     # @param [String] type
     # @return [String]
     def output(type)
-      File.join(*[clean_path(@config['output_dir']),
-                  clean_path(config_for(type, 'output'))].compact)
+      build_path(@config['output_dir'], config_for(type, 'output'))
     end
 
     # @param [String] type
     # @return [Array<String>]
     def files(type)
-      base = clean_path(config_for(type, 'base_dir'))
-      files = config_for(type, 'files')
-      files.map do |file|
-        File.join(*[base, clean_path(file)].compact)
+      dir = config_for(type, 'files_dir') || config_for(type, 'base_dir')
+      config_for(type, 'files').map do |file|
+        build_path(dir, file)
       end
     end
 
     # @param [String] type
     # @return [Hash]
     def options(type)
-      base = @config['options'] || {}
-      base.merge(config_for(type, 'options') || {})
+      opts = @config['options'] || {}
+      opts.merge(config_for(type, 'options') || {})
     end
 
     private
 
-    # @param [String] type
-    # @param [String] config
-    # @return [Object]
-    def config_for(type, config)
-      @config[type] && @config[type][config]
-    end
-
+    # @param [String] base
     # @param [String] path
     # @return [String]
-    def clean_path(path)
-      if path
-        path = path.strip
-        path.empty? ? nil : path.tr("\\", '/')
+    def build_path(base, path)
+      unless Pathname(path).absolute?
+        path = File.join(*[base, path].compact)
+        Pathname(path).absolute? ? path : File.join(*[base_path, path].compact)
+      else
+        path
+      end
+    end
+
+    # @return [String?]
+    def base_path
+      case path = (@config['base_path'] || :self)
+      when Symbol
+        path == :exec ? nil : @path.realpath.dirname.to_s
+      when String
+        path
       else
         nil
       end
     end
+
+    # @param [String] type
+    # @param [String] config
+    # @return [Object]
+    def config_for(type, config)
+      @config[type] && @config[type][config]
+    end
   end
 end

data/test/sample/compressed/compiled.css

@@ -0,0 +1 @@
+body{font-family:Meiryo,Arial;margin:0;padding:0;}ul,li,dl,dt,dd{margin:0;}.c1{color:#f00;}.c2{border:1px solid #00f;}

data/test/sample/compressed/compiled.js

@@ -0,0 +1 @@
+var j1=function(a,b){return a+b};var j2=function(a,b){return a+b};

data/test/sample/config.yml

@@ -1,13 +1,13 @@
-output_dir: .
+base_path: :self
+output_dir: ./compressed
 js:
-  base_dir: .
+  files_dir: ./assets
   files:
     - js-1.js
     - js-2.js
   output: compiled.js
 css:
-  base_dir: .
   files:
-    - css-1.css
-    - css-2.css
+    - ./assets/css-1.css
+    - ./assets/css-2.css
   output: compiled.css

data/test/{text_config.rb → test_config.rb}

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 class YUI::Compressor::Ext::ConfigTest < Test::Unit::TestCase
-
+  # TODO
   def test_truth
     assert true
   end

data/yui-compressor-ext.gemspec

@@ -2,28 +2,25 @@
 
 Gem::Specification.new do |s|
   s.name = %q{yui-compressor-ext}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matsukei Co.,Ltd"]
-  s.date = %q{2010-12-31}
+  s.date = %q{2011-1-1}
   s.default_executable = %q{yuicompress}
-  s.description = %q{YUI Compressor Extension is an enhancing library of YUI Compressor.
-The following functions can be used by this extension.
-* CLI interface
-* Compression and uniting of multiple assets}
+  s.description = %q{YUI Compressor Extension is an enhancing library of YUI Compressor. The functions that CLI interface, Compression and uniting of multiple assets can be used by this extension.}
   s.email = ["osc@matsukei.co.jp"]
   s.executables = ["yuicompress"]
   s.extra_rdoc_files = ["README.rdoc", "Manifest.txt"]
-  s.files = ["README.rdoc", "Manifest.txt", "Rakefile", "bin/yuicompress", "lib/yui/compressor/ext.rb", "lib/yui/compressor/ext/cli.rb", "lib/yui/compressor/ext/cli/base.rb", "lib/yui/compressor/ext/cli/commands.rb", "lib/yui/compressor/ext/cli/commands/abstract.rb", "lib/yui/compressor/ext/cli/commands/all.rb", "lib/yui/compressor/ext/cli/commands/css.rb", "lib/yui/compressor/ext/cli/commands/js.rb", "lib/yui/compressor/ext/config.rb", "script/console", "script/console.cmd", "script/destroy", "script/destroy.cmd", "script/generate", "script/generate.cmd", "test/cli/commands/test_all.rb", "test/cli/commands/test_css.rb", "test/cli/commands/test_js.rb", "test/sample/config.yml", "test/sample/css-1.css", "test/sample/css-2.css", "test/sample/js-1.js", "test/sample/js-2.js", "test/test_helper.rb", "test/text_config.rb", "yui-compressor-ext.gemspec"]
+  s.files = ["Manifest.txt", "README.rdoc", "Rakefile", "bin/yuicompress", "lib/yui/compressor/ext.rb", "lib/yui/compressor/ext/cli.rb", "lib/yui/compressor/ext/cli/base.rb", "lib/yui/compressor/ext/cli/commands.rb", "lib/yui/compressor/ext/cli/commands/abstract.rb", "lib/yui/compressor/ext/cli/commands/all.rb", "lib/yui/compressor/ext/cli/commands/css.rb", "lib/yui/compressor/ext/cli/commands/js.rb", "lib/yui/compressor/ext/config.rb", "script/console", "script/console.cmd", "script/destroy", "script/destroy.cmd", "script/generate", "script/generate.cmd", "test/cli/commands/test_all.rb", "test/cli/commands/test_css.rb", "test/cli/commands/test_js.rb", "test/sample/assets/css-1.css", "test/sample/assets/css-2.css", "test/sample/assets/js-1.js", "test/sample/assets/js-2.js", "test/sample/compressed/compiled.css", "test/sample/compressed/compiled.js", "test/sample/config.yml", "test/test_config.rb", "test/test_helper.rb", "yui-compressor-ext.gemspec"]
   s.has_rdoc = %q{yard}
   s.homepage = %q{http://osc.matsukei.net/projects/ruby-yui-compressor-ext/wiki}
-  s.rdoc_options = ["--title", "YUI-Compressor Extension (#{s.version})", "--quiet"]
+  s.rdoc_options = ["--main", "README.rdoc", "--title", "YUI-Compressor Extension (0.0.3)", "--quiet"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{yui-compressor-ext}
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{YUI Compressor Extensions is an enhancing library of YUI Compressor}
-  s.test_files = ["test/cli/commands/test_all.rb", "test/cli/commands/test_css.rb", "test/cli/commands/test_js.rb", "test/test_helper.rb"]
+  s.summary = %q{YUI Compressor Extension is an enhancing library of YUI Compressor}
+  s.test_files = ["test/cli/commands/test_all.rb", "test/cli/commands/test_css.rb", "test/cli/commands/test_js.rb", "test/test_config.rb", "test/test_helper.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: yui-compressor-ext
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Matsukei Co.,Ltd
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-31 00:00:00 +09:00
+date: 2011-01-01 00:00:00 +09:00
 default_executable: yuicompress
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -114,11 +114,7 @@ dependencies:
         version: 2.6.0
   type: :development
   version_requirements: *id006
-description: |-
-  YUI Compressor Extension is an enhancing library of YUI Compressor.
-  The following functions can be used by this extension.
-  * CLI interface
-  * Compression and uniting of multiple assets
+description: YUI Compressor Extension is an enhancing library of YUI Compressor. The functions that CLI interface, Compression and uniting of multiple assets can be used by this extension.
 email: 
 - osc@matsukei.co.jp
 executables: 
@@ -129,8 +125,8 @@ extra_rdoc_files:
 - README.rdoc
 - Manifest.txt
 files: 
-- README.rdoc
 - Manifest.txt
+- README.rdoc
 - Rakefile
 - bin/yuicompress
 - lib/yui/compressor/ext.rb
@@ -151,13 +147,15 @@ files:
 - test/cli/commands/test_all.rb
 - test/cli/commands/test_css.rb
 - test/cli/commands/test_js.rb
+- test/sample/assets/css-1.css
+- test/sample/assets/css-2.css
+- test/sample/assets/js-1.js
+- test/sample/assets/js-2.js
+- test/sample/compressed/compiled.css
+- test/sample/compressed/compiled.js
 - test/sample/config.yml
-- test/sample/css-1.css
-- test/sample/css-2.css
-- test/sample/js-1.js
-- test/sample/js-2.js
+- test/test_config.rb
 - test/test_helper.rb
-- test/text_config.rb
 - yui-compressor-ext.gemspec
 has_rdoc: yard
 homepage: http://osc.matsukei.net/projects/ruby-yui-compressor-ext/wiki
@@ -165,8 +163,10 @@ licenses: []
 
 post_install_message: 
 rdoc_options: 
+- --main
+- README.rdoc
 - --title
-- YUI-Compressor Extension (0.0.2)
+- YUI-Compressor Extension (0.0.3)
 - --quiet
 require_paths: 
 - lib
@@ -196,9 +196,10 @@ rubyforge_project: yui-compressor-ext
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: YUI Compressor Extensions is an enhancing library of YUI Compressor
+summary: YUI Compressor Extension is an enhancing library of YUI Compressor
 test_files: 
 - test/cli/commands/test_all.rb
 - test/cli/commands/test_css.rb
 - test/cli/commands/test_js.rb
+- test/test_config.rb
 - test/test_helper.rb