threedaymonk-l10nizer 0.0.1 → 0.0.2

data/Rakefile

@@ -37,7 +37,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency("treetop",  "~> 1.2.6")
   s.add_dependency("polyglot", "~> 0.2.5")
 
-  s.add_development_dependency("shoulda")
+  s.add_development_dependency("thoughtbot-shoulda")
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/bin/l10nizer

@@ -1,13 +1,17 @@
 #!/usr/bin/env ruby
 require "l10nizer"
 require "yaml"
+require "fileutils"
+
+Dir.chdir(ARGV.first) if ARGV.first
+templates = Dir["app/views/**/*.html.erb"]
+raise "Can't find any templates in app/views." unless templates.any?
 
 keygen = L10nizer::KeyGenerator.new
 l10ns = {}
 
-templates = Dir["app/views/**/*.html.erb"]
 templates.each do |path|
-  keygen.namespace = path.split("/")[2 .. -2] * "_"
+  keygen.namespace = path.split("/")[2]
   source = File.read(path)
   l10nizer = L10nizer::Processor.new(source, keygen)
   l10ns.merge!(l10nizer.l10ns)
@@ -16,6 +20,13 @@ templates.each do |path|
   end
 end
 
+l10ns = l10ns.inject({}){ |hash, (key, value)|
+  parts = key.split(".")
+  parts[0 .. -2].inject(hash){ |h, k| h[k] ||= {} }[parts.last] = value
+  hash
+}
+
+FileUtils.mkdir_p("config/locales")
 File.open("config/locales/l10nized.yml", "w") do |f|
   f << l10ns.to_yaml
 end

data/lib/l10nizer/grammar.treetop

@@ -16,7 +16,7 @@ grammar HtmlErb
   end
 
   rule tag
-    "<" (erb_eval / [^>])+ ">"
+    "<" (erb_control / erb_eval / [^>])+ ">"
   end
 
   rule whitespace

data/lib/l10nizer/keygen.rb

@@ -27,7 +27,9 @@ module L10nizer
 
     def make_safe(string)
       return nil if string.nil?
-      string.downcase.gsub(/[^a-z0-9]+/, "_").gsub(/^_|_$/, "")[0, 40]
+      safe = string.downcase.gsub(/[^a-z0-9]+/, "_").gsub(/^_|_$/, "")[0, 40]
+      safe = "unknown" if safe.empty?
+      safe
     end
   end
 end

data/lib/l10nizer/version.rb

@@ -2,7 +2,7 @@ module L10nizer #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/test_key_generator.rb

@@ -30,6 +30,10 @@ class KeyGeneratorTest < Test::Unit::TestCase
       assert_equal "a_thing_1", @keygen.call("A thing")
       assert_equal "a_thing_2", @keygen.call("A Thing")
     end
+
+    should "generate_non_empty_keys_for_punctuation" do
+      assert_not_equal "", @keygen.call("<>!@#%#.,")
+    end
   end
 
   context "with namespacing" do

data/test/test_processor.rb

@@ -81,6 +81,12 @@ class ProcessorTest < Test::Unit::TestCase
     assert_equal html, l10nizer.reformed
   end
 
+  should "not try to localise control inside a tag" do
+    html = %{<div class="user-skills block <% unless @user.skills.any? %>blank<% end %>">}
+    l10nizer = L10nizer::Processor.new(html, DumbKeyGenerator.new)
+    assert_equal html, l10nizer.reformed
+  end
+
   context "when parsing a sample document" do
     setup do
       @html     = File.read(File.join(File.dirname(__FILE__), "samples", "input.html.erb"))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: threedaymonk-l10nizer
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Paul Battley
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-10 00:00:00 -07:00
+date: 2009-07-12 00:00:00 -07:00
 default_executable: l10nizer
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
         version: 0.2.5
     version: 
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: thoughtbot-shoulda
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -90,7 +90,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: Automatically extract strings from ERB templates and replace with calls to t()
 test_files: []