lwes 0.1.0 → 0.1.1

data/ChangeLog

@@ -1,2 +1,5 @@
+Version 0.1.1 (erik-s-chang)
+  * add support for namespaced ESFs
+
 Version 0.1.0 (erik-s-chang)
   * remove SWIG ugliness, friendly new Rubyish API

data/lib/lwes/struct.rb

@@ -78,7 +78,19 @@ module LWES
       end
 
       tmp = ::Struct.new(*(event_def.map { |(field,_)| field }))
-      tmp = parent.const_set(klass, tmp)
+      components = klass.to_s.split(/::/)
+      components.each_with_index do |component, i|
+        if i == (components.size - 1)
+          tmp = parent.const_set(component, tmp)
+        else
+          parent = begin
+            parent.const_get(component)
+          rescue NameError
+            eval "module #{parent.name}::#{component}; end"
+            parent.const_get(component)
+          end
+        end
+      end
       tmp.const_set :TYPE_DB, db
       tmp.const_set :NAME, name.to_s
       ed = tmp.const_set :EVENT_DEF, {}

data/lib/lwes/type_db.rb

@@ -15,7 +15,8 @@ module LWES
     # file, then the classes MyEvents::Event1 and MyEvents::Event2 should
     # now be accessible.
     def create_classes!(options = {})
-      (to_hash.keys - [ :MetaEventInfo ]).map do |klass|
+      classes = to_hash.keys - [ :MetaEventInfo ]
+      classes.sort { |a,b| a.to_s.size <=> b.to_s.size }.map do |klass|
         LWES::Struct.new({ :db => self, :class => klass }.merge(options))
       end
     end

data/lwes.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{lwes}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
   s.date = Time.now
   s.authors = ["Erik S. Chang", "Frank Maritato"]
   s.email = %q{lwes-devel@lists.sourceforge.net}

data/test/unit/test_type_db.rb

@@ -1,6 +1,9 @@
 require "#{File.dirname(__FILE__)}/../test_helper"
 require 'tempfile'
 
+module Abcde
+end
+
 class TestTypeDB < Test::Unit::TestCase
 
   def test_constants
@@ -58,4 +61,13 @@ class TestTypeDB < Test::Unit::TestCase
     classes.each { |k| assert_kind_of Class, k }
   end
 
+  def test_namespaced_esf
+    tdb = LWES::TypeDB.new("#{File.dirname(__FILE__)}/namespaced.esf")
+    classes = tdb.create_classes!(:parent => Abcde)
+    expect = %w(Abcde::A::B::C::Event
+                Abcde::A::B::C::Event::Bool
+                Abcde::A::B::C::Event::String)
+    assert_equal expect, classes.map { |i| i.to_s }
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lwes
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Erik S. Chang
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-24 00:00:00 +00:00
+date: 2009-11-25 00:00:00 +00:00
 default_executable: 
 dependencies: []