haml-i18n-extractor 0.3.0 → 0.3.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWYyNWM2YWQ5YTA3OTdlNmUyN2Y5NTJkZmI0ZDc1YzdkMzcxNWM4Mw==
+    YzE3Mzc4M2VkYTdhOGViYWE2NjJlMjhhMjMxOGYxN2FiNjc3ZjJkMA==
   data.tar.gz: !binary |-
-    MThkMzY5ZGFiZWY3ZTNhOGZjNTEyZjUyN2UzNWIzNjg4NjczMjM2ZA==
+    MGFiOWZhODkzODRjNTY4MDVhMzYzY2M1ODE0MWEwNGExNmM1MzMxYQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzFhNmIyNzIwZDhhNGE0N2IzNjQ0NzQwMzg1YjgyZjA1OWM4ZWMwMTA2N2Q0
-    NjBhNjM2MGNhMWE4YTAyMjNhOThhOWQ1ZWYyNzJmYjkwNjEwZjIxOGE3YzQ3
-    OTU5Y2JjNzUzODQ3ZjAzOThhNDYzM2JhZDI0NTIzODVmZTA3MGQ=
+    NWVhMDM5NzZkMzgwNTRmYzg5Njk2ZTAxYjg5NDI0YTdjZTY2ZDc3YmQyMmRj
+    Mzg4NTcwMThjODA5ZTA0YzMxOWViNjBlMDFmMmJhMjZhMDkxNDYzYmQzNTQw
+    MjE0MjE1NjAwMzQ5ODdlYjg4ODllZDc2YTRiYjk1OWEzZDljNWQ=
   data.tar.gz: !binary |-
-    MGZlOTZjZjA5YjlmYTMxMTAzNDlkY2VkYzRmZjgwZWMxZjM0MDZkNTQ4ZjVj
-    OWU2YTU2ZGM3ZDZhMWEwZGM4M2FhYmU0YWY0NjYxNDQzMTgxOGVmY2YxYTky
-    OWRiMzRkYjVhM2MzMTY4Y2JjYzI1ZDQ1MGEwZmUxOGU2NzVmZjA=
+    MWNjYjQwNTEzMWVmNDBmNzk4MzIwMGU3MTFkYzQ3NjY4YzFjMzcwZmY3MGEy
+    YjMzMjFhNWMwNzI2OTZiMWRiZGNiZTZiMjFmMjE3OTkyZjYyNTk0MDJkZDI1
+    Y2ZhZTFlZWRiY2M4NDM1ZGFkMjA5OTdjOTI0YjlhMGQ2Mzg3ZjY=

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

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

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

@@ -85,15 +85,18 @@ module Haml
 
         # assuming rails format, app/views/users/index.html.haml return [users]
         # app/views/admin/users/index.html.haml return [admin, users]
-        # app/views/admin/users/with_namespace/index.html.haml return [admin, users, with_namespace]
+        # app/views/admin/users/with_namespace/index.html.haml return [admin, users, with_namespace, index]
         # otherwise, just grab the last one.
         def standardized_viewnames(pth)
-          array_of_dirs = Pathname.new(pth).dirname.to_s.split("/")
+          pathname = Pathname.new(pth)
+          array_of_dirs = pathname.dirname.to_s.split("/")
+          view_name = pathname.basename.to_s.gsub(/.html.haml$/,"").gsub(/.haml$/,"")
+          view_name.gsub!(/^_/, "")
           index = array_of_dirs.index("views")
           if index
-            array_of_dirs[index+1..-1]
+            array_of_dirs[index+1..-1] << view_name
           else
-            [array_of_dirs.last]
+            [array_of_dirs.last] << view_name
           end
         end
 

data/test/integration_test.rb

@@ -3,6 +3,7 @@ module Haml
 
     def setup
       TestHelper.setup_project_directory!
+      @workflow = TestHelper.mock_full_project_user_interaction!
     end
 
     def teardown
@@ -10,10 +11,14 @@ module Haml
     end
 
     test "it can handle namespaced views" do
-      workflow = TestHelper.mock_full_project_user_interaction!
-      namespaced_extractor = workflow.extractors.select{|ex| ex.haml_writer.path.match /namespace/ }.last
+      namespaced_extractor = @workflow.extractors.select{|ex| ex.haml_writer.path.match /namespace/ }.last
       assert namespaced_extractor.yaml_tool.yaml_hash["en"]["namespace"], "namespace key works"
     end
 
+    test "it can handle partial views" do
+      partial_extractor = @workflow.extractors.select{|ex| ex.haml_writer.path.match /_partial/ }.last
+      assert partial_extractor.yaml_tool.yaml_hash["en"]["view2"]["partial"], "partial filenames in yaml are w/out leading _"
+    end
+
   end
 end

data/test/test_helper.rb

@@ -126,7 +126,7 @@ module TestHelper
     view3 = File.join(PROJECT_DIR, "app", "views", "namespace", "view3")
     [ view1, view2, view3 ].map do |dir|
       FileUtils.mkdir_p(dir)
-      ["thing.haml", "thang.haml"].map do |fn|
+      ["thing.haml", "thang.haml", "_partial.html.haml"].map do |fn|
         haml_text=<<EOH
 %h1 Notifications
 

data/test/workflow_test.rb

@@ -23,13 +23,13 @@ module Haml
     end
 
     test "it_finds_all_haml_files" do
-      assert_equal @workflow.files.size, 6
+      assert_equal @workflow.files.size, 9
     end
 
     test "outputs_stats" do
       with_highline do
         @workflow.start_message
-        assert @output.string.match(/Found 6 haml files/), "Outputs stats"
+        assert @output.string.match(/Found \d haml files/), "Outputs stats"
       end
     end
 

data/test/yaml_tool_test.rb

@@ -33,27 +33,29 @@ module Haml
 
     def existing_yaml_hash
       {"en" => {
-          "viewname" => {
-            "translate_key" => "Translate Key"
-          }
+        "viewname" => {
+          "translate_key" => "Translate Key"
         }
       }
+      }
     end
 
     def ex1_yaml_hash
       {"en"=>
-        {"support"=>
-          {"some_place"=>"Some place",
-           "admin"=>"Admin",
-           "admin_dashboard"=>"Admin Dashboard",
-           "stacks"=>"Stacks",
-           "alerts"=>"t('.alerts')",
-           "accounts"=>"Accounts",
-           "what_is_supposed_to_be_is_supp"=>
-            "What is@ supposed to be, is supposed to be! ~"
-            }
-          }
+       {"support" =>
+        {"ex1" =>
+         {"some_place"=>"Some place",
+          "admin"=>"Admin",
+          "admin_dashboard"=>"Admin Dashboard",
+          "stacks"=>"Stacks",
+          "alerts"=>"t('.alerts')",
+          "accounts"=>"Accounts",
+          "what_is_supposed_to_be_is_supp"=>
+         "What is@ supposed to be, is supposed to be! ~"
+         }
         }
+       }
+      }
     end
 
     test "defaults for empty init" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml-i18n-extractor
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Shai Rosenfeld