i15r 0.3.1 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/i15r.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{i15r}
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Balint Erdi"]
-  s.date = %q{2009-12-14}
+  s.date = %q{2010-01-08}
   s.default_executable = %q{i15r}
   s.description = %q{      The internationalizer. Replaces plain text strings in your views and replaces them with I18n message strings so you only have to provide the translations.
 }

data/lib/i15r/base.rb

@@ -8,7 +8,9 @@ module I15R
     attr_reader :options
 
     def self.get_i18n_message_string(text, prefix)
-      key = text.strip.downcase.gsub(/\s/, '_').gsub(/[\W]/, '')
+      #TODO: downcase does not work properly for accented chars, like 'Ú'
+      #TODO: [:punct:] would be nice but it includes _ which we don't want to remove
+      key = text.strip.downcase.gsub(/[\s]/, '_').gsub(/[!?.,:"';]/, '')
       indent = ""
       (0..prefix.split(".").size).each { |i| indent = "  " + indent }
       # silenced_if_testing do

data/lib/i15r/pattern_matchers/erb/tag_content_matcher.rb

@@ -10,7 +10,7 @@ module I15R
         end
         
         def self.match_tag_content_on_one_line
-          patt = /^(.*)>(\s*)(\w[\s\w:'"!?\.,]+)\s*<\/(.*)$/
+          patt = /^(.*)>(\s*)([[:alnum:][:upper:]][\s[:alnum:][:upper:][:punct:]]+)\s*<\/(.*)$/i
           matches(:erb) do |text, prefix|
             if m = patt.match(text)
               i18n_string = I15R::Base.get_i18n_message_string(m[3], prefix)
@@ -23,7 +23,7 @@ module I15R
         register_matcher :match_tag_content_on_one_line
 
         def self.match_tag_content_multiline
-          patt = /^(\s*)(\w[\w\s,]*)(.*)$/
+          patt = /^(\s*)([[:alnum:][:upper:]][[:alnum:][:upper:][:space:],']*)(.*)$/i
           matches(:erb) do |text, prefix|
             if m = patt.match(text)
               i18n_string = I15R::Base.get_i18n_message_string(m[2], prefix)

data/lib/i15r/pattern_matchers/haml/tag_content_matcher.rb

@@ -34,7 +34,7 @@ module I15R
         register_matcher :match_haml_explicit_tag_content
 
         def self.match_haml_tag_content_just_text_on_line
-          patt = /^(\s*)([^.#\s][\w\s\d\!\-\.\?]+)$/
+          patt = /^(\s*)([^.#\s][[:alpha:][:upper:]\s\d\!\-\.\?]+)$/
           matches(:haml) do |text, prefix|
             if m = patt.match(text)
               i18n_string = I15R::Base.get_i18n_message_string(m[2], prefix)

data/spec/erb/rails_helper_matcher_spec.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'i15r/pattern_matcher'
 require "spec"
 
@@ -21,7 +23,7 @@ describe I15R::PatternMatchers::Erb::RailsHelperMatcher do
     i18ned = %(<%= f.label :name, I18n.t("users.new.name") %>)
     I15R::PatternMatchers::Erb::RailsHelperMatcher.run(plain, "users.new").should == i18ned
   end
-  
+
   it "should replace the label text of a label_tag helper" do
     plain = %(<%= label_tag :name, "Name" %>)
     i18ned = %(<%= label_tag :name, I18n.t("users.new.name") %>)
@@ -39,5 +41,43 @@ describe I15R::PatternMatchers::Erb::RailsHelperMatcher do
     i18ned = %(<%= submit_tag I18n.t("users.new.create_user") %>)
     I15R::PatternMatchers::Erb::RailsHelperMatcher.run(plain, "users.new").should == i18ned
   end
+  
+  describe "when text has non-english characters" do
+    it "should replace a title in a link_to helper" do
+      plain = %(<p class="highlighted"><%= link_to 'Új felhasználó', new_user_path %>?</p>)
+      i18ned = %(<p class="highlighted"><%= link_to I18n.t("users.index.Új_felhasználó"), new_user_path %>?</p>)
+      I15R::PatternMatchers::Erb::RailsHelperMatcher.run(plain, "users.index").should == i18ned
+    end
+
+    it "should replace a title in a link_to helper with html attributes" do
+      plain = %(<p><%= link_to "Új felhasználó létrehozása", new_user_path, { :class => "add" } -%></p>)
+      i18ned = %(<p><%= link_to I18n.t("users.index.Új_felhasználó_létrehozása"), new_user_path, { :class => "add" } -%></p>)
+      I15R::PatternMatchers::Erb::RailsHelperMatcher.run(plain, "users.index").should == i18ned
+    end
+    
+    it "should replace the label text in a label helper" do
+      plain = %(<%= f.label :name, "Név" %>)
+      i18ned = %(<%= f.label :name, I18n.t("users.new.név") %>)
+      I15R::PatternMatchers::Erb::RailsHelperMatcher.run(plain, "users.new").should == i18ned
+    end
+    
+    it "should replace the label text that has non-english chars of a label_tag helper" do
+      plain = %(<%= label_tag :name, "Név" %>)
+      i18ned = %(<%= label_tag :name, I18n.t("users.new.név") %>)
+      I15R::PatternMatchers::Erb::RailsHelperMatcher.run(plain, "users.new").should == i18ned
+    end
+
+    it "should replace the title of a submit helper in a form builder" do
+      plain = %(<%= f.submit "Új felhasználó" %>)
+      i18ned = %(<%= f.submit I18n.t("users.new.Új_felhasználó") %>)
+      I15R::PatternMatchers::Erb::RailsHelperMatcher.run(plain, "users.new").should == i18ned
+    end
+    
+    it "should replace the title of a submit_tag helper" do
+      plain = %(<%= submit_tag "Új felhasználó" %>)
+      i18ned = %(<%= submit_tag I18n.t("users.new.Új_felhasználó") %>)
+      I15R::PatternMatchers::Erb::RailsHelperMatcher.run(plain, "users.new").should == i18ned
+    end
+  end
 
 end

data/spec/erb/tag_attribute_matcher_spec.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'i15r/pattern_matcher'
 require "spec"
 
@@ -10,4 +12,10 @@ describe I15R::PatternMatchers::Erb::TagAttributeMatcher do
     I15R::PatternMatchers::Erb::TagAttributeMatcher.run(plain, "users.new").should == i18ned
   end
 
+  it "should replace a link's title that has non-english characters" do
+    plain = %(<a title="raçine du site" href="/"><img src="site_logo.png" /></a>)
+    i18ned = %(<a title="<%= I18n.t("users.new.raçine_du_site") %>" href="/"><img src="site_logo.png" /></a>)
+    I15R::PatternMatchers::Erb::TagAttributeMatcher.run(plain, "users.new").should == i18ned
+  end
+
 end

data/spec/erb/tag_content_matcher_spec.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'i15r/pattern_matcher'
 require "spec"
 
@@ -32,5 +34,11 @@ describe I15R::PatternMatchers::Erb::TagContentMatcher do
     i18ned = %(<label for="user-name"> <%= I18n.t("users.new.name") %> </label>)
     I15R::PatternMatchers::Erb::TagContentMatcher.run(plain, "users.new").should == i18ned
   end
+  
+  it "should replace a word with non-ascii characters" do
+    plain = %(<label for="when">Mañana</label>)
+    i18ned = %(<label for="when"><%= I18n.t("users.new.mañana") %></label>)
+    I15R::PatternMatchers::Erb::TagContentMatcher.run(plain, "users.new").should == i18ned    
+  end
 
 end

data/spec/haml/rails_helper_matcher_spec.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
 describe I15R::PatternMatchers::Haml::RailsHelperMatcher do
@@ -43,4 +45,48 @@ describe I15R::PatternMatchers::Haml::RailsHelperMatcher do
     I15R::PatternMatchers::Haml::RailsHelperMatcher.run(plain, "users.new").should == i15d
   end
   
+  describe "when text has non-english characters" do
+    it "should replace a title in a link_to helper in a %tag row" do
+      plain = %(%p= link_to 'Új felhasználó', new_user_path)
+      i18ned = %(%p= link_to I18n.t("users.index.Új_felhasználó"), new_user_path)
+      I15R::PatternMatchers::Haml::RailsHelperMatcher.run(plain, "users.index").should == i18ned
+    end
+
+    it "should replace a title in a link_to helper in an implicit div row" do
+      plain = %(#new_user_link= link_to 'Új felhasználó', new_user_path)
+      i18ned = %(#new_user_link= link_to I18n.t("users.index.Új_felhasználó"), new_user_path)
+      I15R::PatternMatchers::Haml::RailsHelperMatcher.run(plain, "users.index").should == i18ned
+    end
+
+    it "should replace the label text in a label helper" do
+      plain = %(= f.label :password, "Contraseña")
+      i18ned = %(= f.label :password, I18n.t("users.new.contraseña"))
+      I15R::PatternMatchers::Haml::RailsHelperMatcher.run(plain, "users.new").should == i18ned
+    end
+
+    it "should preserve whitespace when replacing a label helper" do
+      plain = %(             = f.label :password, "Contraseña")
+      i18ned = %(             = f.label :password, I18n.t("users.new.contraseña"))
+      I15R::PatternMatchers::Haml::RailsHelperMatcher.run(plain, "users.new").should == i18ned
+    end
+
+    it "should replace a title in a link_to helper that uses parens and other text in the same row in an implicit div row" do
+      plain = %q(= "Elfőgadom a #{link_to('feltételeket', terms_and_conditions_path)}")
+      i15d = %q(= I18n.t("users.new.elfőgadom_a", :link => link_to(I18n.t("users.new.feltételeket"), terms_and_conditions_path)))
+      I15R::PatternMatchers::Haml::RailsHelperMatcher.run(plain, "users.new").should == i15d
+    end
+
+    it "should replace a title in a link_to helper that does not use parens and other text in the same row in an implicit div row" do
+      plain = %q(= "Elfőgadom a #{link_to 'feltételeket', terms_and_conditions_path}")
+      i15d = %q(= I18n.t("users.new.elfőgadom_a", :link => link_to(I18n.t("users.new.feltételeket"), terms_and_conditions_path)))
+      I15R::PatternMatchers::Haml::RailsHelperMatcher.run(plain, "users.new").should == i15d
+    end
+
+    it "should replace a title in a link_to helper that uses the haml == operator" do
+      plain = %q(== Elfőgadom a #{link_to('feltételeket', terms_and_conditions_path)})
+      i15d = %q(== I18n.t("users.new.elfőgadom_a", :link => link_to(I18n.t("users.new.feltételeket"), terms_and_conditions_path)))
+      I15R::PatternMatchers::Haml::RailsHelperMatcher.run(plain, "users.new").should == i15d
+    end
+  end
+
 end

data/spec/haml/tag_content_matcher_spec.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
 describe I15R::PatternMatchers::Haml::TagContentMatcher do
@@ -23,4 +25,24 @@ describe I15R::PatternMatchers::Haml::TagContentMatcher do
     plain = %(        .field)
     I15R::PatternMatchers::Haml::TagContentMatcher.run(plain, "users.new").should == plain
   end
+  
+  describe "when text has non-english characters" do
+    it "should replace a tag's content where the tag is an implicit div" do
+      plain = %(#form_head Türkçe)
+      i18ned = %(#form_head= I18n.t("users.edit.türkçe"))
+      I15R::PatternMatchers::Haml::TagContentMatcher.run(plain, "users.edit").should == i18ned
+    end
+
+    it "should replace a tag's content where the tag is an explicit one" do
+      plain = %(%p Egy, kettő, három, négy, öt.)
+      i18ned = %(%p I18n.t("users.show.egy_kettő_három_négy_öt"))
+      I15R::PatternMatchers::Haml::TagContentMatcher.run(plain, "users.show").should == i18ned
+    end
+
+    it "should replace a tag's content which is simple text all by itself on a line" do
+      plain = %(Türkçe)
+      i18ned = %(= I18n.t("users.new.türkçe"))
+      I15R::PatternMatchers::Haml::TagContentMatcher.run(plain, "users.new").should == i18ned
+    end
+  end
 end

data/spec/i15r_spec.rb

@@ -1,4 +1,5 @@
-# puts %(#{File.join(File.expand_path(File.dirname(__FILE__)), "..", "lib", "i15r")})
+# encoding: UTF-8
+
 $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), "..", "lib")
 
 require "i15r"
@@ -59,6 +60,14 @@ describe I15R::Base do
     it "should replace spaces with underscores" do
       I15R::Base.get_i18n_message_string("New name", "users.index").should == "users.index.new_name"
     end
+    
+    it "should not rip out a non-english letter" do
+      I15R::Base.get_i18n_message_string("Mañana", "users.index").should == "users.index.mañana"
+    end
+    
+    it "should replace a ' with an underscore" do
+      I15R::Base.get_i18n_message_string("C'est ça", "users.index").should == "users.index.cest_ça"
+    end    
   end
   
   describe "when substituting the plain contents with i18n message strings" do

data/spec/pattern_matcher_spec.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), "..", "lib")
 
 require 'i15r/pattern_matcher'
@@ -8,10 +10,17 @@ describe I15R::PatternMatchers::Base do
     plain = %(#main)
     I15R::PatternMatchers::Base.run(plain, "users.new", :haml).should == plain
   end
+
   it "should properly replace a line with two matches" do
     plain = %(This is it: <a title="site root" href="/"><img src="site_logo.png" /></a>)
     i18ned = %(<%= I18n.t("users.new.this_is_it") %>: <a title="<%= I18n.t("users.new.site_root") %>" href="/"><img src="site_logo.png" /></a>)
     I15R::PatternMatchers::Base.run(plain, "users.new", :erb).should == i18ned
   end
+
+  it "should properly replace a line with two matches that have non-ascii chars" do
+    plain = %(C'est ça: <a title="site root" href="/"><img src="site_logo.png" /></a>)
+    i18ned = %(<%= I18n.t("users.new.cest_ça") %>: <a title="<%= I18n.t("users.new.site_root") %>" href="/"><img src="site_logo.png" /></a>)
+    I15R::PatternMatchers::Base.run(plain, "users.new", :erb).should == i18ned
+  end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: i15r
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors: 
 - Balint Erdi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-14 00:00:00 +01:00
+date: 2010-01-08 00:00:00 +01:00
 default_executable: i15r
 dependencies: []