scss-lint 0.1 → 0.2

data/lib/scss_lint/linter/declaration_order_linter.rb

@@ -6,7 +6,6 @@ module SCSSLint
 
     DECLARATION_ORDER = [
       Sass::Tree::ExtendNode,
-      Sass::Tree::MixinNode,
       Sass::Tree::PropNode,
       Sass::Tree::RuleNode,
     ]
@@ -14,17 +13,17 @@ module SCSSLint
     class << self
       def run(engine)
         lints = []
-        #engine.tree.each do |node|
-          #if node.is_a?(Sass::Tree::RuleNode)
-            #lints << check_order_of_declarations(node)
-          #end
-        #end
-        #lints.compact
+        engine.tree.each do |node|
+          if node.is_a?(Sass::Tree::RuleNode)
+            lints << check_order_of_declarations(node)
+          end
+        end
+        lints.compact
       end
 
       def description
         'Rule sets should start with @extend declarations, followed by ' <<
-        'mixins, properties, and nested rule sets, in that order'
+        'properties and nested rule sets, in that order'
       end
 
     private
@@ -37,18 +36,17 @@ module SCSSLint
       end
 
       def check_order_of_declarations(rule_node)
-        children = rule_node.children.select { |node| important_node?(node) }
+        children = rule_node.children.select { |node| important_node?(node) }.
+                                      map { |node| node.class }
 
-        # Horribly inefficient, but we're not sorting thousands of declarations
+        # Inefficient, but we're not sorting thousands of declarations
         sorted_children = children.sort do |x,y|
-          DECLARATION_ORDER.index(x.class) <=> DECLARATION_ORDER.index(y.class)
+          DECLARATION_ORDER.index(x) <=> DECLARATION_ORDER.index(y)
         end
 
         if children != sorted_children
-          return create_lint(children.first)
+          return create_lint(rule_node.children.first)
         end
-
-        nil
       end
     end
   end

data/lib/scss_lint/linter/property_format_linter.rb

@@ -17,13 +17,23 @@ module SCSSLint
 
       def description
         'Property declarations should always be on one line of the form ' <<
-        '`property-name: value;`'
+        '`name: value;` or `name: [value] {`'
       end
 
     private
 
+      VALUE_RE = %r{(\S+\s)*\S+} # eg. "10px", "10px normal"
+      PROPERTY_RE = %r{
+        ^\s*[\w-]+:\s           # property name, colon, one space
+          (                     # followed by
+          #{VALUE_RE};          # property and terminating semi-colon eg. a b c;
+          |                     # or
+          ((#{VALUE_RE}\s)?\{)  # nested property, optional value, trailing curly
+          )
+      }x
+
       def check_property_format(prop_node, line)
-        return create_lint(prop_node) unless line =~ /^\s*[\w-]+: [^\s][^;]*;/
+        return create_lint(prop_node) unless line =~ PROPERTY_RE
       end
     end
   end

data/lib/scss_lint/linter/shorthand_linter.rb

@@ -0,0 +1,50 @@
+require 'sass'
+
+module SCSSLint
+  class Linter::ShorthandLinter < Linter
+    include LinterRegistry
+
+    class << self
+      def run(engine)
+        lints = []
+        engine.tree.each do |node|
+          if node.is_a?(Sass::Tree::PropNode)
+            lints << check_valid_shorthand_value(node)
+          end
+        end
+        lints.compact
+      end
+
+      def description
+        'Property values should use the shortest shorthand syntax allowed'
+      end
+
+    private
+
+      def check_valid_shorthand_value(prop_node)
+        if prop_node.value.is_a?(Sass::Script::String) &&
+           prop_node.value.to_s.strip =~ /\A(\S+\s+\S+\s+\S+(\s+\S+)?)\Z/
+          return create_lint(prop_node) unless valid_shorthand?($1)
+        end
+      end
+
+      def valid_shorthand?(shorthand)
+        values = shorthand.split(/\s+/)
+
+        if values[0] == values[1] &&
+           values[1] == values[2] &&
+           values[2] == values[3]
+          false
+        elsif values[0] == values[2] && values[1] == values[3]
+          false
+        elsif values[0] == values[2] && values[3].nil?
+          false
+        elsif values[1] == values[3]
+          false
+        else
+          true
+        end
+      end
+    end
+  end
+end

data/lib/scss_lint/version.rb

@@ -1,3 +1,3 @@
 module SCSSLint
-  VERSION = '0.1'
+  VERSION = '0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scss-lint
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-18 00:00:00.000000000 Z
+date: 2013-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -76,6 +76,7 @@ files:
 - lib/scss_lint/linter/empty_rule_linter.rb
 - lib/scss_lint/linter/debug_linter.rb
 - lib/scss_lint/linter/sorted_properties_linter.rb
+- lib/scss_lint/linter/shorthand_linter.rb
 - lib/scss_lint/linter/property_format_linter.rb
 - lib/scss_lint/linter/zero_unit_linter.rb
 - lib/scss_lint/linter/hex_linter.rb