haml-i18n-extractor 0.4.3 → 0.5.0

data/test/text_replacer_test.rb

@@ -3,65 +3,67 @@ require 'test_helper'
 module Haml
   class TextReplacerTest < MiniTest::Unit::TestCase
     
-    test "it initializes with the line it is going to replace and the match to replace" do
-      Haml::I18n::Extractor::TextReplacer.new("this is whatever", "this is whatever", :plain)
+    def test_it_initializes_with_the_line_it_is_going_to_replace_and_the_match_to_replace
+      Haml::I18n::Extractor::TextReplacer.new("this is whatever", "this is whatever", :plain, "/path/to/doesntmatter.haml")
     end
 
-    test "but it raises if passed a wrong line type" do
+    def test_but_it_raises_if_passed_a_wrong_line_type
       begin
-        replacer = Haml::I18n::Extractor::TextReplacer.new("regular text", "regular text", :this_is_not_defined)
+        replacer = Haml::I18n::Extractor::TextReplacer.new("regular text", "regular text", :this_is_not_defined, "/path/to/doesntmatter.haml")
         assert false, 'should raise'
       rescue Haml::I18n::Extractor::NotDefinedLineType
         assert true, 'raised NotDefinedLineType'
       end
     end
 
+
+
     # some text replacement examples
-    test "it can replace the body of haml with t() characters" do
-      replacer = Haml::I18n::Extractor::TextReplacer.new("this is whatever", "this is whatever", :plain)
+    def test_it_can_replace_the_body_of_haml_with_t_characters
+      replacer = Haml::I18n::Extractor::TextReplacer.new("this is whatever", "this is whatever", :plain, "/path/to/doesntmatter.haml")
       assert_equal replacer.replace_hash, { :modified_line => "= t('.this_is_whatever')", 
-                                          :keyname => "t('.this_is_whatever')", :replaced_text => "this is whatever"  }
+                                          :t_name => "this_is_whatever", :replaced_text => "this is whatever", :path => "/path/to/doesntmatter.haml"  }
     end
 
-    test "it can replace the body of haml with t() characters example" do
-      replacer = Haml::I18n::Extractor::TextReplacer.new("%span Admin Dashboard", "Admin Dashboard", :tag)
+    def test_it_can_replace_the_body_of_haml_with_t_characters_example
+      replacer = Haml::I18n::Extractor::TextReplacer.new("%span Admin Dashboard", "Admin Dashboard", :tag, "/path/to/doesntmatter.haml")
       assert_equal replacer.replace_hash, { :modified_line => "%span= t('.admin_dashboard')",
-                                           :keyname => "t('.admin_dashboard')", :replaced_text => "Admin Dashboard" }
+                                           :t_name => "admin_dashboard", :replaced_text => "Admin Dashboard", :path => "/path/to/doesntmatter.haml" }
     end
 
-    test "it won't replace already replaced t() characters if they are not ruby evaled" do
-      replacer = Haml::I18n::Extractor::TextReplacer.new("%span t('.admin_dashboard')", "t('.admin_dashboard')", :tag)
+    def test_it_wont_replace_already_replaced_t_characters_if_they_are_not_ruby_evaled
+      replacer = Haml::I18n::Extractor::TextReplacer.new("%span t('.admin_dashboard')", "t('.admin_dashboard')", :tag, "/path/to/doesntmatter.haml")
       assert_equal replacer.replace_hash, { :modified_line => "%span t('.admin_dashboard')",
-                                           :keyname => "t('.admin_dashboard')", :replaced_text => "t('.admin_dashboard')" }
+                                           :t_name => "admin_dashboard", :replaced_text => "t('.admin_dashboard')", :path => "/path/to/doesntmatter.haml" }
     end
 
-    test "it won't replace already replaced t() characters that are ruby evaled" do
-      replacer = Haml::I18n::Extractor::TextReplacer.new("%span= t('.admin_dashboard')", "t('.admin_dashboard')", :script)
+    def test_it_wont_replace_already_replaced_t_characters_that_are_ruby_evaled
+      replacer = Haml::I18n::Extractor::TextReplacer.new("%span= t('.admin_dashboard')", "t('.admin_dashboard')", :script, "/path/to/doesntmatter.haml")
       assert_equal replacer.replace_hash, { :modified_line => "%span= t('.admin_dashboard')",
-                                           :keyname => "t('.admin_dashboard')", :replaced_text => "t('.admin_dashboard')" }
+                                           :t_name => "admin_dashboard", :replaced_text => "t('.admin_dashboard')", :path => "/path/to/doesntmatter.haml" }
     end
 
-    test "it can replace the body of haml with t() characters example for link_to and removes surrounding quotes as well" do
-      replacer = Haml::I18n::Extractor::TextReplacer.new(%{%p#brand= link_to 'Some Place', '/'}, "Some Place", :script)
+    def test_it_can_replace_the_body_of_haml_with_t_characters_example_for_link_to_and_removes_surrounding_quotes_as_well
+      replacer = Haml::I18n::Extractor::TextReplacer.new(%{%p#brand= link_to 'Some Place', '/'}, "Some Place", :script, "/path/to/doesntmatter.haml")
       assert_equal replacer.replace_hash, { :modified_line => %{%p#brand= link_to t('.some_place'), '/'} , 
-                                            :keyname => "t('.some_place')", :replaced_text => "Some Place" }
+                                            :t_name => "some_place", :replaced_text => "Some Place", :path => "/path/to/doesntmatter.haml" }
 
-      replacer = Haml::I18n::Extractor::TextReplacer.new(%{%p#brand= link_to "Some Place", "/"}, "Some Place", :script)
+      replacer = Haml::I18n::Extractor::TextReplacer.new(%{%p#brand= link_to "Some Place", "/"}, "Some Place", :script, "/path/to/doesntmatter.haml")
       assert_equal replacer.replace_hash, { :modified_line => %{%p#brand= link_to t('.some_place'), "/"} ,
-                                            :keyname => "t('.some_place')", :replaced_text => "Some Place" }
+                                            :t_name => "some_place", :replaced_text => "Some Place", :path => "/path/to/doesntmatter.haml" }
     end
 
     # keyname restrictions
-    test "it limits the characters of the t namespace it provides to LIMIT_KEY_NAME" do
-      replacer = Haml::I18n::Extractor::TextReplacer.new("this is whatever" * 80, "this is whatever" * 80, :plain)
-      assert_equal replacer.replace_hash[:modified_line].size, Haml::I18n::Extractor::TextReplacer::LIMIT_KEY_NAME + 8 # = t('.')
+    def test_it_limits_the_characters_of_the_t_namespace_it_provides_to_limit_key_name
+      replacer = Haml::I18n::Extractor::TextReplacer.new("this is whatever" * 80, "this is whatever" * 80, :plain, "/path/to/doesntmatter.haml")
+      assert_equal replacer.replace_hash[:modified_line].size, Haml::I18n::Extractor::Helpers::StringHelpers::LIMIT_KEY_NAME + 8 # = t('.')
     end
 
-    test "it does not allow weird characters in the keyname" do
+    def test_it_does_not_allow_weird_characters_in_the_keyname
       weird_line = "thi:s = (is \"' `ch@racter ~ ma?dne{}ss!"
-      replacer = Haml::I18n::Extractor::TextReplacer.new(weird_line, weird_line, :plain)
+      replacer = Haml::I18n::Extractor::TextReplacer.new(weird_line, weird_line, :plain, "/path/to/doesntmatter.haml")
       assert_equal replacer.replace_hash, { :modified_line => "= t('.this_is_chracter_madness')", 
-                                            :keyname => "t('.this_is_chracter_madness')", :replaced_text => weird_line }
+                                            :t_name => "this_is_chracter_madness", :replaced_text => weird_line, :path => "/path/to/doesntmatter.haml" }
     end
 
   end

data/test/workflow_test.rb

@@ -5,14 +5,14 @@ module Haml
 
     def setup
       TestHelper.setup_project_directory! # tests here rely on this setup...
-      @workflow = TestHelper.mock_full_project_user_interaction! 
+      @workflow = TestHelper.mock_full_project_user_interaction!
     end
 
     def teardown
       TestHelper.teardown_project_directory!
     end
 
-    test "it_should_work_on_a_directory_mkay" do
+    def test_it_should_work_on_a_directory_mkay
       begin
         filename = "#{TestHelper::PROJECT_DIR}app/views/bar/thang.haml"
         bad_worfklow = Haml::I18n::Extractor::Workflow.new(filename)
@@ -22,18 +22,18 @@ module Haml
       end
     end
 
-    test "it_finds_all_haml_files" do
+    def test_it_finds_all_haml_files
       assert_equal @workflow.files.size, 9
     end
 
-    test "outputs_stats" do
+    def test_outputs_stats
       with_highline do
         @workflow.start_message
         assert @output.string.match(/Found \d haml files/), "Outputs stats"
       end
     end
 
-    test "yaml_file_in_config" do
+    def test_yaml_file_in_config
       TestHelper.mock_full_project_user_interaction!
     end
 

data/test/yaml_writer_test.rb

@@ -0,0 +1,120 @@
+require 'test_helper'
+
+module Haml
+  class YamlWriterTest < MiniTest::Unit::TestCase
+
+    def setup
+      @temp_locale_dir = "./test/tmp/"
+      TestHelper.setup_project_directory!
+    end
+
+    def setup_info_for_yaml
+      @ex1 = Haml::I18n::Extractor.new(file_path("ex1.haml"))
+      @ex1.run
+    end
+
+    def locale_config_dir
+      dir = File.expand_path(File.join(File.dirname(__FILE__), "/tmp/config/locales"))
+      if ! File.exists?(dir)
+        FileUtils.mkdir_p(dir)
+      end
+      dir
+    end
+
+    def locale_config_file
+      File.join(locale_config_dir, "en.yml")
+    end
+
+    def setup_yaml_file
+      File.open(locale_config_file, "w+") do |f|
+        f.write(existing_yaml_hash.to_yaml)
+      end
+    end
+
+    def existing_yaml_hash
+      {"en" => {
+        "viewname" => {
+          "translate_key" => "Translate Key"
+        }
+      }
+      }
+    end
+
+    def ex1_yaml_hash
+      YAML.load File.read(file_path("ex1.yml"))
+    end
+
+    def ex5_yaml_hash
+      YAML.load File.read(file_path("ex5.yml"))
+    end
+
+    def test_it_can_deal_with_interpolated_vars
+      @ex5 = Haml::I18n::Extractor.new(file_path("ex5.haml"))
+      @ex5.run
+      assert_equal @ex5.yaml_writer.yaml_hash, ex5_yaml_hash
+    end
+
+    def test_defaults_for_empty_init
+      yaml_writer = Haml::I18n::Extractor::YamlWriter.new
+      assert_equal yaml_writer.yaml_file, "./config/locales/en.yml"
+      assert_equal yaml_writer.i18n_scope, :en
+    end
+
+    def test_you_can_pass_a_yaml_file
+      yaml_writer = Haml::I18n::Extractor::YamlWriter.new(nil, @temp_locale_dir)
+      assert_equal yaml_writer.yaml_file, @temp_locale_dir
+    end
+
+    def test_it_can_merge_with_an_existing_yml_file
+      setup_info_for_yaml
+      setup_yaml_file
+      @ex1.yaml_writer.write_file(locale_config_file)
+      really_written = YAML.load(File.read(locale_config_file))
+      assert_equal really_written['en']['viewname'], existing_yaml_hash['en']['viewname']
+      assert_equal really_written['en']['support'], ex1_yaml_hash['en']['support']
+    end
+
+    def test_it_can_accept_a_different_yml_file
+      @ex1 = Haml::I18n::Extractor.new(file_path("ex1.haml"), {:yaml_file => "/tmp/foo.yml"})
+      assert_equal @ex1.yaml_writer.yaml_file, "/tmp/foo.yml"
+    end
+
+    def test_it_knows_about_i18n_scope
+      @ex1 = Haml::I18n::Extractor.new(file_path("ex1.haml"), {:i18n_scope => "he"})
+      assert_equal @ex1.yaml_writer.i18n_scope, :he
+    end
+
+    def test_it_knows_about_i18n_scope_defaults_to_en
+      @ex1 = Haml::I18n::Extractor.new(file_path("ex1.haml"))
+      assert_equal @ex1.yaml_writer.i18n_scope, :en
+    end
+
+    def test_it_will_assume_yaml_file_according_to_i18n_scope_if_no_yaml_file_is_passed
+      yaml_writer = Haml::I18n::Extractor::YamlWriter.new("he", nil)
+      assert_equal yaml_writer.yaml_file, "./config/locales/he.yml"
+    end
+
+    def test_it_will_not_assume_yaml_file_according_to_i18n_scope_if_yaml_file_is_passed
+      yaml_writer = Haml::I18n::Extractor::YamlWriter.new("he", "/tmp/foo.yml")
+      assert_equal yaml_writer.yaml_file, "/tmp/foo.yml"
+    end
+
+    def test_it_relies_on_the_info_for_yaml_having_a_certain_format
+      setup_info_for_yaml
+      @ex1.yaml_writer.info_for_yaml.each do |line_no, info_for_line|
+        assert info_for_line.has_key?(:modified_line), "hash info has :modified_line key"
+        assert info_for_line.has_key?(:t_name), "hash info has :t_name key"
+        assert info_for_line.has_key?(:replaced_text), "hash info has :replaced_text key"
+        # FIXME: since the scope right now is we're running this per file this will be the same, but keeping this right now.
+        assert info_for_line.has_key?(:path), "hash info has :path key"
+      end
+    end
+
+    def test_constructs_a_yaml_hash_according_to_the_view_in_rails_mode
+      setup_info_for_yaml
+      yaml_writer = @ex1.yaml_writer
+      assert_equal yaml_writer.yaml_hash, ex1_yaml_hash
+    end
+
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: haml-i18n-extractor
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
-  - 3
-  version: 0.4.3
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Shai Rosenfeld
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-09-05 00:00:00 Z
+date: 2013-09-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: tilt
@@ -223,21 +223,24 @@ files:
 - haml-i18n-extractor.gemspec
 - lib/haml-i18n-extractor.rb
 - lib/haml-i18n-extractor/core-ext/hash.rb
-- lib/haml-i18n-extractor/extraction/exception_finder.rb
 - lib/haml-i18n-extractor/extraction/extractor.rb
+- lib/haml-i18n-extractor/extraction/finder/exception_finder.rb
+- lib/haml-i18n-extractor/extraction/finder/text_finder.rb
 - lib/haml-i18n-extractor/extraction/haml_parser.rb
 - lib/haml-i18n-extractor/extraction/haml_reader.rb
 - lib/haml-i18n-extractor/extraction/haml_writer.rb
-- lib/haml-i18n-extractor/extraction/tagging_tool.rb
-- lib/haml-i18n-extractor/extraction/text_finder.rb
-- lib/haml-i18n-extractor/extraction/text_replacer.rb
-- lib/haml-i18n-extractor/extraction/yaml_tool.rb
+- lib/haml-i18n-extractor/extraction/replacer/interpolation_helper.rb
+- lib/haml-i18n-extractor/extraction/replacer/replacer_result.rb
+- lib/haml-i18n-extractor/extraction/replacer/text_replacer.rb
+- lib/haml-i18n-extractor/extraction/tagging_writer.rb
+- lib/haml-i18n-extractor/extraction/yaml_writer.rb
 - lib/haml-i18n-extractor/flow/cli.rb
 - lib/haml-i18n-extractor/flow/prompter.rb
 - lib/haml-i18n-extractor/flow/user_action.rb
 - lib/haml-i18n-extractor/flow/workflow.rb
 - lib/haml-i18n-extractor/helpers.rb
 - lib/haml-i18n-extractor/version.rb
+- scripts/renew_test_syntax
 - test/cli_test.rb
 - test/exception_finder_test.rb
 - test/extractor_test.rb
@@ -245,24 +248,29 @@ files:
 - test/haml_reader_test.rb
 - test/haml_writer_test.rb
 - test/integration_test.rb
+- test/interpolation_helper_test.rb
 - test/prompter_test.rb
 - test/support/bad.haml
 - test/support/ex1.haml
 - test/support/ex1.output.haml
+- test/support/ex1.yml
 - test/support/ex2.haml
 - test/support/ex2.output.haml
 - test/support/ex3.haml
 - test/support/ex3.output.haml
 - test/support/ex4.haml
 - test/support/ex4.output.haml
+- test/support/ex5.haml
+- test/support/ex5.output.haml
+- test/support/ex5.yml
 - test/support/nothing_to_translate.haml
 - test/support/nothing_to_translate.i18n-extractor.haml
-- test/tagging_tool_test.rb
+- test/tagging_writer_test.rb
 - test/test_helper.rb
 - test/text_finder_test.rb
 - test/text_replacer_test.rb
 - test/workflow_test.rb
-- test/yaml_tool_test.rb
+- test/yaml_writer_test.rb
 homepage: https://github.com/shaiguitar/haml-i18n-extractor
 licenses: 
 - MIT
@@ -304,21 +312,26 @@ test_files:
 - test/haml_reader_test.rb
 - test/haml_writer_test.rb
 - test/integration_test.rb
+- test/interpolation_helper_test.rb
 - test/prompter_test.rb
 - test/support/bad.haml
 - test/support/ex1.haml
 - test/support/ex1.output.haml
+- test/support/ex1.yml
 - test/support/ex2.haml
 - test/support/ex2.output.haml
 - test/support/ex3.haml
 - test/support/ex3.output.haml
 - test/support/ex4.haml
 - test/support/ex4.output.haml
+- test/support/ex5.haml
+- test/support/ex5.output.haml
+- test/support/ex5.yml
 - test/support/nothing_to_translate.haml
 - test/support/nothing_to_translate.i18n-extractor.haml
-- test/tagging_tool_test.rb
+- test/tagging_writer_test.rb
 - test/test_helper.rb
 - test/text_finder_test.rb
 - test/text_replacer_test.rb
 - test/workflow_test.rb
-- test/yaml_tool_test.rb
+- test/yaml_writer_test.rb

data/test/yaml_tool_test.rb

@@ -1,110 +0,0 @@
-require 'test_helper'
-
-module Haml
-  class YamlToolTest < MiniTest::Unit::TestCase
-
-    def setup
-      @temp_locale_dir = "./test/tmp/"
-      TestHelper.setup_project_directory!
-    end
-
-    def setup_locale_hash
-      @ex1 = Haml::I18n::Extractor.new(file_path("ex1.haml"))
-      @ex1.run
-    end
-
-    def locale_config_dir
-      dir = File.expand_path(File.join(File.dirname(__FILE__), "/tmp/config/locales"))
-      if ! File.exists?(dir)
-        FileUtils.mkdir_p(dir)
-      end
-      dir
-    end
-
-    def locale_config_file
-      File.join(locale_config_dir, "en.yml")
-    end
-
-    def setup_yaml_file
-      File.open(locale_config_file, "w+") do |f|
-        f.write(existing_yaml_hash.to_yaml)
-      end
-    end
-
-    def existing_yaml_hash
-      {"en" => {
-        "viewname" => {
-          "translate_key" => "Translate Key"
-        }
-      }
-      }
-    end
-
-    def ex1_yaml_hash
-      YAML.load File.read(file_path("ex1.yml"))
-    end
-
-    test "defaults for empty init" do
-      yaml_tool = Haml::I18n::Extractor::YamlTool.new
-      assert_equal yaml_tool.yaml_file, "./config/locales/en.yml"
-      assert_equal yaml_tool.i18n_scope, :en
-    end
-
-    test "you can pass a yaml_file" do
-      yaml_tool = Haml::I18n::Extractor::YamlTool.new(nil, @temp_locale_dir)
-      assert_equal yaml_tool.yaml_file, @temp_locale_dir
-    end
-
-    test "it can merge with an existing yml file" do
-      setup_locale_hash
-      setup_yaml_file
-      @ex1.yaml_tool.write_file(locale_config_file)
-      really_written = YAML.load(File.read(locale_config_file))
-      assert_equal really_written['en']['viewname'], existing_yaml_hash['en']['viewname']
-      assert_equal really_written['en']['support'], ex1_yaml_hash['en']['support']
-    end
-
-    test "it can accept a different yml file" do
-      @ex1 = Haml::I18n::Extractor.new(file_path("ex1.haml"), {:yaml_file => "/tmp/foo.yml"})
-      assert_equal @ex1.yaml_tool.yaml_file, "/tmp/foo.yml"
-    end
-
-    test "it knows about i18n scope" do
-      @ex1 = Haml::I18n::Extractor.new(file_path("ex1.haml"), {:i18n_scope => "he"})
-      assert_equal @ex1.yaml_tool.i18n_scope, :he
-    end
-
-    test "it knows about i18n scope, defaults to :en" do
-      @ex1 = Haml::I18n::Extractor.new(file_path("ex1.haml"))
-      assert_equal @ex1.yaml_tool.i18n_scope, :en
-    end
-
-    test "it will assume yaml_file according to i18n_scope if no yaml_file is passed" do
-      yaml_tool = Haml::I18n::Extractor::YamlTool.new("he", nil)
-      assert_equal yaml_tool.yaml_file, "./config/locales/he.yml"
-    end
-
-    test "it will not assume yaml_file according to i18n_scope if yaml_file is passed" do
-      yaml_tool = Haml::I18n::Extractor::YamlTool.new("he", "/tmp/foo.yml")
-      assert_equal yaml_tool.yaml_file, "/tmp/foo.yml"
-    end
-
-    test "it relies on the locale_hash having a certain format" do
-      setup_locale_hash
-      @ex1.yaml_tool.locale_hash.each do |line_no, info_for_line|
-        assert info_for_line.has_key?(:modified_line), "hash info has :modified_line key"
-        assert info_for_line.has_key?(:keyname), "hash info has :keyname key"
-        assert info_for_line.has_key?(:replaced_text), "hash info has :replaced_text key"
-        # FIXME: since the scope right now is we're running this per file this will be the same, but keeping this right now.
-        assert info_for_line.has_key?(:path), "hash info has :path key"
-      end
-    end
-
-    test "constructs a yaml hash according to the view in rails mode" do
-      setup_locale_hash
-      yaml_tool = @ex1.yaml_tool
-      assert_equal yaml_tool.yaml_hash, ex1_yaml_hash
-    end
-
-  end
-end