haml-i18n-extractor 0.2.1 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDE3ZjJhMzg1OGM5MTIxYjJjZjljMWE0NDMzMjZkNmNkNDJjZGU0OA==
+    YWYyNWM2YWQ5YTA3OTdlNmUyN2Y5NTJkZmI0ZDc1YzdkMzcxNWM4Mw==
   data.tar.gz: !binary |-
-    YzBhODViNGViM2VlYjM4YzY1ZjhmMjM2YTJmNzkxNWViMzI1Y2EzZQ==
+    MThkMzY5ZGFiZWY3ZTNhOGZjNTEyZjUyN2UzNWIzNjg4NjczMjM2ZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDE0ZDFkYjZkOTg2Y2Q3MTRhOGY4ZWUwN2UzOTliMWExYTIxNGY5ZTBhOTE4
-    YmY3YTg2MmY1YTQ3MzdmMmQwMDA3YjQ0ZDZhZDBlYmE4ZThjZDU0Y2M5OGY3
-    MTBmNDViNzc2NzU0MGIxYWI0YWI4ZmNkYmIwZjY4ZjlkZTdiNzY=
+    YzFhNmIyNzIwZDhhNGE0N2IzNjQ0NzQwMzg1YjgyZjA1OWM4ZWMwMTA2N2Q0
+    NjBhNjM2MGNhMWE4YTAyMjNhOThhOWQ1ZWYyNzJmYjkwNjEwZjIxOGE3YzQ3
+    OTU5Y2JjNzUzODQ3ZjAzOThhNDYzM2JhZDI0NTIzODVmZTA3MGQ=
   data.tar.gz: !binary |-
-    NDEzZjMyODk1YWM5YWU2ZGI0OWE0NmVmYWVmNjQxYzVhMjE1ZjZlODg1Yzg0
-    MzY5MDI0ZDYyZGY0YmM3MGQyMWQ2NTBlYzJkMGIwMzM5Mzc4YjgzN2FlYmQ1
-    MjFlZDUxMThmMDE3MWE3NjZhZjI1NTc2OGY5ZjZlOWU4YzBhOWQ=
+    MGZlOTZjZjA5YjlmYTMxMTAzNDlkY2VkYzRmZjgwZWMxZjM0MDZkNTQ4ZjVj
+    OWU2YTU2ZGM3ZDZhMWEwZGM4M2FhYmU0YWY0NjYxNDQzMTgxOGVmY2YxYTky
+    OWRiMzRkYjVhM2MzMTY4Y2JjYzI1ZDQ1MGEwZmUxOGU2NzVmZjA=

data/README.md

@@ -25,7 +25,7 @@ end
 
 - Per-project basis, with the binary. See demo below for usage of the binary.
 
-`cd your-rails-app-to-translate && haml-i18n-extractor .`
+`cd your-rails-app-to-translate && haml-i18n-extractor --help`
 
 ## Demo using interactive mode
 

data/bin/haml-i18n-extractor

@@ -7,15 +7,15 @@ require 'haml-i18n-extractor'
 option_parser = Trollop::Parser.new do
   banner <<-EOB
 
-  haml-i18n-extractor -p <path> [--interactive|--non-interactive] [--other-options]
+  haml-i18n-extractor <path> [--interactive|--non-interactive] [--other-options]
 
   See options list:
 EOB
   version "Current version: #{Haml::I18n::Extractor::VERSION}"
-  opt :path, "path", :type => String
   opt :interactive, "interactive mode", :short => 'i'
   opt :non_interactive, "non interactive mode", :short => 'n'
-  opt :yaml_file, "yaml file, defaults to en", :type => String
+  opt :yaml_file, "yaml file path, defaults to config/locales/en.yml", :type => String, :short => 'y'
+  opt :i18n_scope, "top level i18n scope, defaults to :en", :type => String, :short => 's'
 end
 
 opts = Trollop::with_standard_exception_handling option_parser do
@@ -23,6 +23,11 @@ opts = Trollop::with_standard_exception_handling option_parser do
   option_parser.parse ARGV
 end
 
+path_to_extract = File.expand_path(ARGV[0])
+if File.exist?(path_to_extract)
+  opts[:path] = path_to_extract
+end
+
 begin
   Haml::I18n::Extractor::CLI.new(opts).start
 rescue  Haml::I18n::Extractor::CLI::CliError

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

@@ -27,8 +27,7 @@ module Haml
         @haml_reader = Haml::I18n::Extractor::HamlReader.new(haml_path)
         validate_haml(@haml_reader.body)
         @haml_writer = Haml::I18n::Extractor::HamlWriter.new(haml_path, {:type => @type})
-        @yaml_tool = Haml::I18n::Extractor::YamlTool.new
-        @yaml_tool.yaml_file = (@options[:yaml_file] || :en).to_sym
+        @yaml_tool = Haml::I18n::Extractor::YamlTool.new(@options[:i18n_scope], @options[:yaml_file])
         @tagging_tool ||= Haml::I18n::Extractor::TaggingTool.new
         # hold all the processed lines
         @body = []

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

@@ -1,7 +1,7 @@
 module Haml
   module I18n
     class Extractor
-      VERSION = "0.2.1"
+      VERSION = "0.3.0"
     end
   end
 end

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

@@ -8,12 +8,14 @@ module Haml
     class Extractor
       class YamlTool
 
-        attr_accessor :locales_dir, :locale_hash, :yaml_file
+        attr_accessor :locale_hash, :yaml_file, :i18n_scope
 
-        def initialize(locales_dir = nil)
-          @locales_dir = locales_dir ? locales_dir : "./config/locales/"
-          if ! File.exists?(@locales_dir)
-            FileUtils.mkdir_p(@locales_dir)
+        def initialize(i18n_scope = nil, yaml_file = nil)
+          @i18n_scope = i18n_scope && i18n_scope.to_sym || :en
+          @yaml_file = yaml_file || "./config/locales/#{@i18n_scope}.yml"
+          locales_dir = Pathname.new(@yaml_file).dirname
+          if ! File.exists?(locales_dir)
+            FileUtils.mkdir_p(locales_dir)
           end
         end
 
@@ -22,7 +24,7 @@ module Haml
           yml = Hash.new
           @locale_hash.map do |line_no, info|
             unless info[:keyname].nil?
-              keyspace = [@yaml_file,standardized_viewnames(info[:path]), standarized_keyname(info[:keyname]),
+              keyspace = [@i18n_scope,standardized_viewnames(info[:path]), standarized_keyname(info[:keyname]),
                           info[:replaced_text]].flatten
               yml.deep_merge!(nested_hash({},keyspace))
             end
@@ -30,12 +32,8 @@ module Haml
           yml = hashify(yml)
         end
 
-        def locale_file
-          File.join(@locales_dir, "#{@yaml_file}.yml")
-        end
-
         def write_file(filename = nil)
-          pth = filename.nil? ? locale_file : filename
+          pth = filename.nil? ? @yaml_file : filename
           if File.exist?(pth)
             str = File.read(pth)
             if str.empty?

data/test/extractor_test.rb

@@ -62,7 +62,7 @@ module Haml
         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)), {}
+      assert_equal YAML.load(File.read(h.yaml_tool.yaml_file)), {}
     end
 
     test "with a interactive option user can tag a line for later review" do
@@ -105,10 +105,10 @@ module Haml
 
     test "it writes the locale info to an out file when run" do
       TestHelper.hax_shit
-      assert_equal File.exists?(@ex1.yaml_tool.locale_file), false
+      assert_equal File.exists?(@ex1.yaml_tool.yaml_file), false
       @ex1.run
-      assert_equal File.exists?(@ex1.yaml_tool.locale_file), true
-      assert_equal YAML.load(File.read(@ex1.yaml_tool.locale_file)), @ex1.yaml_tool.yaml_hash
+      assert_equal File.exists?(@ex1.yaml_tool.yaml_file), true
+      assert_equal YAML.load(File.read(@ex1.yaml_tool.yaml_file)), @ex1.yaml_tool.yaml_hash
     end
 
     test "sends a hash over of replacement info to its yaml tool when run" do

data/test/yaml_tool_test.rb

@@ -25,7 +25,7 @@ module Haml
       File.join(locale_config_dir, "en.yml")
     end
 
-    def setup_locale_file
+    def setup_yaml_file
       File.open(locale_config_file, "w+") do |f|
         f.write(existing_yaml_hash.to_yaml)
       end
@@ -56,19 +56,20 @@ module Haml
         }
     end
 
-    test "locale dir defaults to config/locales/" do
+    test "defaults for empty init" do
       yaml_tool = Haml::I18n::Extractor::YamlTool.new
-      assert_equal yaml_tool.locales_dir, "./config/locales/"
+      assert_equal yaml_tool.yaml_file, "./config/locales/en.yml"
+      assert_equal yaml_tool.i18n_scope, :en
     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
+    test "you can pass a yaml_file" do
+      yaml_tool = Haml::I18n::Extractor::YamlTool.new(nil, @temp_locale_dir)
+      assert_equal yaml_tool.yaml_file, @temp_locale_dir
     end
 
     test "it can merge with an existing yml file" do
       setup_locale_hash
-      setup_locale_file
+      setup_yaml_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']
@@ -76,8 +77,28 @@ module Haml
     end
 
     test "it can accept a different yml file" do
-      @ex1 = Haml::I18n::Extractor.new(file_path("ex1.haml"), {:yaml_file => "jp"})
-      assert_equal @ex1.yaml_tool.yaml_file, :jp
+      @ex1 = Haml::I18n::Extractor.new(file_path("ex1.haml"), {:yaml_file => "/tmp/foo.yml"})
+      assert_equal @ex1.yaml_tool.yaml_file, "/tmp/foo.yml"
+    end
+
+    test "it knows about i18n scope" do
+      @ex1 = Haml::I18n::Extractor.new(file_path("ex1.haml"), {:i18n_scope => "he"})
+      assert_equal @ex1.yaml_tool.i18n_scope, :he
+    end
+
+    test "it knows about i18n scope, defaults to :en" do
+      @ex1 = Haml::I18n::Extractor.new(file_path("ex1.haml"))
+      assert_equal @ex1.yaml_tool.i18n_scope, :en
+    end
+
+    test "it will assume yaml_file according to i18n_scope if no yaml_file is passed" do
+      yaml_tool = Haml::I18n::Extractor::YamlTool.new("he", nil)
+      assert_equal yaml_tool.yaml_file, "./config/locales/he.yml"
+    end
+
+    test "it will not assume yaml_file according to i18n_scope if yaml_file is passed" do
+      yaml_tool = Haml::I18n::Extractor::YamlTool.new("he", "/tmp/foo.yml")
+      assert_equal yaml_tool.yaml_file, "/tmp/foo.yml"
     end
 
     test "it relies on the locale_hash having a certain format" do

metadata

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