fdlint 0.2.0.pre → 0.2.0

data/test/css/rule/check_list_rule_test.rb

@@ -2,164 +2,147 @@
 
 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 CheckListRuleTest < Test::Unit::TestCase
 
-        include XRay::CSS, XRay::CSS::Rule, XRay::Rule, XRay::Context
-
-        Node = XRay::Node
-        XRay::Rule.import_all
+        Node = Fdlint::Parser::Node
+        Fdlint::Rule.rules
 
         def setup
-          self.scope = :page
+          @file = nil
         end
 
         # selector
 
         def test_check_selector_with_id
 
-          selector = Node.new '#mydiv a'
-          message, level = check_selector_with_id selector
+          # 路径中不包含 /lib/ 文件会被辨认为页面级别样式
+          # 此时检查 selecotr id 的规则才会生效
+          css_file_level :page
 
-          assert_equal :error, level
+          parse :selector, '#mydiv a' do |results|
+            assert_has_result results, [:error, '页面级别样式不使用id']
+          end
 
-          selector = Node.new 'ul #mydiv dt'
-          ret = check_selector_with_id selector
-          assert_not_nil ret
+          parse :selector, 'ul #mydiv dt' do |results|
+            assert_has_result results, [:error, '页面级别样式不使用id']
+          end
 
-          selector = Node.new '.guide-part ul li'
-          ret = check_selector_with_id selector
-          assert_nil ret
+          parse :selector, '.guide-part ul li' do |results|
+            assert results.blank?
+          end
         end
 
         def test_check_selector_with_global_tag 
-          selector = Node.new 'a'
-          message, level = check_selector_with_global_tag selector
-
-          assert_equal :error, level
+          # 路径中不包含 /lib/ 文件会被辨认为页面级别样式
+          # 此时检查 global selecotr 的规则才会生效
+          css_file_level :page
 
-          selector = Node.new 'body'
-          message, level = check_selector_with_global_tag selector
+          parse :selector, 'a' do |results|
+            assert_has_result results, [:error, '页面级别样式不能全局定义标签样式']
+          end
 
-          assert_equal :error, level
+          parse :selector, 'body' do |results|
+            assert_has_result results, [:error, '页面级别样式不能全局定义标签样式']
+          end
         end
 
         def test_check_selector_level
-          selector = Node.new '.mypart .mysubpart ul li a'
-          message, level = check_selector_level selector
-
-          assert_equal :error, level
-          
-          selector = Node.new '.mypart ul li a'
-          ret = check_selector_level selector
-          assert_nil ret
-          
-          selector = Node.new 'html>div.mypart ul li a'
-          message, level = check_selector_level selector
-          assert_equal :error, level
-
-          selector = Node.new 'div.mypart ul li a'
-          ret = check_selector_level selector
-          assert_nil ret
-        end
+          parse :selector, '.mypart .mysubpart ul li a' do |results|
+            assert_has_result results, [:error, 'CSS级联深度不能超过4层']
+          end
 
-        def test_check_selector_with_star
-          selector = Node.new '* html'
-          message, level = check_selector_with_star selector
+          parse :selector, 'html>div.mypart ul li a' do |results|
+            assert_has_result results, [:error, 'CSS级联深度不能超过4层']
+          end
+
+          parse :selector, '.mypart ul li a' do |results|
+            assert results.blank?
+          end
 
-          assert_equal :error, level
+          parse :selector, 'div.mypart ul li a' do |results|
+            assert results.blank?
+          end
         end
 
-        def test_check_declarations_sequence
-          
+        def test_check_selector_with_star
+          parse :selector, '* html' do |results|
+            assert_has_result results, [:error, '禁止使用星号选择符']
+          end
         end
 
         # declaration
         
         def test_check_good_declaration_font
-          sel = Node.new 'font'
-          expr = Node.new 'Arial'
-          dec = Declaration.new(sel, expr)
-
-          message, level = check_declaration_font dec
-          assert_equal nil, level
+          parse :declaration, 'font: Arail;' do |results|
+            assert results.blank?
+          end
         end
 
         def test_check_declaration_font
-          sel = Node.new 'font'
-          expr = Node.new '宋体'
-          dec = Declaration.new(sel, expr)
-
-          message, level = check_declaration_font dec
-          assert_equal :error, level
-        end
-
-        def test_check_redefine_a_hover_color
-          selector = Node.new 'a:hover'
-          
-          prop = Node.new 'color'
-          expr = Node.new '#f00'
-          dec = Declaration.new(prop, expr)
-
-          ruleset = RuleSet.new(selector, [dec])
-
-          message, level = check_ruleset_redefine_a_hover_color ruleset
-          assert_equal :error, level
+          parse :declaration, 'font: 宋体;' do |results|
+            assert_has_result results, [:error, '字体名称中的中文必须用ascii字符表示']
+          end
         end
 
-        def test_check_redefine_lib_css
-          selector = Node.new '.fd-hide'
-          message, level = check_selector_redefine_lib_css selector
-          assert_equal :error, level
-
-          @scope = :lib
-          ret = check_selector_redefine_lib_css selector
-          assert_nil ret 
-        end
-        
         def test_check_property_hack
-          props = %w(_background +font-size *color)
+          props = %w(_background +font-size *color d\isplay)
           props.each do |prop|
-            prop = Node.new prop
-            message, level = check_property_hack prop
-            assert_equal :error, level
+            parse :property, prop do |results|
+              assert_has_result results, [:error, '合理使用hack']
+            end
           end
         end
 
-        def test_check_property_slash_hack
-          prop = Node.new 'd\isplay'
-          message, level = check_property_hack prop
-          assert_equal :error, level
-        end
-
         def test_check_selector_using_hack
-          selector = Node.new 'html*'
-          message, level = check_selector_using_hack selector
-          assert_equal :error, level
+          parse :selector, 'html*' do |results|
+            assert_has_result results, [:error, '合理使用hack']
+          end
         end
 
         def test_check_value_use_css_expression
-          expr = Node.new 'expression(onfocus=this.blur())'
-          message, level = check_value_use_css_expression expr
-          assert_equal :error, level
+          parse :value, 'expression(onfocus=this.blur())' do |results|
+            assert_has_result results, [:error, '禁止使用CSS表达式']
+          end
         end
 
         def test_check_value_use_hack
           exprs = %w(9px\0 #000\9)
           exprs.each do |expr|
-            expr = Node.new expr
-            message, level = check_value_use_hack expr
-            assert_equal :error, level
+            parse :value, expr do |results|
+              assert_has_result results, [:error, '合理使用hack']
+            end
           end
         end
 
+        private
+
+          def css_file_level level
+            if level == :page
+              @file = File.new( '.' )
+            elsif level == :lib
+              @file = File.new( File.join FIXTURE_PATH, 'css/lib/' )
+            end
+          end
+
+          def parse type, text
+            parser   = Fdlint::Parser::CSS::CssParser.new( text ).tap do |parser|
+              visitors = Fdlint::Rule.for_css_content.map do |validation|
+                validation.to_visitor file: @file
+              end
+              parser.add_visitors visitors
+              parser.send "parse_#{type}"
+            end
+
+            yield parser.results.flatten
+          end
+
       end
 
     end

data/test/css/rule/file_name_test.rb

@@ -2,72 +2,51 @@
 
 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 CheckFileNameTest < Test::Unit::TestCase
 
-        include XRay::Rule
-
         def setup
+          Fdlint::Rule.all
         end
 
         def test_file_name_with_ad
-          check 'css/ad.css' do |results|
-            expect_err = ["路径和文件名中不应该出现ad", :error]
-            assert_equal [expect_err], results, "文件名中不应出现ad"
+          check fixture_path('css/ad.css') do |results|
+            assert_has_result results, [:error, "路径和文件名中不应该出现ad"] 
           end
         end
 
         def test_path_name_with_ad
-          check "/css/adver/test.css" do |results|
-            expect_err = ["路径和文件名中不应该出现ad", :error] 
-            assert_equal [expect_err], results, "文件路径中不应出现ad"
-          end
-        end
-
-        def test_file_name_without_ad
-          check 'not-exsiting-file.css' do |results|
-            assert results.empty?, "文件名中不应出现ad,包括路径"
+          check fixture_path( "css/adver/test.css" ) do |results|
+            assert_has_result results, [:error, "路径和文件名中不应该出现ad"] 
           end
         end
 
         def test_file_name_with_underscore
-          check 'not_exsiting_file.css' do |results|
-            expect_err = ["文件名中单词的分隔符应该使用中横线“-”", :error] 
-            assert_equal [expect_err], results, "文件名中单词的分隔符应该使用中横线“-”"
+          check fixture_path( 'css/using_id.css' ) do |results|
+            assert_has_result results, [:warn, "文件名中的连字符建议使用“-”而不是“_”"] 
           end
         end
 
         def test_file_name_with_upcase
-          check 'someFile.css' do |results|
-            expect_err = ["文件夹和文件命名必须用小写字母", :error] 
-            assert_equal [expect_err], results, "文件夹和文件命名必须用小写字母"
+          check fixture_path( 'css/camelCase.css' ) do |results|
+            assert_has_result results, [:error, "文件夹和文件命名必须用小写字母"] 
           end
         end
 
-        def test_dir_name_with_minus
-          check 'test-post-offer/main.css' do |results|
-            expect_err = ["文件夹只有需要版本区分时才可用中横线分隔，如fdev-v3", :error] 
-            assert_equal [expect_err], results, "文件夹只有需要版本区分时才可用中横线分隔"
-          end
-        end
+        protected
 
-        def test_dir_name_with_version_minus
-          check 'test-2/main.css' do |results|
-            assert results.empty?, "目录名字中带有版本号时可以用中横线"
+          def check(file, &block)
+            Fdlint::Validator.new( file ).tap do |validator|
+              validator.validate_file
+              yield validator.results
+            end
           end
-        end
-
-        protected
-        def check(file, &block)
-          yield check_css_file(file)
-        end
 
       end
 

data/test/default_test.rb

@@ -1,14 +1 @@
-require 'test_helper'
-
-class DefaultTest < Test::Unit::TestCase
-
-  def setup
-  end
-
-  def teardown
-  end
-
-  def test_the_truth
-    assert true
-  end
-end
+require 'all_tests'

data/test/fixtures/html/mixed_log_levels.html

@@ -1,4 +1,5 @@
 <html>
+    <link rel="stylesheet" href="test.css"/>
     <body>
         <img src="test.jpg" />
     </body>

data/test/fixtures/html/mixed_types.html

@@ -4,6 +4,9 @@
         <script>
             var a = 1;
         </script>
+        <script>
+            var b = 1;
+        </script>
     </head>
     <body>
         <style>

data/test/helper.rb

@@ -9,33 +9,133 @@ end
 $LOAD_PATH << File.join(File.dirname(__FILE__), '../lib')
 
 require 'test/unit'
-require 'node'
-require 'log_entry.rb'
-require 'runner'
 require 'pathname'
 require 'logger'
 
+require 'fdlint'
+
 FIXTURE_ABS_PATH = File.expand_path(File.join( File.dirname(__FILE__) , '/fixtures' ))
 FIXTURE_REL_PATH = Pathname.new(FIXTURE_ABS_PATH).relative_path_from(Pathname.new(File.expand_path '.'))
 FIXTURE_PATH = FIXTURE_REL_PATH
 
-XRay::Rule.import_all
-
-module XRayTest
-  class Logger < ::Logger
-    def initialize
-      super(STDOUT)
-      debug = ARGV.include? '-d'
-      self.level = debug ? Logger::INFO : Logger::WARN
-    end 
-  end
-end
-
 def has_ruby?(ver)
   not `which ruby#{ver}`.empty?
 end
 
 def fixture(path)
-  IO.read File.join( FIXTURE_PATH, path )
+  IO.read fixture_path( path )
+end
+
+def fixture_path( path )
+  File.join( FIXTURE_PATH, path )
+end
+
+def assert_has_result( results, condition, msg=nil)
+  level, text = *condition
+  assert(
+    results.index do |ret|
+      ret.level == level && ret.message == text
+    end,
+    msg
+  )
+end
+
+def assert_not_has_result( results, condition, msg=nil)
+  level, text = *condition
+  assert_nil(
+    results.index do |ret|
+      ret.level == level && ret.message == text
+    end,
+    msg
+  )
 end
 
+module FdlintTest
+
+  module RuleTest
+
+    def self.extended(klass)
+      def klass.included(cls)
+        cls.send :include, FdlintTest::RuleTest
+      end
+    end
+
+    def self.included(klass)
+      klass.send :extend,  ClassMethods
+      klass.send :include, InstanceMethods
+    end
+
+    module ClassMethods
+
+      def check_rule expect, &block
+        @expect = expect
+        yield
+      end
+
+      def should_with_result expect=@expect, &block
+        level, msg = *expect
+        texts(&block).each_with_index do |src, i|
+          define_method "test_should_with_result_#{msg}_#{i}_#{src[0,20]}" do
+            parse src do |results|
+              assert_has_result results, expect, msg
+            end
+          end
+        end
+      end
+
+      def should_without_result expect=@expect, &block
+        level, msg = *expect
+        texts(&block).each_with_index do |src, i|
+          define_method "test_should_without_result_#{msg}_#{i}" do
+            parse src do |results|
+              assert_not_has_result results, expect, msg
+            end
+          end
+        end
+      end
+
+      def texts( &block )
+        texts = block.call
+        texts = [texts] if texts.is_a? String
+        texts
+      end
+    end
+
+    module InstanceMethods
+      def parse text, &block
+        Fdlint::Validator.new( nil, :text => text, :syntax => syntax ).validate.tap do |results|
+          yield results if block_given?
+        end
+      end
+    end
+
+  end
+
+  module HTML
+    include Fdlint::Parser::HTML
+    extend FdlintTest::RuleTest
+
+    def parser( text )
+      @parser ||= HtmlParser.new(text)
+    end
+    
+    def syntax
+      :html
+    end
+
+  end
+
+  module JS
+    include Fdlint::Parser::JS
+    extend FdlintTest::RuleTest
+
+    def parser( text )
+      @parser ||= JsParser.new(text)
+    end
+
+    def syntax
+      :js
+    end
+    
+  end
+end

data/test/html/mixed_type_test.rb

@@ -1,32 +1,26 @@
 # encoding: utf-8
 require_relative '../helper'
-require 'html/parser'
-require 'html/query'
+require 'fdlint/parser/html/html_parser'
+require 'fdlint/parser/html/query'
 
-module XRayTest
+module FdlintTest
   module HTML
 
     class MixedTypeTest < Test::Unit::TestCase
 
-      def setup
-        @runner = ::XRay::Runner.new
-      end
-      
-      def test_check_html_script_and_style
-        html = %Q{<div class="mod">
-<script> var a=1; </script>
-<style>.mod {_font:arial;}</style>
-          </div>}
+      include FdlintTest::HTML
 
-        results = @runner.check_html( html )
-        assert results.any? {|ret| ret.message == '必须存在文档类型声明' }
-        assert results.any? {|ret| ret.message == '不允许使用全局变量' && ret.row ==2 && ret.column == 10 }
-        assert results.any? {|ret| ret.message == '合理使用hack' && ret.row == 3 && ret.column == 14 }
-      end
+      def test_check_html_script_and_style
+        src = %Q{<div class="mod">
+                  <script> var a=1; </script>
+                  <style>.mod {_font:arial;}</style>
+                </div>}
 
-      private
-      def parse(html)
-        ::XRay::HTML::Parser.parse html
+        parse src do |results|
+          assert_has_result results, [:error, '必须存在文档类型声明']
+          assert_has_result results, [:error, '禁止使用未定义的变量(或全局变量)']
+          assert_has_result results, [:error, '合理使用hack']
+        end
       end
 
     end

data/test/html/parser/parse_comment_test.rb

@@ -1,13 +1,13 @@
 require_relative '../../helper'
 
-module XRayTest
+module FdlintTest
   module HTML
     module Parser
 
       class ParseCommentTest < Test::Unit::TestCase
 
-        include XRay::HTML
-        
+        include Fdlint::Parser::HTML
+
         def test_simple_comment
           parse('<!--content-->') do |e|
             assert_equal CommentElement.new('content'), e
@@ -37,7 +37,7 @@ module XRayTest
         end
 
         def parse(src, &block)
-          XRay::HTML::Parser.parse(src, &block)
+          Fdlint::Parser::HTML::HtmlParser.parse(src, &block)
         end
 
       end

data/test/html/parser/parse_dtd_test.rb

@@ -1,16 +1,16 @@
 require_relative '../../helper'
 
-module XRayTest
+module FdlintTest
   module HTML
     module Parser
 
       class ParseDTDTest < Test::Unit::TestCase
-        
-        include XRay::HTML
+
+        include Fdlint::Parser::HTML
         
         def test_parse_html5_dtd
           parse('<!DOCTYPE html>') do |e|
-            assert_equal DTDElement.new('html'), e
+            assert_equal Document.new(DTDElement.new('html')), e
           end
         end
 
@@ -20,9 +20,9 @@ module XRayTest
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">)
 
           parse(src) do |e|
-            assert_equal DTDElement.new(%q(html 
+            assert_equal Document.new(DTDElement.new(%q(html 
      PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd")), e
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"))), e
           end
         end
 
@@ -36,7 +36,7 @@ module XRayTest
         end
 
         def parse(src, &block)
-          XRay::HTML::Parser.parse(src, &block)
+          HtmlParser.parse(src, &block)
         end
 
       end