norikra 1.0.2-java → 1.0.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 484ecce14e3035444d000c902c7172bc66aa0f21
-  data.tar.gz: f964401ccd096def82fc7d2b0e980fcb634d05c9
+  metadata.gz: ff50de153ac29eecef89cb5e329c5060aca9f756
+  data.tar.gz: 4be725366d25d3a01f229a2879a48a12f3369de5
 SHA512:
-  metadata.gz: 968258b7e2456018e8c557d22802514a198dad763529a40f73edf94c39614ebac3879d9469435899bd353a44b2704615ef47b30516d1609e36136a37f148787e
-  data.tar.gz: 427efc15c89693c0750147176be8105e7d9bec03a7537fada0e8b612f1e1540274b9ea4d011585a2846e4ebcdfbe61addada81d102070ccf7b524f5f648736ad
+  metadata.gz: fe81a8b398ae6ca782174fc693d6b4effa6dc095303b762afadde84fb268b416d102c6e83377096320ef75fa6f5bf7d9eb35ff1ed06b40ef89a8aeeb62f2402f
+  data.tar.gz: 3f80c618ddc6875a32f9ed3cc990b9ae0c3e04002a2bc288e3ffc8b731f87a93584b8f4532110010341305337a298756d16651d9ce8f3f7df67156f21deeecfe

data/Changes.md

@@ -3,6 +3,8 @@
 Changes of norikra.
 
 ## v1
+* v1.0.3:
+  * Fix bug to return Array falsey for Hash output, [] for NULL output
 * v1.0.2:
   * Fix bug:
     * to handle encoding of input strings

data/lib/norikra/engine.rb

@@ -2,6 +2,7 @@ require 'java'
 
 require 'norikra/error'
 require 'norikra/target'
+require 'norikra/listener'
 
 require 'norikra/logger'
 include Norikra::Log
@@ -239,73 +240,6 @@ module Norikra
       load_udf(plugin_klass)
     end
 
-    class Listener
-      include com.espertech.esper.client.UpdateListener
-
-      def initialize(query_name, query_group, output_pool, events_statistics)
-        @query_name = query_name
-        @query_group = query_group
-        @output_pool = output_pool
-        @events_statistics = events_statistics
-      end
-
-      def type_convert(value)
-        if value.respond_to?(:getUnderlying)
-          value = value.getUnderlying
-        end
-
-        trace "converting", :value => value
-
-        if value.respond_to?(:to_a)
-          value.to_a.map{|v| type_convert(v) }
-        elsif value.respond_to?(:to_hash)
-          Hash[ value.to_hash.map{|k,v| [ Norikra::Field.unescape_name(k), type_convert(v)] } ]
-        elsif value.respond_to?(:force_encoding)
-          value.force_encoding('UTF-8')
-        else
-          value
-        end
-      end
-
-      def update(new_events, old_events)
-        t = Time.now.to_i
-        events = new_events.map{|e| [t, type_convert(e)]}
-        trace "updated event", :query => @query_name, :group => @query_group, :event => events
-        @output_pool.push(@query_name, @query_group, events)
-        @events_statistics[:output] += events.size
-      end
-    end
-
-    class LoopbackListener < Listener
-      def initialize(engine, query_name, query_group, events_statistics)
-        @engine = engine
-        @query_name = query_name
-        @query_group = query_group
-        @events_statistics = events_statistics
-        @loopback_target = Norikra::Query.loopback(query_group)
-      end
-
-      def update(new_events, old_events)
-        t = Time.now.to_i
-        event_list = new_events.map{|e| type_convert(e) }
-        trace "loopback event", :query => @query_name, :group => @query_group, :event => event_list
-        @events_statistics[:output] += event_list.size
-        #
-        # We does NOT convert 'container.$0' into container['field'].
-        # Use escaped names like 'container__0'. That is NOT so confused.
-        @engine.send(@loopback_target, event_list)
-      end
-    end
-
-    ##### Unmatched events are simply ignored
-    # class UnmatchedListener
-    #   include com.espertech.esper.client.UnmatchedListener
-    #   def update(event)
-    #     # puts "unmatched:\n- " + event.getProperties.inspect
-    #     # ignore
-    #   end
-    # end
-
     private
 
     def open_target(target)
@@ -484,9 +418,9 @@ module Norikra
       Norikra::Query.rewrite_query(statement_model, event_type_name_map)
 
       listener = if Norikra::Query.loopback(query.group)
-                   LoopbackListener.new(self, query.name, query.group, @statistics[:events])
+                   Norikra::LoopbackListener.new(self, query.name, query.group, @statistics[:events])
                  else
-                   Listener.new(query.name, query.group, @output_pool, @statistics[:events])
+                   Norikra::Listener.new(query.name, query.group, @output_pool, @statistics[:events])
                  end
 
       epl = administrator.create(statement_model)

data/lib/norikra/listener.rb

@@ -0,0 +1,78 @@
+require 'java'
+require 'esper-5.0.0.jar'
+require 'esper/lib/commons-logging-1.1.3.jar'
+require 'esper/lib/antlr-runtime-4.1.jar'
+require 'esper/lib/cglib-nodep-3.1.jar'
+
+require 'norikra/field'
+require 'norikra/query'
+
+module Norikra
+  class Listener
+    include com.espertech.esper.client.UpdateListener
+
+    def initialize(query_name, query_group, output_pool, events_statistics)
+      @query_name = query_name
+      @query_group = query_group
+      @output_pool = output_pool
+      @events_statistics = events_statistics
+    end
+
+    def type_convert(value)
+      if value.respond_to?(:getUnderlying)
+        value = value.getUnderlying
+      end
+
+      trace "converting", :value => value
+
+      if value.nil?
+        value
+      elsif value.respond_to?(:to_hash)
+        Hash[ value.to_hash.map{|k,v| [ Norikra::Field.unescape_name(k), type_convert(v)] } ]
+      elsif value.respond_to?(:to_a)
+        value.to_a.map{|v| type_convert(v) }
+      elsif value.respond_to?(:force_encoding)
+        value.force_encoding('UTF-8')
+      else
+        value
+      end
+    end
+
+    def update(new_events, old_events)
+      t = Time.now.to_i
+      events = new_events.map{|e| [t, type_convert(e)]}
+      trace "updated event", :query => @query_name, :group => @query_group, :event => events
+      @output_pool.push(@query_name, @query_group, events)
+      @events_statistics[:output] += events.size
+    end
+  end
+
+  class LoopbackListener < Listener
+    def initialize(engine, query_name, query_group, events_statistics)
+      @engine = engine
+      @query_name = query_name
+      @query_group = query_group
+      @events_statistics = events_statistics
+      @loopback_target = Norikra::Query.loopback(query_group)
+    end
+
+    def update(new_events, old_events)
+      event_list = new_events.map{|e| type_convert(e) }
+      trace "loopback event", :query => @query_name, :group => @query_group, :event => event_list
+      @events_statistics[:output] += event_list.size
+      #
+      # We does NOT convert 'container.$0' into container['field'].
+      # Use escaped names like 'container__0'. That is NOT so confused.
+      @engine.send(@loopback_target, event_list)
+    end
+  end
+
+  ##### Unmatched events are simply ignored
+  # class UnmatchedListener
+  #   include com.espertech.esper.client.UnmatchedListener
+  #   def update(event)
+  #     # puts "unmatched:\n- " + event.getProperties.inspect
+  #     # ignore
+  #   end
+  # end
+end

data/lib/norikra/version.rb

@@ -1,3 +1,3 @@
 module Norikra
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/spec/engine_spec.rb

@@ -0,0 +1,17 @@
+require_relative './spec_helper'
+
+require 'norikra/engine'
+
+describe Norikra::Engine do
+  it 'can be initialized' do
+    expect { Norikra::Engine.new(nil, nil) }.not_to raise_error
+  end
+
+  describe '#camelize' do
+    it 'make CamelizedString from :snake_case_symbol' do
+      engine = Norikra::Engine.new(nil, nil)
+      expect(engine.camelize(:symbol)).to eql('Symbol')
+      expect(engine.camelize(:snake_case_symbol)).to eql('SnakeCaseSymbol')
+    end
+  end
+end

data/spec/listener_spec.rb

@@ -0,0 +1,163 @@
+# -*- coding: utf-8 -*-
+require_relative './spec_helper'
+
+require 'norikra/listener'
+
+class DummyOutputPool
+  attr_reader :pool
+
+  def initialize
+    @pool = {}
+  end
+
+  def push(query_name, query_group, events)
+    @pool[query_group] ||= {}
+    @pool[query_group][query_name] ||= []
+    @pool[query_group][query_name].push(*events)
+  end
+end
+
+describe Norikra::Listener do
+  it 'should be initialized' do
+    dummy_pool = DummyOutputPool.new
+    statistics = {output: 0}
+    expect { Norikra::Listener.new('name', 'group', dummy_pool, statistics) }.not_to raise_error
+  end
+
+  describe '#type_convert' do
+    dummy_pool = DummyOutputPool.new
+    statistics = {output: 0}
+    listener = Norikra::Listener.new('name', 'group', dummy_pool, statistics)
+
+    it 'returns value itself for number, boolean and nil' do
+      val = 10001
+      expect(listener.type_convert(val)).to eq(val)
+
+      val = 100.001
+      expect(listener.type_convert(val)).to eq(val)
+
+      val = false
+      expect(listener.type_convert(val)).to eq(val)
+
+      val = true
+      expect(listener.type_convert(val)).to eq(val)
+
+      val = nil
+      expect(listener.type_convert(val)).to eq(val)
+    end
+
+    it 'returns String with UTF-8 encoding' do
+      val = "a".force_encoding('ASCII-8BIT')
+      rval = listener.type_convert(val)
+      expect(rval.encoding.to_s).to eql("UTF-8")
+      expect(rval).to eql("a")
+
+      val = "乗鞍".force_encoding('ASCII-8BIT')
+      rval = listener.type_convert(val)
+      expect(rval.encoding.to_s).to eql("UTF-8")
+      expect(rval).to eql("乗鞍")
+    end
+
+    it 'returns Array for to_a responding objects, with type_convert-ed members' do
+      s1 = "乗鞍".force_encoding("ASCII-8BIT")
+      val = [100, 100.01, false, true, nil, s1]
+      rval = listener.type_convert(val)
+      expect(rval).to be_a(Array)
+      expect(rval[0]).to eql(100)
+      expect(rval[1]).to eql(100.01)
+      expect(rval[2]).to eq(false)
+      expect(rval[3]).to eq(true)
+      expect(rval[4]).to be_nil
+      expect(rval[5].encoding.to_s).to eql("UTF-8")
+      expect(rval[5]).to eql("乗鞍")
+    end
+
+    it 'returns Hash for to_hash responding objects, with unescaped keys and type_convert-ed values' do
+      s1 = "乗鞍".force_encoding("ASCII-8BIT")
+      val = {
+        "100" => 100,
+        "100_01" => 100.01,
+        "bool$false" => false,
+        "bool$true" => true,
+        "object$$0" => nil,
+        "string" => s1,
+        "list" => [0, 1, 2],
+        "percentiles" => {
+          "10" => 0.1,
+          "50" => 0.5,
+          "99" => 0.99
+        }
+      }
+      rval = listener.type_convert(val)
+      expect(rval).to be_a(Hash)
+
+      expect(rval["100"]).to eql(100)
+      expect(rval["100_01"]).to eql(100.01)
+      expect(rval["bool.false"]).to eq(false)
+      expect(rval["bool.true"]).to eq(true)
+      expect(rval["object.$0"]).to be_nil
+      expect(rval["string"].encoding.to_s).to eql("UTF-8")
+      expect(rval["string"]).to eql("乗鞍")
+      expect(rval["list"]).to eql([0,1,2])
+      expect(rval["percentiles"]).to eql({"10" => 0.1, "50" => 0.5, "99" => 0.99})
+    end
+  end
+
+  describe '#update' do
+    dummy_pool = DummyOutputPool.new
+    statistics = {output: 0}
+    listener = Norikra::Listener.new('name', 'group', dummy_pool, statistics)
+
+    it 'pushs events into pool, with current time' do
+      listener.update([{"n1" => 100, "s" => "string one"}, {"n1" => 101, "s" => "string two"}], [])
+      expect(statistics[:output]).to eql(2)
+      expect(dummy_pool.pool['group']['name'].size).to eql(2)
+      expect(dummy_pool.pool['group']['name'][0][0]).to be_a(Fixnum)
+      expect(dummy_pool.pool['group']['name'][0][1]).to eql({"n1" => 100, "s" => "string one"})
+      expect(dummy_pool.pool['group']['name'][1][1]).to eql({"n1" => 101, "s" => "string two"})
+
+      listener.update([{"n1" => 102, "s" => "string three"}], [])
+      expect(statistics[:output]).to eql(3)
+      expect(dummy_pool.pool['group']['name'].size).to eql(3)
+    end
+  end
+end
+
+class DummyEngine
+  attr_reader :events
+
+  def initialize
+    @events = {}
+  end
+
+  def send(target, events)
+    @events[target] ||= []
+    @events[target].push(*events)
+  end
+end
+
+describe Norikra::LoopbackListener do
+  it 'should be initialized' do
+    dummy_engine = DummyEngine.new
+    statistics = {output: 0}
+    expect { Norikra::LoopbackListener.new(dummy_engine, 'name', 'LOOPBACK(target1)', statistics) }.not_to raise_error
+  end
+
+  describe '#update' do
+    dummy_engine = DummyEngine.new
+    statistics = {output: 0}
+    listener = Norikra::LoopbackListener.new(dummy_engine, 'name', 'LOOPBACK(target1)', statistics)
+
+    it 'sends events into engine with target name' do
+      listener.update([{"n1" => 100, "s" => "string one"}, {"n1" => 101, "s" => "string two"}], [])
+      expect(statistics[:output]).to eql(2)
+      expect(dummy_engine.events['target1'].size).to eql(2)
+      expect(dummy_engine.events['target1'][0]).to eql({"n1" => 100, "s" => "string one"})
+      expect(dummy_engine.events['target1'][1]).to eql({"n1" => 101, "s" => "string two"})
+
+      listener.update([{"n1" => 102, "s" => "string three"}], [])
+      expect(statistics[:output]).to eql(3)
+      expect(dummy_engine.events['target1'].size).to eql(3)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: norikra
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: java
 authors:
 - TAGOMORI Satoshi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mizuno
@@ -232,6 +232,7 @@ files:
 - lib/norikra/error.rb
 - lib/norikra/field.rb
 - lib/norikra/fieldset.rb
+- lib/norikra/listener.rb
 - lib/norikra/logger.rb
 - lib/norikra/logger_mizuno_patch.rb
 - lib/norikra/output_pool.rb
@@ -271,8 +272,10 @@ files:
 - public/js/jquery.min.js
 - public/js/norikra.webui.js
 - script/spec_server_pry
+- spec/engine_spec.rb
 - spec/field_spec.rb
 - spec/fieldset_spec.rb
+- spec/listener_spec.rb
 - spec/output_pool_spec.rb
 - spec/query_spec.rb
 - spec/spec_helper.rb
@@ -308,8 +311,10 @@ signing_key:
 specification_version: 4
 summary: CEP engine/server with Esper and JRuby
 test_files:
+- spec/engine_spec.rb
 - spec/field_spec.rb
 - spec/fieldset_spec.rb
+- spec/listener_spec.rb
 - spec/output_pool_spec.rb
 - spec/query_spec.rb
 - spec/spec_helper.rb