norikra 1.0.6-java → 1.0.7-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49f70a10326048c87cd3366f588d7bf814e1bb97
-  data.tar.gz: f7e844d23d9c25442ea1c1a06973de2e049c06cf
+  metadata.gz: 89c004c84e1c294cb0a07cb42fb8af1f09ce5bb9
+  data.tar.gz: 5d8907d43f09fd2c772c55dc7e1bfc97bbc2508b
 SHA512:
-  metadata.gz: 16797110955adb8367955627ff11b691a9b5b68c5d369b154fabd8407cd1b24a064b55b0097d89bef53c9a21cdd8cfc7a3479e7768de957b804a0c5dee9f0a05
-  data.tar.gz: 0646b5f217ee7b94b394c34be4506f8de1e30259a29dc0673ab60b5880b82359b232149faa63cf19397d57ade775b2fc55b910422a0c7942e1b508ccdff2580d
+  metadata.gz: ebb8eb23d2656c6006f12a780be1c839d09a581cb13de2da983d27424dadc2f603a61633ca564353d71456781f13f969563e8af93a98fcc1137fef4027cd1581
+  data.tar.gz: 26b751b08b6686c9925c91956835f96f71a4746168368eb6c83d15d405118b0c743023caa36605615f092dbf1c647a7b3dcf1cbe45baf669b929ce46f996fe68

data/Changes.md

@@ -3,6 +3,10 @@
 Changes of norikra.
 
 ## v1
+* v1.0.7:
+  * Fix bug to set nested values as always required if the first event includes container fields (issue #51)
+* v1.0.6:
+  * Fix bug not to receive events on '/send' of JSON API
 * v1.0.5:
   * Add option `--log4j-properties-path` to specify logger configurations by log4j.properties file
   * Add HTTP RPC headers to allow requests from different origins

data/lib/norikra/typedef.rb

@@ -172,13 +172,19 @@ module Norikra
       true
     end
 
-    def simple_guess(data, optional=true, strict=false)
+    def simple_guess(data, opts={})
+      unless opts.has_key?(:optional)
+        opts[:optional] = true
+      end
+
       flatten_key_value_pairs = []
 
       data.each do |key,value|
-        next if strict && !(@fields.has_key?(key) || @waiting_fields.include?(key) || value.is_a?(Hash) || value.is_a?(Array))
+        next if opts[:strict] && !(@fields.has_key?(key) || @waiting_fields.include?(key) || value.is_a?(Hash) || value.is_a?(Array))
 
         if value.is_a?(Hash) || value.is_a?(Array)
+          next if opts[:baseset]
+
           Norikra::FieldSet.leaves(value).map{|chain| [key] + chain}.each do |chain|
             value = chain.pop
             key = Norikra::Field.regulate_key_chain(chain).join('.')
@@ -203,34 +209,14 @@ module Norikra
         }
       ]
 
-      FieldSet.new(mapping, optional)
+      FieldSet.new(mapping, opts[:optional])
     end
 
-    # def self.guess(data, optional=true)
-    #   mapping = Hash[
-    #     data.map{|key,value|
-    #       sval = value.to_s
-    #       type = case
-    #              when val.is_a?(TrueClass) || val.is_a?(FalseClass) || sval =~ /^(?:true|false)$/i
-    #                'boolean'
-    #              when val.is_a?(Integer) || sval =~ /^-?\d+[lL]?$/
-    #                'long'
-    #              when val.is_a?(Float) || sval =~ /^-?\d+\.\d+(?:[eE]-?\d+|[dDfF])?$/
-    #                'double'
-    #              else
-    #                'string'
-    #              end
-    #       [key,type]
-    #     }
-    #   ]
-    #   self.new(mapping, optional)
-    # end
-
     def refer(data, strict=false)
       field_names_key = FieldSet.field_names_key(data, self, strict, @waiting_fields)
       return @set_map[field_names_key] if @set_map.has_key?(field_names_key)
 
-      guessed = self.simple_guess(data, false, strict)
+      guessed = self.simple_guess(data, optional: false, strict: strict)
       guessed_fields = guessed.fields
       @fields.each do |key,field|
         if guessed_fields.has_key?(key)

data/lib/norikra/typedef_manager.rb

@@ -101,7 +101,7 @@ module Norikra
     end
 
     def generate_base_fieldset(target, event)
-      guessed = @typedefs[target].simple_guess(event, false, false) # all fields are non-optional
+      guessed = @typedefs[target].simple_guess(event, optional: false, strict: false, baseset: true) # all fields are non-optional
       guessed.update(@typedefs[target].fields, false)
       guessed
     end

data/lib/norikra/version.rb

@@ -1,3 +1,3 @@
 module Norikra
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

data/spec/typedef_spec.rb

@@ -334,7 +334,7 @@ describe Norikra::Typedef do
 
       it 'can guess about fields already known with strict mode' do
         typedef = Norikra::Typedef.new({'key1' => 'boolean', 'key2' => 'boolean', 'key3' => 'long'})
-        t = typedef.simple_guess({'key1' => true, 'key2' => false, 'key3' => 10, 'key4' => 3.1415, 'key5' => 'foobar'}, true, true)
+        t = typedef.simple_guess({'key1' => true, 'key2' => false, 'key3' => 10, 'key4' => 3.1415, 'key5' => 'foobar'}, optional: true, strict: true)
         r = t.definition
         expect(r['key1']).to eql('boolean')
         expect(r['key2']).to eql('boolean')
@@ -348,7 +348,7 @@ describe Norikra::Typedef do
         typedef = Norikra::Typedef.new({'key1' => 'boolean', 'key2' => 'boolean', 'key3' => 'long'})
         typedef.waiting_fields = ['key5']
 
-        t = typedef.simple_guess({'key1' => true, 'key2' => false, 'key3' => 10, 'key4' => 3.1415, 'key5' => 'foobar'}, true, true)
+        t = typedef.simple_guess({'key1' => true, 'key2' => false, 'key3' => 10, 'key4' => 3.1415, 'key5' => 'foobar'}, optional: true, strict: true)
         r = t.definition
         expect(r['key1']).to eql('boolean')
         expect(r['key2']).to eql('boolean')
@@ -368,7 +368,7 @@ describe Norikra::Typedef do
             'key3' => [{'k2' => 1, 'k3' => 'sssss', 'key4' => 'baz'}],
             'key4' => {'f1' => 'xxx', 'f2' => [30, true]},
             'key5' => 'foobar'
-          }, true, true)
+          }, optional: true, strict: true)
         r = t.definition
         expect(r.size).to eql(6)
         expect(r['key1']).to eql('boolean')
@@ -379,7 +379,7 @@ describe Norikra::Typedef do
         expect(r['key5']).to eql('string')
       end
 
-      it 'ignores empty container fieldss' do
+      it 'ignores empty container fields' do
         typedef = Norikra::Typedef.new({'key1' => 'boolean', 'key2' => 'long', 'key3.$0.key4' => 'string'})
         typedef.waiting_fields = ['key4.f1', 'key4.f2.$0', 'key5']
 
@@ -389,13 +389,34 @@ describe Norikra::Typedef do
             'key3' => [],
             'key4' => {},
             'key5' => 'foobar'
-          }, true, true)
+          }, optional: true, strict: 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
+
+      it 'ignores any container fields if baseset option specified' do
+        typedef = Norikra::Typedef.new(nil) # lazy typedef for baseset generation test
+        typedef.waiting_fields = ['key1.a1', 'key1.a2', 'key2.$0']
+
+        t = typedef.simple_guess({
+            'key1' => {'a1' => 1, 'a2' => 2},
+            'key2' => [3, 4],
+          }, optional: false, strict: false, baseset: true)
+        r = t.definition
+        expect(r.size).to eql(0)
+
+        t = typedef.simple_guess({
+            'key1' => {'a1' => 1, 'a2' => 2},
+            'key2' => [3, 4],
+            'key3' => true,
+          }, optional: false, strict: false, baseset: true)
+        r = t.definition
+        expect(r.size).to eql(1)
+        expect(r['key3']).to eql('boolean')
+      end
     end
 
     describe '#refer' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: norikra
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: java
 authors:
 - TAGOMORI Satoshi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mizuno