ready_for_i18n 0.2.8 → 0.3.0

data/README.textile

@@ -36,11 +36,11 @@ Using the following options:
 
 |  |@--locale [LOCALE]@|@Generating for the specified locale (default locale 'en')@|
 |  |@--ext [EXTENSION]@|@The file extension name of your views(default '.html.erb')@|
+|  |@--dot@|@Generate a structured dictionary file and support `Lazy` Lookup of Rails > 2.3@|
 
 h2. Warning
 
 * This tool is used based on the most "conventional" way of HTML and ERB. But I can not guarantee all the text will be extracted correctly. Create an issue in this github project page if you found some thing miss.
-* Only tested when the local language is English. Other languages support is in the TODO list.
 
 h2. Note on Patches/Pull Requests
  

data/Rakefile

@@ -15,6 +15,8 @@ END_OF_DESC
     gem.homepage = "http://github.com/zigzag/ready_for_i18n"
     gem.authors = ["zigzag"]
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
+    gem.add_dependency("ya2yaml", [">= 0.26"])
+    
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.2.8
+0.3.0

data/bin/ready_for_i18n

@@ -25,6 +25,11 @@ HELP
 require 'optparse'
 require 'fileutils'
 require 'ready_for_i18n'
+
+def error_parameter
+  puts "Invalid options. Run `ready_for_i18n --help` for assistance."
+  exit(1)
+end
  
 options = {}
 opts = OptionParser.new do |opts|
@@ -40,7 +45,17 @@ opts = OptionParser.new do |opts|
   opts.on("--dot","Generate a structured dictionary file and support `Lazy` Lookup of Rails > 2.3 ") do |dot|
     options['dot'] = true
   end
+  
+  opts.on("--nokey",
+    "Output only the text found in your view files but not generate the keys. Normally used for the non-english project") do |nokey|
+    options['nokey'] = true
+  end
 
+  opts.on('--keymap <extracted_locale_text_file>:<english_key_file>',
+    "Using two files for the key mapping from locale text extracted(with --nokey) to english. Separated by the colon ':'") do |mapper|
+    error_parameter if mapper.split(':').size != 2
+    options['keymap'] = mapper
+  end
 end
  
 # Read command line options into `options` hash
@@ -54,8 +69,7 @@ case ARGV.size
     options['source']      = ARGV[0]
     options['destination'] = ARGV[1]
   else
-    puts "Invalid options. Run `ready_for_i18n --help` for assistance."
-    exit(1)
+    error_parameter
 end
  
 # Run the i18n generating

data/lib/extractor_base.rb

@@ -2,13 +2,20 @@ require 'stringio'
 
 module ReadyForI18N
   module ExtractorBase
-    VALUE_PATTERN = /\w+/
+    
     def self.use_dot(on_off)
       @use_dot = on_off
     end
     def self.use_dot?
       @use_dot
     end
+    def self.key_mapper=(mapper)
+      @key_mapper = mapper
+    end
+    def self.key_mapper
+      @key_mapper
+    end
+    
     def extract(input)
       buffer = StringIO.new
       input.each do |line|
@@ -25,11 +32,12 @@ module ReadyForI18N
       buffer.string
     end
     def to_key(s)
-      result = to_value(s).scan(/\w+/).join('_').downcase
+      val = to_value(s)
+      result = (ExtractorBase.key_mapper) ? ExtractorBase.key_mapper.key_for(val) : val.scan(/\w+/).join('_').downcase
       key_prefix ? "#{key_prefix}_#{result}" : result
     end
     def can_replace?(e)
-      e.scan(VALUE_PATTERN).length > 0
+      e.strip.size > 1
     end
     def t_method(val,wrap=false)
       m = ExtractorBase.use_dot? ? "t('.#{to_key(val)}')" : "t(:#{to_key(val)})"

data/lib/html_attr_extractor.rb

@@ -2,18 +2,15 @@ module ReadyForI18N
   class HtmlAttrExtractor < HtmlTextExtractor
     LABEL_TAG_ATTR_PATTERN = [[/<img(.*)(\/>|<\/img>)/i,/alt=["'](.*?)["']/i],
                               [/<img(.*)(\/>|<\/img>)/i,/title=["'](.*?)["']/i],
-                              [/<input(.*)\s*type\s*=\s*["']submit["']/i,/value\s*=\s*["'](.*?)["']/i],
-                              [/<input\s*type\s*=\s*["']submit["'](.*)/i,/value\s*=\s*["'](.*?)["']/i],
-                              [/<input(.*)\s*type\s*=\s*["']button["']/i,/value\s*=\s*["'](.*?)["']/i],
-                              [/<input\s*type\s*=\s*["']button["'](.*)/i,/value\s*=\s*["'](.*?)["']/i]]
+                              [/<input(.*)\s*type\s*=\s*["']submit["'](.*)/i,/value\s*=\s*["'](.*?)["']/i],
+                              [/<input(.*)\s*type\s*=\s*["']button["'](.*)/i,/value\s*=\s*["'](.*?)["']/i]]
     SKIP_PATTERN = /<%(.*)%>/
     protected 
     def values_in_line(line)
       values = []
       LABEL_TAG_ATTR_PATTERN.each do |p|
-        attrs = line.match(p[0])[1] if line =~ p[0]
-        if attrs =~ p[1] 
-          value = attrs.match(p[1])[1]
+        if line =~ p[0] && line =~ p[1]
+          value = line.match(p[1])[1]
           values << value unless value =~ SKIP_PATTERN
         end
       end

data/lib/html_text_extractor.rb

@@ -1,7 +1,7 @@
 module ReadyForI18N
   class HtmlTextExtractor
     SKIP_TAGS = [[/<script/i,/<\/script>/i],[/<%/,/%>/],[/<style/i,/\/style>/i]]
-    SKIP_INLINE_TAG = [/<%(.*?)%>/,/<(.*?)>/,/<(.*)$/,/^(.*)>/,/&nbsp;/]
+    SKIP_INLINE_TAG = [/<script>(.*?)<\/script>/i,/<%(.*?)%>/,/<(.*?)>/,/<(.*)$/,/^(.*)>/,/&nbsp;/]
     SEPERATOR = '_@@@_'
 
     include ReadyForI18N::ExtractorBase
@@ -12,10 +12,10 @@ module ReadyForI18N
     end
     def skip_line?(s)
       @stack ||= []
-      return true if s.nil? || s.strip.size == 0 
+      return false if s.nil? || s.strip.size == 0 
       jump_in_tag = SKIP_TAGS.find{ |start_tag,end_tag| s =~ start_tag}
       @stack.push jump_in_tag[1] if jump_in_tag
-      if @stack.last
+      unless @stack.empty?
         end_tag_match = s.match(@stack.last) 
         if end_tag_match
           @stack.pop 

data/lib/i18n_generator.rb

@@ -4,27 +4,39 @@ module ReadyForI18N
     PATH_PATTERN = /\/views\/(.*)/
     
     def self.excute(opt)
-      @src_path = opt['source']
-      @target_path = opt['destination']
-      if @target_path && (!@target_path.end_with? File::SEPARATOR)
-        @target_path = "#{@target_path}#{File::SEPARATOR}"  
-      end
-      @locale = opt['locale']
-      @ext = opt['extension'] || '.html.erb'
-      
-      ReadyForI18N::ExtractorBase.use_dot(true) if opt['dot']
-      
-      dict = ReadyForI18N::LocaleDictionary.new(@locale)
+      setupOptions(opt)
       Dir.glob(File.join(@src_path,"**#{File::SEPARATOR}*#{@ext}")).each do |f|
         path = f.match(PATH_PATTERN)[1].gsub(/#{@ext}$/,'').split '/' if opt['dot'] && f =~ PATH_PATTERN
         result = EXTRACTORS.inject(File.read(f)) do |buffer,extractor|
-          extractor.new.extract(buffer){|k,v| dict.push(k,v,path)}
+          extractor.new.extract(buffer){|k,v| @dict.push(k,v,path)}
         end
         write_target_file(f,result) if @target_path
       end
-      dict.write_to STDOUT
+      @dict.write_to STDOUT
     end
+
   private
+    def self.setupOptions(opt)
+      @src_path = opt['source']
+      @locale = opt['locale']
+      if opt['nokey']
+        @dict = NoKeyDictionary.new(@locale)
+      else
+        @dict = LocaleDictionary.new(@locale)
+        @target_path = opt['destination']
+        if @target_path && (!@target_path.end_with? File::SEPARATOR)
+          @target_path = "#{@target_path}#{File::SEPARATOR}"  
+        end
+      end
+      @ext = opt['extension'] || '.html.erb'
+      ExtractorBase.use_dot(true) if opt['dot']
+      if opt['keymap']
+        files_content = opt['keymap'].split(':').map{|f| File.read(f)}
+        ReadyForI18N::ExtractorBase.key_mapper = KeyMapper.new(*files_content)
+      end
+      
+    end
+
     def self.write_target_file(source_file_name,content)
       full_target_path = File.dirname(source_file_name).gsub(@src_path,@target_path)
       FileUtils.makedirs full_target_path

data/lib/key_mapper.rb

@@ -0,0 +1,15 @@
+module ReadyForI18N
+  class KeyMapper
+    def initialize(text1,text2)
+      @hash = {}
+      arr1 = text1.split("\n")
+      arr2 = text2.split("\n")
+      raise 'Mapper files should contain the same number of lines' if arr1.size != arr2.size
+      arr1.each_with_index { |text,i| @hash[text] = arr2[i] }
+    end
+    def key_for(text)
+      possible_key = @hash[text] ? @hash[text] : @hash.invert[text]
+      possible_key.scan(/\w+/).join('_').downcase
+    end
+  end
+end

data/lib/locale_dictionary.rb

@@ -10,22 +10,9 @@ module ReadyForI18N
       h[key] = value
     end
     def write_to(out)
-      out.puts "#{@locale}:"
-      write_out_hash(out,@hash,1)
-    end
-    
-    private 
-    def write_out_hash(out,hash,intent)
-      hash.keys.sort{|a,b|a.to_s<=>b.to_s}.each do |k|
-        key_with_indent = "#{'  '*intent}#{k}:"
-        val = hash[k]
-        if (val.is_a? Hash)
-          out.puts(key_with_indent)
-          write_out_hash(out, val, intent + 1) 
-        else
-          out.puts("#{key_with_indent} #{val.dump}" )
-        end
-      end
+      # out.puts "#{@locale}:"
+      $KCODE = 'UTF8'
+      out.puts({"#{@locale}" => @hash}.ya2yaml)
     end
   end
 end

data/lib/no_key_dictionary.rb

@@ -0,0 +1,14 @@
+require 'set'
+module ReadyForI18N
+  class NoKeyDictionary
+    def initialize(locale = nil)
+      @set = Set.new
+    end
+    def push(key,value,path = nil)
+      @set << value if value && !value.strip.empty?
+    end
+    def write_to(out)
+      @set.each { |e| out.puts e }
+    end
+  end
+end

data/lib/ready_for_i18n.rb

@@ -1,6 +1,11 @@
+require 'rubygems'
+require 'ya2yaml'
+
 require 'extractor_base'
 require 'html_text_extractor'
 require 'html_attr_extractor'
 require 'erb_helper_extractor'
 require 'locale_dictionary'
+require 'no_key_dictionary'
+require 'key_mapper'
 require 'i18n_generator'

data/ready_for_i18n.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ready_for_i18n}
-  s.version = "0.2.8"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["zigzag"]
-  s.date = %q{2009-12-25}
+  s.date = %q{2009-12-30}
   s.default_executable = %q{ready_for_i18n}
   s.description = %q{      ready_for_i18n will help you extract visible hard-coded text from your ERB view files,
       then choose a proper key and replace them with the I18n.translate method like t(:login)
@@ -33,7 +33,9 @@ Gem::Specification.new do |s|
      "lib/html_attr_extractor.rb",
      "lib/html_text_extractor.rb",
      "lib/i18n_generator.rb",
+     "lib/key_mapper.rb",
      "lib/locale_dictionary.rb",
+     "lib/no_key_dictionary.rb",
      "lib/ready_for_i18n.rb",
      "ready_for_i18n.gemspec",
      "test/fixtures/html_attr.html.erb",
@@ -41,12 +43,13 @@ Gem::Specification.new do |s|
      "test/helper.rb",
      "test/output/en.yml",
      "test/output/label.html.erb",
-     "test/output/text.html.erb",
      "test/test_erb_helper_extractor.rb",
      "test/test_extractor_base.rb",
      "test/test_html_attr_extractor.rb",
      "test/test_html_text_extractor.rb",
-     "test/test_locale_dictionary.rb"
+     "test/test_key_mapper.rb",
+     "test/test_locale_dictionary.rb",
+     "test/test_nokey_dictionary.rb"
   ]
   s.homepage = %q{http://github.com/zigzag/ready_for_i18n}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -59,7 +62,9 @@ Gem::Specification.new do |s|
      "test/test_extractor_base.rb",
      "test/test_html_attr_extractor.rb",
      "test/test_html_text_extractor.rb",
-     "test/test_locale_dictionary.rb"
+     "test/test_key_mapper.rb",
+     "test/test_locale_dictionary.rb",
+     "test/test_nokey_dictionary.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -68,11 +73,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_runtime_dependency(%q<ya2yaml>, [">= 0.26"])
     else
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_dependency(%q<ya2yaml>, [">= 0.26"])
     end
   else
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    s.add_dependency(%q<ya2yaml>, [">= 0.26"])
   end
 end
 

data/test/fixtures/html_attr.html.erb

@@ -4,4 +4,7 @@
 <input type="submit" value="Compare on chart" />
 <input type="button" name="button_copy" id="copy_<%= u profile.key %>" value="copy" onClick='var name=prompt("Name for the new profile"); if (name!=null) {$("copy_<%= profile.id %>").value=name; submit();} else {return false;}'>
 <input type="hidden" value="Should not extract">
-<input type="text" value="<%= should ignore me %>">
+<input type="text" value="<%= should ignore me %>">
+
+<input id="sub_But" type="button" value="save2" class="submit">
+

data/test/fixtures/index.html.erb

@@ -93,3 +93,7 @@
 <%= link_to_remote 'Add Event', {:url => { :controller => 'events', :action => "new", :rid => params['rid'] },
      :update => "event_form"}, {:class => 'action'} %>
 
+<td>
+SkillName:<%=@skill_name%>
+</td>
+<script>inlineScriptShouldIgnore();</script>

data/test/output/en.yml

@@ -1,5 +1,7 @@
-en:
-  label: "OK"
+--- 
+en: 
+  label: OK
   login_key: "Login:"
   text: "Please Confirm:"
   with_quote: "It is my \"Label\""
+  中文: 没问题

data/test/output/label.html.erb

@@ -93,3 +93,7 @@
 <%= link_to_remote t(:label_add_event), {:url => { :controller => 'events', :action => "new", :rid => params['rid'] },
      :update => "event_form"}, {:class => 'action'} %>
 
+<td>
+SkillName:<%=@skill_name%>
+</td>
+<script>inlineScriptShouldIgnore();</script>

data/test/test_extractor_base.rb

@@ -36,5 +36,18 @@ class TestExtractorBase < Test::Unit::TestCase
     assert_equal("t('.label_login')", c.t_method('Login:'))
     assert_equal("<%=t('.label_login')%>", c.t_method('Login:',true))
   end
+  
+  should "using keymapper when set" do
+    mapper = Object.new
+    def mapper.key_for(text); 'keeey' ;end
+    ReadyForI18N::ExtractorBase.key_mapper = mapper
+    c = Object.new
+    def c.key_prefix; 'label' ;end
+    def c.to_value(s); s ;end
+    c.extend ReadyForI18N::ExtractorBase
+    assert_equal('label_keeey', c.to_key('Login:'))
+    assert_equal("t(:label_keeey)", c.t_method('Login:'))
+    ReadyForI18N::ExtractorBase.key_mapper = nil
+  end
 
 end

data/test/test_html_attr_extractor.rb

@@ -3,7 +3,7 @@ require 'helper'
 class TestHtmlAttrExtractor < Test::Unit::TestCase
   should "extract the Some Attribute that need i18n from the HTML file" do
     f = File.join(File.dirname(__FILE__),'fixtures','html_attr.html.erb')
-    expected = %w{Print Measure Save copy} << 'Compare on chart'
+    expected = %w{Print Measure Save copy save2} << 'Compare on chart'
     result = []
     ReadyForI18N::HtmlAttrExtractor.new.extract(File.read(f)){|k,v| result << v}
     assert_same_elements(expected,result)
@@ -12,7 +12,7 @@ class TestHtmlAttrExtractor < Test::Unit::TestCase
   should "replace the attribut in html with t method" do
     source = File.join(File.dirname(__FILE__),'fixtures','html_attr.html.erb')
     output = ReadyForI18N::HtmlAttrExtractor.new.extract(File.read(source))
-    %w{Print Measure Save copy}.each do |e|
+    %w{Print Measure Save copy save2}.each do |e|
       assert(output.include?("<%=t(:label_#{e.downcase.gsub(':','')})%>"), "should found t method with symbol")
     end
   end

data/test/test_html_text_extractor.rb

@@ -3,7 +3,7 @@ require 'helper'
 class TestHtmlTextExtractor < Test::Unit::TestCase
   should "extract the text that need i18n from the erb view file" do
     f = File.join(File.dirname(__FILE__),'fixtures','index.html.erb')
-    expected = %w{Users Login Name Groups Operations Login: Name: Password: Export} << 'Confirm password:' << 'select all &raquo;'
+    expected = %w{Users Login Name Groups Operations Login: Name: Password: Export SkillName:} << 'Confirm password:' << 'select all &raquo;'
     result = []
     ReadyForI18N::HtmlTextExtractor.new.extract(File.read(f)){|k,v| result << v}
     assert_same_elements(expected,result)
@@ -12,7 +12,7 @@ class TestHtmlTextExtractor < Test::Unit::TestCase
   should "replace the text in helper with t method" do
     source = File.join(File.dirname(__FILE__),'fixtures','index.html.erb')
     output = ReadyForI18N::HtmlTextExtractor.new.extract(File.read(source))
-    %w{Users Login Name Groups Operations Login: Name: Password: Export}.each do |e|
+    %w{Users Login Name Groups Operations Login: Name: Password: Export SkillName:}.each do |e|
       assert(output.include?("<%=t(:text_#{e.downcase.gsub(':','')})%>"), "should found t method with symbol")
     end
   end

data/test/test_key_mapper.rb

@@ -0,0 +1,26 @@
+require 'helper'
+require 'stringio'
+
+class TestKeyMapper < Test::Unit::TestCase
+  
+  should "Find the key of the specified text according to mapper string" do
+    text_en = "key one\nkey two\n"
+    text_cn = "jian yi\njian er\n"
+    
+    mapper = ReadyForI18N::KeyMapper.new(text_en,text_cn)
+    assert_equal("key_one", mapper.key_for("jian yi"))
+    assert_equal("jian_yi", mapper.key_for("key one"))
+  end
+  
+  should "Raise an Error when two file are in different line numbers" do
+    text_en = "key one\nkey two\n"
+    text_cn = "jian yi\njian er"
+    assert_nothing_raised(Exception) { mapper = ReadyForI18N::KeyMapper.new(text_en,text_cn) }
+
+    text_en = "key one\nkey two\n"
+    text_cn = "jian yi\n"
+    assert_raise(RuntimeError) { mapper = ReadyForI18N::KeyMapper.new(text_en,text_cn) }
+  end
+
+  
+end

data/test/test_locale_dictionary.rb

@@ -10,6 +10,8 @@ class TestLocaleDictionary < Test::Unit::TestCase
     dict.push 'label','OK'
     dict.push 'text','Please Confirm:'
     dict.push 'with_quote','It is my "Label"'
+    dict.push '中文','没问题'
+
     File.open(locale_file,'w+') {|f| dict.write_to f}
     
     result = YAML.load_file locale_file
@@ -22,7 +24,8 @@ class TestLocaleDictionary < Test::Unit::TestCase
     dict.push 'label','OK'
     out = StringIO.new
     dict.write_to out
-    assert_equal("en:\n  label: \"OK\"\n", out.string)
+    hash = YAML.load out.string
+    assert_equal("OK", hash['en']['label'])
   end
   
   should "should intent output when path is given" do 
@@ -30,7 +33,17 @@ class TestLocaleDictionary < Test::Unit::TestCase
     dict.push 'label','OK',['my_view']
     out = StringIO.new
     dict.write_to out
-    assert_equal("en:\n  my_view:\n    label: \"OK\"\n", out.string)
+    hash = YAML.load out.string
+    assert_equal("OK",hash['en']['my_view']['label'])
+  end
+
+  should "handle Chinese character as well" do 
+    dict = ReadyForI18N::LocaleDictionary.new('zh_CN')
+    dict.push '中文','没问题'
+    out = StringIO.new
+    dict.write_to out
+    hash = YAML.load out.string
+    assert_equal("没问题",hash['zh_CN']['中文'])
   end
   
 end

data/test/test_nokey_dictionary.rb

@@ -0,0 +1,33 @@
+require 'helper'
+require 'stringio'
+
+class TestNoKeyDictionary < Test::Unit::TestCase
+  
+  should "output to STDOUT when write to is nil" do
+    dict = ReadyForI18N::NoKeyDictionary.new
+    dict.push 'label','OK'
+    out = StringIO.new
+    dict.write_to out
+    assert_equal("OK\n", out.string)
+  end
+
+  should "two same string will only generate one line" do
+    dict = ReadyForI18N::NoKeyDictionary.new
+    dict.push 'Key 1','Same Value:'
+    dict.push 'Key 2','Same Value:'
+    dict.push 'key 3','Different Value:'
+    out = StringIO.new
+    dict.write_to out
+    assert_equal("Same Value:\nDifferent Value:\n", out.string)
+  end
+
+  should "skip the empty string" do
+    dict = ReadyForI18N::NoKeyDictionary.new
+    dict.push 'Key 1','Some Value'
+    dict.push 'Key 2','  '
+    out = StringIO.new
+    dict.write_to out
+    assert_equal("Some Value\n", out.string)
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ready_for_i18n
 version: !ruby/object:Gem::Version 
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors: 
 - zigzag
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-25 00:00:00 +08:00
+date: 2009-12-30 00:00:00 +08:00
 default_executable: ready_for_i18n
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: ya2yaml
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0.26"
+    version: 
 description: "      ready_for_i18n will help you extract visible hard-coded text from your ERB view files,\n      then choose a proper key and replace them with the I18n.translate method like t(:login)\n"
 email: zigzag.chen@gmail.com
 executables: 
@@ -44,7 +54,9 @@ files:
 - lib/html_attr_extractor.rb
 - lib/html_text_extractor.rb
 - lib/i18n_generator.rb
+- lib/key_mapper.rb
 - lib/locale_dictionary.rb
+- lib/no_key_dictionary.rb
 - lib/ready_for_i18n.rb
 - ready_for_i18n.gemspec
 - test/fixtures/html_attr.html.erb
@@ -52,12 +64,13 @@ files:
 - test/helper.rb
 - test/output/en.yml
 - test/output/label.html.erb
-- test/output/text.html.erb
 - test/test_erb_helper_extractor.rb
 - test/test_extractor_base.rb
 - test/test_html_attr_extractor.rb
 - test/test_html_text_extractor.rb
+- test/test_key_mapper.rb
 - test/test_locale_dictionary.rb
+- test/test_nokey_dictionary.rb
 has_rdoc: true
 homepage: http://github.com/zigzag/ready_for_i18n
 licenses: []
@@ -92,4 +105,6 @@ test_files:
 - test/test_extractor_base.rb
 - test/test_html_attr_extractor.rb
 - test/test_html_text_extractor.rb
+- test/test_key_mapper.rb
 - test/test_locale_dictionary.rb
+- test/test_nokey_dictionary.rb

data/test/output/text.html.erb

@@ -1,89 +0,0 @@
-<table width="100%">
-  <tr>
-    <td valign="top">
-      <h1><%=t(:text_users)%></h1>
-      <br/>
-      <table class="data sortable" id="users">
-        <thead>
-          <tr>
-            <th class="left"><%=t(:text_login)%></th>
-            <th class="left"><%=t(:text_name)%></th>
-            <th class="left nosort"><%=t(:text_groups)%></th>
-            <th class="left nosort" nowrap><%=t(:text_operations)%></th>
-          </tr>
-        </thead>
-        <tbody >
-          <% @users.each do |user|%>
-            <% clazz = cycle("even", "odd", :name => 'index_user') %>
-            <tr id="user-<%= u user.login -%>">
-              <td class="left" valign="top"><%=user.login %></td>
-              <td class="left" valign="top"><%=user.name %></td>
-              <td class="left" valign="top">
-                <%= user.groups.sort.map(&:name).join(', ') %> (<%= link_to "select", {:action => 'select_group', :id => user.id}, :id => "select-#{u user.login}" %>)
-              </td>
-              <td class="left" valign="top">
-                <%= link_to "edit", { :id => user.id, :action => 'edit'}, :id => "edit-#{u user.login}" %> |
-                <%= link_to "delete", {:action => 'destroy', :id => user.id}, {:confirm => "Warning : are you sure to delete this user ?", :method => 'delete', :id => "delete-#{u user.login}"} %>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-    </td>
-    <td class="sep"> </td>
-    <td valign="top" align="right" width="210">
-        <%
-        action_name = 'create'
-        title='Add new user'
-        if @user.id
-          action_name = 'update'
-          title='Edit user'
-        end
-         %>
-    <% form_for :user, @user, :url => { :id => @user.id, :action => action_name}, :html => { :method => @user.id.nil?? :post : :put } do |f| %>
-      <table class="admintable" width="100%">
-        <tr>
-            <td class="left" valign="top"><h1><%= title %></h1></td>
-          </tr>
-        <tr>
-          <td class="left" valign="top"><%=t(:text_login)%>
-            <% if @user.id %>
-              <%= @user.login %>
-              <%= f.hidden_field :login %>
-
-            <% else %>
-              <br/><%= f.text_field :login, :size => 30, :maxLength => 40 %>
-            <% end %>
-          </td>
-        </tr>
-        <tr>
-          <td class="left" valign="top"><%=t(:text_name)%><br/><%= f.text_field :name, :size => 30, :maxLength => 200 %></td>
-        </tr>
-        <tr>
-          <td class="left" valign="top"><%=t(:text_password)%><br/><%= f.password_field :password, :size => 30, :maxLength => 50 %></td>
-        </tr>
-        <tr>
-          <td class="left" valign="top"><%=t(:text_confirm_password)%><br/><%= f.password_field :password_confirmation, :size => 30, :maxLength => 50 %></td>
-          </tr>
-        <tr>
-          <td class="left"  nowrap="nowrap" valign="top" colspan="2">
-            <%= submit_tag @user.id.nil?? 'Create':'Update' %>
-            <%= link_to 'cancel', { :controller => 'users', :action => 'index'}, { :class => 'action' } %><br/>
-          </td>
-        </tr>
-
-      </table>
-        <% end %>
-    </td>
-  </tr>
-</table>
-
-<%= link_to "export",
- url_for(:controller => 'api/rules', :action => 'index', :language => @profile.language, :profile => @profile.name,
-      :plugins => @plugins.join(','),
-      :status => @status, :searchtext => @searchtext, :priorities => @priorities.join(','), :categories => @categories.join(','),
-      :format => 'csv'),
- :class => 'action' %>&nbsp;&nbsp;<%=t(:text_export)%>
-
-<%= link_to_remote 'Add Event', {:url => { :controller => 'events', :action => "new", :rid => params['rid'] },
-     :update => "event_form"}, {:class => 'action'} %>