i15r 0.5.1 → 0.5.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f5fb80fbc94c10caa8a7e63cb3a26209078c447d
+  data.tar.gz: d7cbd90394f3c1bfd9cfa9611c33e88ddfe79820
+SHA512:
+  metadata.gz: b4e0f3ed0360fb99589fd6c8b14253226dd3c7fa6db964e946d395822f23141a950f664b4c3f0fca298dc66a2a70430294830cb8346ca25e75255ad892ef1be4
+  data.tar.gz: 8bd3dc91150ccfa99e36567ee8fb8d2cbb700274927df65d741c5ccf5b64f880b2e4fd49ec27c614f54a7ed36032bddfe5a5c0bc8312b695c3ae682bb3e7ce28

data/CHANGELOG.md

@@ -0,0 +1,19 @@
+### 0.5.1
+  * If no path is given, suppose it is 'app' to accomodate Rails apps
+
+### 0.5.0
+  * Insert the replaced text as default in i18n translation string and do it by default
+  * The -p (--pretend) option for dry-running is now -n (--dry-run)
+  * Totally revamp how pattern matching/string replacing is done, fix some errors
+
+### 0.4.4
+  * Adapt best practices/tools of 2012 (skipped 2.5 years of development)
+
+### 0.1.2
+  * More i18n in rails helpers, suppress printing of message strings in test mode, script can run on several files
+
+### 0.1.1
+  * Whitespace issues cleared up.
+
+### 0.1
+  * First version.

data/CONTRIBUTING.md

@@ -0,0 +1,21 @@
+## How to contribute
+
+### Bugs
+
+Please report any errors to the [issue tracker][issue_tracker].
+
+### Bug fixes
+
+If you can submit a fix for a bug, then please fork the repository, and issue a pull request once done.
+
+If the bug concerns the pattern matching or the replacing (text not replaced as it should be, or text
+that should not replaced is) always submit a test to validate your fix against.
+
+If it's not a bug and the fix is trivial, having a test is not an absolute necessity but you gets (lots of) bonus points.
+
+### Enhancements, feature requests
+
+The process is basically the same as for bug fixes. If you provide code that does what you'd like to see in the gem,
+please issue a pull request. If you propose a feature, [open a ticket][issue_tracker].
+
+[issue_tracker]: http://github.com/balinterdi/i15r/issues

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    i15r (0.5.1)
+    i15r (0.5.2)
 
 GEM
   remote: http://rubygems.org/

data/Guardfile

@@ -1,6 +1,5 @@
 guard 'rspec' do
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(%r{^lib/i15r/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
 end
-

data/README.markdown

@@ -1,11 +1,16 @@
-# I15r ![Build Status](https://api.travis-ci.org/balinterdi/i15r.png)
+# I15r ![Build Status](https://api.travis-ci.org/balinterdi/i15r.png) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/balinterdi/i15r)
 
+## Goal
+
+You prefer polishing your views to manually replacing strings in them to make them i18n compatible.
+If I got that one right, i15r is for you. It automates the process that would otherwise drive most of us nuts.
 
 ## Summary
 
-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
+I15r (Internationalizer) searches for all the non-i18n texts in your erb and haml templates in
+the given file/directory and replaces them with I18n messages.
+
+The message string is based on the path of the file in which the text was found and the text itself
 that was replaced.
 
 E.g
@@ -32,21 +37,23 @@ 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
 
+### Standalone
+
     gem install i15r
 
-or put the following in your Gemfile:
+### In-app
+
+Put the following in your Gemfile:
 
-   gem 'i15r', '~> 0.4.4'
+    gem 'i15r', '~> 0.5.1'
 
 ## Usage
 
 ### Convert a single file
 
-    i15r path/leading/to/view
+    i15r path/leading/to/template
 
 ### Convert all files in a directory (deep search)
 
@@ -66,7 +73,9 @@ or
 
 ### 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:
+If you don't want the file path 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]" />
@@ -80,23 +89,86 @@ 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)
+If you want the a prefix plus the file path to appear in the i18n message string,
+you can pass a prefix_with_path parameter:
+
+    i15r app/views/users/new.html.erb --prefix_with_path my_project
+
+The above file will then contain:
+
+    <label for="user-name"><%= I18n.t("my_project.users.new.name") %></label>
+    <input type="text" id="user-name" name="user[name]" />
+
+### Override I18n.t function name
+
+If you don't want to use the full I18n.t name, use the
+override_i18n_method parameter:
+
+    i15r app/views/users/new.html.erb --override_i18n_method t
+
+This will cause output that normally results in:
+
+    <label for="user-name"><%= I18n.t("users.new.name") %></label>
+
+to result in
+
+    <label for="user-name"><%= t("users.new.name") %></label>
+
+### No default translation
+
+If you want to skip the default translation, you must add the
+--no-default flag
+
+For example, if calling
+
+    i15r app/views/users/new.html.erb
+
+results in
+
+    <label for="user-name"><%= I18n.t("users.new.name", :default => 'Name') %></label>
+
+Adding the --no-default flag
+
+    i15r app/views/users/new.html.erb --no-default
+
+results in
+
+    <label for="user-name"><%= I18n.t("users.new.name") %></label>
+
+## Design principles & suggested use
+
+I15R takes the 80-20 approach. It focuses on finding most of the text that needs
+to be replaced in your templates and replacing them with the correct i18n strings.
+It forgoes the 100% hit rate in favor of getting the 80% right and keeping the code
+(relatively) simple. Consequently, please [report][issue_tracker] any bug that concerns
+strings that should not have been replaced or ones that have been replaced incorrectly.
+
+A good practice is to first run i15r with the --dry-run option to see what would be replaced
+and then run it for real, without the --dry-run option. You can also run it on files that have
+already been "internationalized" since i15r will just skip those rows.
+
+### See also
+
+Your next step is probably to create a YML locale file containing all the strings i15r generated. You're in luck! [missing_t][missing_t] is a gem that can do this for you.
+
+## Contributing
+
+Please submit any bugs or feature requests to the [issue tracker][issue_tracker].
+
+If you'd like to contibute, please see [Contributing][contributing].
+
+## License
+
+Copyright (c) 2009 Balint Erdi
+
+MIT License
 
-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.
+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:
 
-[issue_tracker]: http://github.com/balinterdi/i15r/issues
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-## Licensing, contribution
+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.
 
-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@balinterdi.com>.
+[issue_tracker]: https://github.com/balinterdi/i15r/issues
+[contributing]: https://github.com/balinterdi/i15r/blob/master/CONTRIBUTING.md
+[missing_t]: https://github.com/balinterdi/missing_t

data/bin/i15r

@@ -17,12 +17,19 @@ def parse_options(args)
             "Apply PREFIX to generated I18n messages instead of deriving it from the path") do |prefix|
       options[:prefix] = prefix
     end
+    opts.on("--prefix_with_path PREFIX",
+            "Apply PREFIX to generated I18n messages in front of the path") do |prefix|
+      options[:prefix_with_path] = prefix
+    end
     opts.on("-n", "--dry-run", "Do not write the files, just show the diff") do
       options[:dry_run] = true
     end
     opts.on("--no-default", "Do not insert the replaced string as the :default in the I18n string") do
       options[:add_default] = false
     end
+    opts.on("--override_i18n_method METHOD", "Replace I18n.t with METHOD") do |m|
+      options[:override_i18n_method] = m
+    end
 
     opts.on_tail("-h", "--help", "Show this message") do
       puts opts

data/lib/i15r.rb

@@ -9,7 +9,11 @@ class I15R
     end
 
     def prefix
-      @options.fetch(:prefix, nil)
+      @options.fetch(:prefix, nil) || prefix_with_path
+    end
+
+    def prefix_with_path
+      @options.fetch(:prefix_with_path, nil)
     end
 
     def dry_run?
@@ -19,6 +23,10 @@ class I15R
     def add_default
       @options.fetch(:add_default, true)
     end
+
+    def override_i18n_method
+      @options.fetch(:override_i18n_method, nil)
+    end
   end
 
   attr_reader :config
@@ -55,18 +63,24 @@ class I15R
     end
   end
 
+  def full_prefix(path)
+    prefix = [config.prefix]
+    prefix << file_path_to_message_prefix(path) if include_path?
+    prefix.compact.join('.')
+  end
+
   def internationalize_file(path)
     text = @reader.read(path)
-    prefix = config.prefix || file_path_to_message_prefix(path)
     template_type = path[/(?:.*)\.(.*)$/, 1]
     @printer.println("#{path}:")
     @printer.println("")
-    i18ned_text = sub_plain_strings(text, prefix, template_type.to_sym)
+    i18ned_text = sub_plain_strings(text, full_prefix(path), template_type.to_sym)
     @writer.write(path, i18ned_text) unless config.dry_run?
   end
 
   def sub_plain_strings(text, prefix, file_type)
-    pm = I15R::PatternMatcher.new(prefix, file_type, :add_default => config.add_default)
+    pm = I15R::PatternMatcher.new(prefix, file_type, :add_default => config.add_default,
+                                  :override_i18n_method => config.override_i18n_method)
     transformed_text = pm.run(text) do |old_line, new_line|
       @printer.print_diff(old_line, new_line)
     end
@@ -79,4 +93,9 @@ class I15R
     files = File.directory?(path) ? Dir.glob("#{path}/**/*.{erb,haml}") : [path]
     files.each { |file| internationalize_file(file) }
   end
+
+  def include_path?
+    config.prefix_with_path || !config.prefix
+  end
+
 end

data/lib/i15r/pattern_matcher.rb

@@ -1,15 +1,17 @@
+# -*- coding: utf-8 -*-
 class I15R
   class PatternMatcher
     HAML_SYMBOLS = ["%", "#", "{", "}", "(", ")", ".", "_", "-"]
     PATTERNS = {
       :erb => [
-        /<%=\s*link_to\s+(?<title>['"].+?['"])/,
+        /<%=\s*link_to\s+(?!.*&.*;)(?<title>['"].+?['"])/,
         /<%=.*label(_tag)?[^,]+?(?<label-title>(['"].+?['"]|:[[:alnum:]_]+))[^,]+%>.*$/,
         /<%=.*label(_tag)?.*?,\s*(?<label-title>(['"].+?['"]|:[[:alnum:]_]+))/,
         /<%=.*submit(_tag)?\s+(?<submit-text>(['"].+?['"]|:[[:alnum:]_]+))/,
-        />(?<tag-content>[[:space:][:alnum:][:punct:]]+?)<\//,
+        />(?<tag-content>(?!&.*;)[[:space:][:alnum:][:punct:]]+?)<\//,
         /<a\s+title=['"](?<link-title>.+?)['"]/,
-        /^\s*(?<pre-tag-text>[[:alnum:]]+[[:alnum:][:space:][:punct:]]*?)</
+        /^\s*(?<pre-tag-text>[[:alnum:]]+[[:alnum:][:space:][:punct:]]*?)</,
+        /^(?!^var .*)(?!.*(%>|{|})$)(?!.*(:|=).*(;|,)$)(?!.*return .*;$)(?!.*=)(?!^(if |unless ).*(\=|\&|\|))(?!^(if |unless )\S+$)(?!^end$)(?!.*do.*\|$)\s*(?<no-markup-content>[[:alnum:]]+[[:alnum:][:space:][:punct:]]*)/
       ],
       :haml => [
         /=.*link_to\s+(?<title>['"].+?['"]),/,
@@ -27,7 +29,7 @@ class I15R
       @prefix = prefix
       @file_type = file_type
       transformer_class = self.class.const_get("#{file_type.to_s.capitalize}Transformer")
-      @transformer = transformer_class.new(options[:add_default])
+      @transformer = transformer_class.new(options[:add_default], options[:override_i18n_method] || 'I18n.t')
     end
 
     def translation_key(text)
@@ -41,11 +43,15 @@ class I15R
       lines = text.split("\n")
       new_lines = lines.map do |line|
         new_line = line
-        PATTERNS[@file_type].detect do |pattern|
-          if m = pattern.match(line)
-            m.names.each do |group_name|
-              if /\w/.match(m[group_name])
-                new_line = @transformer.transform(m, m[group_name], line, translation_key(m[group_name]))
+        if line !~ /[[:alpha:]]/
+          new_line
+        else
+          PATTERNS[@file_type].detect do |pattern|
+            if m = pattern.match(line)
+              m.names.each do |group_name|
+                if /\w/.match(m[group_name])
+                  new_line = @transformer.transform(m, m[group_name], line, translation_key(m[group_name]))
+                end
               end
             end
           end
@@ -59,8 +65,9 @@ class I15R
     end
 
     class Transformer
-      def initialize(add_default)
+      def initialize(add_default, i18n_method)
         @add_default = add_default
+        @i18n_method = i18n_method
       end
 
       private
@@ -72,9 +79,9 @@ class I15R
             unless original[0] == "'" or original[0] == '"'
               original = %("#{original}")
             end
-            %(I18n.t("#{key}", :default => #{original}))
+            %(#{@i18n_method}("#{key}", :default => #{original}))
           else
-            %(I18n.t("#{key}"))
+            %(#{@i18n_method}("#{key}"))
           end
         end
     end

data/lib/i15r/version.rb

@@ -1,3 +1,3 @@
 class I15R
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/spec/i15r_spec.rb

@@ -39,9 +39,9 @@ describe I15R do
 
   describe "writing the changed file" do
     let(:path) { "app/views/users/new.html.erb" }
-    let(:reader) { mock(:read => %Q{<label for="user-name">Name</label>}) }
-    let(:writer) { mock("writer") }
-    let(:printer) { mock("printer") }
+    let(:reader) { double(:read => %Q{<label for="user-name">Name</label>}) }
+    let(:writer) { double("writer") }
+    let(:printer) { double("printer") }
 
     subject { I15R.new(reader, writer, printer) }
 
@@ -59,8 +59,8 @@ describe I15R do
 
 
   describe "generating the prefix" do
-    let(:reader) { mock(:read => %Q{<label for="user-name">Name</label>}) }
-    let(:writer) { mock("writer") }
+    let(:reader) { double(:read => %Q{<label for="user-name">Name</label>}) }
+    let(:writer) { double("writer") }
 
     subject { I15R.new(reader, writer, I15R::NullPrinter.new) }
 
@@ -92,11 +92,22 @@ describe I15R do
         subject.internationalize_file(path)
       end
     end
+
+    describe "when there is an explicit prefix with path" do
+      let(:path) { "app/views/users/_badge.html.erb" }
+
+      subject { I15R.new(reader, writer, I15R::NullPrinter.new, :prefix_with_path => "nice") }
+
+      specify do
+        writer.should_receive(:write).with(path, %Q{<label for="user-name"><%= I18n.t("nice.users.badge.name", :default => "Name") %></label>\n})
+        subject.internationalize_file(path)
+      end
+    end
   end
 
   describe "the add_default option" do
     let(:path) { "app/users/views/index.html.haml" }
-    let(:patter_matcher) { mock("pattern matcher", :run => "") }
+    let(:patter_matcher) { double("pattern matcher", :run => "") }
     let(:i15r) { I15R::Fixture.new }
 
     subject { I15R::Fixture.new }

data/spec/pattern_matcher_spec.rb

@@ -9,9 +9,17 @@ describe I15R::PatternMatcher do
   describe "in erb templates" do
     let(:pattern_matcher) { I15R::PatternMatcher.new("users.new", :erb) }
 
+    describe "no-markup content" do
+      it { should internationalize("please visit").to('<%= I18n.t("users.new.please_visit") %>') }
+      it { should internationalize("12").to_the_same }
+      it { should internationalize("12 Monkeys").to('<%= I18n.t("users.new.12_monkeys") %>') }
+    end
+
     describe "in tag content" do
       it { should internationalize('<h1>New flight</h1>')
                                .to('<h1><%= I18n.t("users.new.new_flight") %></h1>') }
+      it { should internationalize('<h1>Don\'t worry</h1>')
+                               .to('<h1><%= I18n.t("users.new.dont_worry") %></h1>') }
       it { should internationalize(%(<label for="user-name">Name</label>))
                                .to(%(<label for="user-name"><%= I18n.t("users.new.name") %></label>)) }
 
@@ -39,10 +47,84 @@ describe I15R::PatternMatcher do
                                  .to(%(    <%= f.label I18n.t("users.new.name", :default => "name") %><br />)) }
       end
 
+      describe "when the default option is false" do
+        let(:pattern_matcher) { I15R::PatternMatcher.new("users.new", :erb, :add_default => false) }
+
+        it { should internationalize('<h1>New flight</h1>')
+                                 .to('<h1><%= I18n.t("users.new.new_flight") %></h1>') }
+        it { should internationalize(%(    <%= f.label :name %><br />))
+                                 .to(%(    <%= f.label I18n.t("users.new.name") %><br />)) }
+      end
+
+      describe "when the I18n function is overriden" do
+        let(:pattern_matcher) { I15R::PatternMatcher.new("users.new", :erb, :override_i18n_method => 't') }
+
+        it { should internationalize('<h1>New flight</h1>')
+                                 .to('<h1><%= t("users.new.new_flight") %></h1>') }
+      end
+
       describe "when a line is already international" do
         it { should internationalize(%(  <%= f.label I18n.t("users.new.name") %>)).to_the_same }
         it { should internationalize(%(  <%= f.label t("users.new.name") %>)).to_the_same }
       end
+
+      describe "when a line contains Ruby variables only" do
+        it { should internationalize(%( <%= hello_world %> )).to_the_same }
+        it { should internationalize(%( <h1><%= hello_world %></h1> )).to_the_same }
+      end
+
+      describe "when a line contains Ruby method calls with options" do
+        it { should internationalize(%( <%= hello_world(:option => true) %> )).to_the_same }
+        it { should internationalize(%( <%= hello_world(option: true) %> )).to_the_same }
+        it { should internationalize(%( <h1><%= hello_world(:option => true) %></h1> )).to_the_same }
+        it { should internationalize(%( <h1><%= hello_world(option: true) %></h1> )).to_the_same }
+      end
+
+      describe "when a line contains Ruby code" do
+        it { should internationalize("variable = value").to_the_same }
+        it { should internationalize("if something").to_the_same }
+        it { should internationalize("if some == value").to_the_same }
+        it { should internationalize("if some && value").to_the_same }
+        it { should internationalize("if some || value").to_the_same }
+        it { should internationalize("unless something").to_the_same }
+        it { should internationalize("unless some == value").to_the_same }
+        it { should internationalize("unless some && value").to_the_same }
+        it { should internationalize("unless some || value").to_the_same }
+        it { should internationalize("something do |val|").to_the_same }
+        it { should internationalize("end").to_the_same }
+        it { should internationalize("something %>").to_the_same }
+        it { should internationalize("key: value,").to_the_same }
+        it { should internationalize(":key => value").to_the_same }
+
+        it { should internationalize("some string,").to('<%= I18n.t("users.new.some_string") %>') }
+        it { should internationalize("some string;").to('<%= I18n.t("users.new.some_string") %>') }
+        it { should internationalize("things i do").to('<%= I18n.t("users.new.things_i_do") %>') }
+        it { should internationalize("if you can").to('<%= I18n.t("users.new.if_you_can") %>') }
+      end
+
+      describe "when a line contains Javascript code" do
+        it { should internationalize("var variable").to_the_same }
+        it { should internationalize("if (interesting) {").to_the_same }
+        it { should internationalize("if (!interesting) {").to_the_same }
+        it { should internationalize("return result;").to_the_same }
+      end
+
+      describe "when a line contains CSS code" do
+        it { should internationalize("overflow: auto;").to_the_same }
+      end
+
+      describe "when a line contains HTML entities" do
+        it { should internationalize("&nbsp;").to_the_same }
+        it { should internationalize("<h1>&nbsp;</h1>").to_the_same }
+        it { should internationalize('<%= link_to "&nbsp; >".html_safe, next_page_path %>').to_the_same }
+      end
+
+      describe "when a line contains a form method calls with options" do
+        it { should internationalize(%( <%= f.email_field :email, :option => true %> )).to_the_same }
+        it { should internationalize(%( <%= f.email_field :email, option: true %> )).to_the_same }
+        it { should internationalize(%( <h1><%= f.email_field :email, :option => true %></h1> )).to_the_same }
+        it { should internationalize(%( <h1><%= f.email_field :email, option: true %></h1> )).to_the_same }
+      end
     end
 
     describe "in tag attributes" do
@@ -84,6 +166,13 @@ describe I15R::PatternMatcher do
                                  .to(%(<%= submit_tag I18n.t("users.index.create_user", :default => "Create user") %>)) }
       end
 
+      describe "when the default option is false" do
+        let(:pattern_matcher) { I15R::PatternMatcher.new("users.index", :erb, :add_default => false) }
+
+        it { should internationalize(%(<%= submit_tag "Create user" %>))
+                                 .to(%(<%= submit_tag I18n.t("users.index.create_user") %>)) }
+      end
+
       describe "when text has non-ascii characters" do
         it { should internationalize(%(<p class="highlighted"><%= link_to 'Új felhasználó', new_user_path %>?</p>))
                                  .to(%(<p class="highlighted"><%= link_to I18n.t("users.index.Új_felhasználó"), new_user_path %>?</p>)) }
@@ -118,6 +207,12 @@ describe I15R::PatternMatcher do
   describe "in haml templates" do
     let(:pattern_matcher) { I15R::PatternMatcher.new("users.show", :haml) }
 
+    describe "no-markup content" do
+      it { should internationalize("please visit").to('= I18n.t("users.show.please_visit")') }
+      it { should internationalize("12").to_the_same }
+      it { should internationalize("12 Monkeys").to('= I18n.t("users.show.12_monkeys")') }
+    end
+
     it { should internationalize('#main').to_the_same }
 
     it { should internationalize(%(#form_head My account))
@@ -127,12 +222,14 @@ describe I15R::PatternMatcher do
                              .to(%(%p= I18n.t("users.show.please_check_your_inbox_and_click_on_the_activation_link"))) }
 
     it { should internationalize("please visit").to('= I18n.t("users.show.please_visit")') }
+    it { pending "broken"; should internationalize("apples &amp; oranges").to('= I18n.t("users.show.apples_oranges")') }
     it { should internationalize("Mañana").to('= I18n.t("users.show.mañana")') }
     it { should internationalize("C'est ça").to('= I18n.t("users.show.cest_ça")') }
     it { should internationalize(%(%p Do not close/reload while loading))
                              .to(%(%p= I18n.t("users.show.do_not_close_reload_while_loading"))) }
     it { should internationalize(%(        .field)).to(%(        .field)) }
     it { should internationalize('%p').to_the_same }
+    it { pending "broken"; should internationalize('%p #{variable}').to_the_same }
     it { should internationalize(%(%h2 Resend unlock instructions))
                              .to(%(%h2= I18n.t("users.show.resend_unlock_instructions"))) }
     it { should internationalize(%(%i (we need your password to confirm your changes)))
@@ -158,6 +255,18 @@ describe I15R::PatternMatcher do
                                .to(%(  %h3= I18n.t("users.show.top_scorers", :default => "Top Scorers"))) }
     end
 
+    describe "when the default option is false" do
+      let(:pattern_matcher) { I15R::PatternMatcher.new("users.show", :haml, :add_default => false ) }
+      it { should internationalize(%(  %h3 Top Scorers))
+                               .to(%(  %h3= I18n.t("users.show.top_scorers"))) }
+    end
+
+    describe "when the I18n function is overriden" do
+      let(:pattern_matcher) { I15R::PatternMatcher.new("users.show", :haml, :override_i18n_method => 't', :add_default => true) }
+      it { should internationalize(%(  %h3 Top Scorers))
+                               .to(%(  %h3= t("users.show.top_scorers", :default => "Top Scorers"))) }
+    end
+
     describe "when already evaluated" do
       it { should internationalize(%(%p= link_to 'New user', new_user_path))
                                .to(%(%p= link_to I18n.t("users.show.new_user"), new_user_path)) }

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: i15r
 version: !ruby/object:Gem::Version
-  version: 0.5.1
-  prerelease: 
+  version: 0.5.2
 platform: ruby
 authors:
 - Balint Erdi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-08 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -96,109 +85,67 @@ description: The internationalizer. Replaces plain text strings in your views an
 email:
 - balint.erdi@gmail.com
 executables:
-- !binary |-
-  aTE1cg==
+- i15r
 extensions: []
 extra_rdoc_files: []
 files:
-- !binary |-
-  LmdpdGlnbm9yZQ==
-- !binary |-
-  LnRyYXZpcy55bWw=
-- !binary |-
-  Q0hBTkdFTE9H
-- !binary |-
-  R2VtZmlsZQ==
-- !binary |-
-  R2VtZmlsZS5sb2Nr
-- !binary |-
-  R3VhcmRmaWxl
-- !binary |-
-  TUlULUxJQ0VOU0U=
-- !binary |-
-  TWFuaWZlc3Q=
-- !binary |-
-  UkVBRE1FLm1hcmtkb3du
-- !binary |-
-  UmFrZWZpbGU=
-- !binary |-
-  YmluL2kxNXI=
-- !binary |-
-  aTE1ci5nZW1zcGVj
-- !binary |-
-  aW5pdC5yYg==
-- !binary |-
-  bGliL2kxNXIucmI=
-- !binary |-
-  bGliL2kxNXIvY29uc29sZV9wcmludGVyLnJi
-- !binary |-
-  bGliL2kxNXIvZmlsZV9yZWFkZXIucmI=
-- !binary |-
-  bGliL2kxNXIvZmlsZV93cml0ZXIucmI=
-- !binary |-
-  bGliL2kxNXIvcGF0dGVybl9tYXRjaGVyLnJi
-- !binary |-
-  bGliL2kxNXIvdmVyc2lvbi5yYg==
-- !binary |-
-  c3BlYy9pMTVyX3NwZWMucmI=
-- !binary |-
-  c3BlYy9wYXR0ZXJuX21hdGNoZXJfc3BlYy5yYg==
-- !binary |-
-  c3BlYy9zcGVjLm9wdHM=
-- !binary |-
-  c3BlYy9zcGVjX2hlbHBlci5yYg==
-- !binary |-
-  c3BlYy9zdXBwb3J0L2ludGVybmF0aW9uYWxpemVfbWF0Y2hlci5yYg==
-- !binary |-
-  c3BlYy9zdXBwb3J0L25ld19mbGlnaHQuaHRtbC5lcmI=
-- !binary |-
-  c3BlYy9zdXBwb3J0L25ld191c2VyLmh0bWwuaGFtbA==
-- !binary |-
-  dGFza3MvaTE1ci5yYWtl
-- !binary |-
-  dG9kb3MubWFya2Rvd24=
+- .gitignore
+- .travis.yml
+- CHANGELOG.md
+- CONTRIBUTING.md
+- Gemfile
+- Gemfile.lock
+- Guardfile
+- MIT-LICENSE
+- Manifest
+- README.markdown
+- Rakefile
+- bin/i15r
+- i15r.gemspec
+- init.rb
+- lib/i15r.rb
+- lib/i15r/console_printer.rb
+- lib/i15r/file_reader.rb
+- lib/i15r/file_writer.rb
+- lib/i15r/pattern_matcher.rb
+- lib/i15r/version.rb
+- spec/i15r_spec.rb
+- spec/pattern_matcher_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/support/internationalize_matcher.rb
+- spec/support/new_flight.html.erb
+- spec/support/new_user.html.haml
+- tasks/i15r.rake
+- todos.markdown
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -531769928414317979
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -531769928414317979
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Eases the pain of moving to I18n view templates
 test_files:
-- !binary |-
-  c3BlYy9pMTVyX3NwZWMucmI=
-- !binary |-
-  c3BlYy9wYXR0ZXJuX21hdGNoZXJfc3BlYy5yYg==
-- !binary |-
-  c3BlYy9zcGVjLm9wdHM=
-- !binary |-
-  c3BlYy9zcGVjX2hlbHBlci5yYg==
-- !binary |-
-  c3BlYy9zdXBwb3J0L2ludGVybmF0aW9uYWxpemVfbWF0Y2hlci5yYg==
-- !binary |-
-  c3BlYy9zdXBwb3J0L25ld19mbGlnaHQuaHRtbC5lcmI=
-- !binary |-
-  c3BlYy9zdXBwb3J0L25ld191c2VyLmh0bWwuaGFtbA==
+- spec/i15r_spec.rb
+- spec/pattern_matcher_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/support/internationalize_matcher.rb
+- spec/support/new_flight.html.erb
+- spec/support/new_user.html.haml

data/CHANGELOG

@@ -1,5 +0,0 @@
-v0.1.2  More i18n in rails helpers, suppress printing of message strings in test mode, script can run on several files
-
-v0.1.1  Whitespace issues cleared up.
-
-v0.1    First version.