rtm-activerecord 0.2.0 → 0.2.1

data/lib/rtm/activerecord/001_initial_schema.rb

@@ -109,7 +109,7 @@ module RTM
 end
 
 if __FILE__ == $0
-  puts "Generating SQLite3 Databse tmdm.sqlite3."
+  puts "Generating SQLite3 Database tmdm.sqlite3."
   ActiveRecord::Base.establish_connection(
     :adapter => "sqlite3",
     :database  => "tmdm.sqlite3"

data/lib/rtm/activerecord/connect.rb

@@ -2,13 +2,14 @@
 # License:   Apache License, Version 2.0
 
 require 'active_record'
-require 'rtm/backend/active_record/001_initial_schema'
-require "rtm/backend/active_record/io/from_xtm2"
+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 RTMAR
+  class TMS
     include Singleton
     include RTM::TopicMapSystem
 
@@ -37,7 +38,7 @@ module RTM
     # This function generates the database schema using the default
     # ActiveRecord connection.
     def generate_database
-      RTM::AR::TMDM::InitialSchema.migrate(:up)
+      TMDM::InitialSchema.migrate(:up)
     end
 
     # Connects to the sqlite3 database given in the path or to
@@ -97,10 +98,5 @@ module RTM
     end
     
   end
-
-
-  
-
-  
-  
+end
 end

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

@@ -3,7 +3,7 @@
 
 # Ruby Topic Maps (RTM) http://rtm.rubyforge.org/
 
-class RTM::RTMAR
+module RTM::AR
   def from_xtm2(*args)
     RTM::AR::IO::FROMXTM2.from_xtm2(self, *args)
   end

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

@@ -2,20 +2,12 @@
 # License:   Apache License, Version 2.0
 
 
-class RTM::RTMAR
+module RTM::AR
   def from_xtm2lx(*args)
     RTM::AR::IO::FROMXTM2LX.from_xtm2(self, *args)
   end
 end
 
-# class RTM::RTMAR
-#   def self.from_xtm2lx(*args)
-#     RTM::AR::IO::FROMXTM2LX.from_xtm2(self, *args)
-#   end
-# end
-
-
-
 module RTM::AR::IO
   # XTM2 Export.
   # Each Topic Maps Construct gets a to_xtm2 method.

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

@@ -135,7 +135,7 @@ module RTM::AR::IO
       alias :to_json :to_jtm
     end
   
-    RTM::AR.register_extension self 
+    RTM.register_extension self
   end
 end
   

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

@@ -124,7 +124,7 @@ module RTM::AR:IO
       end
     end
   
-    RTM::AR.register_extension self 
+    RTM.register_extension self
   end
 end
   

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

@@ -156,7 +156,7 @@ module RTM::AR::IO
       end
     end
   
-    RTM::AR.register_extension self 
+    RTM.register_extension self
   end
 end
   

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

@@ -157,7 +157,7 @@ module RTM::AR::IO
       end
     end
   
-    RTM::AR.register_extension self 
+    RTM.register_extension self
   end
 end
   

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

@@ -126,7 +126,7 @@ module RTM::AR::IO
       end
     end
   
-    RTM::AR.register_extension self 
+    RTM.register_extension self
   end
 end
   

data/lib/rtm/activerecord/quaaxtm2rtm.rb

@@ -106,7 +106,7 @@ module RTM
 end
 
 #if __FILE__ == $0
-#  puts "Generating SQLite3 Databse tmdm.sqlite3."
+#  puts "Generating SQLite3 Database tmdm.sqlite3."
 #  ActiveRecord::Base.establish_connection(
 #    :adapter => "sqlite3",
 #    :database  => "tmdm.sqlite3"

data/lib/rtm/activerecord/quaaxtm2rtmviews.rb

@@ -127,7 +127,7 @@ module RTM
 end
 
 #if __FILE__ == $0
-#  puts "Generating SQLite3 Databse tmdm.sqlite3."
+#  puts "Generating SQLite3 Database tmdm.sqlite3."
 #  ActiveRecord::Base.establish_connection(
 #    :adapter => "sqlite3",
 #    :database  => "tmdm.sqlite3"

data/lib/rtm/activerecord.rb

@@ -1,18 +1,16 @@
 # Copyright: Copyright 2009 Topic Maps Lab, University of Leipzig.
 # License:   Apache License, Version 2.0
 
-begin
+if Object.const_defined?("Gem") && rtmgem = Gem.loaded_specs["rtm-activerecord"]
   require 'rtm'
-rescue LoadError
+else
   rtm_path = File.expand_path(File.join(File.dirname(__FILE__), "../../../rtm/lib"))
   if File.directory?(rtm_path)
-    $:.unshift rtm_path
+    $LOAD_PATH.unshift rtm_path
     require 'rtm'
   end
 end
 
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__), ".."))
-
 # class Class
 #   alias :rtm_old_const_missing :const_missing
 #   def const_missing(*const_name,&b)
@@ -31,7 +29,7 @@ module RTM
       super
       
       # code from old monolithic rtm.rb
-      @instance = RTM::RTMAR.instance
+      @instance = ::RTM::AR::TMS.instance
       @instance.connect *args
     end
         
@@ -65,10 +63,11 @@ module RTM::AR
     base
     literal_index
     ].each {|f| require "rtm/activerecord/#{f}" }
-  require "rtm/connect"
-  require "rtm/helpers"
+  require "rtm/activerecord/connect"
   require "rtm/validation"
-  require "rtm/locator_helpers"
+  require "rtm/helpers/locator"
+  require "rtm/helpers/no_output"
+  require "rtm/helpers/uri"
   
 
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rtm-activerecord
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Benjamin Bock
@@ -9,7 +9,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 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.0
+        version: 0.2.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -43,7 +43,7 @@ dependencies:
         version: 2.3.5
     version: 
 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-20100205@topicmapslab.de"
+email: rtm+rtm-activerecord-gem-20100221@topicmapslab.de
 executables: []
 
 extensions: []