rtm-activerecord 0.2.1 → 0.3.0

data/lib/rtm-activerecord.rb

@@ -0,0 +1,4 @@
+# Copyright: Copyright 2009 Topic Maps Lab, University of Leipzig.
+# License:   Apache License, Version 2.0
+
+require File.join(File.dirname(__FILE__), 'rtm/activerecord')

data/lib/rtm/activerecord.rb

@@ -1,105 +1,89 @@
 # Copyright: Copyright 2009 Topic Maps Lab, University of Leipzig.
 # License:   Apache License, Version 2.0
 
-if Object.const_defined?("Gem") && rtmgem = Gem.loaded_specs["rtm-activerecord"]
-  require 'rtm'
-else
+unless Object.const_defined?("Gem") && rtmgem = Gem.loaded_specs["rtm-activerecord"]
   rtm_path = File.expand_path(File.join(File.dirname(__FILE__), "../../../rtm/lib"))
-  if File.directory?(rtm_path)
-    $LOAD_PATH.unshift rtm_path
-    require 'rtm'
-  end
+  $LOAD_PATH.unshift rtm_path if File.directory?(rtm_path)
 end
+require 'rtm'
 
-# class Class
-#   alias :rtm_old_const_missing :const_missing
-#   def const_missing(*const_name,&b)
-#     # puts "Constant missing: #{const_name.first.inspect}" 
-#     rtm_old_const_missing(*const_name,&b)
-#     # puts "Constant missing: #{const_name.first.inspect}"  
-#     
-#   end
-# end
-
-module RTM
-  class ActiveRecordTM < Engine
-    identifier :activerecord
-
-    def initialize(params, *args)
-      super
-      
-      # code from old monolithic rtm.rb
-      @instance = ::RTM::AR::TMS.instance
-      @instance.connect *args
-    end
-        
-    def method_missing(name, *args)
-      @instance.send(name, *args)
-    end
-    def respond_to?(name)
-      super.respond_to?(name) || @instance.respond_to?(name)
-    end
-  end
-end
+require 'uri'
+require "rtm/activerecord/tmdm"
+require "rtm/activerecord/persistent_code_output"
+require "rtm/activerecord/tm_delegator"
+require "rtm/activerecord/tm_set_delegator"
+require "rtm/activerecord/tm_construct"
+require "rtm/activerecord/topic_map"
+require "rtm/activerecord/traverse_associations"
+require "rtm/activerecord/topic"
+require "rtm/activerecord/association_and_role"
+require "rtm/activerecord/name_variant_occurrence"
+require "rtm/activerecord/locators"
+require "rtm/activerecord/set_wrapper"
+require "rtm/activerecord/base"
+require "rtm/activerecord/literal_index"
+require "rtm/activerecord/topic_map_system"
+require "rtm/validation"
+require "rtm/helpers/locator"
+require "rtm/helpers/no_output"
+require "rtm/helpers/uri"
 
 module RTM::AR
   module TraverseAssociations
   end
-  require 'uri'
-  
-  %w[
-    tmdm
-    persistent_code_output
-    tm_delegator
-    tm_set_delegator
-    tm_construct
-    topic_map
-    traverse_associations
-    topic
-    association_and_role
-    name_variant_occurrence
-    locators
-    set_wrapper
-    base
-    literal_index
-    ].each {|f| require "rtm/activerecord/#{f}" }
-  require "rtm/activerecord/connect"
-  require "rtm/validation"
-  require "rtm/helpers/locator"
-  require "rtm/helpers/no_output"
-  require "rtm/helpers/uri"
-  
 
-  
-  
   class Topic
     require 'rtm/activerecord/sugar/topic/characteristics'
-    include RTM::AR::Sugar::Topic::Characteristics
     require 'rtm/activerecord/sugar/topic/counterparts'
-    include RTM::AR::Sugar::Topic::Counterparts
     require 'rtm/activerecord/sugar/topic/identifier_direct'
-    include RTM::AR::Sugar::Topic::IdentifierDirect
     require 'rtm/activerecord/sugar/topic/hash_access'
-    include RTM::AR::Sugar::Topic::HashAccess
     require 'rtm/activerecord/sugar/topic/predefined_associations'
-    include RTM::AR::Sugar::Topic::PredefinedAssociations
     require "rtm/activerecord/io/to_xtm2"
     require "rtm/activerecord/io/to_xtm1"
     require "rtm/activerecord/io/to_yaml"
     require "rtm/activerecord/io/to_string"
     require "rtm/activerecord/io/to_jtm"
-    
+    include RTM::AR::Sugar::Topic::Characteristics
+    include RTM::AR::Sugar::Topic::Counterparts
+    include RTM::AR::Sugar::Topic::IdentifierDirect
+    include RTM::AR::Sugar::Topic::HashAccess
+    include RTM::AR::Sugar::Topic::PredefinedAssociations
   end
+
   class Association
     require 'rtm/activerecord/sugar/association/hash_access'
-    include RTM::AR::Sugar::Association::HashAccess
     require 'rtm/activerecord/sugar/role/counterparts'
+    include RTM::AR::Sugar::Association::HashAccess
     include RTM::AR::Sugar::Role::Counterparts
   end
-end
-
-
-
 
+  class ActiveRecord < RTM::Engine
+    identifier :activerecord
+    include RTM::AR::TopicMapSystem
 
+    def initialize(params)
+      super
 
+      config = @params[:config]
+      case config
+      when :existing
+        # do nothing, reuse existing active_record connection
+      when nil
+        # use the existing or externally configured connection
+        connect unless connected?
+      when :memory
+        # explicityly connect to the sqlite3 in-memory backend
+        connect
+      when ::ActiveRecord::Base
+        # when it is a class which extends ActiveRecord::Base, use the connection of this one.
+        # FIXME: this is not implemented yet.
+      when Array
+        connect *config
+      when Hash
+        connect config
+      else
+        # fall through, like :existing
+      end
+    end
+  end
+end

data/lib/rtm/activerecord/002_rtm01to02.rb

@@ -0,0 +1,17 @@
+class Rtm01to02 < ActiveRecord::Migration
+  def self.up
+    rename_table :association_roles, :roles
+    rename_table :topic_names, :names
+    rename_column :variants, :topic_name_id, :name_id
+    rename_column :item_identifiers, :topic_map_construct_id, :construct_id
+    rename_column :item_identifiers, :topic_map_construct_type, :construct_type
+  end
+
+  def self.down
+    rename_table :roles, :association_roles
+    rename_table :names, :topic_names
+    rename_column :variants, :name_id, :topic_name_id
+    rename_column :item_identifiers, :construct_id, :topic_map_construct_id
+    rename_column :item_identifiers, :construct_type, :topic_map_construct_type
+  end
+end

data/lib/rtm/activerecord/association_and_role.rb

@@ -29,7 +29,7 @@ module RTM::AR
     def filter_roles(*args)
       if args.size == 1
         t = topic_map.get(args.first)
-        return self.roles.find(:all,:conditions => ["ttype_id = ?", t.id])
+        return self.roles.find(:all,:conditions => ["ttype_id = ?", t.__getobj__.id])
       end
       false
     end

data/lib/rtm/activerecord/base.rb

@@ -2,8 +2,6 @@
 # License:   Apache License, Version 2.0
 
 module RTM
-
-  
   module Construct
     def find(*args)
       RTM::AR.const_get(name.split("::").last).find(*args)
@@ -11,11 +9,11 @@ module RTM
   end
   module Reifiable
   end
-  
+
   module TopicMap
     extend Construct
   end
-  
+
   module Topic
     extend Construct
 
@@ -45,39 +43,20 @@ module RTM
     extend Construct
 
   end
-  
+
   module Locator
-    
+
   end
-  
+
   module ItemIdentifier
-    extend Locator  
+    extend Locator
   end
-  
+
   module SubjectIdentifier
     extend Locator
   end
-  
+
   module SubjectLocator
     extend Locator
   end
-  
-#  module Topics  
-#  end
-#  module Associations
-#  end
-#  module Names
-#  end
-#  module Occurrences
-#  end
-#  module Roles
-#  end
-#  module Reifiables
-#  end
-#  module Variants
-#  end
-#  module TopicMaps
-#  end
-#  module Locators
-#  end
 end

data/lib/rtm/activerecord/io/from_xtm2.rb

@@ -194,8 +194,8 @@ module RTM::AR::IO
       end
 
       # Called when the end tag is reached.  In the case of <tag/>, tag_end
-      # will be called immidiately after tag_start
-      # @p the name of the tag
+      # will be called immediately after tag_start
+      # @param the name of the tag
       def end_element(uri, name, qname)
         return unless uri == "http://www.topicmaps.org/xtm/"
         #puts "end of tag: #{name}"
@@ -219,7 +219,7 @@ module RTM::AR::IO
 #        puts "after case"
       end
       # Called when text is encountered in the document
-      # @p text the text content.
+      # @param text the text content.
       def characters(text)
         if @options[:strip_whitespace]
           text.strip!

data/lib/rtm/activerecord/merging.rb

@@ -22,8 +22,8 @@ module RTM
       def merge_item_identifiers(other)
         #self.item_identifiers.add_all other.item_identifiers
         RTM::AR::TMDM::ItemIdentifier.move_all(
-          ["topic_map_construct_id", other.__getobj__.id, self.__getobj__.id],
-          ["topic_map_construct_type", other.__getobj__.class.name, self.__getobj__.class.name]
+          ["construct_id", other.__getobj__.id, self.__getobj__.id],
+          ["construct_type", other.__getobj__.class.name, self.__getobj__.class.name]
         )
       end
     end
@@ -207,10 +207,10 @@ module RTM
 
         # 8. Set C's [item identifiers] property to the union of the values of A and B's [item identifiers] properties.
         #self.item_identifiers.add_all other.item_identifiers
-        #RTM::AR::TMDM::ItemIdentifier.update_all "topic_map_construct_id = #{self.__getobj__.id}, topic_map_construct_type = '#{self.__getobj__.class.name}'", "topic_map_construct_id = #{other.__getobj__.id} and topic_map_construct_type = '#{other.__getobj__.class.name}'"
+        #RTM::AR::TMDM::ItemIdentifier.update_all "construct_id = #{self.__getobj__.id}, construct_type = '#{self.__getobj__.class.name}'", "construct_id = #{other.__getobj__.id} and construct_type = '#{other.__getobj__.class.name}'"
         RTM::AR::TMDM::ItemIdentifier.move_all(
-          ["topic_map_construct_id", other.__getobj__.id, self.__getobj__.id],
-          ["topic_map_construct_type", other.__getobj__.class.name, self.__getobj__.class.name]
+          ["construct_id", other.__getobj__.id, self.__getobj__.id],
+          ["construct_type", other.__getobj__.class.name, self.__getobj__.class.name]
         )
 
         self.merge_rewrap other

data/lib/rtm/activerecord/quaaxtm2rtm.rb

@@ -9,7 +9,7 @@ module RTM
     module TMDM
       class Topic < ActiveRecord::Base;end
       class ItemIdentifier < ActiveRecord::Base
-        belongs_to :topic_map_construct
+        belongs_to :construct
       end
       class SubjectIdentifier < ActiveRecord::Base
         belongs_to :topic
@@ -34,32 +34,32 @@ module RTM
           rename_column "associations", "type_id", "ttype_id"
           rename_column "associations", "topicmap_id", "topic_map_id"
 
-          rename_table "qtm_assocrole", "association_roles"
-          rename_column "association_roles", "type_id", "ttype_id"
-          rename_column "association_roles", "reference", "topic_id"
+          rename_table "qtm_assocrole", "roles"
+          rename_column "roles", "type_id", "ttype_id"
+          rename_column "roles", "reference", "topic_id"
           
-          rename_table "qtm_topicname", "topic_names"
-          rename_column "topic_names", "type_id", "ttype_id"
+          rename_table "qtm_topicname", "names"
+          rename_column "names", "type_id", "ttype_id"
 
           rename_table "qtm_occurrence", "occurrences"
           rename_column "occurrences", "type_id", "ttype_id"
           
           rename_table "qtm_variant", "variants"
-          rename_column "variants", "topicname_id", "topic_name_id"
+          rename_column "variants", "topicname_id", "name_id"
           
           rename_table "qtm_topicmapconstructref", "item_identifiers"
           rename_column "item_identifiers", "locator", "reference"
           add_column :item_identifiers, :topic_map_id, :integer
           ItemIdentifier.reset_column_information
           ItemIdentifier.find(:all).each do |si|
-            si.update_attribute :topic_map_id, si.topic_map_construct.topic_map_id
+            si.update_attribute :topic_map_id, si.construct.topic_map_id
           end
           
           create_table :item_identifiers do |t|
             t.column :topic_map_id, :integer, :null => false
             t.column :reference, :string, :null => false
-            t.column :topic_map_construct_id, :integer
-            t.column :topic_map_construct_type, :string
+            t.column :construct_id, :integer
+            t.column :construct_type, :string
           end
           SubjectIdentifier.reset_column_information
           SubjectIdentifier.find(:all).each do |si|

data/lib/rtm/activerecord/quaaxtm2rtmviews.rb

@@ -9,7 +9,7 @@ module RTM
     module TMDM
       class Topic < ActiveRecord::Base;end
       class ItemIdentifier < ActiveRecord::Base
-        belongs_to :topic_map_construct
+        belongs_to :construct
       end
       class SubjectIdentifier < ActiveRecord::Base
         belongs_to :topic
@@ -39,14 +39,14 @@ module RTM
             t.column :ttype_id
           end
 
-          create_view "association_roles", "select id, association_id, type_id, reference from qtm_assocrole" do |t|
+          create_view "roles", "select id, association_id, type_id, reference from qtm_assocrole" do |t|
             t.column :id
             t.column :association_id
             t.column :ttype_id
             t.column :topic_id
           end
 
-          create_view "topic_names", "select id, topic_id, type_id, value from qtm_topicname" do |t|
+          create_view "names", "select id, topic_id, type_id, value from qtm_topicname" do |t|
             t.column :id
             t.column :topic_id
             t.column :ttype_id
@@ -73,14 +73,14 @@ module RTM
           add_column :item_identifiers, :topic_map_id, :integer
           ItemIdentifier.reset_column_information
           ItemIdentifier.find(:all).each do |si|
-            si.update_attribute :topic_map_id, si.topic_map_construct.topic_map_id
+            si.update_attribute :topic_map_id, si.construct.topic_map_id
           end
           
           create_table :item_identifiers do |t|
             t.column :topic_map_id, :integer, :null => false
             t.column :reference, :string, :null => false
-            t.column :topic_map_construct_id, :integer
-            t.column :topic_map_construct_type, :string
+            t.column :construct_id, :integer
+            t.column :construct_type, :string
           end
           SubjectIdentifier.reset_column_information
           SubjectIdentifier.find(:all).each do |si|

data/lib/rtm/activerecord/rdbms_config.rb

@@ -0,0 +1,43 @@
+# Copyright: Copyright 2009 Topic Maps Lab, University of Leipzig.
+# License:   Apache License, Version 2.0
+
+module RTM::AR
+  module RdbmsConfig
+
+    # This function migrates the database schema using the default
+    # ActiveRecord connection.
+    def migrate_database
+      TMDM::InitialSchema.migrate(:up)
+    end
+
+    # Checks if there is already an ActiveRecord connection of if one was configured.
+    # To do so, it's not enough to call +connected?+ but we also need to try to access something,
+    # as Rails will use the preconfigured database then.
+    def connected?(base_class=::ActiveRecord::Base)
+      begin
+        RTM::AR::TMDM::TopicMap.first # this is needed because Rails establishes the connection upon first usage
+      rescue
+        # puts "GOT AN EXCEPTION. I.e. we were not already connected and there was no connection configured -- or we were connected, but the topic_maps table was missing."
+      end
+      base_class.connected?
+    end
+
+    # Connects Active Record to a database or in Memory database if no parameters given.
+    def connect(*args)
+      base_class = ::ActiveRecord::Base
+      puts("WARNING: ActiveRecord::Base is already connected. Your're now disconnected and reconnected using the RTM connection you specified.") if connected?(base_class)
+
+      if args.size == 0
+        base_class.establish_connection(
+          :adapter => "#{"jdbc" if PLATFORM && PLATFORM =~ /java/}sqlite3",
+          :database  => ":memory:"
+        )
+        no_output do
+          migrate_database
+        end
+      else
+        base_class.establish_connection(*args)
+      end
+    end
+  end
+end

data/lib/rtm/activerecord/tm_delegator.rb

@@ -108,9 +108,9 @@ module RTM::AR
                a[:ttype] = a[:type]
                a.delete(:type)
              end
-             puts "#{"#"}{self.class}:#{prop} -- #{"#"}{args.first.inspect}"
-             puts
-             puts a.inspect
+             # puts "#{"#"}{self.class}:#{prop} -- #{"#"}{args.first.inspect}"
+             # puts
+             # puts a.inspect
              b = {}
              a.each do |k,v|
                if RTM::AR::TMDM::#{options[:type]}.columns.map{|c| c.name}.include?(k)
@@ -150,8 +150,8 @@ EOS
         # create_locator reference:string
         # [ :name => :reference, :type => :String]
         #
-        # create_topic_name value:String, scope:Collection
-        # create_topic_name value:String, type: Topic, scope:Collection
+        # create_name value:String, scope:Collection
+        # create_name value:String, type: Topic, scope:Collection
         # [ {:name => :value, :type => :String}, {:name => :type, :type => :Topic, :optional => true}, {:name => :scope, :type => :Collection} ]
         #
         # create_occurrence value:String, type: Topic, scope:Collection

data/lib/rtm/activerecord/tm_set_delegator.rb

@@ -36,7 +36,7 @@ module RTM::AR
           when :ItemIdentifier
             if @parent.class.name.to_s =~ /::Topic$/
               tbi = @parent.topic_map._item_identifier(obj)
-              if tbi && tmc=tbi.topic_map_construct
+              if tbi && tmc=tbi.construct
                 if tmc.class.name =~ /::Topic$/
                   return @parent if tmc == @parent.__getobj__
                   result = Topic.wrap(tmc).merge @parent
@@ -61,26 +61,26 @@ module RTM::AR
 
           when :SubjectIdentifier
             # check for existing item identifier
-            puts
-            puts "trying to add SI to a topic"
+            # puts
+            # puts "trying to add SI to a topic"
             tbi = @parent.topic_map._item_identifier(obj)
             if tbi && tmc=tbi.construct
-              puts "something with this II exists"
+              # puts "something with this II exists"
               if tmc.class.name =~ /::Topic$/
-                puts "it exists as a topic"
-                puts tmc == @parent.__getobj__
+                # puts "it exists as a topic"
+                # puts tmc == @parent.__getobj__
                 return @parent if tmc == @parent.__getobj__
                 
-                puts "trying to merge"
-                puts "BEFORE"
+                # puts "trying to merge"
+                # puts "BEFORE"
                 begin
                 result = Topic.wrap(tmc).merge(@parent)
                 rescue Exception => e
                   puts e.inspect
                   raise e
                 end
-                puts "AFTER"
-                puts "done merging, now adding SI"
+                # puts "AFTER"
+                # puts "done merging, now adding SI"
                 
                 #result = @parent.merge(Topic.wrap(tmc))
                 # after merging, we still need to add the SI
@@ -93,7 +93,7 @@ module RTM::AR
                 warn("This subject identifier IRI already belongs to another topic map construct (not a topic)")
               end
             end
-            puts "checking for existing SI"
+            # puts "checking for existing SI"
             # check for existing subject identifier
             tbsi = @parent.topic_map._subject_identifier(obj.to_s)
             if tbsi

data/lib/rtm/activerecord/tmdm.rb

@@ -8,6 +8,7 @@ $VERBOSE=old_verbose
 
 module RTM::AR
   # The Active Record TMDM backend
+  # @private
   module TMDM
     # Moves all fields in a collection to another owner (for classes using belongs_to in AR::Base class)
     module Movable

data/lib/rtm/activerecord/topic.rb

@@ -95,9 +95,9 @@ module RTM::AR
     property_set :roles, :aka => [:r, :roles_played, :association_roles], :computable => true, :type => :Role, :wrap => true
 
     def filter_roles(*args)
-      puts
-      puts "topic filter roles:"
-      puts args.inspect
+      # puts
+      # puts "topic filter roles:"
+      # puts args.inspect
       if args.size == 1
         a1 = args.shift
         # if a1 == :any

data/lib/rtm/activerecord/topic_map_system.rb

@@ -0,0 +1,42 @@
+# Copyright: Copyright 2009 Topic Maps Lab, University of Leipzig.
+# License:   Apache License, Version 2.0
+
+require 'rtm/activerecord/rdbms_config'
+require 'rtm/activerecord/001_initial_schema'
+require "rtm/activerecord/io/from_xtm2"
+# require "rtm/backend/active_record/io/from_xtm2_libxml"
+
+module RTM::AR
+  module TopicMapSystem
+    include RTM::TopicMapSystem
+    include RTM::AR::RdbmsConfig
+
+    def create(base_locator)
+      TopicMap.create(base_locator)
+    end
+
+    def topic_maps
+      TopicMap.topic_maps
+    end
+
+    def [](*args)
+      if args.size == 0
+        return TopicMap.topic_maps
+      end
+      TopicMap.topic_maps[*args]
+    end
+
+    # Assignes a logger to active record (or STDOUT as default) which outputs
+    # the sql statements.
+    def log(to=STDOUT)
+      ActiveRecord::Base.logger = Logger.new(to)
+      ActiveRecord::Base.colorize_logging = false if PLATFORM =~ /mswin/
+    end
+
+    # This function generates the database schema using the default
+    # ActiveRecord connection.
+    def migrate_database
+      TMDM::InitialSchema.migrate(:up)
+    end
+  end
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rtm-activerecord
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Benjamin Bock
@@ -9,41 +14,53 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-21 00:00:00 +01:00
+date: 2010-04-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rtm
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.1
-    version: 
+        segments: 
+        - 0
+        - 3
+        - 0
+        version: 0.3.0
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 5
         version: 2.3.5
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 5
         version: 2.3.5
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: "    Ruby Topic Maps is a Topic Maps engine written in Ruby.\n    This is the backend engine which holds all data in ActiveRecord objects.\n    It's available on all ruby platforms but currently does not pass all specs.\n"
-email: rtm+rtm-activerecord-gem-20100221@topicmapslab.de
+email: rtm+rtm-activerecord-gem-20100413@topicmapslab.de
 executables: []
 
 extensions: []
@@ -52,9 +69,9 @@ extra_rdoc_files: []
 
 files: 
 - lib/rtm/activerecord/001_initial_schema.rb
+- lib/rtm/activerecord/002_rtm01to02.rb
 - lib/rtm/activerecord/association_and_role.rb
 - lib/rtm/activerecord/base.rb
-- lib/rtm/activerecord/connect.rb
 - lib/rtm/activerecord/io/from_xtm2.rb
 - lib/rtm/activerecord/io/from_xtm2_libxml.rb
 - lib/rtm/activerecord/io/to_jtm.rb
@@ -69,6 +86,7 @@ files:
 - lib/rtm/activerecord/persistent_code_output.rb
 - lib/rtm/activerecord/quaaxtm2rtm.rb
 - lib/rtm/activerecord/quaaxtm2rtmviews.rb
+- lib/rtm/activerecord/rdbms_config.rb
 - lib/rtm/activerecord/set_wrapper.rb
 - lib/rtm/activerecord/sugar/association/hash_access.rb
 - lib/rtm/activerecord/sugar/role/counterparts.rb
@@ -83,8 +101,10 @@ files:
 - lib/rtm/activerecord/tmdm.rb
 - lib/rtm/activerecord/topic.rb
 - lib/rtm/activerecord/topic_map.rb
+- lib/rtm/activerecord/topic_map_system.rb
 - lib/rtm/activerecord/traverse_associations.rb
 - lib/rtm/activerecord.rb
+- lib/rtm-activerecord.rb
 - LICENSE
 - DISCLAIMER
 - README
@@ -101,18 +121,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: rtm
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: "Ruby Topic Maps: Active Record Backend"

data/lib/rtm/activerecord/connect.rb

@@ -1,102 +0,0 @@
-# Copyright: Copyright 2009 Topic Maps Lab, University of Leipzig.
-# License:   Apache License, Version 2.0
-
-require 'active_record'
-require 'rtm/activerecord/001_initial_schema'
-require "rtm/activerecord/io/from_xtm2"
-# require "rtm/backend/active_record/io/from_xtm2_libxml"
-
-module RTM
-  module AR
-  
-  class TMS
-    include Singleton
-    include RTM::TopicMapSystem
-
-    
-    def create(base_locator)
-      AR::TopicMap.create(base_locator)
-    end
-
-    def topic_maps
-      AR::TopicMap.topic_maps
-    end
-
-    def [](*args)
-      if args.size == 0
-        return AR::TopicMap.topic_maps
-      end
-      args.map { |m| AR::TopicMap.topic_maps[m] }
-    end
-    
-    # Assignes a logger to active record (or STDOUT as default) which outputs
-    # the sql statements.
-    def log(to=STDOUT)
-      ActiveRecord::Base.logger = Logger.new(to)
-      ActiveRecord::Base.colorize_logging = false if PLATFORM =~ /mswin/
-    end
-    # This function generates the database schema using the default
-    # ActiveRecord connection.
-    def generate_database
-      TMDM::InitialSchema.migrate(:up)
-    end
-
-    # Connects to the sqlite3 database given in the path or to
-    # a default database if no path is given.
-    def connect_sqlite3(dbname="tmdm.sqlite3")
-      ActiveRecord::Base.establish_connection(
-        :adapter => platform_specific_adapter("sqlite3"),
-        :database  => dbname
-      )
-    end
-
-    # Connects to a mysql database. Parameters are
-    # either
-    # database, username, password, host
-    # or
-    # only a keyword hash with these parameters.
-    def connect_mysql(database="rtm_development", username=nil, password=nil, host="localhost")
-      if database.is_a? Hash
-        return ActiveRecord::Base.establish_connection(database)
-      end
-      ActiveRecord::Base.establish_connection(
-        :adapter => platform_specific_adapter("mysql"),
-        :database => database,
-        :username => username,
-        :password => password,
-        :host => host
-      )
-    end
-
-    # Connects to a in-memory database. No parameters required.
-    # Schema will automatically be generated.
-    def connect_memory
-      ActiveRecord::Base.establish_connection(
-        :adapter => platform_specific_adapter("sqlite3"),
-        :database  => ":memory:"
-      )
-      no_output do
-        generate_database
-      end
-      true
-    end
-
-    # Connects Active Record to a database or in Memory database if no parameters given.
-    def connect(*args)
-      if args.size == 0
-        return connect_memory
-      end
-      ActiveRecord::Base.establish_connection(*args)
-    end
-
-    private
-    def platform_specific_adapter(adapter)
-      if PLATFORM && PLATFORM =~ /java/
-        return "jdbc#{adapter}"
-      end
-      return adapter
-    end
-    
-  end
-end
-end