talia_core 0.5.4 → 0.7.0

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
-:minor: 5
-:patch: 4
+:minor: 7
+:patch: 0
 :build: 

data/config/talia_core.yml.example

@@ -1,49 +1,51 @@
+sindice: false
 # TaliaCore configuration file
-
 # The domain URI that is the "local" domain of this installation
 local_uri: "http://test.dummy/"
 # The domain URI that is used as a default if no namespace is given
 default_namespace_uri: "http://default.dummy/"
-
 # The RDF store configuration can be read from a file
 rdf_connection_file: rdfstore
-# RDF configuration can also be given as a hash here
-# rdf_connection:
-
 # Set the logging level for ActiveRDF
 ardf_log_level: 0
-
 # If standalone_db is set, ActiveRecord will be configured for use
 # without the Rails environment
 standalone_db: true
 db_file: database
-# Database configuration can also be given as a hash here
-# db_connection: 
-# If unset, the databse log will end up in the default log directory
-# db_log: database.log
-
-# The location for data files (only set if you need to change
-# the default location)
-# data_directory_location: "/var/www/talia_data/"
-
-# Configure the namespaces for use with RDF
 namespaces:
-    # Default namespaces rdf, rdfs, xsd, owl are defined in the semantic_naming
-    # library.
-    # HyperNietzsche namespace
-    hyper: "http://www.hypernietzsche.org/ontology/"
-    # FOAF
-    foaf: http://xmlns.com/foaf/0.1/
-    # SKOS
-    skos: http://www.w3.org/2004/02/skos/core#
-    # DublinCore namespace
-    dct: http://purl.org/dc/terms/
-    dcmit: http://purl.org/dc/dcmitype/
-    dcns:     "http://purl.org/dc/elements/1.1/"
-    # Used in demo apps
-    luccadom: http://trac.talia.discovery-project.eu/wiki/LuccaOntology#
-    talias: http://trac.talia.discovery-project.eu/wiki/StructuralOntology#
-    taliadom: http://trac.talia.discovery-project.eu/wiki/SampleDomainOntology#
-    sesame: http://www.openrdf.org/schema/sesame#
-    swicky: http://discovery-project.eu/ontologies/philoSpace/
-    discovery: http://discovery-project.eu/ontologies/scholar/0.1/
+  hyper: "http://www.hypernietzsche.org/ontology/"
+  foaf: "http://xmlns.com/foaf/0.1/"
+  skos: "http://www.w3.org/2004/02/skos/core#"
+  dct: "http://purl.org/dc/terms/"
+  dcmit: "http://purl.org/dc/dcmitype/"
+  dcns: "http://purl.org/dc/elements/1.1/"
+  luccadom: "http://trac.talia.discovery-project.eu/wiki/LuccaOntology#"
+  talias: "http://trac.talia.discovery-project.eu/wiki/StructuralOntology#"
+  taliadom: "http://trac.talia.discovery-project.eu/wiki/SampleDomainOntology#"
+  sesame: "http://www.openrdf.org/schema/sesame#"
+  swicky: "http://discovery-project.eu/ontologies/philoSpace/"
+  discovery: "http://discovery-project.eu/ontologies/scholar/0.1/"
+  marcont: "http://www.marcont.org/ontology/2.1/"
+  wordnet: "http://xmlns.com/wordnet/1.6/"
+  geo: "http://www.w3.org/2003/01/geo/wgs84_pos#"
+  demo: "http://ontologies.muruca.org/demo3#"
+  gnames: "http://www.geonames.org/ontology#"
+  frbr: "http://purl.org/vocab/frbr/core#"
+site_name: "Talia Tutorial Application"
+iip_root_directory_location:
+data_directory_location:
+iip_server_uri:
+vips_command:
+convert_command:
+googlemap_key: "ABQIAAAAOY6Zv9NunttIT5fALwpiRhSPtRO-56uzZJvIGXQxlGNVk-r4kxRE8NIB3lUS5Sog8714vby5L9bupQ"
+oai:
+  prefix: "oai:talia"
+  repository_name: "Talia OAI Interface"
+shown_tabs:
+  - users
+  - talia_sources
+
+thumb_options:
+  height: "400"
+  width: "400"
+admin_email: "admin@example.com"

data/generators/talia_admin/templates/app/models/fake_source.rb

@@ -0,0 +1,93 @@
+# Methods for "fake" source classes that let Hobo play (somewhat) 
+# together with the classes from TaliaCore::*
+module FakeSource  
+  
+  # Class methods for fake sources
+  module ClassMethods
+    
+    def real_class
+      @real_class ||= TaliaCore::Source
+    end
+    
+    def has_real_class(klass)
+      @real_class = klass
+    end
+    
+    def find(*args)
+      result = real_class.find(*args)
+      if(result.is_a?(Array))
+        result.collect { |s| from_real_source(s) }
+      else
+        result.nil? ? result : from_real_source(result)
+      end
+    end
+    
+    def count(*args)
+      real_class.count(*args)
+    end
+    
+    def new(*args)
+      new_thing = super(*args)
+      new_thing[:type] = real_class.name
+      new_thing.real_source = real_class.new("http://#{rand Time.now.to_i}.x")
+      new_thing.real_source.add_additional_rdf_types
+      new_thing
+    end
+
+    def from_real_source(real_source)
+      result = self.send(:instantiate, real_source.attributes)
+      result.real_source = real_source
+      result
+    end
+    
+  end
+  
+  attr_writer :real_source
+  
+  def real_class
+    self.class.real_class 
+  end
+  
+  def name
+    real_source.respond_to?(:label) ? real_source.label : to_uri.to_name_s
+  end
+  
+  def short_type
+    self.type ? self.type.gsub('TaliaCore::', '') : 'ActiveSource'
+  end
+  
+  def to_uri
+    self.uri.to_uri
+  end
+
+  def real_source
+    @real_source ||= if(new_record?)
+      real_class.new
+    else
+      TaliaCore::ActiveSource.find(self.id, :prefetch_relations => true)
+    end
+  end
+  
+  def rdf_mode
+    nil
+  end
+  
+  # Save the real source stuff, if it exists
+  def save!
+    save_real_source(true)
+  end
+  
+  def save
+    save_real_source(false)
+  end
+  
+  def save_real_source(throws)
+    real_source[:uri] = self[:uri]
+    was_new = self.new_record?
+    result = (throws ? real_source.save! : real_source.save)
+    self.id = real_source.id
+    self.instance_variable_set(:@new_record, false) if(was_new)
+    result
+  end
+  
+end

data/generators/talia_admin/templates/app/models/talia_collection.rb

@@ -1,6 +1,11 @@
 class TaliaCollection < ActiveRecord::Base
   hobo_model # Don't put anything above this
   
+  include FakeSource
+  extend FakeSource::ClassMethods
+  
+  has_real_class TaliaCore::Collection
+  
   self.inheritance_column = 'foo'
   
   fields do
@@ -8,49 +13,20 @@ class TaliaCollection < ActiveRecord::Base
   end
   
   set_table_name "active_sources"
-  
-  
-  
+
   def create_permitted?
     acting_user.administrator?
   end
-  
+
   def update_permitted?
     acting_user.administrator?
   end
-  
+
+  def destroy_permitted?
+    acting_user.administrator?
+  end
+
   def view_permitted?(field)
     true
   end
-  
-  def self.new(*args)
-    new_thing = super(*args)
-    new_thing[:type] = "TaliaCore::Collection"
-    new_thing
-  end
-  
-  def self.find(*args)
-    puts args.inspect
-    result = TaliaCore::Collection.find(*args)
-    if(result.is_a?(Array))
-      result.collect { |s| from_real_collection(s) }
-    else
-      from_real_collection(result)
-    end
-  end
-  
-  def self.count(*args)
-    TaliaCore::Collection.count(*args)
-  end
-  
-  def name 
-    N::URI.new(self.uri).to_name_s
-  end
-  
-  private
-  
-  def self.from_real_collection(real_collection)
-    TaliaCollection.send(:instantiate, real_collection.attributes)
-  end
-  
-end
+end

data/generators/talia_base/talia_base_generator.rb

@@ -55,7 +55,6 @@ class TaliaBaseGenerator < Rails::Generator::Base
       m.make_migration "create_custom_templates.rb"
       m.make_migration "upgrade_relations.rb"
       m.make_migration "create_progress_jobs.rb"
-      m.make_migration "bj_migration.rb"
       
       m.readme 'README'
     end

data/generators/talia_base/templates/app/controllers/custom_templates_controller.rb

@@ -1,7 +1,8 @@
 class CustomTemplatesController < ApplicationController
   
   layout nil
-  session :off
+  # Deprecated, not needed anymore.
+  # session :off
   
   caches_page :xslt
   

data/generators/talia_base/templates/app/controllers/sources_controller.rb

@@ -132,7 +132,7 @@ class SourcesController < ApplicationController
       end
     end
     template = template_map[source.class.name.demodulize]
-    template ? template : "semantic_templates/default/default"
+    template || File.join(template_path, 'default', 'default')
   end
 
   def template_map

data/generators/talia_base/templates/script/configure_talia

@@ -1,4 +1,4 @@
-#!/Developer/Talia/jruby-1.3.1_2.3/bin/jruby
+#!/usr/bin/env ruby
 
 require 'rubygems'
 gem 'activerecord'
@@ -19,35 +19,11 @@ talia_dir = TALIA_CODE_ROOT
 config_dir = File.join(rails_dir, 'config')
 config_template_dir = File.join(talia_dir, 'config')
 
-def check_result(value, regexp)
-  if(regexp && !regexp.match(value))
-    puts "Value does not have the right format (must match #{regexp})"
-    value = ''
-  end
-  value
-end
-
-def raw_read(default, regexp)
+def readl(required = false)
   result = gets.chomp.strip
-  result = default if(default && result == '')
-  check_result(result, regexp)
-end
-
-def readl(required_or_default = false, match_check = nil)
-  # Checks if we have a default value or a "required" bool
-  required = required_or_default
-  default = nil
-  if(required_or_default.is_a?(String))
-    reuqired = false
-    default = required_or_default
-  end
-  
-  match_check = Regexp.new(match_check) if(match_check.is_a?(String))
-  
-  result = raw_read(default, match_check)
   while(result == '' && required)
     print 'Must enter a value, retry: '
-    result = raw_read(default, match_check)
+    result = gets.chomp.strip
   end
   result
 end
@@ -81,7 +57,7 @@ mysql_setup.host = 'localhost'
 mysql_setup.app_name = 'talia'
 mysql_setup.sock = sock_file
 
-print "Enter the mySQL root pasword: "
+print "Enter the mySQL root password: "
 root_pw = readl
 mysql_setup.root_credentials('root', root_pw)
 if(root_pw == '')
@@ -127,15 +103,15 @@ end
 
 print "Loading the configuration templates..."
 db_config = TaliaUtil::Configuration::DatabaseConfig.new(File.join(config_template_dir, 'database.yml.example'))
-rdf_config = TaliaUtil::Configuration::ConfigFile.new(File.join(config_template_dir, 'rdfstore.yml.example'))
+ rdf_config = TaliaUtil::Configuration::ConfigFile.new(File.join(config_template_dir, 'rdfstore.yml.example'))
 talia_config = TaliaUtil::Configuration::ConfigFile.new(File.join(config_template_dir, 'talia_core.yml.example'))
 talia_test_config = TaliaUtil::Configuration::ConfigFile.new(File.join(talia_dir, 'test', 'config', 'talia_core.yml_example')) unless(from_gem)
 puts " done."
 
 puts
 print "Enter the sql driver you want to use (e.g. jdbcmysql, mysql, ...) [jdbcmysql]: "
-adapter = readl('jdbcmysql')
-
+adapter = readl
+adapter = (adapter == '') ? 'jdbcmysql' : adapter
 
 db_config.set_adapter(adapter)
 db_config.set_credentials(rails_user, rails_pw)
@@ -148,29 +124,17 @@ print "Enter the site name (it will appear in the window title): "
 talia_config.site_name = readl
 
 puts
-print "Enter the URI for your site: "
-site_url = readl(true, /\Ahttp:\/\/.+\/\Z/)
+print "Enter the URI for your site. The URI requires a final \"/\": "
+site_url = readl(true)
 
 if(read_yn('Do you want to use the IIP image server?'))
-  init_file = File.join(rails_dir, 'config', 'initializers', 'talia.rb')
-  if(File.exist?(init_file))
-    puts "Adding the creation handler to your talia_initializer. Note that you will need 'vips' installed."
-    File.open(init_file, 'a')  do |io|
-      io.puts ''
-      io.puts '# IIP creation handlers, added automatically'
-      %w(jpeg tiff png gif bmp).each { |t| io.puts "TaliaCore::DataTypes::MimeMapping.add_mapping(:#{t}, TaliaCore::DataTypes::ImageData, :create_iip)" }
-      io.puts ''
-    end
-  else
-    puts "WARNING: Initializer file for Talia not found. You will need to add the image handler for the MIME types manually."
-  end
   puts
   print "Enter the URL of your IIP server, or the port number (for default URL on localhost): "
-  iip_url = readl('', /\A\d{2,}\Z|\Ahttp:\/\/.*/)
-
+  iip_url = readl
   # If only numerals, we'll create the URL
-  if(iip_url =~ /^\d*$/)
-    iip_url = "http://localhost:#{iip_url}/fcgi-bin/iipsrv.fcgi"
+  if iip_url =~ /^\d*$/
+    iip_url = ":#{iip_url}" if iip_url != ''
+    iip_url = "http://localhost#{iip_url}/fcgi-bin/iipsrv.fcgi"
   end
   puts "Setting IIP URL to: #{iip_url}"
 
@@ -179,31 +143,27 @@ if(read_yn('Do you want to use the IIP image server?'))
   puts
   print "Enter the path to store the IIP image files (return for default): "
   iip_directory = readl
-  
+
   vips_default_command = `which vips`.gsub("\n", '')
   print "Enter the path to the vips command (default: #{vips_default_command.inspect}): "
-  vips_command = readl((vips_default_command == '') ? true : vips_default_command)
-  talia_config.vips_command = vips_command
-  
+  vips_command = readl
+  talia_config.vips_command = vips_command == '' ? vips_default_command : vips_command
+
+
   convert_default_command = `which convert`.gsub("\n", '')
   print "Enter the path to the convert command (default: #{convert_default_command.inspect}): "
-  convert_command = readl((convert_default_command == '') ? true : convert_default_command)
-  talia_config.convert_command = convert_command
-  
+  convert_command = readl
+  talia_config.convert_command = convert_command == '' ? convert_default_command : convert_command
 end
 
 puts
 puts "Configuring the Sesame RDF store (change the config by hand for stores other than Sesame)"
 puts
 backends = %w(native memory rdbms http)
-print "Enter the sesame backend to use (#{backends.join('|')}) (default: native): "
-backend = readl
-backend = 'native' if(backend.blank?)
-while(!(backends.include?(backend)))
+print "Enter the sesame backend to use (#{backends.join('|')}): "
+while(!(backends.include?(backend = readl)))
   puts "#{backend} is not a valid backend"
   print "Enter the backend (#{backends.join('|')}: )"
-  backend = readl
-  backend = 'native' if(backend.blank?)
 end
 
 %w(production test development).each do |env|
@@ -231,7 +191,7 @@ when 'rdbms':
     print "Enter the password for the connection: "
     pass = readl
   end
-  %w(production test development).each do |env|
+  %(production test development).each do |env|
     rdf_config[env]['driver'] = driver
     rdf_config[env]['user'] = user
     rdf_config[env]['pass'] = pass
@@ -247,10 +207,11 @@ when 'http':
     pass = readl
   end
   %w(production test development).each do |env|
-    rdf_config[env]['user'] = user unless(user.blank?)
-    rdf_config[env]['pass'] = pass unless(pass.blank?)
+    rdf_config[env]['driver'] = driver
+    rdf_config[env]['user'] = user
+    rdf_config[env]['pass'] = pass
     print "Enter the URL for the '#{env}' environment: "
-    rdf_config[env]['url'] = readl(true, /\Ahttp:\/\/.+\//)
+    rdf_config[env]['url'] = readl(true)
   end
 else
   puts "ERROR: ILLEGAL BACKEND #{backend} - you shouldn't see this..."
@@ -260,8 +221,7 @@ if(iip_directory != '')
   talia_config.iip_root_directory_location = iip_directory
 end
 
-puts ''
-print "Enter the path to store general data files (return for default): "
+print "Enter the path to store the data files (return for default): "
 data_directory = readl
 
 if(data_directory != '')
@@ -305,15 +265,38 @@ end
 puts 
 puts "Now migrating the databases"
 %w(test development production).each do |env|
-  puts "Init database for #{env}"
   raise("Error migrating #{env}") unless(system("rake db:migrate RAILS_ENV=#{env}"))
   # raise("Error creating globalize tables in #{env}") unless(system("rake globalize:setup RAILS_ENV=#{env}"))
-  puts "Importing ontologies for #{env}"
-  system("rake talia_core:rdf_import files=ontologies/*.owl rdf_syntax=rdfxml RAILS_ENV=#{env}")
-  system("rake talia_core:owl_to_rdfs_update RAILS_ENV=#{env}")
   puts "Migrated #{env}"
 end
 
+puts "Importing ontologies"
+system('rake talia_core:rdf_import files=ontologies/*.owl rdf_syntax=rdfxml')
+system('rake talia_core:owl_to_rdfs_update')
+
+# print "Importing language files..."
+# Dir[File.join(rails_dir, 'languages', '*_glob.csv')].each do |lang_file|
+#   language = File.basename(lang_file)[0..1] # first two chars are the lang code
+#   print " #{language}"
+#   raise("Error importing language #{language}") unless(system("rake discovery:import_language language=#{language} file=#{File.expand_path(lang_file)}"))
+# end
+# puts " ... done."
+# puts
+
+puts "Customize the start page. The following custom start pages are available:"
+cust_pages = Dir[File.join(rails_dir, 'customization_files', 'start_page', '_start_page_*.html.erb')]
+cust_pages.each do |cust_page|
+  # Get the descriptive name
+  md = /_start_page_(.*)\.html\.erb/.match(cust_page)
+  puts "#{cust_pages.index(cust_page)} - #{md[1]}"
+end
+
+if(read_yn('Do you want to build a war file now?'))
+  puts
+  puts "Building the war file"
+  system("warble")
+end
+
 puts
 puts "Configuration complete"
-puts
+puts