scss-lint 0.17.1 → 0.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e087dca04b3ac481c798c6c0780b2a714a05406a
-  data.tar.gz: fc983fabca36dd3e16b21d2cb1d488949d97d1d0
+  metadata.gz: 1652c1165c1e0733c886de95fe04a42319edcb94
+  data.tar.gz: 20adb18c09edf8f59e8820f25acccddb96ec295c
 SHA512:
-  metadata.gz: db528b6dcaa880dfda01852687b8347158b100a3dc3e35a3be7859222121204c06c8b7272fc6536298e0b54c50ed11aa0b8ca3ac995f9705ec42f83968334adb
-  data.tar.gz: ae5ac3fcd4cde08613cc4cbeb80763b10a8b4e37f30b98f41af2a437b08932420b2f9e18054f59b808e24834912fc54780ffec50f2545c60478730447c195c01
+  metadata.gz: e5c1b3d9a1553bfcde5ff6a99f6ef7429faf2a0bd9d3497d2de8e6028ed97f7244147d056390540c8db3af52daf62ac51ca420120bb109845c1e7862ae7516f8
+  data.tar.gz: 8a710a91738f37d24de431b0e74b96fa080305710de584b7a7f6f29fb2db1852c95b35b0206aff8c29e66014d136a57f580f247221c0dc00f32bae6740729f91

data/config/default.yml

@@ -18,9 +18,6 @@ linters:
   DeclarationOrder:
     enabled: true
 
-  DeclaredName:
-    enabled: true
-
   DuplicateProperty:
     enabled: true
 
@@ -43,6 +40,9 @@ linters:
   LeadingZero:
     enabled: true
 
+  NameFormat:
+    enabled: true
+
   PlaceholderInExtend:
     enabled: true
 
@@ -89,9 +89,6 @@ linters:
   UrlQuotes:
     enabled: true
 
-  UsageName:
-    enabled: true
-
   ZeroUnit:
     enabled: true
 

data/lib/scss_lint/linter/{usage_name.rb → name_format.rb}

@@ -1,7 +1,7 @@
 module SCSSLint
-  # Checks for variable/function/mixin/placeholder uses which contains uppercase
-  # characters or underscores.
-  class Linter::UsageName < Linter
+  # Checks that the declared names of functions, mixins, and variables are all
+  # lowercase and use hyphens instead of underscores.
+  class Linter::NameFormat < Linter
     include LinterRegistry
 
     def visit_extend(node)
@@ -10,17 +10,32 @@ module SCSSLint
       end
     end
 
+    def visit_function(node)
+      check_declared_name(node, 'function')
+      yield # Continue into content block of this function definition
+    end
+
     def visit_mixin(node)
-      check(node, 'mixin')
+      check_name_use(node, 'mixin')
       yield # Continue into content block of this mixin's block
     end
 
+    def visit_mixindef(node)
+      check_declared_name(node, 'mixin')
+      yield # Continue into content block of this mixin definition
+    end
+
     def visit_script_funcall(node)
-      check(node, 'function') unless FUNCTION_WHITELIST.include?(node.name)
+      check_name_use(node, 'function') unless FUNCTION_WHITELIST.include?(node.name)
     end
 
     def visit_script_variable(node)
-      check(node, 'variable')
+      check_name_use(node, 'variable')
+    end
+
+    def visit_variable(node)
+      check_declared_name(node, 'variable')
+      yield # Continue into expression tree for this variable definition
     end
 
   private
@@ -32,7 +47,16 @@ module SCSSLint
       translateX translateY translateZ
     ].to_set
 
-    def check(node, node_type)
+    def check_declared_name(node, node_type)
+      if node_has_bad_name?(node)
+        fixed_name = node.name.downcase.gsub(/_/, '-')
+
+        add_lint(node, "Name of #{node_type} `#{node.name}` should " <<
+                       "be written in lowercase as `#{fixed_name}`")
+      end
+    end
+
+    def check_name_use(node, node_type)
       add_name_lint(node, node.name, node_type) if node_has_bad_name?(node)
     end
 

data/lib/scss_lint/version.rb

@@ -1,4 +1,4 @@
 # Defines the gem version.
 module SCSSLint
-  VERSION = '0.17.1'
+  VERSION = '0.17.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scss-lint
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.17.2
 platform: ruby
 authors:
 - Causes Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-19 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -97,7 +97,6 @@ files:
 - lib/scss_lint/linter/space_before_brace.rb
 - lib/scss_lint/linter/capitalization_in_selector.rb
 - lib/scss_lint/linter/indentation.rb
-- lib/scss_lint/linter/declared_name.rb
 - lib/scss_lint/linter/sorted_properties.rb
 - lib/scss_lint/linter/trailing_semicolon_after_property_value.rb
 - lib/scss_lint/linter/shorthand.rb
@@ -110,8 +109,8 @@ files:
 - lib/scss_lint/linter/compass/property_with_mixin.rb
 - lib/scss_lint/linter/space_after_property_name.rb
 - lib/scss_lint/linter/property_spelling.rb
-- lib/scss_lint/linter/usage_name.rb
 - lib/scss_lint/linter/url_quotes.rb
+- lib/scss_lint/linter/name_format.rb
 - lib/scss_lint/linter/space_between_parens.rb
 - lib/scss_lint/linter/border_zero.rb
 - lib/scss_lint/linter/space_after_property_colon.rb

data/lib/scss_lint/linter/declared_name.rb

@@ -1,33 +0,0 @@
-module SCSSLint
-  # Checks that the declared names of functions, mixins, and variables are all
-  # lowercase and use hyphens instead of underscores.
-  class Linter::DeclaredName < Linter
-    include LinterRegistry
-
-    def visit_function(node)
-      check(node, 'function')
-      yield # Continue into content block of this function definition
-    end
-
-    def visit_mixindef(node)
-      check(node, 'mixin')
-      yield # Continue into content block of this mixin definition
-    end
-
-    def visit_variable(node)
-      check(node, 'variable')
-      yield # Continue into expression tree for this variable definition
-    end
-
-  private
-
-    def check(node, node_type)
-      if node_has_bad_name?(node)
-        fixed_name = node.name.downcase.gsub(/_/, '-')
-
-        add_lint(node, "Name of #{node_type} `#{node.name}` should " <<
-                       "be written in lowercase as `#{fixed_name}`")
-      end
-    end
-  end
-end