missing_t 0.4.0 → 0.4.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    missing_t (0.4.0)
+    missing_t (0.4.1)
 
 GEM
   remote: http://rubygems.org/

data/lib/missing_t.rb

@@ -1,19 +1,24 @@
 require "yaml"
 
 #TODO: Should I feel about these 'global' helper functions?
-def hashify(strings)
-  strings.map { |s| s.split('.') }.each_with_object({}) do |segmented_string, h|
-    segmented_string.each do |segment|
-      h[segment] ||= {}
-      h = h[segment]
-    end
+def hashify(segments, value)
+  return {} if segments.empty?
+  s, *rest = segments
+  if rest.empty?
+    { s => value }
+  else
+    { s => hashify(rest, value) }
   end
 end
 
 def print_hash(h, level)
   h.each_pair do |k,v|
-    puts %(#{" " * (level*2)}#{k}:)
-    print_hash(v, level+1)
+    if v.respond_to?(:each_pair)
+      puts %(#{" " * (level*2)}#{k}:)
+      print_hash(v, level+1)
+    else
+      puts %(#{" " * (level*2)}#{k}: #{v})
+    end
   end
 end
 
@@ -23,8 +28,8 @@ class Hash
     self.merge(other_hash) do |key, oldval, newval|
       oldval = oldval.to_hash if oldval.respond_to?(:to_hash)
       newval = newval.to_hash if newval.respond_to?(:to_hash)
-      if oldval === Hash
-        if newval === Hash
+      if oldval.is_a? Hash
+        if newval.is_a? Hash
           oldval.deep_safe_merge(newval)
         else
           oldval
@@ -45,13 +50,13 @@ class MissingT
 
   class FileReader
     def read(file)
-      open(File.expand_path(file), "r") do |f|
-        yield f.read
+      IO.readlines(file).each do |line|
+        yield line
       end
     end
   end
 
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 
   def initialize(options={})
     @reader = options.fetch(:reader, FileReader.new)
@@ -60,11 +65,11 @@ class MissingT
   end
 
   def run
-    missing_translations = collect
-    missing_message_strings = missing_translations.values.map { |ms| hashify(ms) }
-
-    missing = missing_message_strings.each_with_object({}) do |h, all_message_strings|
-      all_message_strings.deep_safe_merge!(h)
+    missing = {}
+    collect_missing.each do |file, message_strings|
+      message_strings.each do |message_string, value|
+        missing.deep_safe_merge! hashify(message_string.split('.'), value)
+      end
     end
 
     missing.each do |language, missing_for_language|
@@ -74,7 +79,7 @@ class MissingT
     end
   end
 
-  def collect
+  def collect_missing
     ts = translation_keys
     #TODO: If no translation keys were found and the languages were not given explicitly
     # issue a warning and bail out
@@ -84,9 +89,9 @@ class MissingT
 
   def get_missing_translations(keys, queries, languages)
     languages.each_with_object({}) do |lang, missing|
-      get_missing_translations_for_lang(keys, queries, lang).each do |file, queries|
-        missing[file] ||= []
-        missing[file].concat(queries).uniq!
+      get_missing_translations_for_language(keys, queries, lang).each do |file, queries_for_language|
+        missing[file] ||= {}
+        missing[file].merge!(queries_for_language)
       end
     end
   end
@@ -144,30 +149,59 @@ class MissingT
   end
 
   def extract_i18n_queries(file)
-    i18n_query_pattern = /[^\w]+(?:I18n\.translate|I18n\.t|translate|t)\s*\((.*?)[,\)]/
-    i18n_query_no_parens_pattern = /[^\w]+(?:I18n\.translate|I18n\.t|translate|t)\s+(['"])(.*?)\1/
-
-    @reader.read(File.expand_path(file)) do |content|
-      ([]).tap do |i18n_message_strings|
-        i18n_message_strings.concat content.scan(i18n_query_pattern).map { |match| match[0].gsub(/['"\s]/, '') }
-        i18n_message_strings.concat content.scan(i18n_query_no_parens_pattern).map { |match| match[1].gsub(/['"\s]/, '') }
+    ({}).tap do |queries|
+      @reader.read(File.expand_path(file)) do |line|
+        qs = scan_line(line)
+        queries.merge!(qs)
       end
     end
   end
 
 private
 
-  def get_missing_translations_for_lang(keys, queries, lang)
-    queries.map do |file, queries_in_file|
-      queries_with_no_translation = queries_in_file.reject { |q| has_translation?(keys, lang, q) }
+  def get_missing_translations_for_language(keys, queries, l)
+    queries.each_with_object({}) do |(file, queries_in_file), missing_translations|
+      queries_with_no_translation = queries_in_file.reject { |q, _| has_translation?(keys, l, q) }
       if queries_with_no_translation.any?
-        [file, queries_with_no_translation.map { |q| i18n_label(lang, q) }]
+        missing_translations[file] = add_langauge_prefix(queries_with_no_translation, l)
       end
-    end.compact
+    end
+  end
+
+  def add_langauge_prefix(qs, l)
+    qs.each_with_object({}) do |(q, v), with_prefix|
+      with_prefix["#{l}.#{q}"] = v
+    end
   end
 
   def i18n_label(lang, query)
     "#{lang}.#{query}"
   end
 
+  def scan_line(line)
+    with_parens = /[^\w]+(?:I18n\.translate|I18n\.t|translate|t)\s*\((['"](.*?)['"].*?)\)/
+    no_parens = /[^\w]+(?:I18n\.translate|I18n\.t|translate|t)\s+(['"](.*?)['"].*?)/
+    [with_parens, no_parens].each_with_object({}) do |pattern, extracted_queries|
+      line.scan(pattern).each do |m|
+        if m.any?
+          message_string = m[1]
+          _, *options = m[0].split(',')
+          extracted_queries[message_string] = extract_default_value(options)
+        end
+      end
+    end
+  end
+
+  def extract_default_value(message_string_options)
+    [/:default\s*=>\s*['"](.*)['"]/, /default:\s*['"](.*)['"]/].each do |default_extractor|
+      message_string_options.each do |option|
+        if default_key_match=default_extractor.match(option)
+          return default_key_match[1]
+        end
+      end
+    end
+    ''
+  end
+
+
 end

data/spec/acceptance/missing_t_spec.rb

@@ -3,10 +3,15 @@ require_relative '../spec_helper'
 describe "MissingT" do
   describe "correctly finds all missing translations" do
     m = MissingT.new({ languages: ["en"], path: "spec/support/new.html.erb" })
-    m.collect['spec/support/new.html.erb'].should =~ [
-      "en.flights.new.new_flight", "en.flights.new.name", "en.flights.new.capacity",
-      "en.flights.new.duration", "en.flights.new.from", "en.flights.new.to",
-      "en.flights.new.create", "en.flights.new.back"
-    ]
+    m.collect_missing['spec/support/new.html.erb'].should == {
+      "en.flights.new.new_flight" => "",
+      "en.flights.new.name" => "Name",
+      "en.flights.new.capacity" => "Capacity",
+      "en.flights.new.duration" => "Duration",
+      "en.flights.new.from" => "From",
+      "en.flights.new.to" => "",
+      "en.flights.new.create" => "Create",
+      "en.flights.new.back" => "Back"
+    }
   end
 end

data/spec/missing_t_spec.rb

@@ -32,25 +32,25 @@ describe "MissingT" do
         content = <<-EOS
           <div class="title_gray"><span><%= I18n.t("anetcom.member.projects.new.page_title") %></span></div>
         EOS
-        @missing_t.extract_i18n_queries(content).should == ["anetcom.member.projects.new.page_title"]
+        @missing_t.extract_i18n_queries(content).should == {"anetcom.member.projects.new.page_title" => ""}
       end
       it "should correctly extract the key not right after the <%= mark" do
         content = <<-EOS
           <%= submit_tag I18n.t('anetcom.member.projects.new.create_project'), :class => 'button' %>
         EOS
-        @missing_t.extract_i18n_queries(content).should == ["anetcom.member.projects.new.create_project"]
+        @missing_t.extract_i18n_queries(content).should == {"anetcom.member.projects.new.create_project" => ""}
       end
 
       it "should correctly extract the key when there is an argument in the call" do
         content = <<-EOS
           :html => {:title => I18n.t("tog_social.sharing.share_with", :name => shared.name)}
         EOS
-        @missing_t.extract_i18n_queries(content).should == ["tog_social.sharing.share_with"]
+        @missing_t.extract_i18n_queries(content).should == {"tog_social.sharing.share_with" => ""}
       end
 
       it "should find and correctly extract a dynamic key translation message" do
         content = %q(<div class="title_gray"><span><%= I18n.t("mycompany.welcome.#{key}") %></span></div>)
-        @missing_t.extract_i18n_queries(content).should == [%q(mycompany.welcome.#{key})]
+        @missing_t.extract_i18n_queries(content).should == {%q(mycompany.welcome.#{key}) => ""}
       end
     end
 
@@ -59,21 +59,21 @@ describe "MissingT" do
         content = <<-EOS
           <div class="title_gray"><span><%= t("anetcom.member.projects.new.page_title") %></span></div>
         EOS
-        @missing_t.extract_i18n_queries(content).should == ["anetcom.member.projects.new.page_title"]
+        @missing_t.extract_i18n_queries(content).should == {"anetcom.member.projects.new.page_title" => ""}
       end
 
       it "should find several messages on the same line" do
         content = <<-EOS
-        <div class="title_gray"><span><%= t("anetcom.member.projects.new.page_title") %></span><span>t("anetcom.member.projects.new.page_size")</span></div>
+          <div class="title_gray"><span><%= t("anetcom.member.projects.new.page_title") %></span><span>t("anetcom.member.projects.new.page_size")</span></div>
         EOS
-        @missing_t.extract_i18n_queries(content).should == ["anetcom.member.projects.new.page_title", "anetcom.member.projects.new.page_size"]
+        @missing_t.extract_i18n_queries(content).should == {"anetcom.member.projects.new.page_title" => "", "anetcom.member.projects.new.page_size" => ""}
       end
 
       it "should find messages with a parens-less call" do
         content = <<-EOS
           <div class="title_gray"><span><%= t "anetcom.member.projects.new.page_title" %></span></div>
         EOS
-        @missing_t.extract_i18n_queries(content).should == ["anetcom.member.projects.new.page_title"]
+        @missing_t.extract_i18n_queries(content).should == {"anetcom.member.projects.new.page_title" => ""}
       end
     end
 
@@ -81,14 +81,14 @@ describe "MissingT" do
       content = <<-EOS
         <div class="title_gray"><span><%= I18n.translate("anetcom.member.projects.new.page_title") %></span></div>
       EOS
-      @missing_t.extract_i18n_queries(content).should == ["anetcom.member.projects.new.page_title"]
+      @missing_t.extract_i18n_queries(content).should == {"anetcom.member.projects.new.page_title" => ""}
     end
 
     it "should not extract a function call that just ends in t" do
       content = <<-EOS
         <div class="title_gray"><span><%= at(3) %></span></div>
       EOS
-      @missing_t.extract_i18n_queries(content).should == []
+      @missing_t.extract_i18n_queries(content).should == {}
     end
 
   end

data/spec/support/new.html.erb

@@ -1,18 +1,18 @@
-<h1><%= I18n.t("flights.new.new_flight", :default => "New flight") %></h1>
+'<h1><%= I18n.t("flights.new.new_flight") %></h1>'
 
 <% form_for(@flight) do |f| %>
   <%= f.error_messages %>
 
   <p>
-    <%= f.label I18n.t("flights.new.name", :default => "name") %><br />
+    <%= f.label I18n.t("flights.new.name", :default => "Name") %><br />
     <%= f.text_field :name %>
   </p>
   <p>
-    <%= f.label I18n.t("flights.new.capacity", :default => "capacity") %><br />
+    <%= f.label I18n.t("flights.new.capacity", :default => "Capacity") %><br />
     <%= f.text_field :capacity %>
   </p>
   <p>
-    <%= f.label I18n.t("flights.new.duration", :default => "duration") %><br />
+    <%= f.label I18n.t("flights.new.duration", :default => "Duration") %><br />
     <%= f.text_field :duration %>
   </p>
   <p>
@@ -20,7 +20,7 @@
     <%= f.select :from_id,  @airport_options %>
   </p>
   <p>
-    <%= f.label :to_id, I18n.t("flights.new.to", :default => "To") %><br />
+    <%= f.label :to_id, I18n.t("flights.new.to") %><br />
     <%= f.select :to_id, @airport_options %>
   </p>
   <p>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: missing_t
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-06 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -152,7 +152,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1881571199484440278
+      hash: -2158977663221811532
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1881571199484440278
+      hash: -2158977663221811532
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23