fdlint 0.2.0.pre → 0.2.0

data/test/js/rule_test.rb

@@ -5,7 +5,7 @@ require 'test/unit/ui/console/testrunner'
 
 require File.expand_path('../helper', File.dirname(__FILE__))
 
-module XRayTest
+module FdlintTest
   
   module JS 
 
@@ -21,8 +21,6 @@ module XRayTest
         nest_try_catch_test
         jq_check_test
         no_global_test
-        all_test
-        file_checker_test
         alert_check_test
         private_method_check_test
       )
@@ -43,5 +41,5 @@ module XRayTest
   end
 end
 
-Test::Unit::UI::Console::TestRunner.run(XRayTest::JS::RuleTest) if __FILE__ == $0
+Test::Unit::UI::Console::TestRunner.run(FdlintTest::JS::RuleTest) if __FILE__ == $0
 

data/test/js/stat/if.rb

@@ -1,4 +1,4 @@
-module XRayTest
+module FdlintTest
   module JS
     module Stat
 

data/test/js/stat/iter.rb

@@ -1,4 +1,4 @@
-module XRayTest
+module FdlintTest
   module JS
     module Stat
       

data/test/js/stat/stat.rb

@@ -4,7 +4,7 @@ require_relative 'switch'
 require_relative 'iter'
 require_relative 'try'
 
-module XRayTest
+module FdlintTest
   module JS
     module Stat
       

data/test/js/stat/switch.rb

@@ -1,4 +1,4 @@
-module XRayTest
+module FdlintTest
   module JS
     module Stat
       

data/test/js/stat/try.rb

@@ -1,4 +1,4 @@
-module XRayTest
+module FdlintTest
   module JS
     module Stat
       

data/test/js/stat/var.rb

@@ -1,4 +1,4 @@
-module XRayTest
+module FdlintTest
   module JS
     module Stat
       

data/test/parser_visitable_test.rb

@@ -1,23 +1,21 @@
 require_relative 'helper'
 
-require 'node'
-require 'parser_visitable'
+require 'fdlint/parser/node'
+require 'fdlint/parser/parser_visitable'
 
 
-module XRayTest
+module FdlintTest
   
   class ParserVisitableTest < Test::Unit::TestCase  
     
-    Node = XRay::Node
-    ParserVisitable = XRay::ParserVisitable
+    Node            = Fdlint::Parser::Node
+    ParserVisitable = Fdlint::Parser::ParserVisitable
 
     class MockParser
 
       include ParserVisitable
 
       def parse_node
-        puts 'parse node'
-
         parse_node_a
         parse_node_b
 
@@ -25,12 +23,10 @@ module XRayTest
       end
 
       def parse_node_a
-        puts 'parse node a'
         Node.new 'node a'
       end
 
       def parse_node_b
-        puts 'parse node b'
 
         parse_node_c
 
@@ -38,63 +34,45 @@ module XRayTest
       end
 
       def parse_node_c
-        puts 'parse node c'
         Node.new 'node c'
       end
+
+      def source
+      end
       
     end
 
     class SimpleVisitor
       
-      def visit_node(node)
-        puts "visit node: #{node}"
+      def visit_node(node, source, parser)
         ['visit node', :info]
       end
 
-      def visit_node_a(node)
-        puts "visit node a: #{node}"
+      def visit_node_a(node, source, parser)
         ['visit node a', :warn]
       end
 
-      def visit_node_b(node)
-        puts "visit node b: #{node}"
+      def visit_node_b(node, source, parser)
         [
           ['visit node b 1', :warn],
           ['visit node b 2', :info]
         ]
       end
 
-      def visit_node_c(node)
-        puts "visit node c: #{node}"
+      def visit_node_c(node, source, parser)
         ['visit node c', :warn]
       end
-    end
-
-    class SimpleObserver
-      attr_reader :times
 
-      def update(result, parser)
-        puts "observer: #{result}"
-        @times ||= 0
-        @times += 1  
-      end
     end
 
-
     def test_default
       parser = MockParser.new
 
-      visitor = SimpleVisitor.new
-      parser.add_visitor SimpleVisitor.new
-
-      observer = SimpleObserver.new
-      parser.add_observer observer
-
+      parser.add_visitors SimpleVisitor.new
       parser.parse_node
 
       results = parser.results
-      assert_equal 5, results.length
-      assert_equal 5, observer.times
+      assert_equal 4, results.length
     end
     
   end

data/test/position_info_test.rb

@@ -2,15 +2,14 @@
 
 require_relative 'helper'
 
-require 'position_info'
+require 'fdlint/parser/position_info'
 
-module XRayTest
+module FdlintTest
   
   class PositionInfoTest < Test::Unit::TestCase
 
-    PositionInfo = XRay::PositionInfo
-
-    Position = XRay::Position
+    PositionInfo = Fdlint::Parser::PositionInfo
+    Position     = Fdlint::Parser::Position
 
     @@test_paragraph = %(this is line one
    this is line two this is line two    

data/test/runner/log_level_test.rb

@@ -2,54 +2,59 @@
 require 'test/unit'
 require_relative '../helper'
 
-module XRayTest
+module FdlintTest
 
   module Runner
 
     class LogLevelTest < Test::Unit::TestCase
 
       def setup
-        @runner = XRay::Runner.new
         @html = fixture('html/mixed_log_levels.html')
       end
 
       def test_output_every_thing_by_default
-        res = @runner.check_html @html
-        assert_contain( res, :fatal, :error, :warn )
+        validate do |res|
+          assert_contain( res, :fatal, :error, :warn )
+        end
       end
 
       def test_output_fatals_only
-        @runner.log_level = :fatal
-        res = @runner.check_html( @html )
-        assert_contain( res, :fatal )
-        assert_not_contain( res, :error, :warn )
+        validate :fatal do |res|
+          assert_contain( res, :fatal )
+          assert_not_contain( res, :error, :warn )
+        end
       end
 
-      def test_output_fatals_and_errors
-        @runner.log_level = :error
-        res = @runner.check_html( @html )
-        assert_contain( res, :fatal, :error )
-        assert_not_contain( res, :warn )
+      def _test_output_fatals_and_errors
+        validate :error do |res|
+          assert_contain( res, :fatal, :error )
+          assert_not_contain( res, :error, :warn )
+        end
       end
 
-      def test_output_fatals_errors_and_warnnings
-        @runner.log_level = :warn
-        res = @runner.check_html( @html )
-        assert_contain( res, :fatal, :error, :warn )
+      def _test_output_fatals_errors_and_warnnings
+        validate :warn do |res|
+          assert_contain( res, :fatal, :error, :warn )
+        end
       end
 
       private
-      def assert_contain( results, *types )
-        types.each do |type|
-          assert( results.any? { |r| r.level == type } )
+
+        def assert_contain( results, *types )
+          types.each do |type|
+            assert( results.any? { |r| r.level == type } )
+          end
         end
-      end
 
-      def assert_not_contain( results, *types )
-        types.each do |type|
-          assert( ! (results.any? { |r| r.level == type } ) )
+        def assert_not_contain( results, *types )
+          types.each do |type|
+            assert( ! (results.any? { |r| r.level == type } ) )
+          end
+        end
+
+        def validate log_level=nil
+          yield Fdlint::Validator.new( nil, text: @html, log_level: log_level ).validate
         end
-      end
 
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fdlint
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre
+  version: 0.2.0
 platform: ruby
 authors:
 - qhwa,bencode
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -109,7 +109,6 @@ files:
 - bin/fdlint
 - lib/fdlint.rb
 - lib/fdlint/cli.rb
-- lib/fdlint/file_validator.rb
 - lib/fdlint/helper/code_type.rb
 - lib/fdlint/helper/file_reader.rb
 - lib/fdlint/helper/logger.rb
@@ -121,7 +120,6 @@ files:
 - lib/fdlint/parser/encoding_error.rb
 - lib/fdlint/parser/html/html_parser.rb
 - lib/fdlint/parser/html/query.rb
-- lib/fdlint/parser/html/rule/check_tag_rule.rb
 - lib/fdlint/parser/html/struct.rb
 - lib/fdlint/parser/js/expr/expr.rb
 - lib/fdlint/parser/js/expr/left_hand.rb
@@ -151,10 +149,12 @@ files:
 - lib/fdlint/support/core/file.rb
 - lib/fdlint/support/core/hash.rb
 - lib/fdlint/support/core/nil.rb
+- lib/fdlint/support/core/object.rb
 - lib/fdlint/support/core/string.rb
 - lib/fdlint/support/core_ext.rb
 - lib/fdlint/validator.rb
 - lib/fdlint/version.rb
+- lib/hook/git_pre_commit
 - rules.d/css.rule.rb
 - rules.d/filename.rule.rb
 - rules.d/html.rule.rb
@@ -169,10 +169,12 @@ files:
 - test/css/parser_test.rb
 - test/css/rule/check_encoding_test.rb
 - test/css/rule/check_list_rule_test.rb
-- test/css/rule/compression_test.rb
 - test/css/rule/file_name_test.rb
 - test/default_test.rb
+- test/fixtures/css/ad.css
+- test/fixtures/css/adver/test.css
 - test/fixtures/css/broken.css
+- test/fixtures/css/camelCase.css
 - test/fixtures/css/cbu/36.css
 - test/fixtures/css/cbu/china_top.css
 - test/fixtures/css/cbu/default-merge.css
@@ -199,6 +201,8 @@ files:
 - test/fixtures/css/mac-line-sep-err.css
 - test/fixtures/css/mac-line-sep-good-min.css
 - test/fixtures/css/mac-line-sep-good.css
+- test/fixtures/css/min/ad.css
+- test/fixtures/css/min/ad.min.css
 - test/fixtures/css/multi-encoding-in-a-file.css
 - test/fixtures/css/simple.css
 - test/fixtures/css/using_expr.css
@@ -268,12 +272,10 @@ files:
 - test/html/query_test.rb
 - test/html/rule/check_block_level_element_test.rb
 - test/html/rule/check_button_test.rb
-- test/html/rule/check_class_count_test.rb
 - test/html/rule/check_css_in_head_test.rb
 - test/html/rule/check_dtd_test.rb
 - test/html/rule/check_form_element_name_test.rb
 - test/html/rule/check_head_contain_meta_and_title_test.rb
-- test/html/rule/check_html_template_test.rb
 - test/html/rule/check_hyperlink_with_target_test.rb
 - test/html/rule/check_hyperlink_with_title_test.rb
 - test/html/rule/check_id_n_class_downcase_test.rb
@@ -293,9 +295,7 @@ files:
 - test/js/expr/primary.rb
 - test/js/parser_test.rb
 - test/js/rule/alert_check_test.rb
-- test/js/rule/all_test.rb
 - test/js/rule/base_test.rb
-- test/js/rule/file_checker_test.rb
 - test/js/rule/jq_check_test.rb
 - test/js/rule/nest_try_catch_test.rb
 - test/js/rule/new_object_and_new_array_test.rb
@@ -315,10 +315,7 @@ files:
 - test/js/stat/var.rb
 - test/parser_visitable_test.rb
 - test/position_info_test.rb
-- test/rule_dsl/dsl_basic_test.rb
-- test/rule_dsl/importing_test.rb
 - test/runner/log_level_test.rb
-- test/test_helper.rb
 homepage: https://github.com/qhwa/fdlint
 licenses: []
 metadata: {}
@@ -336,9 +333,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2

data/lib/fdlint/file_validator.rb

@@ -1,38 +0,0 @@
-module XRay
-  
-  class FileValidator
-    def initialize( options )
-      @options = options
-      @validators = []
-    end
-
-    def add_validator( val )
-      @validators << val
-    end
-
-    def add_validators( vals)
-      vals.each { |val| add_validator val }
-    end
-
-    def check( file )
-      results = []
-      @validators.each do |val|
-        if val.respond_to? :check_file
-          val_results = val.check_file(file)
-          if val_results
-            if val_results.is_a? Array
-              results.concat val_results
-            else
-              results << val_results
-            end
-          end
-        end
-      end
-      results
-    end
-
-    alias_method :validate, :check
-
-  end
-
-end

data/lib/fdlint/parser/html/rule/check_tag_rule.rb

@@ -1,80 +0,0 @@
-# encoding: utf-8
-require_relative '../../rule'
-require_relative '../struct'
-require_relative '../query'
-require_relative '../../context'
-
-module XRay
-  module HTML
-    module Rule
-
-      class CheckTagRule
-
-        include ::XRay::Rule, Context
-
-        attr_reader :imported_scripts, :imported_css
-
-        def initialize(opt=nil)
-          @imported_scripts, @imported_css = [], []
-        end
-
-        def script_used?( src )
-          @imported_scripts.include? src
-        end
-
-        def style_used?( src )
-          @imported_css.include? src
-        end
-
-        def visit_doc(html)
-          check_html_doc html
-        end
-
-        def visit_dtd(dtd)
-          @have_dtd = true
-          check_html_dtd dtd
-        end
-
-        def visit_tag(tag)
-          results = check_html_tag tag
-          record_script(tag) or record_style(tag)
-          results
-        end
-
-        def visit_text(tag)
-          check_html_text tag
-        end
-
-        def visit_property(prop)
-          check_html_property prop
-        end
-
-        def record_script( tag )
-          if tag.tag_name_equal? 'script'
-            src = tag.prop_value(:src).to_s
-            unless src.empty? or script_used? src
-              @imported_scripts << src
-            end
-          end
-        end
-
-        def record_style( tag )
-          if tag.tag_name_equal? 'link' and tag.prop_value(:rel) =~ /stylesheet/i
-            src = tag.prop_value(:href).to_s
-            unless src.empty? or style_used? src
-              @imported_css << src
-            end
-          end
-        end
-
-        def has_dtd?
-          @have_dtd
-        end
-
-        alias_method :have_dtd?, :has_dtd?
-
-      end
-
-    end
-  end
-end

data/test/css/rule/compression_test.rb

@@ -1,53 +0,0 @@
-# encoding: utf-8
-require_relative '../../helper'
-
-require 'file_validator'
-require 'css/rule/check_compression_rule'
-
-module XRayTest
-  module CSS
-    module Rule
-      
-      class CompressionTest < Test::Unit::TestCase
-
-        def setup
-          @validator = XRay::FileValidator.new( :encoding => 'gb2312' )
-          @validator.add_validator XRay::CSS::Rule::CompressionChecker.new
-        end
-
-        def test_source_file_with_min
-          file = "#{FIXTURE_PATH}/css/empty.css"
-          results = @validator.check file
-
-          assert results.empty?, "同目录下有min文件，测试应通过"
-        end
-
-        def test_source_file_without_min
-          file = "#{FIXTURE_PATH}/css/import.css"
-          results = @validator.check file
-
-          expect_err = XRay::LogEntry.new('发布上线的文件需要压缩，命名规则如a.js->a-min.js，且两者在同一目录下', :error)
-          assert_equal [expect_err], results, "同目录下没有对应的min文件，测试不应通过"
-        end
-
-        def test_merge_file
-          file = 'merge.css'
-          results = @validator.check file
-
-          assert results.empty?, "merge文件不需要被压缩"
-        end
-
-        def test_min_file
-          file = 'test-min.css'
-          results = @validator.check file
-
-          assert results.empty?, "本身已经被压缩，不需要再检查"
-        end
-
-
-      end
-
-    end
-  end
-end
-

data/test/html/rule/check_class_count_test.rb

@@ -1,36 +0,0 @@
-# encoding: utf-8
-
-require_relative '../../helper'
-require 'html/rule/check_tag_rule'
-
-module XRayTest
-  module HTML
-    module Rule
-      
-      class CheckClassCountTest < Test::Unit::TestCase
-
-        def setup
-          @rule = XRay::HTML::Rule::CheckTagRule.new
-        end
-
-        def test_check_normal
-          prop = XRay::HTML::Property.new('class', 'info')
-          assert_equal [], @rule.check_html_property(prop)
-        end
-
-        def test_check_too_many_classes
-          prop = XRay::HTML::Property.new('class', 'info new red bigger')
-          expected = ["一个节点上定义的class个数最多不超过3个(不含lib中的class)", :error]
-          assert_equal [expected], @rule.check_html_property(prop)
-        end
-
-        def test_check_filter_fdev_classes
-          prop = XRay::HTML::Property.new('class', 'info new red fd-main w952 layout grid layout- grid-')
-          assert_equal [], @rule.check_html_property(prop)
-        end
-
-      end
-
-    end
-  end
-end