haml-i18n-extractor 0.1.0 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjgwZDJiZjM2NDdkYmUwZDNlODFmNmY4NWYwZWYzMmVjNGM0YjVmMA==
+    OWE4MmIxYTMzMzQwMWU3YWRkYjg1ZDYyNjNkZmM4ZTgxMzY1ZTQ5Yg==
   data.tar.gz: !binary |-
-    NjZhOTA5YTVmMDE2YmQxMzcyNmUxMDk3NzFkODNkN2FmMWY5MGM1OQ==
+    ZmE2OTQ5MjFmNmZiYTI1YzFiMmU1MzVlMWVmNGUwZDFlODBjMWU1ZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzU2NTgwNDVlMTE5NDlkMzFhMmViNTYwY2FhZmFiNzJhNTVjNGIzNmM0MTli
-    NWZlYjc2ZDg5MTM2ZDU5NTEwNjQyZDdlNWRiYjIxMGZjNDIwYWMyNzk1MmRk
-    OGRiMmJmNmE3ZjcwNmM4YTA4ZDQ0ZmI2MWFlZjQ1NGExODhkN2Y=
+    MWRkY2QyNGU2NDhhYTQzYWM4MTJiNGI0NmY3MjFmMWIyYWFhZjNlNzBjNzRi
+    NmU4MGYxNDM3ODYwNDFmMDNiZDI4NGQ2NWU4NDgyZjRmNzU0MTFkZjg2MWI4
+    NGEyNDJiMWNiNjMxYjRmNDM2YTUwYWY4MDBkZTExY2JlMTIzOGI=
   data.tar.gz: !binary |-
-    YWRmZjIwNzUyZWM1ODhmYWQ0N2Q3ODk3MmYxZGE0NjBiNmQ5ODI3MmUyYzgz
-    Y2NjZTE3MzI5ZjU1YjU1NjQ3YjgyZTM5M2NmNTRmMDgzNzhiNGNjOTM5MjRk
-    MzE0OWE5YjVhMTNkMjNlNzU5ZDQ0MzFhZDI4N2NjMDljMjZjMDI=
+    ODE5MGJiZWQ4MGNhZWQzMDczZTRmNWJiYTMwNDUxMWYzOTI2M2YyZmYxM2Ew
+    YmFkZjBkYmMwNGZmYWVlMzJmMTRjMjc0M2FiZjM2MjViZjA1ZTA5NzRjZWNj
+    MTJkNjhiOGFkYzk1YjM0YTkwMzhhYzk0YzdiZTlmMDUyNmY4ZDM=

data/.gitignore

@@ -19,3 +19,5 @@ tmp
 # hacks, these should not appear where thye are.
 *.yml
 test/support/ex1.i18n-extractor.haml
+config
+.tags.haml-i18n-extractor

data/TODO

@@ -10,7 +10,7 @@
 
 * Issues
 
-- CLI options: Extractor.new accepts options. pass through workflow. First up: i18n_scope (issue#5)
+- CLI options: Extractor.new accepts options. pass through workflow. First up: yaml_file (issue#5)
 - add a ~/.haml-i18n-extractor file/dir/config file etc. to keep preferences of interactive mode or not?
 
  * Ideas

data/bin/haml-i18n-extractor

@@ -9,6 +9,7 @@ option_parser = Trollop::Parser.new do
   opt :interactive, "interactive mode", :short => 'i'
   opt :non_interactive, "non interactive mode", :short => 'n'
   opt :path, "path", :type => String
+  opt :yaml_file, "yaml file, defaults to en", :type => String
 end
 
 opts = Trollop::with_standard_exception_handling option_parser do

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

@@ -17,11 +17,9 @@ class Haml::I18n::Extractor
         if File.directory?(pth)
           workflow = Haml::I18n::Extractor::Workflow.new(pth, @options)
           workflow.run
-        elsif File.exists?(pth) && @options[:interactive]
-          extractor = Haml::I18n::Extractor.new(pth, :type => :overwrite, :interactive => true)
-          extractor.run
-        elsif File.exists?(pth) && @options[:non_interactive]
-          extractor = Haml::I18n::Extractor.new(pth, :type => :overwrite, :interactive => false)
+        elsif File.exists?(pth)
+          @options.merge!(:type => :overwrite)
+          extractor = Haml::I18n::Extractor.new(pth, @options)
           extractor.run
         end
       end
@@ -30,7 +28,7 @@ class Haml::I18n::Extractor
     private
 
     def check_interactive_or_not_passed
-      if !@options[:interactive] && !@options[:non_interactive]
+      if (!@options[:interactive] && !@options[:non_interactive]) || (@options[:interactive] && @options[:non_interactive])
         @prompter.puts("You must choose either one of interactive mode or non interactive mode.")
         @prompter.puts("See haml-i18n-extractor --help")
         raise CliError

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

@@ -28,6 +28,7 @@ module Haml
         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
         @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.1.0"
+      VERSION = "0.2.0"
     end
   end
 end

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

@@ -67,10 +67,9 @@ module Haml
 
         def process(haml_path, type)
           @prompter.process(haml_path, type)
-          options = {:type => type} # overwrite or dump haml
-          options.merge!({:interactive => @passed_options[:interactive]}) # per-line prompts
+          @passed_options.merge!({:type => type}) # overwrite or dump haml
           begin
-            @extractor = Haml::I18n::Extractor.new(haml_path, options)
+            @extractor = Haml::I18n::Extractor.new(haml_path, @passed_options)
             @extractors << @extractor
             @extractor.run
           rescue Haml::I18n::Extractor::InvalidSyntax

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

@@ -8,11 +8,8 @@ module Haml
     class Extractor
       class YamlTool
 
-        attr_accessor :locales_dir, :locale_hash
+        attr_accessor :locales_dir, :locale_hash, :yaml_file
 
-        # this requires passing an absolute path.
-        # meaning run from a given rails root...
-        # ok? change?
         def initialize(locales_dir = nil)
           @locales_dir = locales_dir ? locales_dir : "./config/locales/"
           if ! File.exists?(@locales_dir)
@@ -25,7 +22,7 @@ module Haml
           yml = Hash.new
           @locale_hash.map do |line_no, info|
             unless info[:keyname].nil?
-              keyspace = [i18n_scope,standardized_viewnames(info[:path]), standarized_keyname(info[:keyname]),
+              keyspace = [@yaml_file,standardized_viewnames(info[:path]), standarized_keyname(info[:keyname]),
                           info[:replaced_text]].flatten
               yml.deep_merge!(nested_hash({},keyspace))
             end
@@ -34,7 +31,7 @@ module Haml
         end
 
         def locale_file
-          File.join(@locales_dir, "#{i18n_scope}.yml")
+          File.join(@locales_dir, "#{@yaml_file}.yml")
         end
 
         def write_file(filename = nil)
@@ -81,9 +78,6 @@ module Haml
           end
           hash
         end
-        def i18n_scope
-          :en
-        end
 
         # comes in like "t('.some_place')", return .some_place
         def standarized_keyname(name)

data/test/yaml_tool_test.rb

@@ -75,6 +75,11 @@ module Haml
       assert_equal really_written['en']['support'], ex1_yaml_hash['en']['support']
     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
+    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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml-i18n-extractor
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Shai Rosenfeld
@@ -202,7 +202,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
-- .tags.haml-i18n-extractor
 - Gemfile
 - LICENSE
 - README.md