any2tmx 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d4a0d4bd6929c4b054a9dbb5fa4a22b64a080ab
-  data.tar.gz: 76c7f0b7b3d31125efa7afb977d5f4c4c884bcf0
+  metadata.gz: 254e2e49f9066afc36e3680b124e270f39aeffcf
+  data.tar.gz: 4c98b41da4be3aea62dc8c3ee708e340caf493d6
 SHA512:
-  metadata.gz: 352cb9d0d316b99ee20011d0576f9ff368be72490f59c6367e417356c8caeedf3dcbe30ac338bd073135407fb94249d4769b3da11015361eceb3760f5705a19d
-  data.tar.gz: 44c1dd91dc6384d6ef4ba988c11518b6272df3b39bc9b082ce0012308d718df9472ebe788348eb54adb60e3e92560c24ec2f95e6714fe825c8e36d5c98ddd508
+  metadata.gz: 393d789effc3dc7ec69e7d6ed672999c70a8000a314e91d8d8abdae771e64f1a324778625ab9f93067432e11c6904e767a588aadd5ebf4e3dd95f5f49e1e660a
+  data.tar.gz: d459eca4642a71e6ca71fc1599c2be0cf329f37a72162cbebb960fb212478f179bec612f46cdba032c0fd68345fbd77226ab17856c4b97b41ad4f60679710fc4

data/History.txt

@@ -14,3 +14,8 @@
 == 1.0.2
 
 * Fix Android transform bug
+
+== 1.0.3
+
+* Stringify keys when processing YAML
+

data/lib/any2tmx/transforms/yaml_transform.rb

@@ -17,7 +17,7 @@ module Any2Tmx
           contents = contents[locale]
         end
 
-        traversable = Any2Tmx::Traversable.new(contents)
+        traversable = Any2Tmx::Traversable.new(contents).stringify_keys
         Any2Tmx::PhraseSet.new(traversable, locale)
       end
     end

data/lib/any2tmx/traversable.rb

@@ -8,7 +8,9 @@ module Any2Tmx
 
     def each_entry(&block)
       if block_given?
-        each_entry_helper(collection, [], &block)
+        each_entry_helper(collection, [], nil) do |entry, path, last_key|
+          yield entry, path + [last_key]
+        end
       else
         to_enum(__method__)
       end
@@ -18,17 +20,46 @@ module Any2Tmx
       each_entry.inject(0) { |ret, _| ret + 1 }
     end
 
+    def dig_each(path)
+      if block_given?
+        path.inject(:start) do |ret, seg|
+          if ret == :start
+            yield collection, seg
+            collection[seg]
+          elsif ret
+            if seg.is_a?(Numeric) && ret.is_a?(Array)
+              yield ret, seg
+              ret[seg]  # array index case
+            elsif ret.is_a?(Hash)
+              yield ret, seg
+              ret[seg]  # hash key case
+            end
+          end
+        end
+      else
+        to_enum(__method__, path)
+      end
+    end
+
     def dig(path)
-      path.inject(:start) do |ret, seg|
-        if ret == :start
-          collection[seg]
-        elsif ret
-          if seg.is_a?(Numeric) && ret.is_a?(Array)
-            ret[seg]  # array index case
-          elsif seg.is_a?(String) && ret.is_a?(Hash)
-            ret[seg]  # hash key case
+      return collection if path.empty?
+      dig_each(path) {}
+    end
+
+    def transform
+      if block_given?
+        self.class.new(make_empty(sym_from(collection))).tap do |copy|
+          each_entry_helper(collection, [], nil) do |entry, path, last_key|
+            dig_each(path).inject(copy.collection) do |copy_obj, (obj, key)|
+              copy_obj[key] ||= make_empty(sym_from(obj[key]))
+              copy_obj[key]
+            end
+
+            yield copy.dig(path), last_key, entry
           end
         end
+      else
+        to_enum(__method__)
       end
     end
 
@@ -40,22 +71,56 @@ module Any2Tmx
       end
     end
 
+    def stringify_keys
+      transform do |obj, key, value|
+        obj[stringify(key)] = value
+      end
+    end
+
     private
 
-    def each_entry_helper(coll, path, &block)
+    def stringify(obj)
+      obj.is_a?(Symbol) ? obj.to_s : obj
+    end
+
+    def sym_from(obj)
+      case obj
+        when Hash
+          :hash
+        when Array
+          :array
+      end
+    end
+
+    def make_empty(sym)
+      case sym
+        when :hash
+          {}
+        when :array
+          []
+      end
+    end
+
+    def each_entry_helper(coll, path, last_key, &block)
+      next_path = if last_key
+        path + [last_key]
+      else
+        path
+      end
+
       case coll
         when Hash
           coll.each_pair do |key, value|
-            each_entry_helper(value, path + [key], &block)
+            each_entry_helper(value, next_path, key, &block)
           end
 
         when Array
           coll.each_with_index do |element, idx|
-            each_entry_helper(element, path + [idx], &block)
+            each_entry_helper(element, next_path, idx, &block)
           end
 
         when String
-          yield coll, path
+          yield coll, path, last_key
       end
     end
   end

data/lib/any2tmx/version.rb

@@ -1,3 +1,3 @@
 module Any2Tmx
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: any2tmx
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2016-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-write-stream