haml_i18n_lint 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d9ee40768e6218d8c809a750e54a587c8b2bba3
-  data.tar.gz: da8a2c1bc972dc38f885813df2a0d002a9e02556
+  metadata.gz: fba6d5c77e333974e53abb7dcdd20f2d7422d686
+  data.tar.gz: 4eb6802848c56cf739814e16c008661124c6a064
 SHA512:
-  metadata.gz: e27accffb82430ba7df4be43f1b14f2209b1e393b730a23f07105f01468f7f90af4d3468063051616e1930ef0b3af3b66b074dae0992fbdd6173b935be95ea3f
-  data.tar.gz: 00e39c081bf4ea7244bb7509f7432af30969c004d60643b484f082892fe6ee81feeabbb28701402706ce0e7cc0d016171f077219a4744a45989706bc174e5c22
+  metadata.gz: d43e795c867d365cb13d305838e6e073a58ca355c0d19b6c44666a99900c47e7842d4a128a9e8d708e9766095c0813fb31babc1cf1bd33ba2216d929fc303a4c
+  data.tar.gz: 3de43811603c2d3c223a0b7a7884d1b6eba9e7b1ebb4f7e629a9932095f951587f9b8cef6b477b8cb43e0e7f0fa037f2c8f4fce4972527b2510f7e5b6031d119

checksums.yaml.gz.sig

@@ -1,3 +1,3 @@
-I&���[�if\D
-��Ǘb:/S.:P;ߪ�ɧ�o���EN�T-lZ"W��x�,�W�w����6&��ּ�^[k;�
-R]Ȋ�G�����b+B40����z�� ����:A6��W���oiU��6��|������������Ѵ"qpa��%wW�>7��#?b��=L����N�M�vT���/�d�|�5��Jٚ)W")ja��	���11��x̢�)D��
+~	��UX�bV��F}?�o��ovc�	�kƶ6m�;�]�_�p�
+.�Pu��F���m��:���CX"��[�������m?�(NM�#U�,0�1�16�7�!]zy&�I4m�Ke��n ����|d�۫�歐qT����k�l¹B���쌣�/�y����a�O�f��e��.񬲦��ƀ�t��k�
]�?�D�U���
+�

data/lib/haml_i18n_lint/config.rb

@@ -42,12 +42,22 @@ module HamlI18nLint
 
     # @return [String] the list of methods, which takes string. The string is no translation required.
     def ignore_methods
-      %w(t render)
+      %w(
+        asset_path
+        image_path
+        image_tag
+        javascript_include_tag
+        pluralize
+        render
+        singularize
+        stylesheet_link_tag
+        t
+      )
     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)
+      %w(id class style type lang selected checked href src language rel media method controller action)
     end
 
     private

data/lib/haml_i18n_lint/linter/compiler_extension.rb

@@ -19,32 +19,7 @@ module HamlI18nLint
       def lint_attribute_need_i18n?
         attributes_hashes = lint_attributes_hashes
         attributes_hashes.any? do |attributes_hash|
-          sexp = Ripper.sexp("{#{attributes_hash}}")
-          program, ((hash,(assoclist_from_args,assocs)),) = sexp
-
-          unless program == :program &&
-                 hash == :hash &&
-                 assoclist_from_args == :assoclist_from_args &&
-                 assocs.respond_to?(:all?) &&
-                 assocs.all? { |assoc| assoc.first == :assoc_new }
-            raise AttributesParseError
-          end
-
-          assocs.any? do |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))|
-              string_content == :string_content &&
-                tstring_content == :@tstring_content &&
-                lint_config.need_i18n?(val)
-            end
-          end
+          script_need_i18n?("{#{attributes_hash}}")
         end
       end
 
@@ -52,6 +27,7 @@ module HamlI18nLint
         super
         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
@@ -62,27 +38,96 @@ module HamlI18nLint
 
       private
 
+      def lint_aref?(sexp)
+        sexp.first == :aref
+      end
+
+      def lint_assoc_new?(sexp, key)
+        return false unless sexp.first == :assoc_new
+
+        _assoc_new, assoc_key, _value = sexp
+
+        type, k, _lineno = assoc_key
+
+        case type
+        when :@label
+          return k == "#{key}:"
+        when :dyna_symbol
+          return k.size == 2 &&
+                 k.first == :string_content &&
+                 k.last[0] == :@tstring_content &&
+                 k.last[1] == key
+        end
+
+        false
+      end
+
+      def lint_command?(sexp, method_name)
+        return unless sexp.first == :command
+
+        _command, (ident, m, _lineno), * = sexp
+
+        ident == :@ident && m == method_name
+      end
+
+      def lint_fcall?(sexp, method_name)
+        return unless sexp.first == :method_add_arg
+
+        _method_add_arg, (fcall, (ident, m, _lineno)), * = sexp
+
+        fcall == :fcall && ident == :@ident && m == method_name
+      end
+
+      def lint_call?(sexp, method_name)
+        return unless sexp.first == :method_add_arg
+
+        _method_add_arg, (call, _receiver, _dot, (ident, m, _lineno)), * = sexp
+
+        call == :call && ident == :@ident && m == method_name
+      end
+
+      def lint_string_literal?(sexp)
+        sexp.first == :string_literal
+      end
+
+      def lint_string_literal_need_i18n?(sexp)
+        exps = sexp.flatten
+        exps.each_with_index.any? do |exp, i|
+          exp == :@tstring_content && exps[i + 1].is_a?(String) && lint_config.need_i18n?(exps[i + 1])
+        end
+      end
+
+      def lint_ignore_method?(sexp, m)
+        lint_command?(sexp, m) || lint_fcall?(sexp, m) || lint_call?(sexp, m)
+      end
+
       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]
+        sexp = Ripper.sexp(script)
+
+        string_literal_found = false
+        walk = -> (sexp) do
+          return if !sexp.is_a?(Array)
+          return if lint_aref?(sexp)
+          return if lint_config.ignore_methods.any? { |m| lint_ignore_method?(sexp, m) }
+          return if lint_config.ignore_keys.any? { |k| lint_assoc_new?(sexp, k) }
+
+          if lint_string_literal?(sexp) && lint_string_literal_need_i18n?(sexp)
+            string_literal_found = true
+            return
           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
+          sexp.each do |sexp|
+            walk.(sexp)
           end
         end
 
-        str_num != tstr_num + ignore_key_num
+        walk.(sexp)
+
+        string_literal_found
       end
 
     end

data/lib/haml_i18n_lint/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml_i18n_lint
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Seiei Miyagi
@@ -30,7 +30,7 @@ cert_chain:
   +zDzgwp9Z4A8i47ioz1YEGIkQhDKZeGQznwkht0zsrtswEAiOisL5uJDtWvQiwt6
   a9nBgrpUm8NHrucdUDtMYjixgmU=
   -----END CERTIFICATE-----
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2017-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: find out not translated yet plain text from your Haml template