talia_core 0.4.2 → 0.4.3

data/generators/talia_base/templates/app/views/sources/semantic_templates/default/default.html.erb

@@ -0,0 +1,21 @@
+<div class="back"><%= index_link %></div>
+
+<h2><%= @source.uri.to_name_s %></h2>
+<table>
+	<% for attribute, value in @source.attributes %>
+	<tr>
+		<td><%= attribute %></td>
+		<td><%= value %></td>
+	</tr>
+	<% end %>
+	<% for predicate in @source.direct_predicates %>
+	<tr>
+		<td><%= predicate %></td>
+		<td>
+			<% @source[predicate].each do |val| %>
+				<%= val %><br/>
+			<% end %>
+		</td>
+	</tr>
+	<% end %>
+</table>

data/generators/talia_base/templates/app/views/sources/semantic_templates/default/province.html.erb

@@ -0,0 +1,19 @@
+<h2>PROVINCE <%= @source.uri.to_name_s %></h2>
+<table>
+	<% for attribute, value in @source.attributes %>
+	<tr>
+		<td><%= attribute %></td>
+		<td><%= value %></td>
+	</tr>
+	<% end %>
+	<% for predicate in @source.direct_predicates %>
+	<tr>
+		<td><%= predicate %></td>
+		<td>
+			<% @source[predicate].each do |val| %>
+				<%= val %><br/>
+			<% end %>
+		</td>
+	</tr>
+	<% end %>
+</table>

data/generators/talia_base/templates/config/routes.rb

@@ -1,4 +1,20 @@
 ActionController::Routing::Routes.draw do |map|
+  map.logout '/logout', :controller => 'sessions', :action => 'destroy'
+  map.login '/login', :controller => 'sessions', :action => 'new'
+  map.register '/register', :controller => 'users', :action => 'create'
+  map.signup '/signup', :controller => 'users', :action => 'new'
+  map.resources :users
+
+  map.resource :session
+
+  map.logout '/logout', :controller => 'sessions', :action => 'destroy'
+  map.login '/login', :controller => 'sessions', :action => 'new'
+  map.register '/register', :controller => 'users', :action => 'create'
+  map.signup '/signup', :controller => 'users', :action => 'new'
+  map.resources :users
+
+  map.resource :session
+
   # The priority is based upon order of creation: first created -> highest priority.
 
   # Sample of regular route:
@@ -31,8 +47,8 @@ ActionController::Routing::Routes.draw do |map|
 
   map.namespace :admin do |admin|
     admin.resources :translations, :collection => { :search => :get }
-    admin.resources :users
-    admin.resources :sources
+    admin.resources :users, :active_scaffold => true
+    admin.resources :sources, :active_scaffold => true
     admin.resources :locales
     admin.resources :background, :active_scaffold => true
     admin.resources :custom_templates, :active_scaffold => true
@@ -76,8 +92,12 @@ ActionController::Routing::Routes.draw do |map|
   # Routes for import
   map.connect 'import/:action', :controller => 'import', :action => 'start_import'
 
-  map.connect ':controller/:action/:id.:format'
-  map.connect ':controller/:action/:id'  
+  # Default semantic dispatch
+  map.connect ':dispatch_uri.:format', :controller => 'sources', :action => 'dispatch',
+    :requirements => { :dispatch_uri => /[^\.]+/ }
+
+  # map.connect ':controller/:action/:id.:format'
+  map.connect ':controller/:action/:id'
   
   
 end

data/generators/talia_base/templates/script/setup_talia_backend

@@ -0,0 +1,35 @@
+#!/bin/env ruby
+
+require File.dirname(__FILE__) + '/../config/boot'
+require "#{RAILS_ROOT}/config/environment"
+require 'rails_generator'
+require 'rails_generator/scripts/generate'
+
+puts "Install and configure restful authentication"
+# First time plugin, has to be done this way since it can not be loaded in
+# a different way
+ARGV = ['install', 'git://github.com/technoweenie/restful-authentication.git']
+require 'commands/plugin'
+orig_name = $0
+$0 = 'generate'
+Rails::Generator::Scripts::Generate.new.run(%w(authenticated user sessions))
+
+puts "Install and configure role-requirements"
+Commands::Plugin.parse!(['install', 'git://github.com/timcharper/role_requirement.git'])
+Rails::Generator::Scripts::Generate.new.run(%w(roles Role User))
+
+if(Rails::VERSION::MAJOR > 2 ||(Rails::VERSION::MAJOR == 2 && Rails::VERSION::MINOR > 2))
+  # TODO: Needed only as long as ActiveScaffold depends on it
+  puts "Install the render_component plugin for ActiveScaffold (optional since Rails 2.2)"
+  Commands::Plugin.parse!(['install', 'git://github.com/lackac/render_component.git', '-r', 'rails-edge'])
+end
+
+
+puts "Install the adminstration backend"
+Rails::Generator::Scripts::Generate.new.run(%w(talia_admin))
+
+puts "Migrating the database"
+system("rake db:migrate")
+
+migration_path = File.join(RAILS_ROOT, 'db', 'migrate')
+ActiveRecord::Migrator.migrate(migration_path)

data/lib/loader_helper.rb

@@ -42,7 +42,14 @@ module TLoad
     require_module("actionpack", "action_controller", "/../../../rails/actionpack", RAILS_GEM_VERSION)
     # This sets the automatic loader path for Talia, allowing the ActiveSupport
     # classes to automatically load classes from this directory.
-    ActiveSupport::Dependencies.load_paths << TLoad.start_dir unless(ActiveSupport::Dependencies.load_paths.include?(TLoad.start_dir))
+    load_paths = ActiveSupport::Dependencies.load_paths
+    load_paths << TLoad.start_dir unless(load_paths.include?(TLoad.start_dir))
+    # Add the other plugins to the path, if we have a Rails root
+    if(defined?(RAILS_ROOT))
+      Dir["#{RAILS_ROOT}/vendor/plugins/*/lib"].each do |plugin_dir|
+        load_paths << plugin_dir if(File.directory?(plugin_dir) || !load_paths.include?(plugin_dir))
+      end
+    end
   end
   
   # Sets up the ActiveSupport autoload path

data/lib/talia_core/active_source.rb

@@ -217,11 +217,6 @@ module TaliaCore
       rels = SemanticRelation.find_by_sql("SELECT DISTINCT predicate_uri FROM semantic_relations WHERE object_id = #{self.id}")
       rels.collect { |rel| N::Predicate.new(rel.predicate_uri) }
     end
-
-    # Returns if the Facsimile is of the given type
-    def has_type?(type)
-      (self.types.include?(type))
-    end
     
     # True if the given attribute is a database attribute
     def db_attr?(attribute)
@@ -271,9 +266,12 @@ module TaliaCore
     #
     # This will check the existing types to avoid duplication
     def add_additional_rdf_types
-      return if(self.class.additional_rdf_types.size == 0) # Avoid database access if there's nothing to do
+      # return if(self.class.additional_rdf_types.empty?)
       type_hash = {}
       self.types.each { |type| type_hash[type.respond_to?(:uri) ? type.uri.to_s : type.to_s] = true }
+      # Add the "class" default type type (unless this is the source for the self type itself).0
+      self.types << rdf_selftype unless(type_hash[rdf_selftype.to_s] || (rdf_selftype.to_s == self.uri.to_s))
+      # Add the user-configured types
       self.class.additional_rdf_types.each do |type|
         self.types << type unless(type_hash[type.respond_to?(:uri) ? type.uri.to_s : type.to_s])
       end
@@ -312,6 +310,11 @@ module TaliaCore
       data_records.find(find_type, options)
     end
     
+    # The RDF type that is used for objects of the current class
+    def rdf_selftype
+      (N::TALIA + self.class.name.demodulize)
+    end
+    
     private
     
     # Extracts the semantic attributes from the attribute hash and passes them

data/lib/talia_core/active_source_parts/class_methods.rb

@@ -126,7 +126,7 @@ module TaliaCore
       # [*:find_through*] accepts and array with an predicate name and an object
       #                   value/uri, to search for predicates that match the given predicate/value 
       #                   combination
-      # [*:type] specifically looks for sources with the given type.
+      # [*:type*] specifically looks for sources with the given type.
       # [*:find_through_inv*] like :find_through, but for the "inverse" lookup
       # [*:prefetch_relations*] if set to "true", this will pre-load all semantic
       #                         relations for the sources (experimental, not fully implemented yet)
@@ -298,6 +298,7 @@ module TaliaCore
       # that method exists; otherwise it'll return nil
       def uri_string_for(value)
         result = if value.is_a? String
+          return nil if(value  =~ /\A\d+\Z/) # This looks like a record id, encoded as a string
           # if this is a local name, prepend the local namespace
           (value =~ /:/) ? value : (N::LOCAL + value).uri
         elsif(value.respond_to?(:uri))

data/lib/talia_core/active_source_parts/predicate_handler.rb

@@ -31,6 +31,7 @@ module TaliaCore
           # Set all as loaded
           sources.each do |src|
             src.each_cached_wrapper { |wrap| wrap.instance_variable_set(:'@loaded', true) }
+            src.instance_variable_set(:'@prefetched', true)
           end
         end
 
@@ -40,15 +41,26 @@ module TaliaCore
       def types
         get_objects_on(N::RDF.type.to_s)
       end
+      
+      # Returns if the Facsimile is of the given type
+      def has_type?(type)
+        (self.types.include?(type))
+      end
 
       # Returns the objects on the given predicate. This will be cached internally
       # so that the object will always be the same as long as the parent source
       # lives.
       def get_objects_on(predicate)
+        TaliaCore::logger.warn "GETTING OBJECTS (#{predicate}) #{@type_cache.inspect}"
         @type_cache ||= {}
         active_wrapper = @type_cache[predicate.to_s]
 
+
         if(active_wrapper.nil?)
+          # If this is a prefetched source we have everything - no use looking further
+          # TODO: Returns an Array instead of a wrapper
+          return [] if(@prefetched)
+          
           active_wrapper = SemanticCollectionWrapper.new(self, predicate)
           @type_cache[predicate.to_s] = active_wrapper
         end

data/lib/talia_core/active_source_parts/rdf.rb

@@ -61,7 +61,7 @@ module TaliaCore
             value = obj.is_a?(SemanticProperty) ? obj.value : obj
             my_rdf.direct_write_predicate(N::URI.new(sem_ref.predicate_uri), value)
           end
-          my_rdf.direct_write_predicate(N::RDF.type, (N::TALIA + self.class.name.demodulize))
+          my_rdf.direct_write_predicate(N::RDF.type, rdf_selftype)
           my_rdf.save
         end
       end

data/lib/talia_core/data_types/iip_loader.rb

@@ -1,3 +1,5 @@
+require 'tmpdir'
+
 module TaliaCore
   module DataTypes
 

data/lib/talia_core/dc_resource.rb

@@ -11,7 +11,7 @@ module TaliaCore
     singular_property :description, N::DCNS.description
     simple_property :publishers, N::DCNS.publisher
     singular_property :language, N::DCNS.language
-    simple_property :subjects, N::DCNS.subject
+    simple_property :dc_subjects, N::DCNS.subject
     singular_property :rights, N::DCNS.rights
     singular_property :title, N::DCNS.title
     

data/lib/talia_core/initializer.rb

@@ -287,6 +287,8 @@ module TaliaCore
             ActiveRecord::Base.logger = talia_logger
           end
         end
+        talia_logger.info("Setting Active Record to full STI use.") unless(ActiveRecord::Base.store_full_sti_class)
+        ActiveRecord::Base.store_full_sti_class = true
       end
 
       # Get the RDF configuration options

data/lib/talia_core/semantic_relation.rb

@@ -1,6 +1,6 @@
 module TaliaCore
   class SemanticRelation < ActiveRecord::Base
-    belongs_to :subject, :class_name => 'ActiveSource'
+    belongs_to :subject, :class_name => 'TaliaCore::ActiveSource'
     belongs_to :object, :polymorphic => true
     before_destroy :discard_property
 

data/lib/talia_util/rake_tasks.rb

@@ -18,7 +18,7 @@ namespace :talia_core do
   task :talia_init do
     Util::title
     Util::init_talia
-    TLoad::force_rails_parts
+    TLoad::force_rails_parts unless(defined?(ActiveRecord))
     Util::talia_config if(Util::flag?('verbose'))
     # Add load paths to allow autoloading of all class from this tasks
     ActiveSupport::Dependencies.load_paths << File.join(TALIA_ROOT, 'lib')
@@ -53,7 +53,7 @@ namespace :talia_core do
   Rake::TestTask.new(:test) do |t| 
     t.libs << 'lib'
     # This will always take the files from the talia_core directory
-    t.test_files = FileList["#{File.dirname(__FILE__)}/../test/**/*_test.rb"]
+    t.test_files = FileList["#{File.dirname(__FILE__)}/../../test/**/*_test.rb"]
     t.verbose = true
   end
   

data/lib/talia_util/util.rb

@@ -94,7 +94,7 @@ module TaliaUtil
   
       # Flush the database. This only flushes the main data tables!
       def flush_db
-        [ 'active_sources', 'data_records', 'semantic_properties', 'semantic_relations'].reverse.each { |f| ActiveRecord::Base.connection.execute "DELETE FROM #{f}" }
+        [ 'active_sources', 'data_records', 'semantic_properties', 'semantic_relations', 'workflows'].reverse.each { |f| ActiveRecord::Base.connection.execute "DELETE FROM #{f}" }
         # Also remove the "unsaved cache" for the wrappers (may be important during testing)
         TaliaCore::SemanticCollectionWrapper.instance_variable_set(:'@unsaved_source_cache', {})
       end

data/test/talia_core/active_source_predicate_test.rb

@@ -7,11 +7,7 @@ module TaliaCore
   class ActiveSourcePredicateTest < Test::Unit::TestCase
 
     def setup
-      setup_once(:flush) do
-        TaliaUtil::Util.flush_rdf
-        TaliaUtil::Util.flush_db
-        true
-      end
+      setup_once(:flush) { TestHelper::flush_store }
     end
 
     def test_each_cached
@@ -21,7 +17,7 @@ module TaliaCore
       src.each_cached_wrapper do |w|
         cached << w
       end
-      assert_equal(1, cached.size)
+      assert_equal(2, cached.size)
     end
     
     def test_cached_predicate

data/test/talia_core/active_source_rdf_test.rb

@@ -4,7 +4,7 @@ require File.join(File.dirname(__FILE__), '..', 'test_helper')
 module TaliaCore
   
   # Test the ActiveSource
-  class ActiveSourceRdfTest < Test::Unit::TestCase
+  class ActiveSourceRdfTest < ActiveSupport::TestCase
     fixtures :active_sources, :semantic_properties, :semantic_relations
     
     def setup
@@ -31,11 +31,11 @@ module TaliaCore
       src[N::RDF.rew] << 'value'
       src.save!
       # Test that there is 1 element now
-      assert_equal(1, (vals = SemanticRelation.find(:all, :conditions => {'subject_id' => src.id })).size, "Expected 1 value, got [#{print_rels(vals)}]")
-      assert_equal(1, src.semantic_relations.size)
+      assert_equal(2, (vals = SemanticRelation.find(:all, :conditions => {'subject_id' => src.id })).size, "Expected 1 value, got [#{print_rels(vals)}]")
+      assert_equal(2, src.semantic_relations.size)
       # Test if the element can be removed
       src[N::RDF.rew].remove
-      assert_equal(0, (vals = SemanticRelation.find(:all, :conditions => {'subject_id' => src.id })).size, "Expected 0 values, got [#{print_rels(vals)}]")
+      assert_equal(1, (vals = SemanticRelation.find(:all, :conditions => {'subject_id' => src.id })).size, "Expected 0 values, got [#{print_rels(vals)}]")
       assert_equal(0, src[N::RDF.rew].size)
     end
     
@@ -82,7 +82,11 @@ module TaliaCore
     protected
     
     def print_rels(relations)
-      relations.collect { |relation| "<#{relation.subject.uri} - #{relation.predicate_uri} - #{relation.object.is_a?(ActiveSource) ? relation.object.uri : relation.object.value}> | " }
+      begin
+        relations.collect { |relation| "<#{relation.subject.uri} - #{relation.predicate_uri} - #{relation.object.is_a?(ActiveSource) ? relation.object.uri : relation.object.value}> | " }
+      rescue
+        relations.inspect
+      end
     end
     
   end

data/test/talia_core/active_source_test.rb

@@ -8,37 +8,21 @@ module TaliaCore
   end
   
   # Test the ActiveSource
-  class ActiveSourceTest < Test::Unit::TestCase
-    fixtures :active_sources, :semantic_properties, :semantic_relations
+  class ActiveSourceTest < ActiveSupport::TestCase
+    fixtures :active_sources, :semantic_properties, :semantic_relations, :data_records
     
     N::Namespace.shortcut(:as_test_preds, 'http://testvalue.org/')
-    
-    def setup
-      setup_once(:flush) do
-        TaliaUtil::Util.flush_rdf
-        true
-      end
-      
-      setup_once(:data_source) do
-        data_source = ActiveSource.new("http://www.test.org/source_with_data")
-        text = DataTypes::SimpleText.new
-        text.location = "text.txt"
-        image = DataTypes::ImageData.new
-        image.location = "image.jpg"
-        data_source.data_records << text
-        data_source.data_records << image
-        data_source.save!
-        data_source
-      end
-      
-    end
 
     def test_has_type
-      facs = ActiveSource.new('http://facsimile/has_type_test')
-      facs.types << N::HYPER.testtype
-      assert(facs.has_type?(N::HYPER.testtype))
+      src = ActiveSource.new('http://xsource/has_type_test')
+      src.types << N::HYPER.testtype
+      assert(src.has_type?(N::HYPER.testtype))
+    end
+    
+    def test_type_field
+      src = DummySource.new('http://xsource/has_type_test')
+      assert_equal(src.type, 'TaliaCore::DummySource')
     end
-
 
     def test_exists
       assert_not_nil(ActiveSource.find(:first))
@@ -237,6 +221,13 @@ module TaliaCore
       assert_equal(0, active_sources(:predicate_search_b).direct_predicates.size)
     end
     
+    def test_default_type
+      src = ActiveSource.new('http://testy.com/testme/test_default_type')
+      src.save!
+      assert_equal(1, src.types.size)
+      assert_property(src.types, src.rdf_selftype)
+    end
+    
     def test_types
       src = ActiveSource.new
       src.uri = 'http://testy.com/testme/type_test'
@@ -244,7 +235,7 @@ module TaliaCore
       src.types << N::SourceClass.new(active_sources(:type_a).uri)
       src.types << N::SourceClass.new(active_sources(:type_b).uri)
       src.save!
-      assert_equal(2, src.types.size)
+      assert_property(src.types, active_sources(:type_a).uri, active_sources(:type_b).uri, src.rdf_selftype)
       assert_kind_of(N::SourceClass, src.types[0])
       assert(src.types.include?(active_sources(:type_b).uri))
     end
@@ -495,13 +486,13 @@ module TaliaCore
     
     def test_rewrite_type
       src = ActiveSource.new('http://as_test/test_update_rewrite_type')
-      src.rewrite_attributes!({}) { |src| src.type = 'SingularAccessorTest' }
+      src.rewrite_attributes!({}) { |src| src.type = 'TaliaCore::SingularAccessorTest' }
       assert_kind_of(SingularAccessorTest, ActiveSource.find(src.uri))
     end
     
     def test_rewrite_type
       src = ActiveSource.new('http://as_test/test_update_type')
-      src.update_attributes!({}) { |src| src.type = 'SingularAccessorTest' }
+      src.update_attributes!({}) { |src| src.type = 'TaliaCore::SingularAccessorTest' }
       assert_kind_of(SingularAccessorTest, ActiveSource.find(src.uri))
     end
     
@@ -531,15 +522,15 @@ module TaliaCore
     end
     
     def test_create_source
-      src = ActiveSource.create_source(:uri => 'http://as_test/create_with_type', ':localthi' => 'value', 'rdf:relatit' => ["<:as_create_attr_dummy_1>", "<:as_create_attr_dummy_1>"], 'type' => 'SingularAccessorTest')
+      src = ActiveSource.create_source(:uri => 'http://as_test/create_with_type', ':localthi' => 'value', 'rdf:relatit' => ["<:as_create_attr_dummy_1>", "<:as_create_attr_dummy_1>"], 'type' => 'TaliaCore::SingularAccessorTest')
       assert_kind_of(SingularAccessorTest, src)
       assert_equal('value', src[N::LOCAL.localthi].first)
       assert_property(src[N::RDF.relatit], N::LOCAL.as_create_attr_dummy_1, N::LOCAL.as_create_attr_dummy_1)
-      assert_property(src.types, N::TALIA.foo)
+      assert_property(src.types, N::TALIA.foo, src.rdf_selftype)
     end
     
     def test_create_for_existing
-      src = ActiveSource.create_source(:uri => 'http://as_test/create_forth_and_existing', ':localthi' => 'valueFOOOO', 'rdf:relatit' => ["<:as_create_attr_dummy_1>", "<:as_create_attr_dummy_1>"], 'type' => 'SingularAccessorTest')
+      src = ActiveSource.create_source(:uri => 'http://as_test/create_forth_and_existing', ':localthi' => 'valueFOOOO', 'rdf:relatit' => ["<:as_create_attr_dummy_1>", "<:as_create_attr_dummy_1>"], 'type' => 'TaliaCore::SingularAccessorTest')
       src.save!
       assert_equal('valueFOOOO', src[N::LOCAL.localthi].first)
       xml = src.to_xml
@@ -550,13 +541,13 @@ module TaliaCore
       assert_equal(src.uri.to_s, new_src.uri.to_s)
       assert_equal('valorz', new_src[N::LOCAL.localthi].first)
       assert_property(new_src[N::RDF.relatit], N::LOCAL.as_create_attr_dummy_1, N::LOCAL.as_create_attr_dummy_1)
-      assert_property(new_src.types, N::TALIA.foo)
+      assert_property(new_src.types, N::TALIA.foo, new_src.rdf_selftype)
     end
     
     def test_create_multi
       src_attribs = [
-        { :uri => N::LOCAL.test_create_multi_stuff, 'rdf:relatit' => [ "<#{N::LOCAL.test_create_multi_stuff_two}>" ], 'type' => 'SingularAccessorTest' },
-        { :uri => N::LOCAL.test_create_multi_stuff_two, ':localthi' => 'valueFOOOO', 'rdf:relatit' => ["<#{N::LOCAL.test_create_multi_stuff}>"], 'type' => 'SingularAccessorTest' }
+        { :uri => N::LOCAL.test_create_multi_stuff, 'rdf:relatit' => [ "<#{N::LOCAL.test_create_multi_stuff_two}>" ], 'type' => 'TaliaCore::SingularAccessorTest' },
+        { :uri => N::LOCAL.test_create_multi_stuff_two, ':localthi' => 'valueFOOOO', 'rdf:relatit' => ["<#{N::LOCAL.test_create_multi_stuff}>"], 'type' => 'TaliaCore::SingularAccessorTest' }
       ]
       ActiveSource.create_multi_from(src_attribs)
       src = TaliaCore::ActiveSource.find(N::LOCAL.test_create_multi_stuff)
@@ -571,7 +562,7 @@ module TaliaCore
     
     
     def test_xml_forth_and_back
-      src = ActiveSource.create_source(:uri => 'http://as_test/create_forth_and_back', ':localthi' => 'value', 'rdf:relatit' => ["<:as_create_attr_dummy_1>", "<:as_create_attr_dummy_1>"], 'type' => 'DummySource')
+      src = ActiveSource.create_source(:uri => 'http://as_test/create_forth_and_back', ':localthi' => 'value', 'rdf:relatit' => ["<:as_create_attr_dummy_1>", "<:as_create_attr_dummy_1>"], 'type' => 'TaliaCore::DummySource')
       xml = src.to_xml
       assert_kind_of(TaliaCore::DummySource, src)
       # Quickly change the URI for the new thing
@@ -583,12 +574,12 @@ module TaliaCore
       assert_equal('http://as_test/create_forth_and_forth', new_src.uri.to_s)
       assert_equal('value', new_src[N::LOCAL.localthi].first)
       assert_property(new_src[N::RDF.relatit], N::LOCAL.as_create_attr_dummy_1, N::LOCAL.as_create_attr_dummy_1)
-      assert_property(new_src.types, N::TALIA.foo)
+      assert_property(new_src.types, N::TALIA.foo, new_src.rdf_selftype)
     end
     
     def test_create_with_file
-      test_file = File.join(Test::Unit::TestCase.fixture_path, 'generic_test.xml')
-      src = ActiveSource.create_source(:uri => 'http://as_test/create_forth_and_back', 'type' => 'Source', 'files' => {'url' => test_file })
+      test_file = File.join(ActiveSupport::TestCase.fixture_path, 'generic_test.xml')
+      src = ActiveSource.create_source(:uri => 'http://as_test/create_with_file', 'type' => 'TaliaCore::Source', 'files' => {'url' => test_file })
       assert_equal(1, src.data_records.size)
       src.save!
       assert(!src.data_records.first.new_record?)
@@ -600,31 +591,46 @@ module TaliaCore
     
     # Test if accessing the data on a Source works
     def test_data_access
-      data = @data_source.data
+      data = make_data_source.data
       assert_equal(2, data.size)
     end
     
     # Test if accessing the data on a Source works
     def test_data_access_by_type
-      data = @data_source.data("SimpleText")
+      data = make_data_source.data("TaliaCore::DataTypes::SimpleText")
       assert_equal(1, data.size)
       assert_kind_of(DataTypes::SimpleText, data.first)
     end
     
     # Test if accessing the data on a Source works
     def test_data_access_by_type_and_location
-      data = @data_source.data("ImageData", "image.jpg")
+      data = make_data_source.data("TaliaCore::DataTypes::ImageData", "image.jpg")
       assert_kind_of(DataTypes::ImageData, data)
     end
     
     # Test accessing inexistent data
     def test_data_access_inexistent
-      data = @data_source.data("Foo")
+      data_source = make_data_source
+      data = data_source.data("Foo")
       assert_equal(0, data.size)
-      data = @data_source.data("SimpleText", "noop.txt")
+      data = data_source.data("SimpleText", "noop.txt")
       assert_nil(data)
     end 
     
+    private
+    
+    def make_data_source
+      data_source = ActiveSource.new("http://www.test.org/source_with_data")
+      text = DataTypes::SimpleText.new
+      text.location = "text.txt"
+      image = DataTypes::ImageData.new
+      image.location = "image.jpg"
+      data_source.data_records << text
+      data_source.data_records << image
+      data_source.save!
+      data_source
+    end
+    
     
   end
   

data/test/talia_core/data_types/data_loader_test.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
 
 module TaliaCore
   # Test the DataRecord storage class
-  class DataLoaderTest < Test::Unit::TestCase
+  class DataLoaderTest < ActiveSupport::TestCase
 
     fixtures :active_sources, :data_records
 
@@ -116,7 +116,7 @@ module TaliaCore
     private
 
     def fixture_file(name)
-      @fixture_files = File.join(Test::Unit::TestCase.fixture_path, name)
+      @fixture_files = File.join(ActiveSupport::TestCase.fixture_path, name)
     end
 
   end

data/test/talia_core/data_types/data_record_test.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
 
 module TaliaCore
   # Test the DataRecord storage class
-  class DataRecordTest < Test::Unit::TestCase
+  class DataRecordTest < ActiveSupport::TestCase
 
     fixtures :active_sources, :data_records
 

data/test/talia_core/data_types/file_record_test.rb

@@ -1,5 +1,6 @@
 require 'test/unit'
 require 'fileutils'
+require 'tempfile'
 
 # Load the helper class
 require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
@@ -17,7 +18,7 @@ end
 module TaliaCore
 
   # Test the DataRecord storage class
-  class FileRecordTest < Test::Unit::TestCase
+  class FileRecordTest < ActiveSupport::TestCase
   
     fixtures :active_sources, :data_records
     
@@ -59,7 +60,7 @@ module TaliaCore
     
     def test_full_filename
       data_record = DataTypes::FileRecord.new do |dr|
-        dr.source_id = 1
+        dr.source = active_sources(:something)
         dr.location  = 'image.jpg'
         dr.assign_type 'image/jpeg'
       end
@@ -141,7 +142,7 @@ module TaliaCore
     
     
     def source_id
-      Source.find(:first)[:id]
+      active_sources(:something).id
     end
 
     def create_from(expected_content = 'abc')

data/test/talia_core/data_types/iip_data_test.rb

@@ -7,7 +7,7 @@ module TaliaCore
   module DataType
     
     # Test the DataRecord storage class
-    class IipDataTest < Test::Unit::TestCase
+    class IipDataTest < ActiveSupport::TestCase
     
       fixtures :active_sources, :data_records
   
@@ -105,7 +105,7 @@ module TaliaCore
       def creation_test
         new_record = DataTypes::IipData.new
         new_record.location = ''
-        new_record.source_id = "something"
+        new_record.source = active_sources(:something)
         yield(new_record)
         new_record.save!
         

data/test/talia_core/data_types/image_data_test.rb

@@ -6,7 +6,7 @@ require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
 module TaliaCore
 
   # Test the DataRecord storage class
-  class ImageDataTest < Test::Unit::TestCase
+  class ImageDataTest < ActiveSupport::TestCase
   
     fixtures :active_sources, :data_records