i15r 0.3.0 → 0.3.1

data/README.markdown

@@ -2,7 +2,7 @@
 
 ## Summary
 
-I15r (Internationalizer) searches for all the non-i18n texts in erb views in the given files/directory and replaces them with I18n messages. The message string is based on the file in which the text was found and the text itself that was replaced. 
+I15r (Internationalizer) searches for all the non-i18n texts in your views in the given files/directory and replaces them with I18n messages. The message string is based on the file in which the text was found and the text itself that was replaced. 
 
 E.g
 
@@ -28,6 +28,8 @@ will be replaced by
     <label for="user-name"><%= I18n.t("member.users.edit.name") %></label>
     <input type="text" id="user-name" name="user[name]" />
 
+It can process erb and haml files.
+
 ## Installation
 
     gem install i15r --source http://gemcutter.org
@@ -42,7 +44,7 @@ will be replaced by
 
     i15r path/leading/to/directory
     
-All files with an erb suffix will be converted.
+All files with an erb or haml suffix in that directory or somewhere in the hierarchy below will be converted.
 
 ### Dry run
 
@@ -50,6 +52,32 @@ By default, i15r overwrites all the source files with the i18n message strings i
 
     i15r app/views/users -p
 
+or
+
+    i15r app/views/users --pretend
+
+### Custom prefix
+
+If you don't want the filename to appear in the i18n message string, you can pass a prefix parameter that will be used to generate the message strings. For example if you have the following in a file called app/views/users/new.html.erb:
+
+    <label for="user-name">Name</label>
+    <input type="text" id="user-name" name="user[name]" />
+
+And then call:
+
+    i15r app/views/users/new.html.erb --prefix my_project
+
+The file will then contain:
+
+    <label for="user-name"><%= I18n.t("my_project.name") %></label>
+    <input type="text" id="user-name" name="user[name]" />
+
+## Disclaimer (sort of)
+
+Please note that this is an early version mainly built up of examples I've come through doing client work. I am pretty sure there are a number of cases which i15r -at the moment- does not handle well (or at all). If you find such an example, please [let me know][issue_tracker] or if you feel motivated, submit a patch. Oh, yes, to prevent unwanted changes to your view files, you should use a SCM (that goes without saying, of course) and probably use the --pretend option.
+
+[issue_tracker]: http://github.com/balinterdi/i15r/issues
+
 ## Licensing, contribution
 
 The source code of this gem can be found at [http://github.com/balinterdi/i15r/](http://github.com/balinterdi/i15r/). It is released under the MIT-LICENSE, so you can basically do anything with it. However, if you think your modifications only make the tool better, please send a pull request or patch and I will consider merging in your changes. Any suggestions or feedback are welcome to <balint@bucionrails.com>.

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/i15r.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{i15r}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Balint Erdi"]
-  s.date = %q{2009-12-08}
+  s.date = %q{2009-12-14}
   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.
 }
@@ -33,15 +33,24 @@ Gem::Specification.new do |s|
      "lib/i15r/base.rb",
      "lib/i15r/pattern_matcher.rb",
      "lib/i15r/pattern_matchers/base.rb",
-     "lib/i15r/pattern_matchers/rails_helper_matcher.rb",
-     "lib/i15r/pattern_matchers/tag_attribute_matcher.rb",
-     "lib/i15r/pattern_matchers/tag_content_matcher.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/rails_helper_matcher_spec.rb",
      "spec/spec.opts",
-     "spec/tag_attribute_matcher_spec.rb",
-     "spec/tag_content_matcher_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/support/new_flight.html.erb",
+     "spec/support/new_user.html.haml",
      "tasks/i15r.rake",
      "todos.markdown"
   ]
@@ -51,11 +60,14 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{The internationalizer. Makes your Ruby app international}
   s.test_files = [
-    "spec/i15r_spec.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/rails_helper_matcher_spec.rb",
-     "spec/tag_attribute_matcher_spec.rb",
-     "spec/tag_content_matcher_spec.rb"
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/i15r/base.rb

@@ -81,22 +81,24 @@ module I15R
       File.read(File.expand_path(file))
     end
 
-    def write_content_to(file, content)
-      open(File.expand_path(file), "w") { |f| f.write(content) }
+    def write_content_to(path, content)
+      open(File.expand_path(path), "w") { |f| f.write(content) }
     end
 
     def show_diff(plain_row, i9l_row)
       silenced_if_testing do
         $stdout.puts "- #{plain_row}"
         $stdout.puts "+ #{i9l_row}"
+        $stdout.puts
       end
     end
 
-    def internationalize_file(file)
-      text = get_content_from(file)
-      prefix = self.prefix || file_path_to_message_prefix(file)
-      i18ned_text = sub_plain_strings(text, prefix)
-      write_content_to(file, i18ned_text) unless dry_run?
+    def internationalize_file(path)
+      text = get_content_from(path)
+      prefix = self.prefix || file_path_to_message_prefix(path)
+      template_type = path[/(?:.*)\.(.*)$/, 1]
+      i18ned_text = sub_plain_strings(text, prefix, template_type.to_sym)
+      write_content_to(path, i18ned_text) unless dry_run?
     end
 
     def display_indented_header(prefix)
@@ -112,15 +114,15 @@ module I15R
       end
     end
 
-    def sub_plain_strings(text, prefix)
-      #TODO: find out how to display diff rows
-      I15R::PatternMatchers::Base.run(text, prefix) do |plain_row, i9l_row|
+    def sub_plain_strings(text, prefix, file_type)
+      i15d = I15R::PatternMatchers::Base.run(text, prefix, file_type) do |plain_row, i9l_row|
         show_diff(plain_row, i9l_row)
       end
+      i15d + "\n"
     end
 
     def internationalize!(path)
-      files = path =~ /.erb$/ ? [path] : Dir.glob("#{path}/**/*.erb")
+      files = File.directory?(path) ? Dir.glob("#{path}/**/*.{erb,haml}") : [path]
       files.each { |file| internationalize_file(file) }
     end
 

data/lib/i15r/pattern_matcher.rb

@@ -1,4 +1,3 @@
 require 'i15r/pattern_matchers/base'
-require 'i15r/pattern_matchers/tag_attribute_matcher'
-require 'i15r/pattern_matchers/rails_helper_matcher'
-require 'i15r/pattern_matchers/tag_content_matcher'
+require 'i15r/pattern_matchers/erb'
+require 'i15r/pattern_matchers/haml'

data/lib/i15r/pattern_matchers/base.rb

@@ -7,22 +7,27 @@ module I15R
       #   end
       # end
 
-      def self.matches(&block)
-        @@matchers ||= []
-        @@matchers.push(block)
+      def self.matches(file_type, &block)
+        @@matchers ||= {}
+        @@matchers[file_type] ||= []
+        @@matchers[file_type].push(block)
       end
 
-      def self.run(text, prefix)
-        i18ned_text = text
-        @@matchers.each do |matcher|
-          m = matcher.call(text, prefix)
-          unless m.nil?
-            plain_row, i18ned_row = m
-            yield plain_row, i18ned_row if block_given?
-            i18ned_text.gsub!(plain_row, i18ned_row)
+      def self.run(text, prefix, file_type)
+        lines = text.split("\n")
+        i18ned_lines = lines.map do |line|
+          @@matchers[file_type].inject(line) do |i18ned_line, matcher|
+            m = matcher.call(i18ned_line, prefix)
+            unless m.nil?
+              row_before_match, row_after_match = m
+              yield row_before_match, row_after_match if block_given?
+              row_after_match
+            else
+              i18ned_line
+            end
           end
         end
-        i18ned_text
+        i18ned_lines.join("\n")
       end
       
       #TODO: use method_added to add to matchers so that

data/lib/i15r/pattern_matchers/erb.rb

@@ -0,0 +1,10 @@
+module I15R
+  module PatternMatchers
+    module Erb
+    end
+  end
+end
+
+require "i15r/pattern_matchers/erb/rails_helper_matcher"
+require "i15r/pattern_matchers/erb/tag_content_matcher"
+require "i15r/pattern_matchers/erb/tag_attribute_matcher"

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

@@ -0,0 +1,75 @@
+require 'i15r/base'
+
+module I15R
+  module PatternMatchers
+    module Erb
+      class RailsHelperMatcher < Base
+
+        def self.run(text, prefix)
+          super(text, prefix, :erb)
+        end
+
+        def self.match_link_to_title
+          patt = /^(.*)<%=\s*link_to\s+['"](.*?)['"]\s*,(.*)%>(.*)$/
+          matches(:erb) do |text, prefix|
+            if m = patt.match(text)
+              i18n_string = I15R::Base.get_i18n_message_string(m[2], prefix)
+              i18ned_row = %(#{m[1]}<%= link_to I18n.t("#{i18n_string}"),#{m[3]}%>#{m[4]})
+              [m[0], i18ned_row]
+            end
+          end
+        end
+        register_matcher :match_link_to_title
+
+        def self.match_label_helper_text
+          patt = /^(.*)<%=(.*)\.label(.*),\s*['"](.*?)['"]\s*%>(.*)$/
+          matches(:erb) do |text, prefix|
+            if m = patt.match(text)
+              i18n_string = I15R::Base.get_i18n_message_string(m[4], prefix)
+              i18ned_row = %(#{m[1]}<%=#{m[2]}.label#{m[3]}, I18n.t("#{i18n_string}") %>#{m[5]})
+              [m[0], i18ned_row]
+            end
+          end
+        end
+        register_matcher :match_label_helper_text
+
+        def self.match_label_tag_helper_text
+          patt = /^(.*)<%=(.*)label_tag (.*),\s*['"](.*?)['"]\s*%>(.*)$/
+          matches(:erb) do |text, prefix|
+            if m = patt.match(text)
+              i18n_string = I15R::Base.get_i18n_message_string(m[4], prefix)
+              i18ned_row = %(#{m[1]}<%=#{m[2]}label_tag #{m[3]}, I18n.t("#{i18n_string}") %>#{m[5]})
+              [m[0], i18ned_row]
+            end
+          end
+        end
+        register_matcher :match_label_tag_helper_text
+
+        def self.match_submit_helper_text
+          patt = /^(.*)<%=(.*)\.submit\s*['"](.*?)['"]\s*%>(.*)$/
+          matches(:erb) do |text, prefix|
+            if m = patt.match(text)
+              i18n_string = I15R::Base.get_i18n_message_string(m[3], prefix)
+              i18ned_row = %(#{m[1]}<%=#{m[2]}.submit I18n.t("#{i18n_string}") %>#{m[4]})
+              [m[0], i18ned_row]
+            end
+          end
+        end
+        register_matcher :match_submit_helper_text
+
+        def self.match_submit_tag_helper_text
+          patt = /^(.*)<%=\s*submit_tag\s*['"](.*?)['"]\s*%>(.*)$/
+          matches(:erb) do |text, prefix|
+            if m = patt.match(text)
+              i18n_string = I15R::Base.get_i18n_message_string(m[2], prefix)
+              i18ned_row = %(#{m[1]}<%= submit_tag I18n.t("#{i18n_string}") %>#{m[3]})
+              [m[0], i18ned_row]
+            end
+          end
+        end
+        register_matcher :match_submit_tag_helper_text
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+require 'i15r/base'
+
+module I15R
+  module PatternMatchers
+    module Erb
+      class TagAttributeMatcher < Base
+        
+        def self.run(text, prefix)
+          super(text, prefix, :erb)
+        end
+        
+        def self.match_title_attribute
+          patt = /^(.*)(<a\s+.*title=)['"](.*?)['"](.*)/
+          matches(:erb) do |text, prefix|
+            if m = patt.match(text)
+              i18n_string = I15R::Base.get_i18n_message_string(m[3], prefix)
+              i18ned_row = %(#{m[1]}#{m[2]}"<%= I18n.t("#{i18n_string}") %>"#{m[4]})
+              [m[0], i18ned_row]
+            end
+          end
+        end
+        register_matcher :match_title_attribute
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+require 'i15r/base'
+
+module I15R
+  module PatternMatchers
+    module Erb
+      class TagContentMatcher < Base
+        
+        def self.run(text, prefix)
+          super(text, prefix, :erb)
+        end
+        
+        def self.match_tag_content_on_one_line
+          patt = /^(.*)>(\s*)(\w[\s\w:'"!?\.,]+)\s*<\/(.*)$/
+          matches(:erb) do |text, prefix|
+            if m = patt.match(text)
+              i18n_string = I15R::Base.get_i18n_message_string(m[3], prefix)
+              ending_punctuation = m[3][/([?.!:\s]*)$/, 1]
+              i15d_row = %(#{m[1]}>#{m[2]}<%= I18n.t("#{i18n_string}") %>#{ending_punctuation.to_s}</#{m[4]})
+              [m[0], i15d_row]
+            end
+          end
+        end
+        register_matcher :match_tag_content_on_one_line
+
+        def self.match_tag_content_multiline
+          patt = /^(\s*)(\w[\w\s,]*)(.*)$/
+          matches(:erb) do |text, prefix|
+            if m = patt.match(text)
+              i18n_string = I15R::Base.get_i18n_message_string(m[2], prefix)
+              i15d_row = %(#{m[1]}<%= I18n.t("#{i18n_string}") %>#{m[3]})
+              [m[0], i15d_row]
+            end
+          end
+        end
+        register_matcher :match_tag_content_multiline
+
+      end
+    end
+  end
+end

data/lib/i15r/pattern_matchers/haml.rb

@@ -0,0 +1,9 @@
+module I15R
+  module PatternMatchers
+    module Haml
+    end
+  end
+end
+
+require "i15r/pattern_matchers/haml/rails_helper_matcher"
+require "i15r/pattern_matchers/haml/tag_content_matcher"

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

@@ -0,0 +1,83 @@
+module I15R
+  module PatternMatchers
+    module Haml
+      class RailsHelperMatcher < Base
+        
+        def self.run(text, prefix)
+          super(text, prefix, :haml)
+        end
+        
+        def self.match_haml_tag_and_link_to_title
+          #TODO: allow parens around link_to arguments
+          patt = /^(.*%\w+=\s*)link_to\s+['"](.*?)['"]\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]}link_to I18n.t("#{i18n_string}"),#{m[3]})
+              [m[0], i18ned_row]
+            end
+          end
+        end
+        register_matcher :match_haml_tag_and_link_to_title
+
+        def self.match_haml_implicit_div_tag_and_link_to_title
+          #TODO: allow parens around link_to arguments
+          patt = /^(.*#[\w\d\-_]+=\s*)link_to\s+['"](.*?)['"]\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]}link_to I18n.t("#{i18n_string}"),#{m[3]})
+              [m[0], i18ned_row]
+            end
+          end
+        end
+        register_matcher :match_haml_implicit_div_tag_and_link_to_title
+        
+        def self.match_haml_label_helper_text
+          patt = /^(.*=.*\.label.*,\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}"))
+              [m[0], i18ned_row]
+            end
+          end
+        end
+        register_matcher :match_haml_label_helper_text
+
+        def self.match_haml_text_and_link_to_with_parens
+          # that's good for the parentheses version
+          patt = /^(.*=)(.*)#\{link_to\(['"](.*?)['"],(\s*[\w_]+)\)\}.*$/
+          matches(:haml) do |text, prefix|
+            if m = patt.match(text)
+              pre_text = I15R::Base.get_i18n_message_string(m[2], prefix)
+              link_to_title = I15R::Base.get_i18n_message_string(m[3], prefix)
+              i18ned_row = %(#{m[1]} I18n.t("#{pre_text}", :link => link_to(I18n.t("#{link_to_title}"),#{m[4]})#{m[5]}))
+              [m[0], i18ned_row]
+            end
+          end
+          # %q(= "I accept the #{link_to 'terms and conditions', terms_and_conditions_path}"
+          # = I18n.t("users.new.i_accept_the", :link => link_to(I18n.t("users.new.terms_and_conditions"), terms_and_conditions_path))
+        end
+        register_matcher :match_haml_text_and_link_to_with_parens
+        
+        def self.match_haml_text_and_link_to_without_parens
+          # that's good for the parentheses version
+          patt = /^(.*=)(.*)#\{link_to\s+['"](.*?)['"],(\s*[\w_]+)\}.*$/
+          matches(:haml) do |text, prefix|
+            if m = patt.match(text)
+              pre_text = I15R::Base.get_i18n_message_string(m[2], prefix)
+              link_to_title = I15R::Base.get_i18n_message_string(m[3], prefix)
+              i18ned_row = %(#{m[1]} I18n.t("#{pre_text}", :link => link_to(I18n.t("#{link_to_title}"),#{m[4]})#{m[5]}))
+              [m[0], i18ned_row]
+            end
+          end
+        end
+        register_matcher :match_haml_text_and_link_to_without_parens
+        
+        
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,52 @@
+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
+          patt = /^(.*#[^\s=]+)\s+([^\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}"))
+              [m[0], i18ned_row]
+            end
+          end
+        end
+        register_matcher :match_haml_implicit_div_tag_content
+
+        def self.match_haml_explicit_tag_content
+          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}"))
+              [m[0], i18ned_row]
+            end
+          end
+        end
+        register_matcher :match_haml_explicit_tag_content
+
+        def self.match_haml_tag_content_just_text_on_line
+          patt = /^(\s*)([^.#\s][\w\s\d\!\-\.\?]+)$/
+          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}"))
+              [m[0], i18ned_row]
+            end
+          end
+        end
+        register_matcher :match_haml_tag_content_just_text_on_line
+
+      end
+
+    end
+  end
+end

data/spec/{rails_helper_matcher_spec.rb → erb/rails_helper_matcher_spec.rb}

@@ -1,45 +1,43 @@
-$:.unshift File.join(File.expand_path(File.dirname(__FILE__)), "..", "lib")
-
 require 'i15r/pattern_matcher'
 require "spec"
 
 # FIXME: since matcher blocks are added and executed in the Base class, 
 # tests are not independent: they are coupled through the Base's run method
-describe I15R::PatternMatchers::RailsHelperMatcher do
+describe I15R::PatternMatchers::Erb::RailsHelperMatcher do
   it "should replace a title in a link_to helper" do
-    plain = %(want a <p class="highlighted"><%= link_to 'New user', new_user_path %>?</p>)
-    i18ned = %(want a <p class="highlighted"><%= link_to I18n.t("users.index.new_user"), new_user_path %>?</p>)
-    I15R::PatternMatchers::RailsHelperMatcher.run(plain, "users.index").should == i18ned
+    plain = %(<p class="highlighted"><%= link_to 'New user', new_user_path %>?</p>)
+    i18ned = %(<p class="highlighted"><%= link_to I18n.t("users.index.new_user"), 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 "Create a new user", new_user_path, { :class => "add" } -%></p>)
     i18ned = %(<p><%= link_to I18n.t("users.index.create_a_new_user"), new_user_path, { :class => "add" } -%></p>)
-    I15R::PatternMatchers::RailsHelperMatcher.run(plain, "users.index").should == i18ned
+    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, "Name" %>)
     i18ned = %(<%= f.label :name, I18n.t("users.new.name") %>)
-    I15R::PatternMatchers::RailsHelperMatcher.run(plain, "users.new").should == i18ned
+    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") %>)
-    I15R::PatternMatchers::RailsHelperMatcher.run(plain, "users.new").should == i18ned
+    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 "Create user" %>)
     i18ned = %(<%= f.submit I18n.t("users.new.create_user") %>)
-    I15R::PatternMatchers::RailsHelperMatcher.run(plain, "users.new").should == i18ned
+    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 "Create user" %>)
     i18ned = %(<%= submit_tag I18n.t("users.new.create_user") %>)
-    I15R::PatternMatchers::RailsHelperMatcher.run(plain, "users.new").should == i18ned
+    I15R::PatternMatchers::Erb::RailsHelperMatcher.run(plain, "users.new").should == i18ned
   end
 
 end

data/spec/erb/tag_attribute_matcher_spec.rb

@@ -0,0 +1,13 @@
+require 'i15r/pattern_matcher'
+require "spec"
+
+# FIXME: since matcher blocks are added and executed in the Base class, that's what should be called
+# in the tests. That's not elegant and tests are not independent: they are coupled through the Base's run method
+describe I15R::PatternMatchers::Erb::TagAttributeMatcher do
+  it "should replace a link's title" do
+    plain = %(<a title="site root" href="/"><img src="site_logo.png" /></a>)
+    i18ned = %(<a title="<%= I18n.t("users.new.site_root") %>" href="/"><img src="site_logo.png" /></a>)
+    I15R::PatternMatchers::Erb::TagAttributeMatcher.run(plain, "users.new").should == i18ned
+  end
+
+end

data/spec/{tag_content_matcher_spec.rb → erb/tag_content_matcher_spec.rb}

@@ -1,38 +1,36 @@
-$:.unshift File.join(File.expand_path(File.dirname(__FILE__)), "..", "lib")
-
 require 'i15r/pattern_matcher'
 require "spec"
 
-describe I15R::PatternMatchers::TagContentMatcher do
+describe I15R::PatternMatchers::Erb::TagContentMatcher do
 
   it "should replace a single word" do
     plain = %(<label for="user-name">Name</label>)
     i18ned = %(<label for="user-name"><%= I18n.t("users.new.name") %></label>)
-    I15R::PatternMatchers::TagContentMatcher.run(plain, "users.new").should == i18ned
+    I15R::PatternMatchers::Erb::TagContentMatcher.run(plain, "users.new").should == i18ned
   end
 
   it "should replace several words" do
     plain = %(<label for="user-name">Earlier names</label>)
     i18ned = %(<label for="user-name"><%= I18n.t("users.new.earlier_names") %></label>)
-    I15R::PatternMatchers::TagContentMatcher.run(plain, "users.new").should == i18ned
+    I15R::PatternMatchers::Erb::TagContentMatcher.run(plain, "users.new").should == i18ned
   end
 
   it "should remove punctuation from plain strings" do
     plain = %(<label for="user-name">Got friends? A friend's name</label>)
     i18ned = %(<label for="user-name"><%= I18n.t("users.new.got_friends_a_friends_name") %></label>)
-    I15R::PatternMatchers::TagContentMatcher.run(plain, "users.new").should == i18ned
+    I15R::PatternMatchers::Erb::TagContentMatcher.run(plain, "users.new").should == i18ned
   end
 
   it "should not remove punctuation outside plain strings" do
     plain = %(<label for="user-name">A friend's name:</label>)
     i18ned = %(<label for="user-name"><%= I18n.t("users.new.a_friends_name") %>:</label>)
-    I15R::PatternMatchers::TagContentMatcher.run(plain, "users.new").should == i18ned
+    I15R::PatternMatchers::Erb::TagContentMatcher.run(plain, "users.new").should == i18ned
   end
 
   it "should preserve whitespace in the content part of the tag" do
     plain = %(<label for="user-name"> Name </label>)
     i18ned = %(<label for="user-name"> <%= I18n.t("users.new.name") %> </label>)
-    I15R::PatternMatchers::TagContentMatcher.run(plain, "users.new").should == i18ned
+    I15R::PatternMatchers::Erb::TagContentMatcher.run(plain, "users.new").should == i18ned
   end
 
 end

data/spec/haml/rails_helper_matcher_spec.rb

@@ -0,0 +1,46 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+
+describe I15R::PatternMatchers::Haml::RailsHelperMatcher do
+  it "should replace a title in a link_to helper in a %tag row" do
+    plain = %(%p= link_to 'New user', new_user_path)
+    i18ned = %(%p= link_to I18n.t("users.index.new_user"), 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 'New user', new_user_path)
+    i18ned = %(#new_user_link= link_to I18n.t("users.index.new_user"), 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, "Password")
+    i18ned = %(= f.label :password, I18n.t("users.new.password"))
+    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, "Password")
+    i18ned = %(             = f.label :password, I18n.t("users.new.password"))
+    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(= "I accept the #{link_to('terms and conditions', terms_and_conditions_path)}")
+    i15d = %q(= I18n.t("users.new.i_accept_the", :link => link_to(I18n.t("users.new.terms_and_conditions"), 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(= "I accept the #{link_to 'terms and conditions', terms_and_conditions_path}")
+    i15d = %q(= I18n.t("users.new.i_accept_the", :link => link_to(I18n.t("users.new.terms_and_conditions"), 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(== I accept the #{link_to('terms and conditions', terms_and_conditions_path)})
+    i15d = %q(== I18n.t("users.new.i_accept_the", :link => link_to(I18n.t("users.new.terms_and_conditions"), terms_and_conditions_path)))
+    I15R::PatternMatchers::Haml::RailsHelperMatcher.run(plain, "users.new").should == i15d
+  end
+  
+end

data/spec/haml/tag_content_matcher_spec.rb

@@ -0,0 +1,26 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+
+describe I15R::PatternMatchers::Haml::TagContentMatcher do
+  it "should replace a tag's content where the tag is an implicit div" do
+    plain = %(#form_head My account)
+    i18ned = %(#form_head= I18n.t("users.edit.my_account"))
+    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 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
+
+  it "should replace a tag's content which is simple text all by itself on a line" do
+    plain = %(please visit)
+    i18ned = %(= I18n.t("users.new.please_visit"))
+    I15R::PatternMatchers::Haml::TagContentMatcher.run(plain, "users.new").should == i18ned
+  end
+
+  it "should not replace an implict div with an assigned class" do
+    plain = %(        .field)
+    I15R::PatternMatchers::Haml::TagContentMatcher.run(plain, "users.new").should == plain
+  end
+end

data/spec/i15r_spec.rb

@@ -52,7 +52,6 @@ describe I15R::Base do
   end
 
   describe "turning plain messages into i18n message strings" do
-
     it "should downcase a single word" do
       I15R::Base.get_i18n_message_string("Name", "users.new").should == "users.new.name"
     end
@@ -60,9 +59,8 @@ 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
-
   end
-
+  
   describe "when substituting the plain contents with i18n message strings" do
     before do
       @i15r.options.prefix = nil
@@ -106,7 +104,7 @@ describe I15R::Base do
         <label for="user-name"><%= I18n.t("#{message_prefix}.name") %></label>
         <input type="text" id="user-name" name="user[name]" />
       EOS
-      @i15r.sub_plain_strings(plain_snippet, message_prefix).should == i18ned_snippet
+      @i15r.sub_plain_strings(plain_snippet, message_prefix, :erb).should == i18ned_snippet
     end
   end # "when no prefix option was given"
 
@@ -122,9 +120,22 @@ describe I15R::Base do
         <input type="text" id="user-name" name="user[name]" />
       EOS
 
-      @i15r.sub_plain_strings(plain_snippet, prefix_option).should == i18ned_snippet
+      @i15r.sub_plain_strings(plain_snippet, prefix_option, :erb).should == i18ned_snippet
     end
-
   end # "when an explicit prefix option was given"
 
+  describe "when running the internationalization for an ERB file" do
+    before do
+      #TODO: this is not necessary once fakefs correctly fakes open, I think
+      @i15r.stub!(:write_content_to).and_return(true)
+      @file_path = "app/views/users/new.html.erb"
+      File.open(@file_path, "w") { |f| f.write("<label for=\"user-name\">Name</label>") }
+    end
+    
+    it "should only run ERB matchers" do
+      @i15r.should_receive(:sub_plain_strings).with(anything, anything, :erb)
+      @i15r.internationalize_file(@file_path)
+    end
+  end
+
 end

data/spec/pattern_matcher_spec.rb

@@ -4,5 +4,14 @@ require 'i15r/pattern_matcher'
 require "spec"
 
 describe I15R::PatternMatchers::Base do
-
+  it "should not replace a simple haml div tag with an id" 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
+  
 end

data/spec/spec.opts

@@ -1,4 +1,5 @@
 --colour
 --format profile
 --timeout 20
---diff
+--diff
+--debugger

data/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+$:.unshift File.join(File.expand_path(File.dirname(__FILE__)), "..", "lib")
+
+require 'i15r'
+require 'i15r/pattern_matchers/haml'

data/spec/support/new_flight.html.erb

@@ -0,0 +1,31 @@
+<h1>New flight</h1>
+
+<% form_for(@flight) do |f| %>
+  <%= f.error_messages %>
+
+  <p>
+    <%= f.label :name %><br />
+    <%= f.text_field :name %>
+  </p>
+  <p>
+    <%= f.label :capacity %><br />
+    <%= f.text_field :capacity %>
+  </p>
+  <p>
+    <%= f.label :duration %><br />
+    <%= f.text_field :duration %>
+  </p>
+  <p>
+    <%= f.label :from_id, "From" %><br />
+    <%= f.select :from_id,  @airport_options %>
+  </p>
+  <p>
+    <%= f.label :to_id, "To" %><br />
+    <%= f.select :to_id, @airport_options %>
+  </p>
+  <p>
+    <%= f.submit 'Create' %>
+  </p>
+<% end %>
+
+<%= link_to 'Back', flights_path %>

data/spec/support/new_user.html.haml

@@ -0,0 +1,37 @@
+- @page_title = "Register"
+#main
+  = render :partial => "layouts/short_terms_and_conditions"
+  #form
+    = render :partial => "layouts/flash", :locals => { :flash => flash }
+    = my_error_messages_for :user
+    #form_head Register
+    #form_body
+      - form_for @user do |f|
+        = f.hidden_field :invitation_id
+        .field
+          = f.label :email, "Email"
+          = f.text_field :email
+        .field
+          = f.label :password, "Password"
+          = f.password_field :password
+        .field
+          = f.label :password_confirmation, "Re-enter your password"
+          = f.password_field :password_confirmation
+        %div{ :class => "field option", :style => "float:left" }
+          %label{ :for => "user_wants_newsletter" }
+            = f.check_box :wants_newsletter, :class => "checkbox"
+            Subscribe to the Quaestorial newsletter
+        %div{ :class => "field option", :style => "float:left" }
+          %label{ :for => "user_accept_t_and_c" }
+            = f.check_box :accept_t_and_c, :class => "checkbox"
+            == I accept the #{link_to('terms and conditions', terms_and_conditions_path)}
+        %button{ :type => "submit" }
+          Register
+      .clear
+    #form_bottom
+      = "Already a user? Log in #{link_to('here', login_path)}"
+  #info
+    If you are looking for our valuations services
+    %br/
+    please visit
+    = link_to "www.quaestorial-valuations.com", "http://www.quaestorial-valuations.com", :target => "_blank"

data/todos.markdown

@@ -26,9 +26,17 @@ This is easy to fix, the whitespace has to be readded just like the punctuation
 * DONE suppress printing of yaml strings (change by Alberto) when running the specs
 * DONE make it possible to run i15r on several files
 
+### 0.3.0
+
+* DONE dry-run option: only show the diffs but do not actually overwrite the files
+
 ### 0.?
 
-* dry-run option: only show the diffs but do not actually overwrite the files
+* 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.
+* 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: i15r
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Balint Erdi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-08 00:00:00 +01:00
+date: 2009-12-14 00:00:00 +01:00
 default_executable: i15r
 dependencies: []
 
@@ -36,15 +36,24 @@ files:
 - lib/i15r/base.rb
 - lib/i15r/pattern_matcher.rb
 - lib/i15r/pattern_matchers/base.rb
-- lib/i15r/pattern_matchers/rails_helper_matcher.rb
-- lib/i15r/pattern_matchers/tag_attribute_matcher.rb
-- lib/i15r/pattern_matchers/tag_content_matcher.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/rails_helper_matcher_spec.rb
 - spec/spec.opts
-- spec/tag_attribute_matcher_spec.rb
-- spec/tag_content_matcher_spec.rb
+- spec/spec_helper.rb
+- spec/support/new_flight.html.erb
+- spec/support/new_user.html.haml
 - tasks/i15r.rake
 - todos.markdown
 has_rdoc: true
@@ -76,8 +85,11 @@ signing_key:
 specification_version: 3
 summary: The internationalizer. Makes your Ruby app international
 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/rails_helper_matcher_spec.rb
-- spec/tag_attribute_matcher_spec.rb
-- spec/tag_content_matcher_spec.rb
+- spec/spec_helper.rb

data/lib/i15r/pattern_matchers/rails_helper_matcher.rb

@@ -1,69 +0,0 @@
-require 'i15r/base'
-
-module I15R
-  module PatternMatchers
-    class RailsHelperMatcher < Base
-
-      def self.match_link_to_title
-        patt = /^(.*)<%=\s*link_to\s+['"](.*?)['"]\s*,(.*)%>(.*)$/
-        matches do |text, prefix|
-          if m = patt.match(text)
-            i18n_string = I15R::Base.get_i18n_message_string(m[2], prefix)
-            i18ned_row = %(#{m[1]}<%= link_to I18n.t("#{i18n_string}"),#{m[3]}%>#{m[4]})
-            [m[0], i18ned_row]
-          end
-        end
-      end
-      register_matcher :match_link_to_title
-
-      def self.match_label_helper_text
-        patt = /^(.*)<%=(.*)\.label(.*),\s*['"](.*?)['"]\s*%>(.*)$/
-        matches do |text, prefix|
-          if m = patt.match(text)
-            i18n_string = I15R::Base.get_i18n_message_string(m[4], prefix)
-            i18ned_row = %(#{m[1]}<%=#{m[2]}.label#{m[3]}, I18n.t("#{i18n_string}") %>#{m[5]})
-            [m[0], i18ned_row]
-          end
-        end
-      end
-      register_matcher :match_label_helper_text
-
-      def self.match_label_tag_helper_text
-        patt = /^(.*)<%=(.*)label_tag (.*),\s*['"](.*?)['"]\s*%>(.*)$/
-        matches do |text, prefix|
-          if m = patt.match(text)
-            i18n_string = I15R::Base.get_i18n_message_string(m[4], prefix)
-            i18ned_row = %(#{m[1]}<%=#{m[2]}label_tag #{m[3]}, I18n.t("#{i18n_string}") %>#{m[5]})
-            [m[0], i18ned_row]
-          end
-        end
-      end
-      register_matcher :match_label_tag_helper_text
-
-      def self.match_submit_helper_text
-        patt = /^(.*)<%=(.*)\.submit\s*['"](.*?)['"]\s*%>(.*)$/
-        matches do |text, prefix|
-          if m = patt.match(text)
-            i18n_string = I15R::Base.get_i18n_message_string(m[3], prefix)
-            i18ned_row = %(#{m[1]}<%=#{m[2]}.submit I18n.t("#{i18n_string}") %>#{m[4]})
-            [m[0], i18ned_row]
-          end
-        end
-      end
-      register_matcher :match_submit_helper_text
-
-      def self.match_submit_tag_helper_text
-        patt = /^(.*)<%=\s*submit_tag\s*['"](.*?)['"]\s*%>(.*)$/
-        matches do |text, prefix|
-          if m = patt.match(text)
-            i18n_string = I15R::Base.get_i18n_message_string(m[2], prefix)
-            i18ned_row = %(#{m[1]}<%= submit_tag I18n.t("#{i18n_string}") %>#{m[3]})
-            [m[0], i18ned_row]
-          end
-        end
-      end
-      register_matcher :match_submit_tag_helper_text
-
-    end
-  end
-end

data/lib/i15r/pattern_matchers/tag_attribute_matcher.rb

@@ -1,21 +0,0 @@
-require 'i15r/base'
-
-module I15R
-  module PatternMatchers
-    class TagAttributeMatcher < Base
-
-      def self.match_title_attribute
-        patt = /^(.*)(<a\s+.*title=)['"](.*?)['"](.*)/
-        matches do |text, prefix|
-          if m = patt.match(text)
-            i18n_string = I15R::Base.get_i18n_message_string(m[3], prefix)
-            i18ned_row = %(#{m[1]}#{m[2]}"<%= I18n.t("#{i18n_string}") %>"#{m[4]})
-            [m[0], i18ned_row]
-          end
-        end
-      end
-      register_matcher :match_title_attribute
-
-    end
-  end
-end

data/lib/i15r/pattern_matchers/tag_content_matcher.rb

@@ -1,20 +0,0 @@
-require 'i15r/base'
-
-module I15R
-  module PatternMatchers
-    class TagContentMatcher < Base
-      def self.match_tag_content
-        patt = /^(.*)>(\s*)(\w[\s\w:'"!?\.,]+)\s*<\/(.*)$/
-        matches do |text, prefix|
-          if m = patt.match(text)
-            i18n_string = I15R::Base.get_i18n_message_string(m[3], prefix)
-            ending_punctuation = m[3][/([?.!:\s]*)$/, 1]
-            i18ned_row = %(#{m[1]}>#{m[2]}<%= I18n.t("#{i18n_string}") %>#{ending_punctuation.to_s}</#{m[4]})
-            [m[0], i18ned_row]
-          end
-        end
-      end
-      register_matcher :match_tag_content
-    end
-  end
-end

data/spec/tag_attribute_matcher_spec.rb

@@ -1,15 +0,0 @@
-$:.unshift File.join(File.expand_path(File.dirname(__FILE__)), "..", "lib")
-
-require 'i15r/pattern_matcher'
-require "spec"
-
-# FIXME: since matcher blocks are added and executed in the Base class, that's what should be called
-# in the tests. That's not elegant and tests are not independent: they are coupled through the Base's run method
-describe I15R::PatternMatchers::TagAttributeMatcher do
-  it "should replace a link's title" do
-    plain = %(Site root\nThis is it: <a title="site root" href="/"><img src="site_logo.png" /></a>)
-    i18ned = %(Site root\nThis is it: <a title="<%= I18n.t("users.new.site_root") %>" href="/"><img src="site_logo.png" /></a>)
-    I15R::PatternMatchers::TagAttributeMatcher.run(plain, "users.new").should == i18ned
-  end
-
-end