haml-i18n-extractor 0.0.10 → 0.0.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTRlOTVmMDNhOWVmMmRmN2JkMDhhOTMzOTAyZGViNmEyNDIyMTJkZQ==
+    ODdmOTAwNjUxNWQ5YTEzYWU1MWY5ZGJmYzUxZjAwNDQwNTQxMjFkYg==
   data.tar.gz: !binary |-
-    ODY1NDJjZTRmMjQ0Y2ZmMWZlZTE3MGZjYjdhNTc3OTE2ZDlkMDNiMw==
+    MzdjODNhMWY1NDc3ZTM3Y2FkOTMyMDMxZjhiMjFkNzJhZmMzZTFiMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDViNDlhMjk2ZjE1N2JkZjM1ODVhNTNhMWQ4YTU2MjFhNThiNTkwYmI3Y2Ey
-    OTQ1ODM0OTQxMGQzY2Y5ZTlhNGE4ZDk0ZjhmZWEzOTVjODkxZjIwMGIyMzk3
-    MzMxZmYzNWEwZjNiMTdmY2JhODRjZmJlZThlMzYzNTNlNWJiMjA=
+    NTJjMDA1NjA3NGJhNDk1N2RlYjBkZmQ4OGZmNmY4NTVlMDMyNjNlYWJkNzVi
+    ZGEyMTFjNzgwNzdmMmZmYTg2NWY2NmI4NGU4MmIxMWZkODkwZjUwZDU4NmUw
+    YjNjMDNhZTNlZjBlZTIyMzkyMTBiM2JjNTc5MDgzMWFhNjQ2YTQ=
   data.tar.gz: !binary |-
-    MzY0MjVmOWQ1NTMzZTYzNzkyMGIyNjFhNTRjMWZjMGZkM2ViZmJkNDA3Yzky
-    MGMxOWQyZjZlZGRkNjJhYjFlMmU2NTRkNTI5N2RjYzFjZWU0MDkxOWY1ZjMz
-    YTFmZTQ1OTg2ZDA0MDJhMzVkOTY2ZGRkMjdjMTgyZjVmNmM5MWY=
+    ZTVjODAwMDM1ZTg2ZTEyNDI0Mjc2MmRiYmE5NTgxY2Q5YzEyODU0MmZlOGY1
+    MmUxMTNiYjk4NzcyNjcwNzEyNzJmMGMwNTQyOTViMzFkOWFmYjdkM2Q3OGQx
+    OTc5M2IxOTA0MmRiNmNhZWMzZTM5NzA4OTY3YWFlYzM4ZDJlM2I=

data/TODO

@@ -12,10 +12,23 @@
 
 ## workflow todo's
 
-  cleanup workflow - keep around
-    just handle a rails project dir  move any prompting in workflow into prompter.
-  if the user says 'no' on a line, make sure to not replace it
-    no extra yaml keys...
-  make sure yaml keys are in one file and fall into config/locales properly.
+  make sure yaml keys are in one file
+
+  either way when yaml is written, it should just write itself to config/locales/en.yml
+  wether its one-off, or project mode. and that's something yaml_tool should do.
+  merge itself in.
+
   give user more context on line changes (like grep -C 4)
-  also right now there is a bug where it asks for 'y' twice?
+  agreegate yaml:
+
+<ruby>
+
+  require 'yaml'
+  require 'pp'
+  ActiveSupport::HashWithIndifferentAccess = HashWithIndifferentAccess # hack when it writes out the yaml, it should not be with_indifferent_access
+  all_yaml =  Dir.glob('*yml').collect{|x| File.read(x) }
+  locale_hash = Hash.new
+  all_yaml.map{|y| YAML.load(y) }.map{|x| locale_hash.deep_merge!(x)}
+  pp locale_hash; "file.write it"
+
+</ruby>

data/lib/haml-i18n-extractor/core-ext/hash.rb

@@ -3,6 +3,10 @@
 # @date now equals {month=>{day=>{hours=>{min=>{sec=>1}}}}}
 class Hash
   def self.recursive_init
-    new { |hash, key| hash[key] = recursive_init }
+    new do |hash, key|
+      unless key.nil?
+        hash[key] = recursive_init
+      end
+    end
   end
-end
+end

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

@@ -16,6 +16,8 @@ module Haml
       attr_reader :haml_reader, :haml_writer
       attr_reader :locale_hash, :yaml_tool, :type
 
+      DEFAULT_LINE_LOCALE_HASH = { :modified_line => nil,:keyname => nil,:replaced_text => nil, :path => nil }
+
       def initialize(haml_path, opts = {})
         @type = opts[:type]
         @prompt_per_line = opts[:prompt_per_line]
@@ -64,18 +66,19 @@ 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, locale_hash = handle_line_replacing(orig_line, line_match, line_type, line_no)
+        should_be_replaced, text_to_replace, line_locale_hash = handle_line_replacing(orig_line, line_match, line_type, line_no)
         if should_be_replaced
           if prompt_per_line?
-            user_approves = Haml::I18n::Extractor::Prompter.new(orig_line,text_to_replace).ask_user
+            user_approves = Haml::I18n::Extractor::Prompter.new.ask_user(orig_line,text_to_replace)
           else
             user_approves = true
           end
         end
-        append_to_locale_hash(line_no, locale_hash)
         if user_approves
+          append_to_locale_hash(line_no, line_locale_hash)
           add_to_body("#{whitespace}#{text_to_replace}")
         else
+          append_to_locale_hash(line_no, DEFAULT_LINE_LOCALE_HASH)
           add_to_body("#{whitespace}#{orig_line}")
         end
         return should_be_replaced
@@ -93,7 +96,7 @@ module Haml
           hash = replacer.replace_hash.dup.merge!({:path => @haml_reader.path })
           [ true, hash[:modified_line], hash ]
         else
-          hash = { :modified_line => nil,:keyname => nil,:replaced_text => nil, :path => nil }
+          hash = DEFAULT_LINE_LOCALE_HASH
           [ false, orig_line, hash ]
         end
       end

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

@@ -7,13 +7,13 @@ module Haml
 
         def initialize(orig_path, options = {})
           @type = options[:type] || :dump # safe default.
-          
+
           if overwrite?
             @path = orig_path
           elsif dump?
             @path = orig_path.gsub(/.haml$/, ".i18n-extractor.haml")
           end
-          
+
         end
 
         def write_file
@@ -33,4 +33,4 @@ module Haml
       end
     end
   end
-end
+end

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

@@ -8,19 +8,14 @@ module Haml
 
         include Helpers::Highline
 
-        def initialize(orig_line, replaced_line)
-          @orig_line = orig_line
-          @replaced_line = replaced_line
-        end
-
-        def ask_user
+        def ask_user(orig_line, replaced_line)
           say(highlight("Replace this line:"))
           say("\n")
-          say(@orig_line.inspect)
+          say(orig_line.inspect)
           say("\n")
           say(highlight("With this line?"))
           say("\n")
-          say(@replaced_line.inspect)
+          say(replaced_line.inspect)
           say("\n")
           answer = ask(highlight('y/n?')) do |q|
                      q.echo      = false
@@ -30,6 +25,48 @@ module Haml
           answer == 'y'
         end
 
+        def output_stats(file_count, file_names)
+          say(highlight("Wowza! Found #{file_count} haml files!\n\n", :red))
+          say("#{file_names}\n\n")
+        end
+
+        def process(haml_path, type)
+          say(highlight("#{type}-d file") + " #{haml_path}\n\n")
+        end
+
+        def end_message
+          say(highlight("\n\n\nNow run a git diff or such and see what changed!"))
+        end
+
+        def not_processing(haml_path)
+          say(highlight("Not processing") + " file #{haml_path}.")
+        end
+
+        def syntax_error(haml_path)
+          say("Haml Syntax error fo #{haml_path}. Please inspect further.")
+        end
+
+        CHOICES = {O: :overwrite, D: :dump, N: :next}
+
+        def process_file?(file, file_index)
+          o = %{[#{highlight(:O)}]verwrite}
+          d = %{[#{highlight(:D)}]ump}
+          n = %{[#{highlight(:N)}]ext}
+          say("#{o} OR #{d} OR #{n}\n")
+          say("Choose the right option for")
+          say("#{highlight(file_index)} #{highlight(file)}")
+          choices = CHOICES.keys.map(&:to_s)
+          prompt = "Your choice #{highlight(choices)}?"
+          answer = ask(prompt) do |q|
+                     q.echo      = false
+                     q.character = true
+                     q.validate  = /\A[#{choices}r]\Z/
+                   end
+          return :overwrite if answer == 'O'
+          return :overwrite if answer == 'R' # cheat 'replace'
+          return :dump if answer == 'D'
+        end
+
       end
     end
   end

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

@@ -1,7 +1,7 @@
 module Haml
   module I18n
     class Extractor
-      VERSION = "0.0.10"
+      VERSION = "0.0.12"
     end
   end
 end

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

@@ -1,15 +1,11 @@
-require 'highline'
-require 'highline/import'
-
 module Haml
   module I18n
     class Extractor
       class Workflow
 
-        include Helpers::Highline
-
         def initialize(project_path)
           @project_path = project_path
+          @prompter = Haml::I18n::Extractor::Prompter.new
           unless File.directory?(@project_path)
             raise Extractor::NotADirectory, "#{@project_path} needs to be a directory!"
           end
@@ -21,33 +17,15 @@ module Haml
           end
         end
 
-
-        # FIXME, use prompter to do any prompting in this class TODO
-        #
         def output_stats
-          say(highlight("Wowza! Found #{files.size} haml files!\n\n", :red))
-          say("#{files.join("\n")}\n\n")
+          file_count = files.size
+          file_names = files.join("\n")
+          @prompter.output_stats(file_count, file_names)
         end
 
-        CHOICES = {O: :overwrite, D: :dump, N: :next}
-
         def process_file?(file)
-          o = %{[#{highlight(:O)}]verwrite}
-          d = %{[#{highlight(:D)}]ump}
-          n = %{[#{highlight(:N)}]ext}
-          say("#{o} OR #{d} OR #{n}\n")
-          say("Choose the right option for")
-          say("#{index_for(file)} #{highlight(file)}")
-          choices = CHOICES.keys.map(&:to_s)
-          prompt = "Your choice #{highlight(choices)}?"
-          answer = ask(prompt) do |q|
-                     q.echo      = false
-                     q.character = true
-                     q.validate  = /\A[#{choices}r]\Z/
-                   end
-          return :overwrite if answer == 'O'
-          return :overwrite if answer == 'R' # cheat 'replace'
-          return :dump if answer == 'D'
+          file_index = index_for(file)
+          @prompter.process_file?(file, file_index)
         end
 
         def run
@@ -57,7 +35,7 @@ module Haml
             if type
               process(haml_path, type)
             else
-              say(highlight("Not processing") + " file #{haml_path}.")
+              @prompter.not_processing(haml_path)
             end
           end
         end_message
@@ -66,22 +44,22 @@ module Haml
         private
 
         def end_message
-          say(highlight("\n\n\nNow run a git diff or such and see what changed!"))
+          @prompter.end_message
         end
 
         def index_for(file)
-          highlight((files.index(file) + 1).to_s)
+          (files.index(file) + 1).to_s
         end
 
         def process(haml_path, type)
-          say(highlight("#{type}-d file") + " #{haml_path}\n\n")
+          @prompter.process(haml_path, type)
           options = {:type => type} # overwrite or dump haml
           options.merge!({:prompt_per_line => true}) # per-line prompts
           begin
             @ex1 = Haml::I18n::Extractor.new(haml_path, options)
             @ex1.run
           rescue Haml::I18n::Extractor::InvalidSyntax
-            say("Haml Syntax error fo #{haml_path}. Please inspect further.")
+            @prompter.syntax_error(haml_path)
           end
         end
       end

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

@@ -7,27 +7,26 @@ module Haml
   module I18n
     class Extractor
       class YamlTool
-        
+
         attr_accessor :locales_dir, :locale_hash
 
         def initialize(locales_dir = nil)
           if locales_dir
             @locales_dir = locales_dir
           else
-            # locales_dir = rails_mode? ? (Rails.root.to_s + "/config/locales") : "."
-            @locales_dir = File.expand_path(".")
+            @locales_dir = File.expand_path("./config/locales/")
           end
         end
 
         # {:en => {:view_name => {:key_name => :string_name } } }
         def yaml_hash
-          h = HashWithIndifferentAccess.recursive_init
+          yml = HashWithIndifferentAccess.recursive_init
           @locale_hash.map do |line_no, info|
             unless info[:keyname].nil?
-              h[i18n_scope][standardized_viewname(info[:path])][standarized_keyname(info[:keyname])] = info[:replaced_text]
+              yml[i18n_scope][standardized_viewname(info[:path])][standarized_keyname(info[:keyname])] = info[:replaced_text]
             end
           end
-          h
+          yml = hashify(yml)
         end
 
         def locale_file
@@ -36,19 +35,35 @@ module Haml
             if pth
               full_path = Pathname.new(pth)
               base_name = full_path.basename.to_s
+              if ! File.exist?(@locales_dir)
+                FileUtils.mkdir_p(@locales_dir)
+              end
               File.expand_path(File.join( @locales_dir, standardized_viewname(full_path) + ".#{base_name}.yml"))
             end
-          end.to_s
+          end || "haml-i18-extractor.yml"
         end
-        
+
         def write_file
           f = File.open(locale_file, "w+")
           f.puts yaml_hash.to_yaml
           f.flush
         end
-        
+
         private
 
+        # {:foo => {:bar => {:baz => :mam}, :barrr => {:bazzz => :mammm} }}
+        def hashify(my_hash)
+          if my_hash.is_a?(HashWithIndifferentAccess)
+            result = {}
+            my_hash.each do |k, v|
+              result[k.to_s] = hashify(v)
+            end
+            result
+          else
+            my_hash
+          end
+        end
+
         def i18n_scope
           :en
         end
@@ -64,11 +79,7 @@ module Haml
           Pathname.new(pth).dirname.to_s.split("/").last
         end
 
-        # def rails_mode?
-        #   defined?(Rails)
-        # end
-
-      end
+     end
     end
   end
-end
+end

data/test/extractor_test.rb

@@ -25,7 +25,7 @@ module Haml
       assert_equal h.prompt_per_line?, false
     end
 
-    test "with a prompt_per_line option takes user input into consideration" do
+    test "with a prompt_per_line option takes user input into consideration for haml" 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
@@ -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 into consideration for yaml" 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" # do not replace lines
+      end
+      with_highline(user_input) do
+        h.run
+      end
+      # no changes were made cause user was all like 'uhhh, no thxk'
+      assert_equal YAML.load(File.read(h.yaml_tool.locale_file)), {}
+    end
+
     test "can not initialize if the haml is not valid syntax" do
       begin
         Haml::I18n::Extractor.new(file_path("bad.haml"))
@@ -60,6 +73,7 @@ module Haml
     end
 
     test "it writes the locale info to an out file when run" do
+      Dir.glob("*yml").map {|p| FileUtils.rm(p) } # HAX, TODO: handle with yaml files correctly (config/en.yml)
       assert_equal File.exists?(@ex1.yaml_tool.locale_file), false
       @ex1.run
       assert_equal File.exists?(@ex1.yaml_tool.locale_file), true

data/test/prompter_test.rb

@@ -5,13 +5,13 @@ module Haml
 
     def test_asks_to_process_line_yes
       with_highline("y") do
-        assert_equal Haml::I18n::Extractor::Prompter.new("orig", "replace").ask_user, true
+        assert_equal Haml::I18n::Extractor::Prompter.new.ask_user("orig", "replace"), true
       end
     end
 
     def test_asks_to_process_line_no
       with_highline("n") do
-        assert_equal Haml::I18n::Extractor::Prompter.new("orig", "replace").ask_user, false
+        assert_equal Haml::I18n::Extractor::Prompter.new.ask_user("orig", "replace"), false
       end
     end
 

data/test/test_helper.rb

@@ -89,25 +89,6 @@ ensure
   $terminal = old_terminal
 end
 
-
-
-def without_rails_mode
-  Object.send(:remove_const, :Rails) if defined?(Rails)
-  yield
-end
-
-def with_rails_mode
-  create_klass=<<EOR
-  module Rails
-    def self.root
-      "/data/current/name"
-    end
-  end
-EOR
-  eval create_klass
-  yield
-end
-
 module TestHelper
 
   TMPDIR = File.join(File.dirname(__FILE__) +  "/tmp/")

data/test/workflow_test.rb

@@ -12,6 +12,18 @@ module Haml
     TestHelper.teardown_project_directory!
   end
 
+  def full_project_user_interaction
+    automate_user_interaction = ""
+    6.times do                            # should be number of files we're testing on
+      automate_user_interaction << "O"    # overwrite file
+      50.times do                         # should be number of lines in file,
+                                          # this should do right now.
+        automate_user_interaction << "y"  # replace line
+      end
+    end
+    automate_user_interaction
+ end
+
   def test_it_should_work_on_a_directory_mkay
     filename = "#{TestHelper::PROJECT_DIR}app/views/bar/thang.haml"
     bad_worfklow = Haml::I18n::Extractor::Workflow.new(filename)
@@ -19,7 +31,7 @@ module Haml
     rescue Haml::I18n::Extractor::NotADirectory
       assert true, "workflow works on a directory bubba."
   end
-  
+
   def test_it_finds_all_haml_files
     assert_equal @workflow.files.size, 4
   end
@@ -49,16 +61,14 @@ module Haml
     end
   end
 
-  def test_run_works
-    automate_user_interaction = ""
-    6.times do                            # should be number of files we're testing on
-      automate_user_interaction << "O"    # overwrite file
-      50.times do                         # should be number of lines in file,
-                                          # this should do right now.
-        automate_user_interaction << "y"  # replace line
-      end
+  def test_yaml_file_in_config
+    with_highline(full_project_user_interaction) do
+      @workflow.run
     end
-    with_highline(automate_user_interaction ) do
+  end
+
+  def test_run_works
+    with_highline(full_project_user_interaction) do
       @workflow.run
     end
   end

data/test/yaml_tool_test.rb

@@ -28,25 +28,16 @@ module Haml
         }
     end
 
-    # test "locale dir defaults for rails if you do not pass anything" do
-    #   with_rails_mode do
-    #     yaml_tool = Haml::I18n::Extractor::YamlTool.new
-    #     assert_equal yaml_tool.locales_dir, "/data/current/name/config/locales"
-    #   end
-    # end
-
-    test "locale dir defaults to cwd if no rails" do
-      without_rails_mode do
-        yaml_tool = Haml::I18n::Extractor::YamlTool.new
-        assert_equal yaml_tool.locales_dir, File.expand_path(".")
-      end
+    test "locale dir defaults to config/locales/" do
+      yaml_tool = Haml::I18n::Extractor::YamlTool.new
+      assert_equal yaml_tool.locales_dir, File.expand_path("./config/locales")
     end
-    
+
     test "you can set the locale_dir" do
       yaml_tool = Haml::I18n::Extractor::YamlTool.new(@temp_locale_dir)
       assert_equal yaml_tool.locales_dir, @temp_locale_dir
     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|

metadata

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