i15r 0.4.0 → 0.4.2

data/Rakefile

@@ -17,4 +17,6 @@ rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
 
+task :default => :spec
+
 Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.2

data/i15r.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{i15r}
-  s.version = "0.4.0"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Balint Erdi"]
-  s.date = %q{2010-01-08}
+  s.date = %q{2010-11-28}
   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.
 }
@@ -19,62 +19,60 @@ Gem::Specification.new do |s|
     "README.markdown"
   ]
   s.files = [
-    ".gitignore",
-     "CHANGELOG",
-     "MIT-LICENSE",
-     "Manifest",
-     "README.markdown",
-     "Rakefile",
-     "VERSION",
-     "bin/i15r",
-     "i15r.gemspec",
-     "init.rb",
-     "lib/i15r.rb",
-     "lib/i15r/base.rb",
-     "lib/i15r/pattern_matcher.rb",
-     "lib/i15r/pattern_matchers/base.rb",
-     "lib/i15r/pattern_matchers/erb.rb",
-     "lib/i15r/pattern_matchers/erb/rails_helper_matcher.rb",
-     "lib/i15r/pattern_matchers/erb/tag_attribute_matcher.rb",
-     "lib/i15r/pattern_matchers/erb/tag_content_matcher.rb",
-     "lib/i15r/pattern_matchers/haml.rb",
-     "lib/i15r/pattern_matchers/haml/rails_helper_matcher.rb",
-     "lib/i15r/pattern_matchers/haml/tag_content_matcher.rb",
-     "spec/erb/rails_helper_matcher_spec.rb",
-     "spec/erb/tag_attribute_matcher_spec.rb",
-     "spec/erb/tag_content_matcher_spec.rb",
-     "spec/haml/rails_helper_matcher_spec.rb",
-     "spec/haml/tag_content_matcher_spec.rb",
-     "spec/i15r_spec.rb",
-     "spec/pattern_matcher_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "spec/support/new_flight.html.erb",
-     "spec/support/new_user.html.haml",
-     "tasks/i15r.rake",
-     "todos.markdown"
+    "CHANGELOG",
+    "MIT-LICENSE",
+    "Manifest",
+    "README.markdown",
+    "Rakefile",
+    "VERSION",
+    "bin/i15r",
+    "i15r.gemspec",
+    "init.rb",
+    "lib/i15r.rb",
+    "lib/i15r/base.rb",
+    "lib/i15r/pattern_matcher.rb",
+    "lib/i15r/pattern_matchers/base.rb",
+    "lib/i15r/pattern_matchers/erb.rb",
+    "lib/i15r/pattern_matchers/erb/rails_helper_matcher.rb",
+    "lib/i15r/pattern_matchers/erb/tag_attribute_matcher.rb",
+    "lib/i15r/pattern_matchers/erb/tag_content_matcher.rb",
+    "lib/i15r/pattern_matchers/haml.rb",
+    "lib/i15r/pattern_matchers/haml/rails_helper_matcher.rb",
+    "lib/i15r/pattern_matchers/haml/tag_content_matcher.rb",
+    "spec/erb/rails_helper_matcher_spec.rb",
+    "spec/erb/tag_attribute_matcher_spec.rb",
+    "spec/erb/tag_content_matcher_spec.rb",
+    "spec/haml/rails_helper_matcher_spec.rb",
+    "spec/haml/tag_content_matcher_spec.rb",
+    "spec/i15r_spec.rb",
+    "spec/pattern_matcher_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "spec/support/new_flight.html.erb",
+    "spec/support/new_user.html.haml",
+    "tasks/i15r.rake",
+    "todos.markdown"
   ]
   s.homepage = %q{http://github.com/balinterdi/i15r}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{The internationalizer. Makes your Ruby app international}
   s.test_files = [
     "spec/erb/rails_helper_matcher_spec.rb",
-     "spec/erb/tag_attribute_matcher_spec.rb",
-     "spec/erb/tag_content_matcher_spec.rb",
-     "spec/haml/rails_helper_matcher_spec.rb",
-     "spec/haml/tag_content_matcher_spec.rb",
-     "spec/i15r_spec.rb",
-     "spec/pattern_matcher_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/erb/tag_attribute_matcher_spec.rb",
+    "spec/erb/tag_content_matcher_spec.rb",
+    "spec/haml/rails_helper_matcher_spec.rb",
+    "spec/haml/tag_content_matcher_spec.rb",
+    "spec/i15r_spec.rb",
+    "spec/pattern_matcher_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/lib/i15r/base.rb

@@ -10,7 +10,7 @@ module I15R
     def self.get_i18n_message_string(text, prefix)
       #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(/[!?.,:"';]/, '')
+      key = text.strip.downcase.gsub(/[\s]/, '_').gsub(/[!?.,:"';()]/, '')
       indent = ""
       (0..prefix.split(".").size).each { |i| indent = "  " + indent }
       # silenced_if_testing do
@@ -144,4 +144,4 @@ module I15R
       $testing
     end
   end
-end
+end

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

@@ -2,11 +2,11 @@ module I15R
   module PatternMatchers
     module Haml
       class TagContentMatcher < Base
-        
+
         def self.run(text, prefix)
           super(text, prefix, :haml)
         end
-        
+
         def self.match_haml_implicit_div_tag_content
           #TODO: really ugly. so many negative groups
           # to prevent #new-user-link= link_to '...', new_user_path to match
@@ -22,11 +22,11 @@ module I15R
         register_matcher :match_haml_implicit_div_tag_content
 
         def self.match_haml_explicit_tag_content
-          patt = /^(.*%[\w+]\s+)(.*)$/
+          patt = /^(.*%[\w]+)\s+(.*)$/
           matches(:haml) do |text, prefix|
             if m = patt.match(text)
               i18n_string = I15R::Base.get_i18n_message_string(m[2], prefix)
-              i18ned_row = %(#{m[1]}I18n.t("#{i18n_string}"))
+              i18ned_row = %(#{m[1]}= I18n.t("#{i18n_string}"))
               [m[0], i18ned_row]
             end
           end
@@ -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][[:alpha:][:upper:]\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/tag_content_matcher_spec.rb

@@ -35,6 +35,7 @@ describe I15R::PatternMatchers::Erb::TagContentMatcher do
     I15R::PatternMatchers::Erb::TagContentMatcher.run(plain, "users.new").should == i18ned
   end
   
+  #1.8fail
   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>)

data/spec/haml/tag_content_matcher_spec.rb

@@ -11,7 +11,7 @@ describe I15R::PatternMatchers::Haml::TagContentMatcher do
 
   it "should replace a tag's content where the tag is an explicit one" do
     plain = %(%p Please check your inbox and click on the activation link.)
-    i18ned = %(%p I18n.t("users.show.please_check_your_inbox_and_click_on_the_activation_link"))
+    i18ned = %(%p= I18n.t("users.show.please_check_your_inbox_and_click_on_the_activation_link"))
     I15R::PatternMatchers::Haml::TagContentMatcher.run(plain, "users.show").should == i18ned
   end
 
@@ -25,7 +25,24 @@ describe I15R::PatternMatchers::Haml::TagContentMatcher do
     plain = %(        .field)
     I15R::PatternMatchers::Haml::TagContentMatcher.run(plain, "users.new").should == plain
   end
-  
+
+  it "should not replace a line with just an hmtl tag and no text" do
+    plain = "%p"
+    I15R::PatternMatchers::Haml::TagContentMatcher.run(plain, "users.new").should == plain
+  end
+
+  it "should not include the %tag in the generated message string" do
+    plain = "%h2 Resend unlock instructions"
+    i18ned = %(%h2= I18n.t("users.new.resend_unlock_instructions"))
+    I15R::PatternMatchers::Haml::TagContentMatcher.run(plain, "users.new").should == i18ned
+  end
+
+  it "should suppress ( and ) in the generated I18n message string" do
+    plain = "%i (we need your current password to confirm your changes)"
+    i18ned = %(%i= I18n.t("users.new.we_need_your_current_password_to_confirm_your_changes"))
+    I15R::PatternMatchers::Haml::TagContentMatcher.run(plain, "users.new").should == i18ned
+  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)
@@ -35,14 +52,15 @@ describe I15R::PatternMatchers::Haml::TagContentMatcher do
 
     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"))
+      i18ned = %(%p= I18n.t("users.show.egy_kettő_három_négy_öt"))
       I15R::PatternMatchers::Haml::TagContentMatcher.run(plain, "users.show").should == i18ned
     end
 
+  #1.8fail
     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
+end

data/spec/pattern_matcher_spec.rb

@@ -17,10 +17,11 @@ describe I15R::PatternMatchers::Base do
     I15R::PatternMatchers::Base.run(plain, "users.new", :erb).should == i18ned
   end
 
+  #1.8fail
   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

data/spec/support/new_user.html.haml

@@ -4,7 +4,7 @@
   #form
     = render :partial => "layouts/flash", :locals => { :flash => flash }
     = my_error_messages_for :user
-    #form_head Register
+    #form_head Register (türkçe)
     #form_body
       - form_for @user do |f|
         = f.hidden_field :invitation_id

data/todos.markdown

@@ -30,15 +30,22 @@ This is easy to fix, the whitespace has to be readded just like the punctuation
 
 * DONE dry-run option: only show the diffs but do not actually overwrite the files
 
-### 0.?
+### 0.3.1
 
 * haml matchers
   * DONE nothing is replaced in haml files although specs pass. Probably something related to receiving the whole file content as one blob of text and not as lines. It works with erb, though.
 * sort out the ugly hierarchy, make it consistent (e.g add "erb" directory as there is a haml one), do not require files in lib by full path (e.g instead of require 'i15r/pattern\_matchers\_/haml/rails\_helper_matcher' => require 'haml/rails\_helper_matcher'), etc.
+
+### 0.4.0
+
+* DONE handle non-ascii characters properly (UTF-8 support) when replacing them. Mañana should become I18n.t("prefix.manana"), for instance. That is, regular expressions should be utf-8 aware.
+
+### 0.?
+
 * make a PatternMatcher::Erb (and Haml) class that implements the run method and make the classes that now exist modules that these classes include/extend
 * make the haml matchers nicer (was thrown together very hastily for a client project)
 * make prefix not replace the inferred message string prefix, but really act as a prefix. (e.g if anetcom is given as a prefix, and the inferred message string is 'users.new' it should not be 'anetcom.name', but 'anetcom.users.new.name')
-* handle non-ascii characters properly (UTF-8 support) when replacing them. Mañana should become I18n.t("prefix.manana"), for instance. That is, regular expressions should be utf-8 aware.
 * write the necessary i18n strings back into the yaml file
 * make interactive mode possible. the user is asked about each message to be replaced. he can choose to replace it, skip it or even edit it. Ideally the message would be shown in its context.
+* make specs pass with ruby 1.8, see specs tagged with #1.8fail, probably the "weird characters" in the specs should be replaced by their unicode codes (e.g \u1234)
 

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: i15r
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  hash: 11
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Balint Erdi
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-08 00:00:00 +01:00
+date: 2010-11-28 00:00:00 +01:00
 default_executable: i15r
 dependencies: []
 
@@ -22,7 +28,6 @@ extensions: []
 extra_rdoc_files: 
 - README.markdown
 files: 
-- .gitignore
 - CHANGELOG
 - MIT-LICENSE
 - Manifest
@@ -61,26 +66,32 @@ homepage: http://github.com/balinterdi/i15r
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: The internationalizer. Makes your Ruby app international

data/.gitignore

@@ -1,2 +0,0 @@
-*.rbc
-pkg/