haml-i18n-extractor 0.0.18 → 0.0.19

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDY5MTVjZmVhOWM2YWE1NGMxZmQ2OTYzMjZkZWM3MmZjY2FiODgxNQ==
+    NzYwYzZlM2U0ZTJjZjRjMTI4NzUzOGQ5YTJhZTZjNmJkN2RjZWM5MA==
   data.tar.gz: !binary |-
-    NWNlYTJhNTA1MTI4YmRmOTVjOTQ4MWE1NWNhMDc5ZTQyYmViZjc1OA==
+    ZTI2N2EzYmQxN2YyMzZmNjU1OGY5N2Q1MGY4ZWYwNGNiODcwOWVlNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZGIwNWE4ZTU3Y2I2YjBiMjY5OTE1Y2EyOGI1MmZkZGFkNDRkNmY5Mjg5NDMy
-    MGNiMjhjOGVmOTQ3ZTA2NjdmM2U2NTE2ZWE1YjVkZTRjNGY2NWMxODc2MjRm
-    MmJmMmU1ODFkMDRlMTNmODMxMmNhMDdiN2Y3NDY3NTQ1YzI0NDk=
+    YmJjOTk2ZmU0YTI2MzZmZWZkZTI4YjQ5MzVjOTNhNmRiZTE5ZWQwYzkxY2Zi
+    ZjE4NmNlZGI0NWFmYjQ4NjAwMWY1ZDE5YmIxMjg1NGMzN2UzNjMzNmExNWFh
+    ZGIwZGI0ZmU5NzQ0YmFmNDEwOTg3YWFkMTE0N2Q3NDE0NTliZDU=
   data.tar.gz: !binary |-
-    YTgwMTUyNzQ3NGQxMWM0ODRkZTNhN2EyMDQwMmI1ZjQ0NTg2MTlmMmM0ZWU2
-    ZjRmMDA1ODE4YzAxNjQ4YzYwOTRmMmRlZjE3MDE4YmM3MjRiNGIxNjM0Y2M2
-    MmRiYTEyODIwODg1YTYyY2YxM2FmZDk5YjI3ZmZiNWVlZGE1ZGI=
+    M2IzYjJjNTdjMzMwYTU5NmJhODgxMTA4YzNiNDUzOTA4Yjk1MDNjZDc1MGE1
+    YTU2YWNkMmIxY2Q0MGEyMGM3OWMxODhiMjc4YmMyMDExM2U5NzZjYjQzYjI2
+    OTk1ZWNmYzVkNGE1MmY1NTJkNGVhOTNkMTk1MDg5NWEyMGEwMDI=

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

@@ -9,6 +9,7 @@ module Haml
       class InvalidSyntax < StandardError ; end
       class NotADirectory < StandardError ; end
       class NotDefinedLineType < StandardError ; end
+      class AbortFile < StandardError ; end
 
       LINE_TYPES_ALL = [:text, :not_text, :loud, :silent, :element]
       LINE_TYPES_ADD_EVAL = [:text, :element]
@@ -54,8 +55,14 @@ module Haml
       end
 
       def new_body
-        @haml_reader.lines.each_with_index do |orig_line, line_no|
-          process_line(orig_line,line_no)
+        begin
+          @haml_reader.lines.each_with_index do |orig_line, line_no|
+            @current_line_no = line_no
+            process_line(orig_line,line_no)
+          end
+        rescue AbortFile
+          @prompter.moving_to_next_file
+          add_rest_of_file_to_body(@current_line_no)
         end
         @body.join("\n")
       end
@@ -68,7 +75,7 @@ module Haml
         orig_line.chomp!
         orig_line, whitespace = handle_line_whitespace(orig_line)
         line_type, line_match = handle_line_finding(orig_line)
-        should_be_replaced, text_to_replace, line_locale_hash = handle_line_replacing(orig_line, line_match, line_type, line_no)
+        should_be_replaced, text_to_replace, line_locale_hash = gather_replacement_info(orig_line, line_match, line_type, line_no)
 
         user_action = Haml::I18n::Extractor::UserAction.new('y') # default if no prompting: just do it.
         if should_be_replaced
@@ -80,6 +87,8 @@ module Haml
         if user_action.tag?
           @tagging_tool.write(line_locale_hash[:path], line_no)
           add_to_body("#{whitespace}#{orig_line}")
+        elsif user_action.next?
+          raise AbortFile, "stopping to process the rest of the file"
        elsif user_action.replace_line?
           append_to_locale_hash(line_no, line_locale_hash)
           add_to_body("#{whitespace}#{text_to_replace}")
@@ -97,7 +106,13 @@ module Haml
 
       private
 
-      def handle_line_replacing(orig_line, line_match, line_type, line_no)
+      def add_rest_of_file_to_body(line_no)
+        @haml_reader.lines[line_no..@haml_reader.lines.size-1].map do |orig_ln|
+          add_to_body(orig_ln.chomp)
+        end
+      end
+
+      def gather_replacement_info(orig_line, line_match, line_type, line_no)
         if line_match && !line_match.empty?
           replacer = Haml::I18n::Extractor::TextReplacer.new(orig_line, line_match, line_type)
           hash = replacer.replace_hash.dup.merge!({:path => @haml_reader.path })

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

@@ -17,10 +17,10 @@ module Haml
           say("\n")
           say(replaced_line.inspect)
           say("\n")
-          answer = ask(highlight('[y]es/[n]o/[t]ag?')) do |q|
+          answer = ask(highlight('[y]es/[n]o/[t]ag/[N]ext?')) do |q|
             q.echo      = false
             q.character = true
-            q.validate  = /\A[ynt]\Z/
+            q.validate  = /\A[yntN]\Z/
           end
           Haml::I18n::Extractor::UserAction.new(answer)
         end
@@ -78,6 +78,9 @@ module Haml
           return :dump if answer == 'D'
         end
 
+        def moving_to_next_file
+          say("Next received! Saved changes done so far, moving to the next file.\n")
+        end
       end
     end
   end

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

@@ -32,9 +32,9 @@ module Haml
           #@input == 'D'
         #end
 
-        #def next?
-          #@input == 'N'
-        #end
+        def next?
+          @input == 'N'
+        end
 
       end
     end

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

@@ -1,7 +1,7 @@
 module Haml
   module I18n
     class Extractor
-      VERSION = "0.0.18"
+      VERSION = "0.0.19"
     end
   end
 end

data/test/extractor_test.rb

@@ -38,6 +38,19 @@ module Haml
       assert_equal File.read(h.haml_writer.path), File.read(file_path("ex1.haml"))
     end
 
+    test "with a prompt_per_line option takes user input N as next and stops processing file" do
+      h = Haml::I18n::Extractor.new(file_path("ex1.haml"), :prompt_per_line => true)
+      user_input = "D" # dump
+      File.readlines(file_path("ex1.haml")).size.times do
+        user_input << "N" # just move on to next file
+      end
+      with_highline(user_input) do
+        h.run
+      end
+      # no changes were made cause user was all like 'uhhh, move to next file'
+      assert_equal File.read(h.haml_writer.path), File.read(file_path("ex1.haml"))
+    end
+
     test "with a prompt_per_line option takes user input into consideration for yaml" do
       hax_shit
       h = Haml::I18n::Extractor.new(file_path("ex1.haml"), :prompt_per_line => true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haml-i18n-extractor
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Shai Rosenfeld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-01 00:00:00.000000000 Z
+date: 2013-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt