haml_i18n_lint 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bb308fd331c251ccf43f96620ade24c80174b2a
-  data.tar.gz: e998ab3fb26a7513d2f87304d7ba8b0e9f044cf5
+  metadata.gz: 8d9ee40768e6218d8c809a750e54a587c8b2bba3
+  data.tar.gz: da8a2c1bc972dc38f885813df2a0d002a9e02556
 SHA512:
-  metadata.gz: ac0d81447e3874683ec0ec58e1a7e58e934e1fd88366ffcce14275b1f6ca4e0e09776ac7351deba57d2775ae244d5b1c3135c97de2a989ea0309e46c01091efe
-  data.tar.gz: ea03e92ab5db3ec31f3b73aa31e1afa06c0b7088e8f65bdf91c7cd15e14c85d6b089be654f99be9afc46191ab88fb35aaf9563888db3d08da91c9977e9bce290
+  metadata.gz: e27accffb82430ba7df4be43f1b14f2209b1e393b730a23f07105f01468f7f90af4d3468063051616e1930ef0b3af3b66b074dae0992fbdd6173b935be95ea3f
+  data.tar.gz: 00e39c081bf4ea7244bb7509f7432af30969c004d60643b484f082892fe6ee81feeabbb28701402706ce0e7cc0d016171f077219a4744a45989706bc174e5c22

data/lib/haml_i18n_lint/config.rb

@@ -45,6 +45,11 @@ module HamlI18nLint
       %w(t render)
     end
 
+    # @return [String] the list of key of attributes hash. The key is no translation required.
+    def ignore_keys
+      %w(id class method controller action type lang selected checked src href rel language media)
+    end
+
     private
 
     def load_config(config_content)

data/lib/haml_i18n_lint/linter/compiler_extension.rb

@@ -4,20 +4,7 @@ module HamlI18nLint
 
       def compile_script
         super
-        if Ripper.lex(@node.value[:text].rstrip).any? { |(_, on_kw, kw_do)| on_kw == :on_kw && kw_do == "do" }
-          program = Ripper.sexp(@node.value[:text] + "\nend").flatten
-        else
-          program = Ripper.sexp(@node.value[:text]).flatten
-        end
-        str_num = program.flatten.count { |t| t == :string_literal }
-        tstr_num = program.each_with_index.count do |t, i|
-          lint_config.ignore_methods.any? do |m|
-            [t, program[i + 1], program[i + 2]] == [:fcall, :@ident, m.to_s] ||
-              [t, program[i + 1], program[i + 2]] == [:command, :@ident, m.to_s]
-          end
-        end
-
-        lint_add_matched_node(@node) unless str_num == tstr_num
+        lint_add_matched_node(@node) if script_need_i18n?(@node.value[:text])
       end
 
       def compile_plain
@@ -44,8 +31,12 @@ module HamlI18nLint
           end
 
           assocs.any? do |assoc|
-            assoc_new, key, value = assoc
+            assoc_new, (_label, key, _pos), value = assoc
+
+            next if lint_config.ignore_keys.any? { |k| "#{k}:" == key }
+
             raise AttributesParseError unless assoc_new == :assoc_new
+
             string_literal, *strings = value
             next unless string_literal == :string_literal
             strings.any? do |(string_content, (tstring_content,val,pos))|
@@ -59,12 +50,41 @@ module HamlI18nLint
 
       def compile_tag
         super
-        lint_add_matched_node(@node) if lint_config.need_i18n?(@node.value[:value])
+        if @node.value[:parse]
+          lint_add_matched_node(@node) if script_need_i18n?(@node.value[:value])
+        else
+          lint_add_matched_node(@node) if lint_config.need_i18n?(@node.value[:value])
+        end
         lint_add_matched_node(@node) if lint_config.need_i18n?(@node.value.dig(:attributes, 'placeholder') || "")
         lint_add_matched_node(@node) if lint_config.need_i18n?(@node.value.dig(:attributes, 'value') || "")
         lint_add_matched_node(@node) if lint_attribute_need_i18n?
       end
 
+      private
+
+      def script_need_i18n?(script)
+        script = script.dup
+        if Ripper.lex(script.rstrip).any? { |(_, on_kw, kw_do)| on_kw == :on_kw && kw_do == "do" }
+          script << "\nend\n"
+        end
+        program = Ripper.sexp(script).flatten
+        str_num = program.flatten.count { |t| t == :string_literal }
+        tstr_num = program.each_with_index.count do |t, i|
+          lint_config.ignore_methods.any? do |m|
+            [t, program[i + 1], program[i + 2]] == [:fcall, :@ident, m.to_s] ||
+              [t, program[i + 1], program[i + 2]] == [:command, :@ident, m.to_s]
+          end
+        end
+
+        ignore_key_num = program.count.times.count do |i|
+          lint_config.ignore_keys.any? do |k|
+            program[i, 3] == [:assoc_new, :@label, "#{k}:"] && program[i + 5] == :string_literal
+          end
+        end
+
+        str_num != tstr_num + ignore_key_num
+      end
+
     end
   end
 end

data/lib/haml_i18n_lint/version.rb

@@ -1,3 +1,3 @@
 module HamlI18nLint
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml_i18n_lint
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Seiei Miyagi
@@ -30,7 +30,7 @@ cert_chain:
   +zDzgwp9Z4A8i47ioz1YEGIkQhDKZeGQznwkht0zsrtswEAiOisL5uJDtWvQiwt6
   a9nBgrpUm8NHrucdUDtMYjixgmU=
   -----END CERTIFICATE-----
-date: 2017-05-04 00:00:00.000000000 Z
+date: 2017-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml