distil 0.13.6 → 0.14.0.b

data/lib/distil/configurable.rb

@@ -1,168 +1,79 @@
-module Kernel
-
-  def Boolean(string)
-    return true if string == true || string =~ /^true$/i
-    return false if string == false || string.nil? || string =~ /^false$/i
-    raise ArgumentError.new("invalid value for Boolean: \"#{string}\"")
-  end
-
-end
-
-class ValidationError < StandardError
-end
-
-
-class Configurable
-  attr_reader :options
+module Distil
   
-  @@options= {}
-
-  def get_option(name)
-    return nil if !@options.respond_to?(name)
-    value=@options[name]
-    value.respond_to?(:value_of) ? value.value_of(self) : value
-  end
-  
-  def get_options(settings=nil, parent=nil)
-    keys= @@options.keys
-    values= @@options.map { |k,v| convert_type(v[:type], v[:value]) }
+  class Configurable
   
-    s= @options ? @options : (@options=Struct.new(*keys).new(*values))
-    return s if !settings
-  
-    setting_keys= settings.keys.map { |key| key.to_s }
-  
-    @@options.each { |key, value|
-
-      intersect= value[:aliases] & setting_keys
-      next if !parent && intersect.empty?
-
-      if (intersect.empty?)
-        s[key]= parent[key]
-        next
-      end
-    
-      if (intersect.length>1)
-        raise ArgumentError, "Multiple variants for #{key.to_s} defined: #{intersect.join(", ")}"
-      end
-          
-      setting_key= intersect[0]
-      setting_value= settings[setting_key]
-      settings.delete(setting_key)
-    
-      # decide if any type conversions are needed...
-      setting_value= convert_type(value[:type], setting_value)
-    
-      if (value.has_key?(:valid_values) && !value[:valid_values].include?(setting_value))
-        raise ValidationError, "Invalid value for '#{setting_key}': #{setting_value}"
-      end
-        
-      s[key]= setting_value
-
-    }
-
-    @extras.merge!(settings)
-    s
-  end
-
-  # option name, [type], [default], [options]
-  def self.option(name, *rest)
-  
-    name_string= name.to_s
-  
-    info= {
-      :aliases=>[name_string, name_string.gsub('_', '-'), name_string.gsub('_', ' ')].uniq
-    }
-
-    arg= rest.shift
-
-    if (arg.is_a?(Class) || arg==URI)
-      info[:type]= arg
-      info[:value]= nil
-      arg= rest.shift
+    @@config_aliases={}
+    def self.alias_config_key(original, key_alias)
+      @@config_aliases[key_alias.to_s]= original.to_s
     end
-
-    if (!arg.nil? && !arg.is_a?(Hash))
-      info[:value]= arg
-      info[:type]= arg.class if !info.has_key?(:type)
-      arg= rest.shift
+    
+    def key_for_alias(key_alias)
+      key_alias= key_alias.to_s.gsub("-", "_").gsub(" ", "_")
+      @@config_aliases[key_alias] || key_alias
     end
+    
+    class ConfigDsl
 
-    # handle named arguments
-    if (arg.is_a?(Hash))
-      if arg.has_key?(:aliases)
-        info[:aliases].concat(arg[:aliases]).uniq!
-        arg.delete(:aliases)
+      def initialize(hash)
+        @hash= hash
+        @used= Set.new
       end
-      info.merge!(arg)
-    end
 
-    if @@options.has_key?(name)
-      orig= @@options[name]
-      if orig.has_key?(:type) && info.has_key?(:type) && info[:type]!=orig[:type]
-        raise ArgumentError, "Redefinition of option #{self}##{name} changes type"
+      def with_each(key)
+        case when @hash.include?(key.to_sym)
+          value= @hash[key.to_sym]
+        when @hash.include?(key.to_s)
+          value= @hash[key.to_s]
+        else
+          return
+        end
+        
+        value= value.split(",").map { |s| s.strip } if value.is_a?(String)
+        value.each { |v| yield v }
+        @used << key.to_s
       end
-      if orig.has_key?(:value) && !info[:value].nil? && info[:value]!=orig[:value]
-        raise ArgumentError, "Redefinition of option #{name} changes value"
+      
+      def with(key)
+        case when @hash.include?(key.to_sym)
+          yield @hash[key.to_sym]
+        when @hash.include?(key.to_s)
+          yield @hash[key.to_s]
+        else
+          return
+        end
+        @used << key.to_s
       end
-      orig[:type]||=info[:type]
-      orig[:value]||=info[:value]
-      orig[:aliases].concat(info[:aliases]).uniq!
-    else
-      @@options[name]= info
-    end
-    
-    self.send :define_method, name do
-      value=@options[name]
-      value.respond_to?(:value_of) ? value.value_of(self) : value
+      
+      def used?(key)
+        @used.include?(key.to_s)
+      end
+      
     end
     
-    self.send :define_method, "#{name}=" do |value|
-      @options[name]= convert_type(@@options[name][:type], value)
+    def configure_with(hash)
+      new_hash= {}
+      hash.each { |key, value|
+        new_hash[key_for_alias(key)]= value
+      }
+      
+      dsl= ConfigDsl.new(new_hash)
+      yield dsl if block_given?
+      
+      new_hash.each { |key, value|
+        next if dsl.used?(key.to_s)
+        
+        key= key_for_alias(key)
+        case
+        when self.respond_to?("#{key}=")
+          self.send "#{key}=", value
+        when self.respond_to?(key) && 0!=self.method(key).arity
+          self.send key, value
+        else
+          self.instance_variable_set("@#{key}", value)
+        end
+      }
     end
     
-    # self.send :protected, "#{name}=".to_s
-    
-  end
-
-  def initialize(options={}, parent=nil)
-    @extras= Hash.new
-    if (parent.is_a?(Configurable))
-      parent_options= parent.options
-    end
-    get_options(options, parent_options)
   end
   
-  private
-  
-  def convert_type(type, value)
-    case
-    when FalseClass==type || TrueClass==type
-      Boolean(value)
-    when Array==type
-      value.is_a?(String) ? value.split(/\s*,\s*/) : value
-    when Fixnum==type
-      value.to_i
-    when nil==type || NilClass==type
-      value
-    when String==type
-      value ? value.to_s : nil;
-    when value.nil?
-      value
-    when URI==type
-      URI.parse(value)
-    else
-      if type.respond_to?(:from_options)
-        type.from_options(value, self)
-      else
-        puts "type=#{type} value=#{value}"
-        type.new(value)
-      end
-    end
-  end
-  
-end
-
-Dir.glob("#{File.dirname(__FILE__)}/configurable/*.rb") { |file|
-  require file
-}
+end

data/lib/distil/error-reporter.rb

@@ -23,42 +23,44 @@ module Distil
       @@total_warning_count
     end
     
+    def has_errors?
+      @@error_count > 0
+    end
+
+    def has_warnings?
+      @@warning_count > 0
+    end
+
     def self.error(message, file=nil, line_number=nil)
       @@error_count+=1
-      if (file && line_number)
-        printf("%s:%d: error: %s\n", file, line_number, message)
+
+      case when file && line_number
+        puts "#{file}:#{line_number}: error: #{message}"
+      when file
+        puts "#{file}: error: #{message}"
       else
-        printf("error: %s\n", message)
+        puts "error: #{message}"
       end
     end
     
     def error(message, file=nil, line_number=nil)
-      @@error_count+=1
-      if (file && line_number)
-        printf("%s:%d: error: %s\n", file, line_number, message)
-      else
-        printf("error: %s\n", message)
-      end
+      ErrorReporter.error(message, file, line_number)
     end
 
     def self.warning(message, file=nil, line_number=nil)
       @@warning_count+=1
-      return if (ignore_warnings)
-      if (file && line_number)
-        printf("%s:%d: warning: %s\n", file, line_number, message)
+      return if (@@ignore_warnings)
+      case when file && line_number
+        puts "#{file}:#{line_number}: warning: #{message}"
+      when file
+        puts "#{file}: warning: #{message}"
       else
-        printf("warning: %s\n", message)
+        puts "warning: #{message}"
       end
     end
 
     def warning(message, file=nil, line_number=nil)
-      @@warning_count+=1
-      return if (ignore_warnings)
-      if (file && line_number)
-        printf("%s:%d: warning: %s\n", file, line_number, message)
-      else
-        printf("warning: %s\n", message)
-      end
+      ErrorReporter.warning(message, file, line_number)
     end
     
     def report

data/lib/distil/file-vendor.rb

@@ -0,0 +1,29 @@
+module Distil
+  
+  module FileVendor
+    
+    def cache_file(file)
+      @file_cache={} if @file_cache.nil?
+      @file_cache[file.full_path]= file
+    end
+    
+    def file_from_path(filepath)
+      return if !filepath
+      @file_cache={} if @file_cache.nil?
+      full_path= File.expand_path(filepath)
+      file= @file_cache[full_path]
+      return file if file
+    
+      extension= File.extname(filepath)[1..-1]
+    
+      SourceFile.subclasses.each { |handler|
+        next if (handler.extension != extension)
+        return handler.new(filepath, self)
+      }
+    
+      return SourceFile.new(filepath, self)
+    end
+
+  end
+  
+end

data/lib/distil/hash-additions.rb

@@ -0,0 +1,45 @@
+# Hash#deep_merge
+# From: http://pastie.textmate.org/pastes/30372, Elliott Hird
+# Source: http://gemjack.com/gems/tartan-0.1.1/classes/Hash.html
+# This file contains extensions to Ruby and other useful snippits of code.
+# Time to extend Hash with some recursive merging magic.
+
+class Hash
+
+  # Merges self with another hash, recursively.
+  # 
+  # This code was lovingly stolen from some random gem:
+  # http://gemjack.com/gems/tartan-0.1.1/classes/Hash.html
+  # 
+  # Thanks to whoever made it.
+
+  def deep_merge(hash)
+    target = dup
+    
+    hash.keys.each do |key|
+      if hash[key].is_a? Hash and self[key].is_a? Hash
+        target[key] = target[key].deep_merge(hash[key])
+        next
+      end
+      
+      target[key] = hash[key]
+    end
+    
+    target
+  end
+
+
+  # From: http://www.gemtacular.com/gemdocs/cerberus-0.2.2/doc/classes/Hash.html
+  # File lib/cerberus/utils.rb, line 42
+
+  def deep_merge!(second)
+    second.each_pair do |k,v|
+      if self[k].is_a?(Hash) and second[k].is_a?(Hash)
+        self[k].deep_merge!(second[k])
+      else
+        self[k] = second[k]
+      end
+    end
+  end
+
+end

data/lib/distil/javascript-code.rb

@@ -0,0 +1,12 @@
+class JavascriptCode < String
+  def to_json(*options)
+    self
+  end
+end
+
+module Kernel
+  # A convenience factory method
+  def JavascriptCode(str)
+    JavascriptCode.new(str)
+  end
+end

data/lib/distil/{task/validate-js-task.rb → javascript-file-validator.rb}

@@ -1,33 +1,25 @@
 module Distil
 
+  JSL_CONF= "#{LIB_DIR}/jsl.conf"
   LINT_COMMAND= "#{VENDOR_DIR}/jsl-0.3.0/bin/jsl"
-  # LINT_COMMAND= "/Users/jeff/.gem/ruby/1.8/gems/distil-0.10.2/vendor/jsl-0.3.0/bin/jsl"
-  
+  # LINT_COMMAND= "/Users/jeff/.gem/ruby/1.8/gems/distil-0.13.6/vendor/jsl-0.3.0/bin/jsl"
   JS_GLOBALS= Set.new ['Array', 'Boolean', 'Date', 'Error', 'EvalError',
                        'Function', 'Math', 'Number', 'Object', 'RangeError',
                        'ReferenceError', 'RegExp', 'String', 'SyntaxError',
                        'TypeError', 'URIError']
-                       
-  class ValidateJsTask < Task
+  
+  module JavascriptFileValidator
 
     include ErrorReporter
     
-    option :jsl_conf, "#{LIB_DIR}/jsl.conf"
-    option :global_export
-    option :additional_globals
-    
-    def handles_file(file)
-      return ["js"].include?(file.content_type)
-    end
-
-    def process_files(files)
+    def validate_javascript_files
       return if (!File.exists?(LINT_COMMAND))
 
       tmp= Tempfile.new("jsl.conf")
     
       conf_files= [ "jsl.conf",
                     "#{ENV['HOME']}/.jsl.conf",
-                    jsl_conf
+                    JSL_CONF
                   ]
 
       jsl_conf= conf_files.find { |f| File.exists?(f) }
@@ -46,19 +38,24 @@ module Distil
         tmp << "+define #{g}\n"
       }
       
-      target.file_aliases.each { |original, full_path|
-        next if !File.exist?(full_path)
-        tmp << "+alias #{original} #{full_path}\n"
+      libraries.each { |l|
+        tmp.puts "+alias #{l.name} #{l.file_for(:js, nil, DEBUG_VARIANT)}"
       }
       
-      files.each { |f|
-        next if !handles_file(f)
-        tmp << "+process #{f}\n"
+      dependency_aliases.each { |name, file|
+        tmp.puts "+alias #{name} #{file}"
+      }
+      
+      source_files.each { |f|
+        tmp.puts "+process #{f}" if f.content_type=="js"
       }
 
       tmp.close()
       command= "#{LINT_COMMAND} -nologo -nofilelisting -conf #{tmp.path}"
 
+      # puts "\n\n\n\n#{name}\n\n"
+      # puts "jsl conf:\n#{File.read(tmp.path)}\n\n"
+      
       stdin, stdout, stderr= Open3.popen3(command)
       stdin.close
       output= stdout.read
@@ -81,8 +78,7 @@ module Distil
         puts
       end
 
-    end
-    
+    end    
   end
   
-end
+end