norikra 0.0.14-java → 0.0.15-java

data/lib/norikra/engine.rb

@@ -133,26 +133,27 @@ module Norikra
 
     def send(target_name, events)
       trace "send messages", :target => target_name, :events => events
-      unless @targets.include?(target_name) # discard events for target not registered
+      unless @targets.any?{|t| t.name == target_name} # discard events for target not registered
         trace "messages skipped for non-opened target", :target => target_name
         return
       end
       return if events.size < 1
 
-      if @typedef_manager.lazy?(target_name)
-        info "opening lazy target", :target => target_name
-        debug "generating base fieldset from event", :target => target_name, :event => events.first
-        base_fieldset = @typedef_manager.generate_base_fieldset(target_name, events.first)
+      target = @targets.select{|t| t.name == target_name}.first
+
+      if @typedef_manager.lazy?(target.name)
+        info "opening lazy target", :target => target
+        debug "generating base fieldset from event", :target => target.name, :event => events.first
+        base_fieldset = @typedef_manager.generate_base_fieldset(target.name, events.first)
 
-        debug "registering base fieldset", :target => target_name, :base => base_fieldset
-        register_base_fieldset(target_name, base_fieldset)
+        debug "registering base fieldset", :target => target.name, :base => base_fieldset
+        register_base_fieldset(target.name, base_fieldset)
 
-        info "target successfully opened with fieldset", :target => target_name, :base => base_fieldset
+        info "target successfully opened with fieldset", :target => target, :base => base_fieldset
       end
 
       registered_data_fieldset = @registered_fieldsets[target_name][:data]
 
-      target = @targets.select{|t| t.name == target_name}.first
       strict_refer = (not target.auto_field?)
 
       events.each do |event|

data/lib/norikra/target.rb

@@ -12,10 +12,6 @@ module Norikra
       @auto_field = !!auto_field
     end
 
-    def to_s
-      @name
-    end
-
     def to_hash
       {:name => @name, :auto_field => @auto_field}
     end

data/lib/norikra/typedef.rb

@@ -246,7 +246,7 @@ module Norikra
     def dump_all
       fields = {}
       @fields.each do |key,field|
-        fields[field.name] = field.to_hash(true)
+        fields[field.name.to_sym] = field.to_hash(true)
       end
       fields
     end

data/lib/norikra/version.rb

@@ -1,3 +1,3 @@
 module Norikra
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

data/spec/typedef_manager_spec.rb

@@ -224,24 +224,23 @@ describe Norikra::TypedefManager do
       end
     end
 
-    describe '#dump' do
-      it 'returns array of target typedef dump' do
+    describe '#dump_target' do
+      it 'returns target typedef dump' do
         m = Norikra::TypedefManager.new
         m.add_target('sample', {'a'=>'string','b'=>'string','c'=>'double'})
         m.reserve('sample', 'z', 'boolean')
         m.add_target('sample_next', {'a'=>'string','b'=>'string','c'=>'double','d'=>'double'})
 
-        r = m.dump
-        expect(r.size).to eql(2)
-        expect(r[0][:name]).to eql('sample')
-        expect(r[0][:fields]).to eql({
+        r = m.dump_target('sample')
+        expect(r).to eql({
             a: {name: 'a', type: 'string', optional: false},
             b: {name: 'b', type: 'string', optional: false},
             c: {name: 'c', type: 'double', optional: false},
             z: {name: 'z', type: 'boolean', optional: true},
           })
-        expect(r[1][:name]).to eql('sample_next')
-        expect(r[1][:fields]).to eql({
+
+        r = m.dump_target('sample_next')
+        expect(r).to eql({
             a: {name: 'a', type: 'string', optional: false},
             b: {name: 'b', type: 'string', optional: false},
             c: {name: 'c', type: 'double', optional: false},

metadata

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