balinterdi-missing_t 0.1.1 → 0.1.2

data/CHANGELOG

@@ -0,0 +1,5 @@
+v0.1.2 Extraction of I18n messages became better (will now correctly extract messages with dynamic keys, like "myapp.title.#{key}"). Added colorization of output.
+
+v0.1.1 Remove dependencies to ruby-debug and pp.
+
+v0.1.0 I am alive!

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2008 Balint Erdi (balint.erdi@gmail.com)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('missing_t', '0.1.1') do |p|
+Echoe.new('missing_t', '0.1.2') do |p|
   p.description    = "See all the missing I18n translations in your Rails project"
   p.url            = "http://github.com/balinterdi/missing_t"
   p.author         = "Balint Erdi"

data/bin/missing_t

@@ -4,11 +4,13 @@ $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 
 require 'missing_t'
 
-MissingT.new.find_missing_translations(ARGV[0]).each do |file, queries|
+@missing_t = MissingT.new
+@missing_t.instance_eval do
+  find_missing_translations(ARGV[0]).each do |file, queries|
   puts
   puts "#{file}:"
   puts
-  queries.each { |q| puts "    #{q}" }
+  queries.each { |q| puts "    #{red(q)}" }
+  end
 end
 
-

data/lib/missing_t.rb

@@ -34,7 +34,22 @@ class Hash
 
 end
 
+module Helpers
+  # snatched from rspec source
+  def colour(text, colour_code)
+    "#{colour_code}#{text}\e[0m"
+  end
+
+  def green(text); colour(text, "\e[32m"); end
+  def red(text); colour(text, "\e[31m"); end
+  def magenta(text); colour(text, "\e[35m"); end
+  def yellow(text); colour(text, "\e[33m"); end
+  def blue(text); colour(text, "\e[34m"); end
+
+end
+
 class MissingT
+  include Helpers
   extend Forwardable
   def_delegators :@translations, :[]
 
@@ -95,9 +110,11 @@ class MissingT
   end
 
   def extract_i18n_queries(file)
-    i18n_query_pattern = /I18n\.(?:translate|t)\s*\((.*?)[,\)]/
-    get_content_of_file_with_i18n_queries(file).
-      scan(i18n_query_pattern).map { |match| match.first.gsub(/[^\w\.]/, '') }
+    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/
+    file_content = get_content_of_file_with_i18n_queries(file)
+    file_content.scan(i18n_query_pattern).map { |match| match.first.gsub(/['"\s]/, '') }.
+      concat(file_content.scan(i18n_query_no_parens_pattern).map { |match| match[1].gsub(/['"\s]/, '') })
   end
 
   def collect_translation_queries
@@ -158,12 +175,14 @@ class MissingT
 end
 
 if __FILE__ == $0
-  # puts "ARGV[1] = #{ARGV[0]}"
   # pp MissingT.new.find_missing_translations(ARGV[0]).values.inject(0) { |sum, qs| sum + qs.length }
-  MissingT.new.find_missing_translations(ARGV[0]).each do |file, queries|
+  @missing_t = MissingT.new
+  @missing_t.instance_eval do
+    find_missing_translations(ARGV[0]).each do |file, queries|
     puts
     puts "#{file}:"
     puts
-    queries.each { |q| puts "    #{q}" }
+    queries.each { |q| puts "    #{red(q)}" }
+    end
   end
 end

data/missing_t.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{missing_t}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Balint Erdi"]
-  s.date = %q{2009-03-03}
+  s.date = %q{2009-03-10}
   s.default_executable = %q{missing_t}
   s.description = %q{See all the missing I18n translations in your Rails project}
   s.email = %q{balint.erdi@gmail.com}
   s.executables = ["missing_t"]
-  s.extra_rdoc_files = ["bin/missing_t", "lib/missing_t.rb", "README.markdown", "tasks/missing_t.rake"]
-  s.files = ["bin/missing_t", "init.rb", "lib/missing_t.rb", "Manifest", "Rakefile", "README.markdown", "spec/missing_t_spec.rb", "spec/spec_helper.rb", "tasks/missing_t.rake", "missing_t.gemspec"]
+  s.extra_rdoc_files = ["bin/missing_t", "CHANGELOG", "lib/missing_t.rb", "README.markdown", "tasks/missing_t.rake"]
+  s.files = ["bin/missing_t", "CHANGELOG", "init.rb", "lib/missing_t.rb", "Manifest", "missing_t.gemspec", "MIT-LICENSE", "Rakefile", "README.markdown", "spec/missing_t_spec.rb", "spec/spec_helper.rb", "tasks/missing_t.rake"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/balinterdi/missing_t}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Missing_t", "--main", "README.markdown"]

data/spec/missing_t_spec.rb

@@ -83,21 +83,86 @@ describe "MissingT" do
     end
   end
 
-  describe "extracting i18n queries" do
+  describe "the i18n query extracion" do
     before do
+      $stubba = Mocha::Central.new
+      metaclass = class << @missing_t; self; end
+      metaclass.instance_eval do
+        define_method :get_content_of_file_with_i18n_queries do |content|
+          content
+        end
+      end
+    end
+
+    it "should correctly extract the I18n.t type of messages" 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"]
+    end
+
+    it "should correctly extract the I18n.t type of messages 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"]
+    end
+
+    it "should correctly extract the I18n.t type of messages from a link_to" do
+      # honestly, I am not sure anymore why this qualifies as a sep. test case
+      # but I am sure there was something special about this one :)
+      content = <<-EOS
         <%= link_to I18n.t("tog_headlines.admin.publish"), publish_admin_headlines_story_path(story), :class => 'button' %>
-        :html => {:title => I18n.t("tog_social.sharing.share_with", :name => shared.name)} 
       EOS
-      $stubba = Mocha::Central.new
-      @missing_t.stubs(:get_content_of_file_with_i18n_queries).returns(content)
+      @missing_t.extract_i18n_queries(content).should == ["tog_headlines.admin.publish"]
+    end
+
+    it "should correctly extract the I18n.t type of messages with an argument in the message" 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"]
+    end
+
+    it "should correctly extract the I18n.translate type of messages" 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"]
+    end
+
+    it "should correctly extract the t type of messages" 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"]
+    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>
+      EOS
+      @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"]
+    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 == []
     end
 
-    it "should extract the I18n queries correctly when do" do
-      i18n_queries = @missing_t.extract_i18n_queries(nil)
-      i18n_queries.should == ["anetcom.member.projects.new.page_title", "anetcom.member.projects.new.create_project", "tog_headlines.admin.publish", "tog_social.sharing.share_with"]
+    it "should find and correctly extract a dynamic key translation message" do
+      # @missing_t.stubs(:get_content_of_file_with_i18n_queries).returns(content)
+      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})]
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: balinterdi-missing_t
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Balint Erdi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-03 00:00:00 -08:00
+date: 2009-03-10 00:00:00 -07:00
 default_executable: missing_t
 dependencies: []
 
@@ -21,20 +21,23 @@ extensions: []
 
 extra_rdoc_files: 
 - bin/missing_t
+- CHANGELOG
 - lib/missing_t.rb
 - README.markdown
 - tasks/missing_t.rake
 files: 
 - bin/missing_t
+- CHANGELOG
 - init.rb
 - lib/missing_t.rb
 - Manifest
+- missing_t.gemspec
+- MIT-LICENSE
 - Rakefile
 - README.markdown
 - spec/missing_t_spec.rb
 - spec/spec_helper.rb
 - tasks/missing_t.rake
-- missing_t.gemspec
 has_rdoc: true
 homepage: http://github.com/balinterdi/missing_t
 post_install_message: