norikra 0.0.22-java → 0.0.23-java

data/lib/norikra/fieldset.rb

@@ -52,8 +52,14 @@ module Norikra
           ary
         else # Hash
           obj.map {|k,v|
-            if v.is_a?(Hash) || v.is_a?(Array)
-              dig.call(v).map{|chain| [k] + chain}
+            if k.nil?
+              []
+            elsif v.is_a?(Hash) || v.is_a?(Array)
+              if v.empty?
+                []
+              else
+                dig.call(v).map{|chain| [k] + chain}
+              end
             else
               [[k, v]]
             end

data/lib/norikra/version.rb

@@ -1,3 +1,3 @@
 module Norikra
-  VERSION = "0.0.22"
+  VERSION = "0.0.23"
 end

data/spec/fieldset_spec.rb

@@ -81,6 +81,31 @@ describe Norikra::FieldSet do
         expect(leaves[3]).to eql(['f1', 1, 4])
         expect(leaves[4]).to eql(['f2', 5])
       end
+
+      it 'does not return leaves with keys nil' do
+        leaves = Norikra::FieldSet.leaves({'f1' => [{'fz1' => 1, nil => {'fz3' => 2, 'fz4' => 3}}, 4], nil => 5})
+        expect(leaves.size).to eql(2)
+        expect(leaves[0]).to eql(['f1', 0, 'fz1', 1])
+        expect(leaves[1]).to eql(['f1', 1, 4])
+      end
+
+      it 'return leaves with values nil' do
+        leaves = Norikra::FieldSet.leaves({'f1' => [{'fz1' => 1}, nil, 4], 'f2' => 5, 'f3' => nil})
+        expect(leaves.size).to eql(5)
+        expect(leaves[0]).to eql(['f1', 0, 'fz1', 1])
+        expect(leaves[1]).to eql(['f1', 1, nil])
+        expect(leaves[2]).to eql(['f1', 2, 4])
+        expect(leaves[3]).to eql(['f2', 5])
+        expect(leaves[4]).to eql(['f3', nil])
+      end
+
+      it 'does not return leaves with empty containers' do
+        leaves = Norikra::FieldSet.leaves({'f1' => [{'fz1' => 1, 'fz2' => {}}, 4], 'f2' => 5, 'f3' => []})
+        expect(leaves.size).to eql(3)
+        expect(leaves[0]).to eql(['f1', 0, 'fz1', 1])
+        expect(leaves[1]).to eql(['f1', 1, 4])
+        expect(leaves[2]).to eql(['f2', 5])
+      end
     end
 
     describe '.field_names_key' do

metadata

@@ -2,14 +2,14 @@
 name: norikra
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.0.22
+  version: 0.0.23
 platform: java
 authors:
 - TAGOMORI Satoshi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mizuno