norikra 0.0.23-java → 0.0.24-java

data/lib/norikra/fieldset.rb

@@ -38,6 +38,11 @@ module Norikra
     end
 
     def self.leaves(container)
+      unless container.is_a?(Array) || container.is_a?(Hash)
+        raise ::ArgumentError, "FieldSet#leaves accepts Array or Hash only"
+      end
+      return [] if container.empty?
+
       # returns list of [ [key-chain-items-flatten-list, value] ]
       dig = Proc.new do |obj|
         if obj.is_a?(Array)

data/lib/norikra/version.rb

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

data/spec/fieldset_spec.rb

@@ -50,6 +50,17 @@ describe Norikra::FieldSet do
     end
 
     describe '.leaves' do
+      it 'raises ArgumentError for non-container values' do
+        expect { Norikra::FieldSet.leaves('value') }.to raise_error(ArgumentError)
+        expect { Norikra::FieldSet.leaves('') }.to raise_error(ArgumentError)
+        expect { Norikra::FieldSet.leaves(1024) }.to raise_error(ArgumentError)
+        expect { Norikra::FieldSet.leaves(nil) }.to raise_error(ArgumentError)
+      end
+      it 'returns blank array for empty container' do
+        expect( Norikra::FieldSet.leaves({}) ).to eql([])
+        expect( Norikra::FieldSet.leaves([]) ).to eql([])
+      end
+
       it 'returns field access chains to all keys of 1-depth Hash container' do
         leaves = Norikra::FieldSet.leaves({'field1' => 1, 'field2' => 2})
         expect(leaves.size).to eql(2)

data/spec/typedef_spec.rb

@@ -378,6 +378,24 @@ describe Norikra::Typedef do
         expect(r['key4$f2$$0']).to eql('long')
         expect(r['key5']).to eql('string')
       end
+
+      it 'ignores empty container fieldss' do
+        typedef = Norikra::Typedef.new({'key1' => 'boolean', 'key2' => 'long', 'key3.$0.key4' => 'string'})
+        typedef.waiting_fields = ['key4.f1', 'key4.f2.$0', 'key5']
+
+        t = typedef.simple_guess({
+            'key1' => true,
+            'key2' => 10,
+            'key3' => [],
+            'key4' => {},
+            'key5' => 'foobar'
+          }, true, true)
+        r = t.definition
+        expect(r.size).to eql(3)
+        expect(r['key1']).to eql('boolean')
+        expect(r['key2']).to eql('long')
+        expect(r['key5']).to eql('string')
+      end
     end
 
     describe '#refer' do

metadata

@@ -2,7 +2,7 @@
 name: norikra
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.0.23
+  version: 0.0.24
 platform: java
 authors:
 - TAGOMORI Satoshi