haml_i18n_lint 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d33d3da626c5b6b8b7431491df426c3a04ab815f
-  data.tar.gz: 45cdf88fbe8861263baea6e8e98f7a428022652b
+  metadata.gz: 92371c38e13089e237c3f9208a03300effdbad22
+  data.tar.gz: 12be2772d233c1a7f173857f6de0bdaf4e0faf01
 SHA512:
-  metadata.gz: 5ca4f944d1a8ae07523ce545b8f22fbe408c628916a8ab713405b3df793897a5f1af5b90aeeb784c9d6aa17a9ed282cae3c274e632d9f59aa8823f289c0dd059
-  data.tar.gz: dbad78a31f25ffd4c14b6e5b5decac9a1ecbfe528d1d319e4a1c465f8d5ba15c2c0c064e779ad2c2e070cc4a70ab17a06d81fc0c12505accfec7f65a8dc26baa
+  metadata.gz: 261397e52363434dd01c5410c449b7e674770db7faff5a3872a9cf227e917884b15a1a2f2ff541ef136e0d3b2e90dec2de072475d95d520a32badaf36125c815
+  data.tar.gz: c5ba7e28a4d3eb3b3f4bc4fec4c0d5002ab0bcda68359a414595fcfce5d1913c86fa0200a2fe6a00f8c579ed607e0947b8fa4a217498515b09b9492fec449189

data/haml_i18n_lint.gemspec

@@ -8,9 +8,6 @@ Gem::Specification.new do |spec|
   spec.version       = HamlI18nLint::VERSION
   spec.authors       = ["Seiei Miyagi"]
   spec.email         = ["hanachin@gmail.com"]
-  spec.cert_chain    = ["certs/hanachin.pem"]
-  spec.signing_key   = File.expand_path("~/.ssh/gem-private_key.pem") if $0 =~ /gem\z/
-
   spec.summary       = "find out not translated yet plain text from your Haml template"
   spec.homepage      = "https://github.com/okinawarb/haml_i18n_lint"
   spec.license       = "MIT"

data/lib/haml_i18n_lint/linter/compiler_extension.rb

@@ -1,3 +1,5 @@
+require "haml_i18n_lint/ruby_parser"
+
 module HamlI18nLint
   class Linter
     module CompilerExtension
@@ -111,7 +113,7 @@ module HamlI18nLint
         if Ripper.lex(script.rstrip).any? { |(_, on_kw, kw_do)| on_kw == :on_kw && kw_do == "do" }
           script << "\nend\n"
         end
-        sexp = Ripper.sexp(script)
+        sexp = RubyParser.sexp(script)
 
         string_literal_found = false
         walk = -> (sexp) do
@@ -121,7 +123,7 @@ module HamlI18nLint
           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
+            string_literal_found = sexp[1]
             return
           end
 
@@ -132,7 +134,7 @@ module HamlI18nLint
 
         walk.(sexp)
 
-        lint_add(script) if string_literal_found
+        lint_add(string_literal_found) if string_literal_found
       end
 
     end

data/lib/haml_i18n_lint/linter.rb

@@ -1,5 +1,3 @@
-require 'ripper'
-
 module HamlI18nLint
   # Linter linting a Haml template
   class Linter

data/lib/haml_i18n_lint/ruby_parser.rb

@@ -0,0 +1,54 @@
+require "ripper"
+
+module HamlI18nLint
+  class RubyParser < Ripper::SexpBuilderPP
+
+    def self.sexp(src, filename = '-', lineno = 1)
+      builder = new(src, filename, lineno)
+      sexp = builder.parse
+      sexp unless builder.error?
+    end
+
+    def initialize(src, *)
+      @src = src
+      super
+    end
+
+    def on_tstring_beg(tok)
+      @buf ||= []
+      @buf << [[lineno, column]]
+      super
+    end
+
+    def on_heredoc_beg(tok)
+      @buf ||= []
+      @buf << [[lineno, column]]
+      super
+    end
+
+    def on_tstring_end(tok)
+      @buf.last << [lineno, column]
+      super
+    end
+
+    def on_heredoc_end(tok)
+      @buf.last << [lineno, column + tok.size-1]
+      super
+    end
+
+    def on_string_literal(*args)
+      pos = @buf.pop
+      lineno_pos = pos.map(&:first)
+      column_pos = pos.map(&:last)
+      lines = @src.lines[lineno_pos.first-1...lineno_pos.last]
+      if lineno_pos.first == lineno_pos.last
+        lines[0] = lines[0].byteslice(column_pos.first..column_pos.last).force_encoding(@src.encoding)
+      else
+        lines[0] = lines[0].dup.tap { |l| l.force_encoding(Encoding::BINARY)[0...column_pos.first] = ''; l.force_encoding(@src.encoding) }
+        lines[-1] = lines[-1].dup.tap { |l| l.force_encoding(Encoding::BINARY)[column_pos.last+1..-1] = ''; l.force_encoding(@src.encoding) }
+      end
+      args.unshift(:string_literal, lines.join, pos)
+      args
+    end
+  end
+end

data/lib/haml_i18n_lint/version.rb

@@ -1,3 +1,3 @@
 module HamlI18nLint
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml_i18n_lint
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Seiei Miyagi
@@ -30,7 +30,7 @@ cert_chain:
   +zDzgwp9Z4A8i47ioz1YEGIkQhDKZeGQznwkht0zsrtswEAiOisL5uJDtWvQiwt6
   a9nBgrpUm8NHrucdUDtMYjixgmU=
   -----END CERTIFICATE-----
-date: 2017-05-13 00:00:00.000000000 Z
+date: 2017-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -140,7 +140,6 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- certs/hanachin.pem
 - examples/output_yaml.rb
 - examples/react.rb
 - examples/sample.rb
@@ -156,6 +155,7 @@ files:
 - lib/haml_i18n_lint/linter5.rb
 - lib/haml_i18n_lint/linter5/compiler_extension.rb
 - lib/haml_i18n_lint/options.rb
+- lib/haml_i18n_lint/ruby_parser.rb
 - lib/haml_i18n_lint/runner.rb
 - lib/haml_i18n_lint/version.rb
 homepage: https://github.com/okinawarb/haml_i18n_lint

metadata.gz.sig

@@ -1,2 +1,3 @@
-�9��ql�ʲn4X�����&%�D}�Rs(|��{�'96r	̘A�k�B�I��"r��#��p�D�5?)��9�N�'�>��I�2��`���.��>�*�$B����%�bj}�ֱ
-Q�Ϋ4����_��!�9�)�T������h��5;�A{7���P:�z"���;�E�	�+�
+h|a}�G�4�l1w���:���A1���h̝�rkY��}p*Lr��#"�.�۬m��mV��s��kr�”%�p���@	L�:j��I\.w�c7=L}<'��*u\�϶��C��������|���Hvѥ�
+iU�������tC��W�B{��/[w������i��Ͱ=���4@�
+K���7z�mᐢY�:ҁ���M��4���R��;��XkG��Y�-U���҆�䁜��

data/certs/hanachin.pem

@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MREwDwYDVQQDDAhoYW5h
-Y2hpbjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29t
-MB4XDTE3MDUwNDE0NDYxOVoXDTE4MDUwNDE0NDYxOVowPzERMA8GA1UEAwwIaGFu
-YWNoaW4xFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
-bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN03A8Jvk7k0aVLmIHrj
-soZLOppADifbdH+FoXUfWXFeu9x/hq8UsuMyTuSF6oNZRihzk7yakKBcv8B44wc2
-Kfui97h+UOqBib5oPZOrJjW34dSfnHgdsPskZRK1yvMW0X88q7K+9iBT78Xpkf40
-XkDh7mEyA0sC25n8BBTg3HpPMNXtQazR0UrtSH/Uyu2t7Sy4QQVKFYfVdfITfMoG
-i7X/2cXs0ao6dLOK8H1lodxZ+2Dc5UQCrerVXKvVjAgZhJIN7qgbpAfuc+KFpGhq
-pvkFaoOJ/NCg54DDiJYhZMm2X3NtjRRE3Ujt4bwO6vVlr5aPU2/vPCvsiyF1PmO+
-a+UCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFMug
-kMbzYl73rLFxRlmgKeNAiSZjMB0GA1UdEQQWMBSBEmhhbmFjaGluQGdtYWlsLmNv
-bTAdBgNVHRIEFjAUgRJoYW5hY2hpbkBnbWFpbC5jb20wDQYJKoZIhvcNAQEFBQAD
-ggEBAFBV/OUPBF6DhEe/Q1bojFYwRdLI+JbDAoH97GRuBzKokbW7a4k5EGMw4aLx
-RXH75W+vmsG1z/RE7lpD+T7Uf+ZuGwCIhFsGiZBcbBbinz4MEsqjGwu2/OPOgbYK
-alk+o48ier71CaSsfz83hSAzklJ7g6BocJCWROXuVzX9eCw7YB3F4xNzdw8HxHkA
-WbyMQMURxOX5Em9t+EgSU9Odx0tJgnhygUSdTJknavnpaZUa2odWS4+wagh8nXxS
-+zDzgwp9Z4A8i47ioz1YEGIkQhDKZeGQznwkht0zsrtswEAiOisL5uJDtWvQiwt6
-a9nBgrpUm8NHrucdUDtMYjixgmU=
------END CERTIFICATE-----