haml-i18n-extractor 0.4.0 → 0.4.1

data/TODO

@@ -25,10 +25,6 @@ https://github.com/shaiguitar/haml-i18n-extractor/issues/2
 
   Now we are able to have internal access to Haml::Parser internals, we can deal with...
 
-    Html Comments?!
-    Filters?!
-      use with_filter.haml...
-
     ExceptionText needs to be responsible for knowing if needed to interpolate?
 
     (BUG: duplicate texts in one line...)

data/lib/haml-i18n-extractor/extractor.rb

@@ -6,6 +6,11 @@ module Haml
         ENV['DEBUG']
       end
 
+      # helpful for debugging
+      def self.extractors
+        @extractors ||= []
+      end
+
       class InvalidSyntax < StandardError ; end
       class NotADirectory < StandardError ; end
       class NotDefinedLineType < StandardError ; end
@@ -34,6 +39,8 @@ module Haml
         @body = []
         # holds a line_no => {info_about_line_replacemnts_or_not}
         @locale_hash = {}
+
+        self.class.extractors << self
       end
 
       def run

data/lib/haml-i18n-extractor/text_finder.rb

@@ -10,24 +10,26 @@ module Haml
           @metadata = line_metadata
         end
 
-        def find
-          text_match = process_by_regex.last
-        end
-
         # returns [ line_type, text_found ]
         def process_by_regex
-          return [:plain, ""] if @metadata.nil? # a linebreak in a haml file, empty.
-          if ENV['DEBUG']
-            puts @metadata[:type]
+          if Haml::I18n::Extractor.debug?
+            binding.pry
+            puts '!!!'
+            puts @metadata && @metadata[:type]
             puts @orig_line
           end
+          # if any of the handler methods return nil the extractor just outputs orig_line and keeps on going.
+          # if there's an empty string that should do the trick to ( ExceptionFinder can return no match that way )
           @metadata && send("#{@metadata[:type]}", @metadata)
         end
 
         private
 
+        #FIXME move all these matches into a helper of some sort.
+
         def plain(line)
           txt = line[:value][:text]
+          return nil if txt.match(/<!--/) || txt.match(/-->\s*$/) # ignore html comments
           [:plain, txt]
         end
 
@@ -57,16 +59,11 @@ module Haml
           end
         end
 
-        def filter(line)
-          #$stderr.puts('=' * 80)
-          #$stderr.puts(line.inspect)
-          #$stderr.puts("have not handled filters!")
-          #$stderr.puts("please remind me to fix this")
-          #$stderr.puts('=' * 80)
-        end
-
+        # returns nil, so extractor just keeps the orig_line and keeps on going.
+        #
         # move to method missing and LINE_TYPES_IGNORE?
         # LINE_TYPES_IGNORE = [:silent_script, :haml_comment, :comment, :doctype, :root]
+        def filter(line); end
         def silent_script(line); end
         def haml_comment(line); end
         def comment(line); end

data/lib/haml-i18n-extractor/version.rb

@@ -1,7 +1,7 @@
 module Haml
   module I18n
     class Extractor
-      VERSION = "0.4.0"
+      VERSION = "0.4.1"
     end
   end
 end

data/lib/haml-i18n-extractor/workflow.rb

@@ -3,10 +3,7 @@ module Haml
     class Extractor
       class Workflow
 
-        attr_reader :extractors
-
         def initialize(project_path, options = {})
-          @extractors = []
           @passed_options = options
           @project_path = project_path
           @prompter = Haml::I18n::Extractor::Prompter.new
@@ -70,7 +67,7 @@ module Haml
           @passed_options.merge!({:type => type}) # overwrite or dump haml
           begin
             @extractor = Haml::I18n::Extractor.new(haml_path, @passed_options)
-            @extractors << @extractor
+            Extractor.extractors << @extractor
             @extractor.run
           rescue Haml::I18n::Extractor::InvalidSyntax
             @prompter.syntax_error(haml_path)

data/test/extractor_test.rb

@@ -98,6 +98,11 @@ module Haml
     end
 
     # really integration tests...movez.
+    test "it can replace a string body and have expected output ex4" do
+      expected_output = File.read(file_path("ex4.output.haml"))
+      assert_equal Haml::I18n::Extractor.new(file_path("ex4.haml")).new_body, expected_output
+    end
+
     test "it can replace a string body and have expected output ex3" do
       expected_output = File.read(file_path("ex3.output.haml"))
       assert_equal Haml::I18n::Extractor.new(file_path("ex3.haml")).new_body, expected_output

data/test/integration_test.rb

@@ -11,12 +11,12 @@ module Haml
     end
 
     test "it can handle namespaced views" do
-      namespaced_extractor = @workflow.extractors.select{|ex| ex.haml_writer.path.match /namespace/ }.last
+      namespaced_extractor = Haml::I18n::Extractor.extractors.select{|ex| ex.haml_writer.path.match /namespace/ }.last
       assert namespaced_extractor.yaml_tool.yaml_hash["en"]["namespace"], "namespace key works"
     end
 
     test "it can handle partial views" do
-      partial_extractor = @workflow.extractors.select{|ex| ex.haml_writer.path.match /_partial/ }.last
+      partial_extractor = Haml::I18n::Extractor.extractors.select{|ex| ex.haml_writer.path.match /_partial/ }.last
       assert partial_extractor.yaml_tool.yaml_hash["en"]["view2"]["partial"], "partial filenames in yaml are w/out leading _"
     end
 

data/test/support/{with_filter.haml → ex4.haml}

@@ -1,3 +1,12 @@
+html comments what
+<!-- END OLARK CHAT LINK -->
+<!-- BEGIN OLARK LEAVE MESSAGE LINK -->
+:javascript
+  var foo = 1;
+  alert("false")
+  var bar = foo;
+More
+And More
 .class This is text
 - if true
   :javascript

data/test/support/ex4.output.haml

@@ -0,0 +1,31 @@
+= t('.html_comments_what')
+<!-- END OLARK CHAT LINK -->
+<!-- BEGIN OLARK LEAVE MESSAGE LINK -->
+:javascript
+  var foo = 1;
+  alert("false")
+  var bar = foo;
+= t('.more')
+= t('.and_more')
+.class= t('.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

@@ -4,9 +4,9 @@ module Haml
   class StringFinderTest < MiniTest::Unit::TestCase
 
     # empty line
-    test "empty line does not explode" do
-      assert_equal find_text(""), ""
-      assert_equal find_type(""), :plain
+    test "empty lines, filters, matches with no @metadata" do
+      assert_equal find_text(""), nil
+      assert_equal find_type(""), nil
     end
 
     # regular text mode

metadata

@@ -1,205 +1,216 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: haml-i18n-extractor
-version: !ruby/object:Gem::Version
-  version: 0.4.0
+version: !ruby/object:Gem::Version 
+  hash: 13
+  prerelease: 
+  segments: 
+  - 0
+  - 4
+  - 1
+  version: 0.4.1
 platform: ruby
-authors:
+authors: 
 - Shai Rosenfeld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-09-03 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: tilt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: haml
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: activesupport
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: highline
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: trollop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.16.2
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: trollop
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 83
+        segments: 
+        - 1
+        - 16
+        - 2
         version: 1.16.2
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: rbench
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: m
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: m
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: pry
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: minitest
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: actionpack
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: rails
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id013
 description: Parse the texts out of the haml files into localization files
-email:
+email: 
 - shaiguitar@gmail.com
-executables:
+executables: 
 - haml-i18n-extractor
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rvmrc
 - Gemfile
@@ -242,9 +253,10 @@ files:
 - 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/nothing_to_translate.haml
 - test/support/nothing_to_translate.i18n-extractor.haml
-- test/support/with_filter.haml
 - test/tagging_tool_test.rb
 - test/test_helper.rb
 - test/text_finder_test.rb
@@ -252,30 +264,39 @@ files:
 - test/workflow_test.rb
 - test/yaml_tool_test.rb
 homepage: https://github.com/shaiguitar/haml-i18n-extractor
-licenses:
+licenses: 
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Parse the texts out of the haml files into localization files
-test_files:
+test_files: 
 - test/cli_test.rb
 - test/exception_finder_test.rb
 - test/extractor_test.rb
@@ -291,13 +312,13 @@ test_files:
 - 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/nothing_to_translate.haml
 - test/support/nothing_to_translate.i18n-extractor.haml
-- test/support/with_filter.haml
 - test/tagging_tool_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
-has_rdoc: 

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDg2NjFhOWVjNTZkOTc4ZWFiMGNkNDc4YmFmNTg3YjhkYmJmZDEwOQ==
-  data.tar.gz: !binary |-
-    NmZiYWU3YjVkZWNlN2U3MzFjNjIwNjJkZGI1ODAxMWRhZDQ2MGI2OA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MmE3ZThkNzJmN2MxYjJlMGM0ZDM4M2NkZTY4NDkzMzk0YjdhYjY2YzM0NDUz
-    NGVmMTZmMWVkNTIzYjU1MDQ0Mzc4NzUwMzJhYjA5NTIwMTczZGU3ZjU1MDc0
-    OWYzZjI0OWUwNTBmOWQ0YTQ3ZDlhMzg4YjM1NGJmMWU3MGUxZTg=
-  data.tar.gz: !binary |-
-    YzdhNzRkYThiNWMyZjAzMzFhNjExOTliZjg5ZjE1ZGZlMmI3NTM0MGJhNDg2
-    OTViOWRiYTZiYTEwYzQ2ODczYzdlYWI5ZWYxYzE2NGZjNmZhMTU2Y2MyYzMy
-    N2NmYzNlZDBjODJiZTg2YmQ1YzEwODM3MDljNzNhZGY1ZmQ3Mjg=