herbgobbler 0.3.4 → 0.3.5

data/lib/core/base_translation_store.rb

@@ -17,7 +17,10 @@ class BaseTranslationStore
   end
   
   def start_new_context( new_context )
-    @context = new_context
+    # Rails does not allow contexts that begin with an underscore. If we are
+    # converting erb partials that start with underscores we want to ensure
+    # we strip those so that we handle Rails i18n conventions properly.
+    @context = new_context.gsub(/(^|\/)_/, '\1')
   end
   
   def add_translation( key, value )

data/lib/core/rails_translation_store.rb

@@ -50,16 +50,28 @@ class RailsTranslationStore < BaseTranslationStore
   # and serialize the hash
   def serialize
     to_return = "#{@language}:\n"
-    last_context = nil
+    last_context_array = []
     self.each do |context, key, value|
       whitespace_depth = 2
+      new_context_array = []
       context_array = context.split('/')
-      context_array.each do |split_context|
-        to_return << "#{build_whitespace( whitespace_depth )}#{split_context}:\n" 
+
+      context_array.zip(last_context_array) do |new, old|
+        if new != old || new_context_array.any?
+          new_context_array << new
+        else
+          new_context_array << nil
+        end
+      end
+
+      new_context_array.each do |split_context|
+        if split_context != nil
+          to_return << "#{build_whitespace( whitespace_depth )}#{split_context}:\n"
+        end
         whitespace_depth += 2
-      end unless context == last_context
-        to_return << "#{build_whitespace( 2 + 2 * context_array.length )}#{key}: \"#{escape(value)}\"\n"
-      last_context = context
+      end
+      to_return << "#{build_whitespace( 2 + 2 * context_array.length )}#{key}: \"#{escape(value)}\"\n"
+      last_context_array = context_array
     end
     
     to_return.chomp

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: herbgobbler
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-21 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler