fdlint 0.2.0.pre → 0.2.0

data/lib/fdlint/printer/console_printer.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'colored'
 
 module Fdlint 
@@ -6,36 +7,23 @@ module Fdlint
 
     class ConsolePrinter < BasePrinter
 
+      def pre_validate( file )
+        Kernel.print "\n---> reviewing " << file.to_s << " "
+      end
+
       def print( file, source, results )
 
         super
-
-        if source
-          print_with_source
-        else
-          if @results && @results.empty?
-            puts "[OK] ".green << file.to_s
-          else
-            puts "[EE] ".red << file.to_s
-
-            @results.each do |r|
-              print_log_entry r
-            end
-          end
-        end
-      end
-
-      def print_with_source
+        
         if @results.empty?
-          puts "[OK] ".green << file.to_s
+          puts " [✔]\n".green
         else
-          puts "[EE] ".red << file.to_s
+          puts " [✗]\n".yellow
 
           @results.each do |r|
             print_log_entry r
           end
         end
-        
 
       end
 
@@ -49,11 +37,15 @@ module Fdlint
           indent = ' ' * ( col - left )
 
           puts "     #{log_text entry}\n"
-          puts "       #{source.lines[row][left..right].gsub(/\t/, ' ')}"
-          puts "       #{indent}^"
+          if source
+            puts "       #{source.lines.to_a[row][left..right].gsub(/\t/, ' ')}"
+            puts "       #{indent}^"
+          end
         else
-          puts "     #{log_text entry}\n"
+          puts "     #{log_text entry}"
         end
+
+        puts "\n"
       end
 
 

data/lib/fdlint/rule.rb

@@ -19,7 +19,7 @@ module Fdlint
       #
       # Returns an Array holding all validations for this file
       def validations_for_file( opt={} )
-        (all[opt[:code_type]] || []).select do |validation|
+        (all[opt[:syntax]] || []).select do |validation|
           validation.scope == :file
         end
       end
@@ -63,9 +63,9 @@ module Fdlint
         debug { "done" }
       end
 
-      def add( code_type, scope, opt )
-        debug { "  -> adding rule: #{code_type.inspect} - #{scope.inspect} - #{opt[:desc]}" }
-        cache = @rules[code_type] ||= []
+      def add( syntax, scope, opt )
+        debug { "  -> adding rule: #{syntax.inspect} - #{scope.inspect} - #{opt[:desc]}" }
+        cache = @rules[syntax] ||= []
         cache << Validation.new( scope, opt[:block] ).tap do |v|
           v.desc = opt[:desc]
           v.uri  = opt[:uri]

data/lib/fdlint/support/core/object.rb

@@ -0,0 +1,6 @@
+class Object
+  def present?
+    !blank?
+  end
+end
+

data/lib/fdlint/support/core_ext.rb

@@ -1,4 +1,5 @@
 require_relative 'core/nil'
+require_relative 'core/object'
 require_relative 'core/string'
 require_relative 'core/array'
 require_relative 'core/hash'

data/lib/fdlint/validator.rb

@@ -1,4 +1,5 @@
 require 'fdlint/rule'
+require 'fdlint/helper/file_reader'
 require 'fdlint/helper/code_type'
 require 'fdlint/parser'
 require 'fdlint/parser/js/js_parser'
@@ -9,13 +10,15 @@ module Fdlint
 
   class Validator
 
-    attr_reader :file, :source, :results, :code_type
+    attr_reader :file, :source, :results, :syntax, :log_level
+
     include Fdlint::Helper::Logger
 
     def initialize( path = nil, options = {} )
       @file      = path
       @source    = options[:text]
-      @code_type = options[:code_type] || Helper::CodeType.guess( source, file )
+      @syntax    = options[:syntax] || Helper::CodeType.guess( source, file )
+      @log_level = options[:log_level]
     end
 
     def validate
@@ -30,7 +33,13 @@ module Fdlint
         results << InvalidFileEncoding.new
       end
 
-      yield file, source, results
+      filter_results_by_log_level if log_level
+
+      if block_given?
+        yield file, source, results
+      else
+        results
+      end
     end
 
     def validate_file
@@ -65,8 +74,45 @@ module Fdlint
       end
 
       def parse
-        parser.parse_no_throw
-        parser.results
+        root = parser.parse_no_throw
+        parser.results.tap do |results|
+          if root.respond_to? :query
+            parse_inline_script( root, results )
+            parse_inline_stylesheet( root, results )
+          end
+        end
+      end
+
+      def parse_inline_script( root, results )
+        root.query('script') do |script|
+
+          next if script.has_prop?( :src )
+
+          script_row = script.position.row
+          script_col = script.outer_html[/^\s*<script*?>/i].size
+          src        = script.text
+
+          Validator.new( nil,  :text => src, :syntax => :js ).validate.each do |ret|
+            ret.column += script_col if ret.row == 1
+            ret.row    += script_row - 1
+            results << ret
+          end
+        end
+      end
+
+      def parse_inline_stylesheet( root, results )
+        root.query('style') do |style|
+
+          style_row = style.position.row
+          style_col = style.outer_html[/^\s*<style*?>/i].size
+          src       = style.text
+
+          Validator.new( nil,  :text => src, :syntax => :css ).validate.each do |ret|
+            ret.column += style_col if ret.row == 1
+            ret.row    += style_row - 1
+            results << ret
+          end
+        end
       end
 
       def parser
@@ -78,7 +124,7 @@ module Fdlint
           :js   => ::Fdlint::Parser::JS::JsParser,
           :css  => ::Fdlint::Parser::CSS::CssParser,
           :html => ::Fdlint::Parser::HTML::HtmlParser
-        }.fetch( code_type ).new( source )
+        }.fetch( syntax ).new( source )
 
         file = File.new(self.file) if self.file
 
@@ -90,11 +136,17 @@ module Fdlint
       end
 
       def content_level_rules
-        Fdlint::Rule.send( :"for_#{code_type}_content" )
+        Fdlint::Rule.send( :"for_#{syntax}_content" )
       end
 
       def file_level_rules
-        Fdlint::Rule.for_file( :code_type => code_type )
+        Fdlint::Rule.for_file( :syntax => syntax )
+      end
+
+      def filter_results_by_log_level
+        @results.select! do |r|
+          LogEntry.level_greater_or_equal? r.level, log_level
+        end
       end
 
   end

data/lib/fdlint/version.rb

@@ -1,3 +1,3 @@
 module Fdlint
-  VERSION = '0.2.0.pre'
+  VERSION = '0.2.0'
 end

data/lib/hook/git_pre_commit

@@ -0,0 +1,18 @@
+html_path = "spec_results.html"  
+`spec -f h:#{html_path} -f p spec` # run the spec. send progress to screen. save html results to html_path  
+
+# find out how many errors were found  
+html = open(html_path).read  
+examples = html.match(/(\d+) examples/)[0].to_i rescue 0  
+failures = html.match(/(\d+) failures/)[0].to_i rescue 0  
+pending = html.match(/(\d+) pending/)[0].to_i rescue 0  
+
+if failures.zero?  
+  puts "0 failures! #{examples} run, #{pending} pending"  
+else  
+  puts "\aDID NOT COMMIT YOUR FILES!"  
+  puts "View spec results at #{File.expand_path(html_path)}"  
+  puts  
+  puts "#{failures} failures! #{examples} run, #{pending} pending"  
+  exit 1  
+end

data/rules.d/css.rule.rb

@@ -7,7 +7,7 @@ review( 'selector' ) {
 
   desc "页面级别样式请用class选择符代替id选择符，以免在重用时影响其他页面"
   rule { |selector, source, file|
-    if file && file.page_level?  && selector =~ /^#/
+    if file && file.page_level?  && selector =~ /#/
       error '页面级别样式不使用id'
     end
   }

data/rules.d/filename.rule.rb

@@ -2,7 +2,7 @@ rules_for 'css', 'js'
 
 review( 'file' ) {
   rule { |file|
-    if file.name =~ /(?:[^a-z0-9%_-]|^)
+    AD_REG ||= /(?:[^a-z0-9%_-]|^)
       #以ad开头，与后面文字组合，构成常见的广告单词
       ad
       (?:
@@ -12,6 +12,8 @@ review( 'file' ) {
         |fshow|pic|vert|view|info|click|sponsor|banner
         |click|ver|name|x|log|
       )/x
+
+    if file.path =~ AD_REG
       error '路径和文件名中不应该出现ad'
     end
   }

data/rules.d/html.rule.rb

@@ -24,8 +24,12 @@ review( 'property' ) { |prop|
     error "不能定义内嵌样式style"
   end
 
-  if prop =~ /[A-Z_]/
-    error "属性名必须小写，连字符用中横线"
+  if prop =~ /[A-Z]/
+    error "属性名必须小写"
+  end
+
+  if prop =~ /_/
+    error "属性名连字符用中横线"
   end
 
   if prop =~ 'id' and prop.value =~ /[A-Z]/
@@ -33,7 +37,10 @@ review( 'property' ) { |prop|
   end
 
   if prop =~ 'class' and prop.value =~ /[A-Z]/
-    error "class名称全部小写，单词分隔使用中横线"
+    error "class名称全部小写"
+  end
+  if prop =~ 'class' and prop.value =~ /[_]/
+    error "class名称单词分隔使用中横线"
   end
 
   if prop.value and prop.sep != '"'
@@ -67,16 +74,22 @@ review( 'tag' ) { |tag|
 
 review( 'tag' ) {
 
+  has_target = false
+
+  before( 'doc' ) {
+    has_target = false
+  }
+
   # <base target='_self'>
   after( 'tag' ) { |tag|
-    if tag =~ 'base' and tag.prop_value('target')
-      @has_target = true
+    if tag =~ 'base' and tag['target'] == '_self'
+      has_target = true
     end
   }
 
   rule { |tag|
-    unless @has_target
-      if tag =~ 'a' and tag.prop_value('href') =~ /^#/ and tag.prop_value(:target) != '_self'
+    unless has_target
+      if tag =~ 'a' and tag.prop_value('href') =~ /^#/ and tag['target'] != '_self'
         warn '功能a必须加target="_self"，除非preventDefault过'
       end
     end
@@ -84,34 +97,34 @@ review( 'tag' ) {
 
 }
 
-review( 'tag' ) {
+group( 'uniq links' ) {
 
-  after( 'tag' ) {|tag|
-    if tag =~ 'script'
-      src = tag['src'].to_s
-      if !src.empty?
-        @scripts_used ||= []
-        @scripts_used << src
-      end
-    elsif tag.stylesheet_link?
-      src = tag['href'].to_s
-      if !src.empty?
-        @styles_used ||= []
-        @styles_used << src
-      end
-    end
+  scripts_used = nil
+  styles_used  = nil
+
+  before( 'doc' ) {
+    scripts_used = []
+    styles_used  = []
   }
 
-  rule { |tag|
+  review( 'tag' ) { |tag|
     if tag =~ 'script'
       src = tag['src'].to_s
-      if !src.empty? && (@script_used || []).include?( src )
-        error "避免重复引用同一或相同功能文件"
+      if src.present?
+        if scripts_used.include?( src )
+          error "避免重复引用同一文件"
+        else
+          scripts_used << src
+        end
       end
     elsif tag.stylesheet_link?
-      src = tag['src'].to_s
-      if !src.empty? && (@styles_used || []).include?( src )
-        error "避免重复引用同一或相同功能文件"
+      src = tag['href'].to_s
+      if src.present?
+        if styles_used.include?( src )
+          error "避免重复引用同一文件"
+        else
+          styles_used << src
+        end
       end
     end
   }
@@ -152,8 +165,8 @@ review( 'tag' ) { |tag|
   end
 
   if tag.stylesheet_link?
-    if tag.has_scope? and !tag.in_scope?('head')
-      error "外链CSS置于head里(例外：应用里的footer样式)"
+    if !tag.in_scope?('head')
+      warn "外链CSS置于head里(例外：应用里的footer样式)"
     end
   end
 
@@ -162,8 +175,8 @@ review( 'tag' ) { |tag|
   end
 }
 
-review( 'text_tag' ) do |text_tag|
-  if text_tag.text =~ /[<>]/
+review( 'text_tag' ) do |text_tag, source, file|
+  if text_tag.text =~ /[<>]/ && !(text_tag.in_scope?('script') || text_tag.in_scope?('style'))
     error "特殊HTML符号(>和<)必须转义"
   end
 end

data/rules.d/js.rule.rb

@@ -102,7 +102,7 @@ review( 'expr_equal' ) { |expr|
   end
 }
 
-review( 'stat' ) { |stat|
+review( 'stat_try' ) { |stat|
   if stat.try_part.contains?('try') ||
       stat.catch_part && (stat.catch_part.contains? 'try') ||
       stat.finally_part && (stat.finally_part.contains? 'try')
@@ -187,7 +187,7 @@ review( 'statement' ) { |stat, source, file, parser|
 
 review( 'expr_logical_or' ) { |expr, source|
   if expr.left && expr.right
-    left = expr.position.pos - 2
+    left = expr.position.pos - 1
     unless expr.type == "(" || expr.type == "."
       unless source[left, expr.type.size + 2] == (" " << expr.type << " ")
         error '操作符(如, +/-/*/% 等)两边留空'

data/test/all_tests.rb

@@ -2,6 +2,9 @@ gem 'test-unit' if defined? gem
 require 'test/unit'
 require 'test/unit/testsuite'
 require 'test/unit/ui/console/testrunner'
+require 'logger'
+
+$logger = Logger.new('/dev/null')
 
 unless Kernel.respond_to?(:require_relative)
   module Kernel
@@ -18,67 +21,50 @@ require_relative 'css/mac_line_end_support_test'
 require_relative 'css/rule/check_list_rule_test'
 require_relative 'css/rule/check_encoding_test'
 require_relative 'css/rule/file_name_test'
-require_relative 'css/rule/compression_test'
 require_relative 'html/parser_test'
 require_relative 'html/rule_test'
 require_relative 'html/query_test'
 require_relative 'html/mixed_type_test'
 require_relative 'js/parser_test'
 require_relative 'js/rule_test'
-require_relative 'rule_dsl/dsl_basic_test'
-require_relative 'rule_dsl/importing_test'
-require_relative 'cli/cli_test'
-require_relative 'cli/type_test'
-require_relative 'cli/output_format_test'
-require_relative 'cli/log_level_test'
 require_relative 'runner/log_level_test'
 
-
-module XRayTest
+module FdlintTest
 
   class ALL < Test::Unit::TestSuite
 
     def self.suite
-      tests = Test::Unit::TestSuite.new
-
-      tests << PositionInfoTest.suite
-      tests << ParserVisitableTest.suite
-      
-      #CSS
-      tests << CSS::ParserTest.suite
-      tests << CSS::MacLineEndSupportTest.suite
-      tests << CSS::Rule::CheckListRuleTest.suite
-      tests << CSS::Rule::CheckEncodingTest.suite
-      tests << CSS::Rule::CheckFileNameTest.suite
-      tests << CSS::Rule::CompressionTest.suite
-
-      #HTML
-      tests << HTML::ParserTest.suite
-      tests << HTML::RuleTest.suite
-      tests << HTML::QueryTest.suite
-      tests << HTML::MixedTypeTest.suite
+      Test::Unit::TestSuite.new.tap do |tests|
 
-      #JS
-      tests << JS::ParserTest.suite
-      tests << JS::RuleTest.suite
+        tests << PositionInfoTest.suite
+        tests << ParserVisitableTest.suite
+        
+        #CSS
+        tests << CSS::ParserTest.suite
+        tests << CSS::MacLineEndSupportTest.suite
+        tests << CSS::Rule::CheckListRuleTest.suite
+        tests << CSS::Rule::CheckEncodingTest.suite
+        tests << CSS::Rule::CheckFileNameTest.suite
 
-      #RULE
-      tests << Rule::DSLBasicTest.suite
-      tests << Rule::ImportingTest.suite
+        #HTML
+        tests << HTML::ParserTest.suite
+        tests << HTML::RuleTest.suite
+        tests << HTML::QueryTest.suite
+        tests << HTML::MixedTypeTest.suite
 
-      #CLI
-      tests << CLI::CLITest.suite
-      tests << CLI::TypeTest.suite
-      tests << CLI::OutputFormatTest.suite
-      tests << CLI::LogLevelTest.suite
+        #JS
+        tests << JS::ParserTest.suite
+        tests << JS::RuleTest.suite
 
-      #RUNNER
-      tests << Runner::LogLevelTest.suite
+        #CLI
+        #CLI is no longer tested in unit tests
 
-      tests
+        #RUNNER
+        tests << Runner::LogLevelTest.suite
+      end
     end
   end
 
 end
 
-Test::Unit::UI::Console::TestRunner.run( XRayTest::ALL )
+Test::Unit::UI::Console::TestRunner.run( FdlintTest::ALL )

data/test/css/mac_line_end_support_test.rb

@@ -2,32 +2,30 @@
 
 require_relative '../helper'
 
-require 'node'
-require 'log_entry'
-require 'css/struct'
-require 'css/rule/checklist'
+require 'fdlint/parser/node'
+require 'fdlint/log_entry'
+require 'fdlint/parser/css/struct'
 
-module XRayTest
+module FdlintTest
   module CSS
       
     class MacLineEndSupportTest < Test::Unit::TestCase
 
       def setup
-        @runner = XRay::Runner.new :encoding => 'gb2312'
       end
 
       def test_check_mac_line_end_with_good_css
         file = "#{FIXTURE_PATH}/css/mac-line-sep-good.css"
-        results = @runner.check_css_file file
-
-        assert results.empty?, "Mac style line end should be supported"
+        assert_nothing_thrown "Mac style line end should be supported" do
+          Fdlint::Validator.new( file ).validate
+        end
       end
 
       def test_check_mac_line_end_with_error_css
         file = "#{FIXTURE_PATH}/css/mac-line-sep-err.css"
-        results = @runner.check_css_file file
-
-        assert_equal 1, results.size, "check as usual"
+        assert_nothing_thrown "Mac style line end should be supported" do
+          Fdlint::Validator.new( file ).validate
+        end
       end
 
 

data/test/css/parser_test.rb

@@ -2,14 +2,13 @@
 
 require_relative '../helper'
 
-require 'css/parser'
+require 'fdlint/parser/css/css_parser'
 
 
-module XRayTest
+module FdlintTest
   module CSS
     class ParserTest < Test::Unit::TestCase 
-      ParseError = XRay::ParseError
-      include XRay::CSS
+      ParseError = Fdlint::Parser::ParseError
 
       def test_parse_stylesheet_empty
         css = "  \n "
@@ -261,7 +260,7 @@ END
       private
 
       def create_parser(css)
-        Parser.new css, XRayTest::Logger.new
+        Fdlint::Parser::CSS::CssParser.new css
       end
 
       def parse_css(css, name = 'stylesheet')

data/test/css/rule/check_encoding_test.rb

@@ -2,19 +2,17 @@
 
 require_relative '../../helper'
 
-require 'node'
-require 'css/struct'
-require 'css/rule/checklist'
+require 'fdlint/parser/node'
+require 'fdlint/parser/css/struct'
 
-module XRayTest
+module FdlintTest
   module CSS
     module Rule
       
       class CheckEncodingTest < Test::Unit::TestCase
 
         def setup
-          @runner = XRay::Runner.new :encoding => 'gb2312'
-          @expect_err = XRay::LogEntry.new("File can't be read as gb2312 charset", :fatal) 
+          @expect_err = Fdlint::LogEntry.new("File can't be read as gb2312 charset", :fatal) 
         end
 
         def test_check_utf8_file_well_written
@@ -50,8 +48,9 @@ module XRayTest
         
         private
         def check_file( file )
-          results = @runner.check_css_file file
-          yield results
+          Fdlint::Validator.new( file ).validate do |file, source, results|
+            yield results
+          end
         end
 
         def has_encoding_error?( results )