tidy_i18n 0.0.5 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWIxODcyNTI4ODI0NDgyZGM5MWQ2ODI1ZjVhZmJlOGVmMWJkY2FjOA==
+    NjNlNjVjMjQ4ZjE2ZGM4NTZjYzFmODBlOWFhMGYyMTM1YmFkN2JhOA==
   data.tar.gz: !binary |-
-    NThkZTY0MzlmNDc1NTgxOTUyMjYyNzg2ZGU0M2FmOGFjZTEwMjk4Mg==
-!binary "U0hBNTEy":
+    ZTI0MjJjMjA4YjJlYmUzMDk0NGMyYmQxOWZiM2NhMmMyNzlhMjQ2ZA==
+SHA512:
   metadata.gz: !binary |-
-    NGJlYjI3MTAxODFjNDU1NzJkODIyYWQwNDE2MWZiNmIyNTcwNTgyNzdlZTk3
-    YjhlM2IyNGU0ZWI2MDQ2ZjUzYTYwYTc4ZTZjMDI5NmIzNDEzNTUwYTE3YzM5
-    ODU1NGQ5ZGQ4MzRmM2EyNjE5ZDAyNTVkZmY1ZWIyM2U2NzI3MmI=
+    ODNiZjQyMWIwZjNiN2E1ZTBiMjkxZjhhNDRhYWUwMjVjODU4YjVmYWU0Mjdk
+    YjY3MzIxY2E4MjZkZmI2YjMxMjNkZDYyZjczM2Q5NTE2ZjQ2YzUyN2NkYTBm
+    NWJjYTg3YzljNDNlYzdjYTA0ZjgwZDBjM2JiNmQ2Y2QyNjY5YjU=
   data.tar.gz: !binary |-
-    ODBjY2UzNGQ5ZjFmYzBlM2E3YTNmY2ZhMzc5NGYxODdmMTNjYmQ3YzE5NWMy
-    MGRhMjcyOGFjNDI5MmQ2NDgxMmE4MTMyZmRmNjNjNjliYTI2YzBkZmJkYzk0
-    YzhmOWIwODQ3Mzg5MWQzNzJkMmRkZGJiN2QyZTRiYjQ0MjAyYTk=
+    ZjM0OTZhZDMwNzY1ODNiMTg5ZTljZjRlOWI4NzJlNTNmNTRkYTY4MmZmNjgy
+    MTU1MzZiNTQ1OWZlOTExZGM0ZGY1OTZjNjNjNDNjYmRmM2VjZTk0MGZjNjk4
+    N2M0M2U1ZDA1Mzc1MGE3NDc3ZWZkMTA4MjBlYjkzNzgwZmRlMTQ=

data/lib/tidy_i18n/dictionary_converter.rb

@@ -32,7 +32,7 @@ module TidyI18n
         convert_dictionary(value, path)
       when "Array"
         value.collect { |v| convert_value(v, path) }
-      when "Fixnum", "FalseClass", "TrueClass", "NilClass", "Symbol"
+      when "Fixnum", "FalseClass", "TrueClass", "NilClass", "Symbol", "Integer"
         value
       else
         raise InvalidTranslationValue.new("#{path.join('.')} #{value.class.name} #{value.inspect}")

data/lib/tidy_i18n/translation_keys.rb

@@ -1,4 +1,7 @@
+require "psych"
+
 module TidyI18n
+  TranslationKey = Struct.new(:name, :value)
   class TranslationKeys
 
     def self.parse(yaml)
@@ -7,34 +10,32 @@ module TidyI18n
 
     class RepeatKeyBuilder
 
-      TranslationKey = Struct.new(:name, :value)
       attr_reader :parsed_keys
 
       def initialize
         self.key_parts = []
         self.parsed_keys = []
+        self.current_sequence_values = []
       end
 
-      def start_stream(*row)
-        # puts "start_stream: #{row.inspect}"
-      end
-
-      def start_document(*row)
-        # puts "start_document: #{row.inspect}"
+      def start_stream(*row); end
+      def start_document(*row); end
+      def start_sequence(*row)
+        self.building_sequence = true
       end
 
       def start_mapping(*row)
-        @last_scalar = nil
+        @most_recent_scalar = nil
       end
 
       def scalar(*row)
-        if leaf?
-          parsed_keys << TranslationKey.new(key_parts.join("."), row.first)
-          @last_scalar = nil
-          key_parts.pop
+        if second_half_of_pair?
+          append_parsed_key(row.first)
+        elsif building_sequence?
+          current_sequence_values << row.first
         else
           key_parts << row.first
-          @last_scalar = row
+          @most_recent_scalar = row
         end
       end
 
@@ -42,22 +43,31 @@ module TidyI18n
         @key_parts.pop
       end
 
-      def end_document(*row)
-        # puts "end_document: #{row.inspect}"
-      end
-
-      def end_stream(*row)
-        # puts "end_stream: #{row.inspect}"
+      def end_document(*row); end
+      def end_stream(*row); end
+      def end_sequence
+        append_parsed_key(current_sequence_values)
+        self.building_sequence = false
+        self.current_sequence_values = []
       end
 
       private
 
-      def leaf?
-        @last_scalar
+      def append_parsed_key(value)
+        parsed_keys << TranslationKey.new(key_parts.join("."), value)
+        key_parts.pop
+        @most_recent_scalar = nil
+      end
+
+      def building_sequence?
+        building_sequence
       end
 
-      attr_accessor :key_parts
+      def second_half_of_pair?
+        @most_recent_scalar && !building_sequence?
+      end
 
+      attr_accessor :key_parts, :building_sequence, :current_sequence_values
       attr_writer :parsed_keys
 
     end
@@ -74,7 +84,7 @@ module TidyI18n
 
     def build_keys
       builder = RepeatKeyBuilder.new
-      parser = Psych::Parser.new builder
+      parser = Psych::Parser.new(builder)
       parser.parse(yaml)
       builder.parsed_keys
     end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: tidy_i18n
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Eric Meyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2017-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 description: Helpers for I18n. Add ways to encourage clean locale organization.
@@ -31,17 +31,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/tidy_i18n.rb
 - lib/tidy_i18n/dictionary_converter.rb
 - lib/tidy_i18n/duplicate_keys.rb
+- lib/tidy_i18n/locales.rb
 - lib/tidy_i18n/locales/reverse.rb
 - lib/tidy_i18n/locales/tilde.rb
-- lib/tidy_i18n/locales.rb
 - lib/tidy_i18n/missing_keys.rb
 - lib/tidy_i18n/translation_keys.rb
 - lib/tidy_i18n/translations.rb
-- lib/tidy_i18n.rb
 homepage: https://github.com/ericmeyer/tidy_i18n
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -59,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Helpers for I18n