haml-i18n-extractor 0.0.12 → 0.0.15

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODdmOTAwNjUxNWQ5YTEzYWU1MWY5ZGJmYzUxZjAwNDQwNTQxMjFkYg==
+    NTY3NzcyNDcwZjBhZDJkMGJmMGI1OGViMGQzZmQ1ZWQ3MTQzNjViYQ==
   data.tar.gz: !binary |-
-    MzdjODNhMWY1NDc3ZTM3Y2FkOTMyMDMxZjhiMjFkNzJhZmMzZTFiMA==
+    MjcwNjMxZDg2ZWE3NTI3NjI3NDUyYWY1MDFjOGE3YjIyZDVmMTU1ZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTJjMDA1NjA3NGJhNDk1N2RlYjBkZmQ4OGZmNmY4NTVlMDMyNjNlYWJkNzVi
-    ZGEyMTFjNzgwNzdmMmZmYTg2NWY2NmI4NGU4MmIxMWZkODkwZjUwZDU4NmUw
-    YjNjMDNhZTNlZjBlZTIyMzkyMTBiM2JjNTc5MDgzMWFhNjQ2YTQ=
+    NjQwYThlMzcxMzdhNGNjNTdlNmE1YmM5MDI3N2YwNGYxZjU1NWRjZDVjZWVj
+    ZTk2YmJmMjlkYzE1NGI5MGQ0YTVkNGJlZTE3MmE4OTllY2VkN2E4ZjVjY2U4
+    NDBjYzc1ZmM5NzFjMTE1MTFhNTBlMGE3Y2MyZTU4YmJlMTRiZTY=
   data.tar.gz: !binary |-
-    ZTVjODAwMDM1ZTg2ZTEyNDI0Mjc2MmRiYmE5NTgxY2Q5YzEyODU0MmZlOGY1
-    MmUxMTNiYjk4NzcyNjcwNzEyNzJmMGMwNTQyOTViMzFkOWFmYjdkM2Q3OGQx
-    OTc5M2IxOTA0MmRiNmNhZWMzZTM5NzA4OTY3YWFlYzM4ZDJlM2I=
+    MmE2YWJjODY5MTA5OGU4MjZiODI4NWJiMDNhZmMxMDRhZDNkNDg5N2Y4MDRm
+    NzU0ZDNmZjYwYTU1NzgzOGRjMmIzYjE4NzkwYzkxMGJlMmQ2ZWM3MWUzYThm
+    ODQ3Y2EzNTZkZmE0NDMxNmMzZTExZmRkMWI5ZDhiY2ViZjQ1MmE=

data/TODO

@@ -10,6 +10,8 @@
 - add herbgobbler (ERB) and this to another more generalized repo for translating templates?
 - Refactor tests: split out what is integration vs unit, too much coupling.
 
+- Make dependencies for gem install haml-i18n-extractor work (highline and haml do not install with it?)
+
 ## workflow todo's
 
   make sure yaml keys are in one file
@@ -17,6 +19,7 @@
   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.
+  concept of project directory of whereever we expect that to be?
 
   give user more context on line changes (like grep -C 4)
   agreegate yaml:

data/haml-i18n-extractor.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "tilt"
   gem.add_dependency "haml"
+  gem.add_dependency "activesupport"
+  gem.add_dependency "highline"
 
-  gem.add_development_dependency 'rails', '>= 3.0.0'
   gem.add_development_dependency 'rbench'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'minitest'
   gem.add_development_dependency 'nokogiri'
-  gem.add_development_dependency 'highline'
 
 end

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

@@ -10,3 +10,5 @@ class Hash
     end
   end
 end
+
+require 'active_support/core_ext/hash/deep_merge'

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

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

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

@@ -10,11 +10,13 @@ module Haml
 
         attr_accessor :locales_dir, :locale_hash
 
+        # this requires passing an absolute path.
+        # meaning run from a given rails root...
+        # ok? change?
         def initialize(locales_dir = nil)
-          if locales_dir
-            @locales_dir = locales_dir
-          else
-            @locales_dir = File.expand_path("./config/locales/")
+          @locales_dir = locales_dir ? locales_dir : "./config/locales/"
+          if ! File.exists?(@locales_dir)
+            FileUtils.mkdir_p(@locales_dir)
           end
         end
 
@@ -30,22 +32,24 @@ module Haml
         end
 
         def locale_file
-          if @locale_hash
-            pth = @locale_hash.map{|_,h| h[:path] }.compact.first
-            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 || "haml-i18-extractor.yml"
+          File.join(@locales_dir, "#{i18n_scope}.yml")
         end
 
-        def write_file
-          f = File.open(locale_file, "w+")
-          f.puts yaml_hash.to_yaml
+        def write_file(filename = nil)
+          pth = filename.nil? ? locale_file : filename
+          if File.exist?(pth)
+            str = File.read(pth)
+            if str.empty?
+              existing_yaml_hash = {}
+            else
+              existing_yaml_hash = YAML.load(str)
+            end
+          else
+            existing_yaml_hash = {}
+          end
+          final_yaml_hash = existing_yaml_hash.deep_merge!(yaml_hash)
+          f = File.open(pth, "w+")
+          f.puts final_yaml_hash.to_yaml
           f.flush
         end
 
@@ -54,7 +58,7 @@ module Haml
         # {:foo => {:bar => {:baz => :mam}, :barrr => {:bazzz => :mammm} }}
         def hashify(my_hash)
           if my_hash.is_a?(HashWithIndifferentAccess)
-            result = {}
+            result = Hash.new
             my_hash.each do |k, v|
               result[k.to_s] = hashify(v)
             end

data/test/extractor_test.rb

@@ -39,6 +39,7 @@ module 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)
       user_input = "D" # dump
       File.readlines(file_path("ex1.haml")).size.times do
@@ -72,8 +73,13 @@ module Haml
       assert_equal File.exists?(@ex1.haml_writer.path), true
     end
 
-    test "it writes the locale info to an out file when run" do
+    def hax_shit
       Dir.glob("*yml").map {|p| FileUtils.rm(p) } # HAX, TODO: handle with yaml files correctly (config/en.yml)
+      Dir.glob("config/locales/*yml").map {|p| FileUtils.rm(p) } # HAX, TODO: handle with yaml files correctly (config/en.yml)
+    end
+
+    test "it writes the locale info to an out file when run" do
+      hax_shit
       assert_equal File.exists?(@ex1.yaml_tool.locale_file), false
       @ex1.run
       assert_equal File.exists?(@ex1.yaml_tool.locale_file), true

data/test/yaml_tool_test.rb

@@ -4,7 +4,7 @@ module Haml
   class YamlToolTest < MiniTest::Unit::TestCase
 
     def setup
-      @temp_locale_dir = File.expand_path(__FILE__) + "/tmp/"
+      @temp_locale_dir = "./test/tmp/"
     end
 
     def setup_locale_hash
@@ -12,6 +12,33 @@ module 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_locale_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
       {"en"=>
         {"support"=>
@@ -30,7 +57,7 @@ module Haml
 
     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")
+      assert_equal yaml_tool.locales_dir, "./config/locales/"
     end
 
     test "you can set the locale_dir" do
@@ -38,6 +65,15 @@ module Haml
       assert_equal yaml_tool.locales_dir, @temp_locale_dir
     end
 
+    test "it can merge with an existing yml file" do
+      setup_locale_hash
+      setup_locale_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 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.12
+  version: 0.0.15
 platform: ruby
 authors:
 - Shai Rosenfeld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -39,27 +39,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rbench
+  name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rbench
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='