haml-i18n-extractor 0.3.5 → 0.4.0

data/test/support/ex1.output.haml

@@ -24,5 +24,9 @@
                 %li
                   %a{:href => url_for([:admin, :accounts])}
                     %span= t('.accounts')
+        = link_to pending_account_invoices_path(account) do
+          = t('.this_linkez')
         - if true
-          = t('.what_is_supposed_to_be_is_supp')
+          = t('.what_is_supposed_to_be_is_supp')
+        %td=link_to(t('.details'), admin_usage_import_url(usage_import.usage_report))
+        = t('.random')

data/test/support/ex2.haml

@@ -0,0 +1,31 @@
+= render :partial => "layouts/adminnav", :locals => {:account => nil }
+.row
+  .admin.span12
+    %h1
+      Billing Month
+      = @billing_month.display_name
+
+    %h3
+      All Invoices Billable?
+      %span{:style => (@billable_invoices == @active_invoices) ? "color: #090" : "color: #900"}
+        = "#{@billable_invoices} out of #{@active_invoices}"
+    %h3
+      24 hours past end of billing month?
+      %span{:style => (@billing_month.past_cutoff) ? "color: #090" : "color: #900"}
+        = @billing_month.past_cutoff
+
+    - if @billing_month.open?
+      - if @billing_month.past_cutoff && (@billable_invoices == @active_invoices)
+        = form_for @billing_month, :url => close_admin_billing_month_url(@billing_month), :method => "POST" do |f|
+          = f.submit "Close This Month (cannot be undone)", :class => 'btn btn-primary'
+      - else
+        %p
+          Billing Month cannot be closed yet.
+      %p
+        Closing the billing month will mark all the invoices as "Posted".
+      %p
+        After closing you will need to do a payment run to charge all the affected customers for the amounts due in posted invoices.
+    - elsif @billing_month.closing?
+      Month is currently closing (reload to check if it's done)
+    - elsif @billing_month.closed?
+      Month is closed

data/test/support/ex2.output.haml

@@ -0,0 +1,31 @@
+= render :partial => "layouts/adminnav", :locals => {:account => nil }
+.row
+  .admin.span12
+    %h1
+      = t('.billing_month')
+      = @billing_month.display_name
+
+    %h3
+      = t('.all_invoices_billable')
+      %span{:style => (@billable_invoices == @active_invoices) ? "color: #090" : "color: #900"}
+        =t('.billable_invoices_out_of_activ')
+    %h3
+      = t('.24_hours_past_end_of_billing_m')
+      %span{:style => (@billing_month.past_cutoff) ? "color: #090" : "color: #900"}
+        = @billing_month.past_cutoff
+
+    - if @billing_month.open?
+      - if @billing_month.past_cutoff && (@billable_invoices == @active_invoices)
+        = form_for @billing_month, :url => close_admin_billing_month_url(@billing_month), :method => "POST" do |f|
+          = f.submit "Close This Month (cannot be undone)", :class => 'btn btn-primary'
+      - else
+        %p
+          = t('.billing_month_cannot_be_closed')
+      %p
+        = t('.closing_the_billing_month_will')
+      %p
+        = t('.after_closing_you_will_need_to')
+    - elsif @billing_month.closing?
+      = t('.month_is_currently_closing_rel')
+    - elsif @billing_month.closed?
+      = t('.month_is_closed')

data/test/support/ex3.haml

@@ -0,0 +1,13 @@
+%h1
+  = link_to '#', id: 'customer-control-menu', role: 'button', class: 'dropdown-toggle', data: {toggle: 'dropdown'} do
+    Here
+  = link_to 'real text here', id: 'customer-control-menu', role: 'button', class: 'dropdown-toggle', data: {toggle: 'dropdown'} do
+    There
+
+  %span.creator{:title => "This user is an owner of this account"} owner
+  %span.title&= user.name
+  %strong \#{@account.name}
+
+  %table(style="width:400px")
+    %td (?)
+    %td \#{@account.send(attr) || '(none)'}

data/test/support/ex3.output.haml

@@ -0,0 +1,13 @@
+%h1
+  = link_to t('.link_to_id_customercontrolmenu'), id: 'customer-control-menu', role: 'button', class: 'dropdown-toggle', data: {toggle: 'dropdown'} do
+    = t('.here')
+  = link_to t('.real_text_here'), id: 'customer-control-menu', role: 'button', class: 'dropdown-toggle', data: {toggle: 'dropdown'} do
+    = t('.there')
+
+  %span.creator{:title= => "This user is an t('.owner') of this account"} t('.owner')
+  %span.title&= user.name
+  %strong \#{@account.name}
+
+  %table(style="width:400px")
+    %td= t('.td')
+    %td \#{@account.send(attr) || '(none)'}

data/test/support/with_filter.haml

@@ -0,0 +1,22 @@
+.class This is text
+- if true
+  :javascript
+    var cheaterButton = $("<a href='#'>Cheat</a>");
+    $('form').prepend(cheaterButton);
+    cheaterButton.click(function(){
+      $('[name="field_creditCardType"]').first().click();
+      $('[name="field_creditCardNumber"]').val("4111111111111111");
+      $('[name="field_creditCardExpirationMonth"]').val("01");
+      $('[name="field_creditCardExpirationYear"]').val("2015");
+      $('[name="field_cardSecurityCode"]').val("111");
+      $('[name="field_creditCardHolderName"]').val("Foo Bar");
+      $('[name="field_creditCardCountry"]').val("USA");
+      $('[name="field_creditCardAddress1"]').val("123 Abc St");
+      $('[name="field_creditCardAddress2"]').val("Apt 456");
+      $('[name="field_creditCardCity"]').val("San Francisco");
+      $('[name="field_creditCardState"]').val("CA");
+      $('[name="field_creditCardPostalCode"]').val("94107");
+      $('[name="field_phone"]').val("1234567890");
+      $('[name="field_email"]').val("foo@example.com");
+      return false;
+    });

data/test/text_finder_test.rb

@@ -6,113 +6,113 @@ module Haml
     # empty line
     test "empty line does not explode" do
       assert_equal find_text(""), ""
-      assert_equal find_type(""), :text
+      assert_equal find_type(""), :plain
     end
 
     # regular text mode
     test "regular text without whitespaces" do
       assert_equal find_text("iphone"), "iphone"
-      assert_equal find_type("iphone"), :text
+      assert_equal find_type("iphone"), :plain
     end
 
     test "regular text with whitespaces" do
-      assert_equal find_text("  iphone4"), "iphone4"
-      assert_equal find_type("  iphone4"), :text
+      assert_equal find_text("iphone4  "), "iphone4"
+      assert_equal find_type("iphone4  "), :plain
     end
 
-    # silent script mode
-    test "silent scripts with strings" do
-      assert_equal find_text("- 'jessica'"), "jessica"
-      assert_equal find_type("- 'jessica'"), :silent
+    test "scripts with strings" do
+      assert_equal find_text("= 'jessica'"), " 'jessica'"
+      assert_equal find_type("= 'jessica'"), :script
     end
 
-    test "silent scripts with no strings" do
-      assert_equal find_text("- if true"), ""
-      assert_equal find_type("- if true"), :silent
+    test "scripts with no strings" do
+      assert_equal find_text("= true"), ""
+      assert_equal find_type("= true"), :script
     end
 
-    # html element mode
-    test "%tag Text is an element" do
+    # html tag mode
+    test "%tag Text is an tag" do
       assert_equal find_text("%span Text to find"), "Text to find"
-      assert_equal find_type("%span Text to find"), :element
+      assert_equal find_type("%span Text to find"), :tag
     end
 
-    test "%tag Text with class is an element" do
+    test "%tag Text with class is an tag" do
       assert_equal find_text("%span.whatever-with-thing Text to find"), "Text to find"
-      assert_equal find_type("%span.whatever-with-thing Text to find"), :element
+      assert_equal find_type("%span.whatever-with-thing Text to find"), :tag
     end
 
-    test "%tag Text with ruby eval code is a loud script" do
+    test "%tag Text with ruby eval code is a script script" do
       assert_equal find_text("%span= ruby_eval_code"), ""
-      assert_equal find_type("%span= ruby_eval_code"), :loud
+      assert_equal find_type("%span= ruby_eval_code"), :tag
     end
 
-    test "%tag Text with ruby eval code and class is a loud script" do
+    test "%tag Text with ruby eval code and class is a script script" do
       assert_equal find_text( "%span#whatever-with-thing= ruby_eval_code"), ""
-      assert_equal find_type( "%span#whatever-with-thing= ruby_eval_code"), :loud
+      assert_equal find_type( "%span#whatever-with-thing= ruby_eval_code"), :tag
     end
-    
+
     test "Ruby style tags %a{'href' => 'http://whatever'} whatever" do
       assert_equal find_text("%a{'href' => 'http://whatever'} whatever"), "whatever"
-      assert_equal find_type("%a{'href' => 'http://whatever'} whatever"), :element
+      assert_equal find_type("%a{'href' => 'http://whatever'} whatever"), :tag
     end
-    
-    # loud scripts / ruby eval mode
-    test "loud scripts with strings" do
-      assert_equal find_text('= "bob"'), "bob"
-      assert_equal find_text("= 'bob'"), "bob"
-      assert_equal find_type("= 'bob'"), :loud
+
+    # script scripts / ruby eval mode
+    test "script scripts with strings" do
+      assert_equal find_text('= "bob"'), " \"bob\""
+      assert_equal find_text("= 'bob'"), " 'bob'"
+      assert_equal find_type("= 'bob'"), :script
     end
 
-    test "loud scripts does not interpolate ruby vars in strings" do
-      assert_equal find_text('= "ruby can #{var}"'), "ruby can \#{var}"
-      assert_equal find_type('= "ruby can #{var}"'), :loud
+    test "script scripts does not interpolate ruby vars in strings" do
+      assert_equal find_text('= "ruby can #{var}"'), " \"ruby can \#{var}\""
+      assert_equal find_type('= "ruby can #{var}"'), :script
     end
-    
-    # special loud scripts exceptions
+
+    # special script scripts exceptions
     test "it finds link_to texts as an exception to the rule" do
       assert_equal find_text('= link_to "This should be found", "/"'), "This should be found"
-      assert_equal find_type('= link_to "This should be found", "/"'), :loud
+      assert_equal find_type('= link_to "This should be found", "/"'), :script
     end
-    
+
     test "it finds link_to texts as an exception to the rule and does not interpolate" do
-      assert_equal find_text('= "Statistics for #{@name}"'), "Statistics for \#{@name}"
-      assert_equal find_type('= "Statistics for #{@name}"'), :loud
-    end
-
-    # html element mode with ruby evaling
-    test "html element with ruby eval with strings" do
-      assert_equal find_text('%p= "bob"'), "bob"
-      assert_equal find_text("%p.what= 'bob'"), "bob"
-      assert_equal find_text("%p.what{:attr => :val}= 'bob'"), "bob"
-      assert_equal find_type("%p.what{:attr => :val}= 'bob'"), :loud
-    end
-    
-    test "html element loud scripts does not interpolate ruby vars in strings" do
-      assert_equal find_text('%p= "ruby can #{var}"'), "ruby can \#{var}"
-      assert_equal find_text('%p.what= "ruby can #{var}"'), "ruby can \#{var}"
-      assert_equal find_text('%p.what{:attr => :val}= "ruby can #{var}"'), "ruby can \#{var}"
-      assert_equal find_type('%p.what{:attr => :val}= "ruby can #{var}"'), :loud
-    end
-    
-    test "html element it finds link_to texts as an exception to the rule" do
+      assert_equal find_text('= "Statistics for #{@name}"'), " \"Statistics for \#{@name}\""
+      assert_equal find_type('= "Statistics for #{@name}"'), :script
+    end
+
+    # html tag mode with ruby evaling
+    test "html tag with ruby eval with strings" do
+      assert_equal find_text('%p= "bob"'), "\"bob\""
+      assert_equal find_text("%p.what= 'bob'"), "'bob'"
+      assert_equal find_text("%p.what{:attr => :val}= 'bob'"), "'bob'"
+      assert_equal find_type("%p.what{:attr => :val}= 'bob'"), :tag
+    end
+
+    test "html tag script scripts does not interpolate ruby vars in strings" do
+      assert_equal find_text('%p= "ruby can #{var}"'), "\"ruby can \#{var}\""
+      assert_equal find_text('%p.what= "ruby can #{var}"'), "\"ruby can \#{var}\""
+      assert_equal find_text('%p.what{:attr => :val}= "ruby can #{var}"'), "\"ruby can \#{var}\""
+      assert_equal find_type('%p.what{:attr => :val}= "ruby can #{var}"'), :tag
+    end
+
+    test "html tag it finds link_to texts as an exception to the rule" do
       assert_equal find_text('%p= link_to "This should be found", "/"'), "This should be found"
       assert_equal find_text('%p.what= link_to "This should be found", "/"'), "This should be found"
       assert_equal find_text('%p.what{:attr => :val}= link_to "This should be found", "/"'), "This should be found"
-      assert_equal find_type('%p.what{:attr => :val}= link_to "This should be found", "/"'), :loud
+      assert_equal find_type('%p.what{:attr => :val}= link_to "This should be found", "/"'), :tag
     end
-    
-    test "html element it finds link_to texts as an exception to the rule and does not interpolate" do
-      assert_equal find_text('%p= "Statistics for #{@name}"'), "Statistics for \#{@name}"
-      assert_equal find_text('%p.what= "Statistics for #{@name}"'), "Statistics for \#{@name}"
-      assert_equal find_text('%p.what{:attr => :val}= "Statistics for #{@name}"'), "Statistics for \#{@name}"
-      assert_equal find_type('%p.what{:attr => :val}= "Statistics for #{@name}"'), :loud
+
+    test "html tag it finds link_to texts as an exception to the rule and does not interpolate" do
+      assert_equal find_text('%p= "Statistics for #{@name}"'), "\"Statistics for \#{@name}\""
+      assert_equal find_text('%p.what= "Statistics for #{@name}"'), "\"Statistics for \#{@name}\""
+      assert_equal find_text('%p.what{:attr => :val}= "Statistics for #{@name}"'), "\"Statistics for \#{@name}\""
+      assert_equal find_type('%p.what{:attr => :val}= "Statistics for #{@name}"'), :tag
     end
 
     private
 
     def process_haml(haml)
-      text_finder = Haml::I18n::Extractor::TextFinder.new(haml)
+      metadata = Haml::I18n::Extractor::HamlParser.new(haml).metadata.first
+      text_finder = Haml::I18n::Extractor::TextFinder.new(haml,metadata)
       text_finder.process_by_regex
     end
 
@@ -127,4 +127,4 @@ module Haml
     end
 
   end
-end
+end

data/test/text_replacer_test.rb

@@ -4,7 +4,7 @@ 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", :text)
+      Haml::I18n::Extractor::TextReplacer.new("this is whatever", "this is whatever", :plain)
     end
 
     test "but it raises if passed a wrong line type" do
@@ -18,48 +18,48 @@ module Haml
 
     # 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", :text)
+      replacer = Haml::I18n::Extractor::TextReplacer.new("this is whatever", "this is whatever", :plain)
       assert_equal replacer.replace_hash, { :modified_line => "= t('.this_is_whatever')", 
                                           :keyname => "t('.this_is_whatever')", :replaced_text => "this is whatever"  }
     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", :element)
+      replacer = Haml::I18n::Extractor::TextReplacer.new("%span Admin Dashboard", "Admin Dashboard", :tag)
       assert_equal replacer.replace_hash, { :modified_line => "%span= t('.admin_dashboard')",
                                            :keyname => "t('.admin_dashboard')", :replaced_text => "Admin Dashboard" }
     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')", :element)
+      replacer = Haml::I18n::Extractor::TextReplacer.new("%span t('.admin_dashboard')", "t('.admin_dashboard')", :tag)
       assert_equal replacer.replace_hash, { :modified_line => "%span t('.admin_dashboard')",
                                            :keyname => "t('.admin_dashboard')", :replaced_text => "t('.admin_dashboard')" }
     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')", :loud)
+      replacer = Haml::I18n::Extractor::TextReplacer.new("%span= t('.admin_dashboard')", "t('.admin_dashboard')", :script)
       assert_equal replacer.replace_hash, { :modified_line => "%span= t('.admin_dashboard')",
                                            :keyname => "t('.admin_dashboard')", :replaced_text => "t('.admin_dashboard')" }
     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", :loud)
+      replacer = Haml::I18n::Extractor::TextReplacer.new(%{%p#brand= link_to 'Some Place', '/'}, "Some Place", :script)
       assert_equal replacer.replace_hash, { :modified_line => %{%p#brand= link_to t('.some_place'), '/'} , 
                                             :keyname => "t('.some_place')", :replaced_text => "Some Place" }
 
-      replacer = Haml::I18n::Extractor::TextReplacer.new(%{%p#brand= link_to "Some Place", "/"}, "Some Place", :loud)
+      replacer = Haml::I18n::Extractor::TextReplacer.new(%{%p#brand= link_to "Some Place", "/"}, "Some Place", :script)
       assert_equal replacer.replace_hash, { :modified_line => %{%p#brand= link_to t('.some_place'), "/"} ,
                                             :keyname => "t('.some_place')", :replaced_text => "Some Place" }
     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, :text)
+      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('.')
     end
-    
+
     test "it does not allow weird characters in the keyname" do
-      weird_line = "this (is `ch@racter ~ ma?dne{}ss!"
-      replacer = Haml::I18n::Extractor::TextReplacer.new(weird_line, weird_line, :text)
+      weird_line = "thi:s = (is \"' `ch@racter ~ ma?dne{}ss!"
+      replacer = Haml::I18n::Extractor::TextReplacer.new(weird_line, weird_line, :plain)
       assert_equal replacer.replace_hash, { :modified_line => "= t('.this_is_chracter_madness')", 
                                             :keyname => "t('.this_is_chracter_madness')", :replaced_text => weird_line }
     end

data/test/yaml_tool_test.rb

@@ -41,21 +41,7 @@ module Haml
     end
 
     def ex1_yaml_hash
-      {"en"=>
-       {"support" =>
-        {"ex1" =>
-         {"some_place"=>"Some place",
-          "admin"=>"Admin",
-          "admin_dashboard"=>"Admin Dashboard",
-          "stacks"=>"Stacks",
-          "alerts"=>"t('.alerts')",
-          "accounts"=>"Accounts",
-          "what_is_supposed_to_be_is_supp"=>
-         "What is@ supposed to be, is supposed to be! ~"
-         }
-        }
-       }
-      }
+      YAML.load File.read(file_path("ex1.yml"))
     end
 
     test "defaults for empty init" do