rtm-javatmapi 0.2.0 → 0.2.1

data/lib/rtm/javatmapi/core/topic_map.rb

@@ -2,15 +2,19 @@
 # License:   Apache License, Version 2.0
 
 module Java::OrgTmapiCore::TopicMap
-  
+
   URI_PATTERN = ":"
-  
+
+  include RTM::TopicMap
   extend Superiseable
-  #include RTM::TopicMap
 
   attr_accessor :prefixes #hash
   
-  attr_accessor :base_iri
+  attr_reader :base_iri
+  def base_iri=(base_iri)
+    class << self;undef :base_iri=;end
+    @base_iri = base_iri
+  end
   
   alias :base_locator :base_iri
 
@@ -130,7 +134,7 @@ module Java::OrgTmapiCore::TopicMap
   # the role player: the corresponding value in the Hash.
   #
   # Each identifier (type, scope-identifier, roletype-identifier and
-  # player-identifier) may be a Topic or Topic-Reference.
+  # player-identifier) may be a topic reference.
   #
   # :call-seq:
   #   create_association(type) -> Association
@@ -170,10 +174,10 @@ module Java::OrgTmapiCore::TopicMap
     end
     raise("create_association: type must be a Topic or Topic-Reference") unless type.is_a?(Java::OrgTmapiCore::Topic) || type.is_a?(String) || type.is_a?(Java::OrgTmapiCore::Locator)
     if scope == :ucs
-  		assoc = createAssociation(get!(type),[].to_java(org.tmapi.core.Topic))
+      assoc = createAssociation(get!(type),[].to_java(org.tmapi.core.Topic))
     else
       raise("create_association: scope must be an Array") unless scope.is_a?(Array)
-  		assoc = scope.empty? ? createAssociation(get!(type),[].to_java(org.tmapi.core.Topic)) : createAssociation(get!(type),get!(scope))
+      assoc = scope.empty? ? createAssociation(get!(type),[].to_java(org.tmapi.core.Topic)) : createAssociation(get!(type),get!(scope))
     end 
     raise("create_association: roles must be a Hash") unless roles.is_a?(Hash)
     roles.each do |k,v|
@@ -234,12 +238,10 @@ module Java::OrgTmapiCore::TopicMap
   #
   def instances(type = :any)
     return types.map{|t| t.instances.to_a}.flatten.uniq if type == :any
-    type = topic_map.get(type) unless type.is_a?(RTM::Topic)
-    return type ? type_instance_index.getTopics(type).to_a : Array.new
+    type = self.get(type) unless type.is_a?(RTM::Topic)
+    return type ? type_instance_index.getTopics(type).to_a : []
   end
 
-
-
   # Returns all topics in the topic map that are used as type
   # in an "type-instance"-relationship.
   #
@@ -250,6 +252,26 @@ module Java::OrgTmapiCore::TopicMap
     type_instance_index.getTopicTypes
   end
 
+  superised
+  # Returns all associations contained in this topic map.
+  #
+  # The optional argument specifies the type the associations should have,
+  # i.e. all instances of the specified type are returned. Type may be a
+  # topic reference.
+  #
+  # The return value may be empty.
+  #
+  # :call_spec:
+  #   associations -> Set of Associations
+  #   associations(type) -> Array of Associations
+  #
+  def associations(type = :any)
+    return getAssociations if type == :any
+    raise("associations(type): type must be a topic reference.") unless (type.is_a?(RTM::Topic) || type.is_a?(RTM::Locator) || type.is_a?(String))
+    type = self.get(type) unless type.is_a?(RTM::Topic)
+    return type ? type_instance_index.getAssociations(type).to_a : []
+  end
+
   # Returns all topics in this topic map that are used
   # as types of associations.
   #
@@ -438,14 +460,14 @@ module Java::OrgTmapiCore::TopicMap
   #
   def create_topic_by(identifier)
     case identifier
-      when Java::OrgTmapiCore::Locator
-        return create_topic_by_subject_identifier(identifier)
-      when String
-        reroute_for_create(identifier)
-      when Array
-        return identifier.map{|i| create_topic_by(i)}
-      else
-        return nil
+    when Java::OrgTmapiCore::Locator
+      return create_topic_by_subject_identifier(identifier)
+    when String
+      reroute_for_create(identifier)
+    when Array
+      return identifier.map{|i| create_topic_by(i)}
+    else
+      return nil
     end
   end
 
@@ -471,27 +493,35 @@ module Java::OrgTmapiCore::TopicMap
   #   get(identifier-Array) -> Array of Topics or empty Array
   #
   def get(identifier)
-    case identifier
+    self.cached(self, :get, identifier) {
+      case identifier
       when nil
-        return nil
+        nil
       when Java::OrgTmapiCore::Topic
-        return identifier
+        identifier
       when Java::OrgTmapiCore::Locator
-        return get_construct_by_item_identifier(identifier) if get_construct_by_item_identifier(identifier).is_a?(Java::OrgTmapiCore::Topic)
-        return get_topic_by_subject_identifier(identifier) if get_topic_by_subject_identifier(identifier)
-        #return get_topic_by_subject_locator(identifier) if get_topic_by_subject_locator(identifier) #not allowed because Topics with equals si and ii are merged but sl not
-        return nil
+        if get_construct_by_item_identifier(identifier).is_a?(Java::OrgTmapiCore::Topic)
+          get_construct_by_item_identifier(identifier)
+        elsif get_topic_by_subject_identifier(identifier)
+          get_topic_by_subject_identifier(identifier)
+        else
+          #return get_topic_by_subject_locator(identifier) if get_topic_by_subject_locator(identifier) #not allowed because Topics with equals si and ii are merged but sl not
+          nil
+        end
       when String
         reroute_for_get(identifier)
       when Array
         # in: multi array -> out: multi array
-        return identifier.map{|i| get(i)}
-      #when Hash
+        identifier.map{|i| get(i)}
+        #when Hash
         #TODO: use case for getting Topics if argument is a hash
       else
         raise("get(#{identifier.inspect}): arguments do not match")
-    end
+      end
+    }
   end
+  alias :topic :get
+  # alias :[] :get # not sure if this is a good idea, for now we leave it out
 
   # Calls get(identifier) and returns the Topic or Array of Topics according
   # to the nature of the identifier (Topic/Topic-References or
@@ -510,13 +540,14 @@ module Java::OrgTmapiCore::TopicMap
   #   get!(identifier-Array) -> Array of Topics
   #
   def get!(identifier)
-   return nil unless identifier
-   if identifier.is_a?(Array)
-     return identifier.map{|i| get!(i)}
-   end
-   found = get(identifier)
-   return found ? found : create_topic_by(identifier)
+    return nil unless identifier
+    if identifier.is_a?(Array)
+      return identifier.map{|i| get!(i)}
+    end
+    found = get(identifier)
+    return found ? found : create_topic_by(identifier)
   end
+  alias :topic! :get!
 
   def construct_by_id(id)
     getConstructById(id)
@@ -569,13 +600,13 @@ module Java::OrgTmapiCore::TopicMap
   # Executes yield on locator and returns the result.
   def get_stuff(identifier)
     unless (identifier.is_a?(String)) || (identifier.is_a?(Java::OrgTmapiCore::Locator))
-     identifier_in_use = identifier.map{|x|(x.is_a? Java::OrgTmapiCore::Locator)? x : create_locator(x)}
-     return identifier_in_use.map{|y| yield y}
+      identifier_in_use = identifier.map{|x|(x.is_a? Java::OrgTmapiCore::Locator)? x : create_locator(x)}
+      return identifier_in_use.map{|y| yield y}
     else
-     unless identifier.is_a? Java::OrgTmapiCore::Locator
-      identifier = create_locator(identifier)
-     end
-     return (yield identifier)
+      unless identifier.is_a? Java::OrgTmapiCore::Locator
+        identifier = create_locator(identifier)
+      end
+      return (yield identifier)
     end
   end
 
@@ -588,14 +619,14 @@ module Java::OrgTmapiCore::TopicMap
   #
   def reroute_for_create(identifier)
     case identifier
-     when /^(\^|ii:)\s*(.*)/ #identifiers starts with ^ or ii:
-       create_topic_by_item_identifier(create_locator($2))
-     when /^(=|sl:)\s*(.*)/ #identifier starts with = or sl:
-       create_topic_by_subject_locator(create_locator($2))
-     when /^(si:)\s*(.*)/ #identifier starts with si:
-       create_topic_by_subject_identifier(create_locator($2))
-     else #identifier does not start with a special character
-       create_topic_by_subject_identifier(create_locator(identifier.lstrip))#lstrip: leading whitespace chars removed
+    when /^(\^|ii:)\s*(.*)/ #identifiers starts with ^ or ii:
+      create_topic_by_item_identifier(create_locator($2))
+    when /^(=|sl:)\s*(.*)/ #identifier starts with = or sl:
+      create_topic_by_subject_locator(create_locator($2))
+    when /^(si:)\s*(.*)/ #identifier starts with si:
+      create_topic_by_subject_identifier(create_locator($2))
+    else #identifier does not start with a special character
+      create_topic_by_subject_identifier(create_locator(identifier.lstrip))#lstrip: leading whitespace chars removed
     end
   end
 
@@ -608,14 +639,14 @@ module Java::OrgTmapiCore::TopicMap
   #
   def reroute_for_get(identifier)
     case identifier
-      when /^(si:|sl:|ii:|=|^)$/
-        return nil
-      when /^(\^|ii:)\s*(.*)/ #identifiers starts with ^ or ii:
-        get_construct_by_item_identifier(create_locator($2))
-      when /^(=|sl:)\s*(.+)/ #identifier starts with = or sl:
-        get_topic_by_subject_locator(create_locator($2))
-      when /^(si:)\s*(.+)/ #identifier starts with si:
-        get_topic_by_subject_identifier(create_locator($2))
+    when /^(si:|sl:|ii:|=|^)$/
+      return nil
+    when /^(\^|ii:)\s*(.*)/ #identifiers starts with ^ or ii:
+      get_construct_by_item_identifier(create_locator($2))
+    when /^(=|sl:)\s*(.+)/ #identifier starts with = or sl:
+      get_topic_by_subject_locator(create_locator($2))
+    when /^(si:)\s*(.+)/ #identifier starts with si:
+      get_topic_by_subject_identifier(create_locator($2))
     else #identifier does not start with a special character
       get_topic_by_subject_identifier(create_locator(identifier.lstrip)) #lstrip: leading whitespace chars removed
     end

data/lib/rtm/javatmapi/core/typed.rb

@@ -2,8 +2,8 @@
 # License:   Apache License, Version 2.0
 
 module Java::OrgTmapiCore::Typed
-  
-  #include RTM::Typed
+
+  include RTM::Typed
   extend Superiseable
 
   # Returns the type of this typed construct

data/lib/rtm/javatmapi/core/variant.rb

@@ -2,9 +2,9 @@
 # License:   Apache License, Version 2.0
 
 module Java::OrgTmapiCore::Variant
-  
-  #include RTM::Variant
-  #extend Superiseable
+
+  include RTM::Variant
+  extend Superiseable
 
   # Returns the Name this Variant belongs to.
   #
@@ -12,8 +12,8 @@ module Java::OrgTmapiCore::Variant
   #   parent -> Name
   #
   def parent
-		getParent
-	end
+    getParent
+  end
   alias :reverse_children :parent
 
 end

data/lib/rtm/javatmapi/superiseable.rb

@@ -2,7 +2,7 @@
 # License:   Apache License, Version 2.0
 
 module Superiseable
-  
+
   def superised
     @superised = true
   end
@@ -15,60 +15,17 @@ module Superiseable
   end
   
   def superising method_name
-    @to_superize ||= []
-    @to_superize << method_name
+    @superized_methods ||= []
+    @superized_methods << method_name
   end
   
-  def superize
-    @to_superize.each do |method_name|
-      self::JavaImplementations[self].each do |c|
-        # puts "Superising #{method_name} in #{self} (#{c})"
-        c.class_eval do
-          define_method(method_name) { |*args| super *args}
-        end
+  def register_java_implementation(klass)
+    self.included(klass) if self.respond_to?(:included)
+    return unless @superized_methods
+    @superized_methods.each do |method_name|
+      klass.class_eval do
+        define_method(method_name) { |*args| super *args}
       end
     end
   end
-  
-
-#    def superising method_name
-#      start = Time.now
-#      
-#      puts self
-#      puts self::JavaImplementations[self]
-#      
-#      todo = self
-#      
-##      # TODO docu
-##      if todo == RTM::Scoped
-##        todo = [Java::OrgTmapiCore::Name, Java::OrgTmapiCore::Occurrence, Java::OrgTmapiCore::Association, Java::OrgTmapiCore::Variant]
-##      elsif todo == RTM::Reifiable
-##        todo = [Java::OrgTmapiCore::Association, Java::OrgTmapiCore::Name, Java::OrgTmapiCore::Occurrence, Java::OrgTmapiCore::Role, Java::OrgTmapiCore::TopicMap, Java::OrgTmapiCore::Variant]
-##      elsif todo == RTM::Construct
-##        todo = [Java::OrgTmapiCore::Association, Java::OrgTmapiCore::Name, Java::OrgTmapiCore::Occurrence, Java::OrgTmapiCore::Role, Java::OrgTmapiCore::TopicMap, Java::OrgTmapiCore::Variant, Java::OrgTmapiCore::Topic]
-##      elsif todo == RTM::Typed
-##        todo = [Java::OrgTmapiCore::Association, Java::OrgTmapiCore::Name, Java::OrgTmapiCore::Occurrence, Java::OrgTmapiCore::Role]
-##      end
-#      todo = [todo].flatten
-#      
-#      
-#      implFinder = ::ImplementationsForInterface.new
-#      if $CLASSPATH
-#        $CLASSPATH.to_a.each do |entry|
-#          entry.slice!(/^file:/)
-#          implFinder.addPathEntry(entry)
-#        end
-#      end  
-#      
-#      todo.each do |i|  
-#        IMPLEMENTATIONS[i.java_class]  ||= implFinder.classInformationsFor(i.java_class).select {|c| !c.getClassName.include? "$" }.map {|c| eval(c.getClassName) }
-#        IMPLEMENTATIONS[i.java_class].each do |c|
-#          c.class_eval do
-#            define_method(method_name) { |*args| super *args}
-#          end
-#        end
-#      end
-#      #puts "Und so lange hat es gedauert:" + (Time.now - start).to_s
-#    end
-  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rtm-javatmapi
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Benjamin Bock
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-05 00:00:00 +01:00
+date: 2010-02-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,10 +23,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.0
+        version: 0.2.1
     version: 
 description: "    Ruby Topic Maps is a Topic Maps engine written in Ruby.\n    This backend engine uses any Java TMAPI 2.0 compatible backend. See http://www.tmapi.org/2.0/.\n    You can provide your own TMAPI 2.0 compatible implementation or use one of the existing ones:\n    * rtm-ontopia\n    * rtm-tinytim\n    * rtm-sesametm    \n"
-email: "#rtm+rtm-javatmapi-gem-20100205@topicmapslab.de"
+email: rtm+rtm-javatmapi-gem-20100221@topicmapslab.de
 executables: []
 
 extensions: []
@@ -35,9 +35,9 @@ extra_rdoc_files: []
 
 files: 
 - lib/rtm/javatmapi/aliases.rb
-- lib/rtm/javatmapi/base.rb
 - lib/rtm/javatmapi/core/association.rb
 - lib/rtm/javatmapi/core/construct.rb
+- lib/rtm/javatmapi/core/datatype_aware.rb
 - lib/rtm/javatmapi/core/locator.rb
 - lib/rtm/javatmapi/core/name.rb
 - lib/rtm/javatmapi/core/occurrence.rb
@@ -52,8 +52,6 @@ files:
 - lib/rtm/javatmapi/core.rb
 - lib/rtm/javatmapi/ext/java_util_set.rb
 - lib/rtm/javatmapi/ext.rb
-- lib/rtm/javatmapi/inclusion.rb
-- lib/rtm/javatmapi/java_implementations.rb
 - lib/rtm/javatmapi/superiseable.rb
 - lib/rtm/javatmapi.rb
 - lib/rtm/javatmapi/javalibs/asm-2.2.3.jar
@@ -80,7 +78,7 @@ files:
 - lib/rtm/javatmapi/javalibs/slf4j-api-1.5.8.jar
 - lib/rtm/javatmapi/javalibs/slf4j-log4j12-1.5.8.jar
 - lib/rtm/javatmapi/javalibs/tinytim-mio-2.0.0a5.jar
-- lib/rtm/javatmapi/javalibs/tmapi-2.0a2.jar
+- lib/rtm/javatmapi/javalibs/tmapi-2.0.jar
 - lib/rtm/javatmapi/javalibs/tmapix-io-0.3.0-snapshot-200910281502.jar
 - lib/rtm/javatmapi/javalibs/trove-2.0.4.jar
 - LICENSE

data/lib/rtm/javatmapi/base.rb

@@ -1,30 +0,0 @@
-# Copyright: Copyright 2009 Topic Maps Lab, University of Leipzig.
-# License:   Apache License, Version 2.0
-
-module RTM
-
-  def self.connect
-    @@tmsf = TopicMapSystemFactory.newInstance.newTopicMapSystem
-  end
-
-  def self.create(base_locator)
-    @@tmsf.createTopicMap(base_locator)
-  end
-
-
-  def self.[](*args)
-    if args.size == 0
-      return @@tmsf.getLocators.map {|l| @@tmsf.getTopicMap l}
-    end
-    args.map{|l| @@tmsf.getTopicMap l }
-  end
-
-  # Applications SHOULD call this method when the RTM is no longer required
-  def self.close
-    if defined?(@@tmsf) && @@tmsf.nil?
-      @@tmsf.close
-      @@tmsf = nil
-    end
-  end
-
-end

data/lib/rtm/javatmapi/inclusion.rb

@@ -1,46 +0,0 @@
-# Copyright: Copyright 2009 Topic Maps Lab, University of Leipzig.
-# License:   Apache License, Version 2.0
-
-module Java::OrgTmapiCore::TopicMap
-  include RTM::TopicMap
-end
-
-module Java::OrgTmapiCore::Topic 
-  include RTM::Topic
-end
-
-module Java::OrgTmapiCore::Association
-  include RTM::Association   
-end
-
-module Java::OrgTmapiCore::Name    
-  include RTM::Name
-end
-
-module Java::OrgTmapiCore::Occurrence
-  include RTM::Occurrence
-end
-
-module Java::OrgTmapiCore::Variant
-  include RTM::Variant
-end
-
-module Java::OrgTmapiCore::Role
-  include RTM::Role
-end
-
-module Java::OrgTmapiCore::Locator  
-  include RTM::Locator
-end
-
-module Java::OrgTmapiCore::Reifiable  
-  include RTM::Reifiable
-end
-
-module Java::OrgTmapiCore::Scoped
-  include RTM::Scoped  
-end
-
-module Java::OrgTmapiCore::Typed  
-  include RTM::Typed
-end