i18n_checker 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9607a3e59428a3dfa046b5a42d494cc3a72ca793
-  data.tar.gz: 5ef70c86648059fee29f83c8bac3f645b2b72bfd
+  metadata.gz: b8cc0a9bda5cd2dd6ec90141387fdf63601481d8
+  data.tar.gz: 7ae32cf03e242ba9887f66066221499c8a6738ad
 SHA512:
-  metadata.gz: 3fa10307135742d472e83c7bbc2f87d18bfc7199dac3c112e2f34c5961a8cc28d6b2a3bf6bad4317f9ec8ea067c4af5cea619892c6563878e4a2856c3dfe427a
-  data.tar.gz: 8c98e0689824e94298fd57d3f6bd7e1c68df399e3db61631f0203cb24823719d795c8298789263b1c763189d52578e39f98987d53e0386ba53d382043884e6d8
+  metadata.gz: 49d3701f3164df63479d64256a589788761832649ef75507e827dd674d416f60048961d896ac7c728e8ab9b70eb954c17cf888cca151c94e282fcce47e5652c7
+  data.tar.gz: 739df006a0076e099d3740c96d8d83f49ee84c544676f1e0c6296faa26c609da5c8d08e503aad3d7bc29e7466f9fe3f55da7623c64becee18b91aefcf70c4148

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    i18n_checker (0.2.1)
+    i18n_checker (0.3.0)
       colorator (~> 1.1.0)
       haml_parser (~> 0.4)
       parser

data/lib/i18n_checker/cache.rb

@@ -0,0 +1,123 @@
+require 'forwardable'
+
+module I18nChecker
+  module Cache
+    class Files
+      extend Forwardable
+
+      include Enumerable
+
+      attr_reader :files
+
+      def_delegators :files, :size, :each
+
+      def initialize(files = {})
+        @files = files
+      end
+
+      def read(file)
+        return files[file] if files.key?(file)
+        files[file] = I18nChecker::Cache::File::of(file)
+        files[file]
+      end
+    end
+
+    class File
+      attr_reader :file, :lines
+
+      class << self
+        def of(file)
+          new(file, Lines::of(::File.read(file)))
+        end
+      end
+
+      def initialize(file, lines)
+        @file = file
+        @lines = lines
+      end
+
+      def [](scope)
+        lines[scope]
+      end
+
+      def to_s
+        lines.to_s
+      end
+    end
+
+    class Lines
+      extend Forwardable
+
+      include Enumerable
+
+      attr_reader :lines
+
+      def_delegators :lines, :size, :each
+
+      class << self
+        def of(source)
+          lines = {}
+          source.split("\n").each_with_index do |content, i|
+            line_number = i + 1
+            lines[line_number] = Line.new(line_number, content)
+          end
+          last_key = lines.keys.last
+          lines.delete last_key if lines[last_key] == ''
+          new(lines)
+        end
+      end
+
+      def initialize(lines = {})
+        @lines = lines
+      end
+
+      def [](scope)
+        return lines_of(scope) if scope.kind_of?(Range)
+        return line_of(scope) if scope.kind_of?(Integer)
+      end
+
+      def line_of(line_number)
+        lines[line_number]
+      end
+
+      def lines_of(range)
+        results = {}
+        raise StandardError, "invalid line number #{range.first}" if range.first <= 0
+        raise StandardError, "invalid line number #{range.last}" if lines.size < range.last
+        range.each do |i|
+          results[i] = lines[i]
+        end
+        self.class.new(results)
+      end
+
+      def to_s
+        lines.values.join("\n")
+      end
+    end
+
+    class Line
+      attr_reader :line, :content
+
+      def initialize(line_number, content)
+        @line = line_number
+        @content = content
+      end
+
+      def [](range)
+        columns_of(range)
+      end
+
+      def columns_of(range)
+        content[range.first - 1, range.last]
+      end
+
+      def start_of(text)
+        content.index(text)
+      end
+
+      def to_s
+        content
+      end
+    end
+  end
+end

data/lib/i18n_checker/detector/locale_text_not_found.rb

@@ -16,7 +16,7 @@ module I18nChecker
         locale_files = @locale_files.dup
         locale_files.delete_if { |locale_file| locale_file.include?(locale_text) }
         locale_files.map do |locale_file|
-          LocaleTextResult.new(
+          TextResult.new(
             locale_text: locale_text,
             locale_file: locale_file
           )

data/lib/i18n_checker/detector/text_result.rb

@@ -0,0 +1,21 @@
+require 'forwardable'
+
+module I18nChecker
+  module Detector
+    class TextResult
+      extend Forwardable
+
+      def_delegators :locale_file, :lang
+      def_delegators :locale_text, :file, :line, :column, :text
+
+      def initialize(locale_file:, locale_text:)
+        @locale_text = locale_text
+        @locale_file = locale_file
+      end
+
+      private
+
+      attr_reader :locale_file, :locale_text
+    end
+  end
+end

data/lib/i18n_checker/locale/collector/haml.rb

@@ -9,6 +9,12 @@ module I18nChecker
       class Haml
         include I18nChecker::Collectible
 
+        attr_reader :file_caches
+
+        def initialize(file_caches = I18nChecker::Cache::Files.new)
+          @file_caches = file_caches
+        end
+
         def collect(template_file)
           template = read_template_file(template_file)
           parser = HamlParser::Parser.new(filename: template_file)
@@ -18,7 +24,7 @@ module I18nChecker
         private
 
         def read_template_file(template_file)
-          ::File.open(template_file, &:read)
+          file_caches.read(template_file).to_s
         end
 
         def collect_locale_texts(ast)
@@ -38,11 +44,16 @@ module I18nChecker
 
         def locale_text_from_script(script_node)
           return unless translate_script = script_node.script.match(/^t\(\'+(.+)\'+\)$/)
+
+          locale_text = translate_script[1]
+          file_cache = file_caches.read(script_node.filename)
+          column = file_cache[script_node.lineno].start_of(locale_text)
+
           I18nChecker::Locale::Text.new(
             file: script_node.filename,
             line: script_node.lineno,
-            column: 0, # FIXME: collect from source file
-            text: translate_script[1]
+            column: column,
+            text: locale_text
           )
         end
       end

data/lib/i18n_checker/locale/collector/ruby.rb

@@ -10,6 +10,12 @@ module I18nChecker
       class Ruby
         include I18nChecker::Collectible
 
+        attr_reader :file_caches
+
+        def initialize(file_caches = I18nChecker::Cache::Files.new)
+          @file_caches = file_caches
+        end
+
         def collect(source_file)
           I18nChecker::Locale::Texts.new(process(source_file))
         end
@@ -17,8 +23,9 @@ module I18nChecker
         private
 
         def buffer_of(source_file)
+          source = file_caches.read(source_file).to_s
           source_buffer = Parser::Source::Buffer.new('(string)')
-          source_buffer.source = ::File.read(source_file)
+          source_buffer.source = source
           source_buffer
         end
 

data/lib/i18n_checker/locale.rb

@@ -12,20 +12,22 @@ module I18nChecker
       end
 
       def texts_of(resources)
+        caches = I18nChecker::Cache::Files.new
+
         files = resources.delete_if { |resource| ::File.directory?(resource) }.to_a
         grouped_files = files.group_by { |file| ::File.extname(file) }
         grouped_locale_texts = grouped_files.map do |k, v|
-          text_collector_of(k).collect_all(v)
+          text_collector_of(k, caches: caches).collect_all(v)
         end
         grouped_locale_texts.reduce { |locale_texts, n| locale_texts.concat(n) }.uniq!
       end
 
-      def text_collector_of(file_extname)
+      def text_collector_of(file_extname, caches:)
         case file_extname
         when '.haml'
-          I18nChecker::Locale::Collector::Haml.new
+          I18nChecker::Locale::Collector::Haml.new(caches)
         when '.rb'
-          I18nChecker::Locale::Collector::Ruby.new
+          I18nChecker::Locale::Collector::Ruby.new(caches)
         else
           raise StandardError, "not support #{extname} file" # FIXME: throw custom error!!
         end

data/lib/i18n_checker/locale_text_not_found_checker.rb

@@ -1,5 +1,5 @@
 require "i18n_checker/detector/locale_text_not_found"
-require "i18n_checker/detector/locale_text_result"
+require "i18n_checker/detector/text_result"
 require "i18n_checker/detector/detected_result"
 
 module I18nChecker

data/lib/i18n_checker/rake_task.rb

@@ -1,5 +1,6 @@
 require 'rake'
 require 'rake/tasklib'
+require 'i18n_checker/cache'
 require 'i18n_checker/locale'
 require 'i18n_checker/reporter'
 require "i18n_checker/locale_text_not_found_checker"

data/lib/i18n_checker/reporter/default_reporter.rb

@@ -17,10 +17,10 @@ module I18nChecker
 
       def failed(result)
         logger.info CHECK_COMPLETED.red
-        logger.info 'There are settings where translated text can not be found'.red
+        logger.info "There are settings where translated text can not be found\n".red
         result.locale_texts.each do |locale_text|
-          logger.info "  #{locale_text.file_name.cyan}"
-          logger.info "    line: #{locale_text.line} - #{locale_text.lang}.#{locale_text.text}"
+          logger.info "#{locale_text.file.cyan}"
+          logger.info "  line:#{locale_text.line}, column:#{locale_text.column} - #{locale_text.lang}.#{locale_text.text}"
         end
       end
     end

data/lib/i18n_checker/version.rb

@@ -1,3 +1,3 @@
 module I18nChecker
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/i18n_checker.rb

@@ -1,6 +1,7 @@
 require "i18n_checker/version"
 require "i18n_checker/rake_task"
 require "i18n_checker/collectible"
+require "i18n_checker/cache"
 require "i18n_checker/locale"
 require "i18n_checker/locale/text_processor"
 require "i18n_checker/locale/collector/haml"
@@ -11,7 +12,7 @@ require "i18n_checker/locale/key_path"
 require "i18n_checker/locale/file"
 require "i18n_checker/locale/files"
 require "i18n_checker/detector/locale_text_not_found"
-require "i18n_checker/detector/locale_text_result"
+require "i18n_checker/detector/text_result"
 require "i18n_checker/detector/detected_result"
 require "i18n_checker/reporter/detect_result_reporter"
 require "i18n_checker/reporter/default_reporter"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n_checker
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - holyshared
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-18 00:00:00.000000000 Z
+date: 2017-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml_parser
@@ -155,10 +155,11 @@ files:
 - Rakefile
 - i18n-checker.gemspec
 - lib/i18n_checker.rb
+- lib/i18n_checker/cache.rb
 - lib/i18n_checker/collectible.rb
 - lib/i18n_checker/detector/detected_result.rb
 - lib/i18n_checker/detector/locale_text_not_found.rb
-- lib/i18n_checker/detector/locale_text_result.rb
+- lib/i18n_checker/detector/text_result.rb
 - lib/i18n_checker/locale.rb
 - lib/i18n_checker/locale/collector.rb
 - lib/i18n_checker/locale/collector/haml.rb

data/lib/i18n_checker/detector/locale_text_result.rb

@@ -1,26 +0,0 @@
-module I18nChecker
-  module Detector
-    class LocaleTextResult
-      def initialize(locale_file:, locale_text:)
-        @locale_text = locale_text
-        @locale_file = locale_file
-      end
-
-      def file_name
-        @locale_text.file
-      end
-
-      def lang
-        @locale_file.lang
-      end
-
-      def line
-        @locale_text.line
-      end
-
-      def text
-        @locale_text.text
-      end
-    end
-  end
-end