talia_core 0.4.3 → 0.4.4

data/generators/talia_base/templates/public/stylesheets/main.css

@@ -0,0 +1,276 @@
+/* CSS Document */
+
+
+/* ***************** ************** ************** */
+/* ***************** TAG GENERICI ************** */
+/* ***************** ************** ************** */
+* {margin: 0; padding: 0;}
+
+
+body {
+    text-align:left;
+    color:#333;
+    margin: 0;
+    padding: 0;
+    border: 0;
+    font-family: Avenir, "Lucida Grande", Verdana, "Bitstream Vera Sans", Arial, Helvetica, sans-serif;
+    font-size:0.8125em;
+    background: #FFF url(/images/core/left_edge.gif) top left repeat-y;
+}
+
+
+/* DEFINIZIONE TAG */
+a{
+    color: #355a8e;
+    text-decoration: none;
+    outline: none;
+}
+a:hover{
+    color: #355a8e;
+    text-decoration: underline;
+    background-color: transparent;
+}
+h1{
+    font-size:1.3em;
+    margin-bottom: 5px;
+}
+h2{
+    font-size:1.2em;
+    margin-bottom: 5px;
+}
+h3{
+    font-size:1.1em;
+    margin-bottom: 5px;
+}
+p{
+    color:#333333;
+    line-height:1.7em;
+    font-size:0.9em;
+    margin-bottom: 5px;
+}
+
+td {
+    padding-right: 3ex;
+}
+/* DEFINIZIONE TAG */
+
+
+/* Taglist */
+div.tags {
+    margin-bottom: 0.5em;
+    margin-top: 0.5em;
+    padding: 0.3em;
+    background-color: #F1F1F1;
+    line-height: 1.5em;
+}
+
+span.tag {
+    background-color: #C0C0C0;
+    margin: 5px;
+}
+
+span.tag_selected {
+    background-color: #A0A0E0;
+    margin: 5px;
+}
+
+/* ***************** ************** ************** */
+/* ***************** CLASSI RICORRENTI ************** */
+/* ***************** ************** ************** */
+.hidden{
+    display:none;
+}
+
+.floatClear{
+    clear:both;
+}
+
+/* ***************** ************** ************** */
+/* ***************** HEADER ************** */
+/* ***************** ************** ************** */
+
+
+#title_bar h1{
+    padding: 13px 0 0 13px;
+}
+#title_bar h1 a{
+    font-size:1.7em;
+    color:#FFFFFF;
+    display: block;
+    width: 235px;
+    height: 97px;
+    background: transparent url(/images/core/logo.gif) top left no-repeat;
+    text-indent: -9999px;
+}
+
+#title_bar p.header_subtitle{
+    display: none;
+}
+
+div#title_bar{
+    height: 122px;
+    margin:0;
+    padding:0;
+    border:0;
+    width:100%;
+    background:#666 url(/images/core/header_bg.gif) top left repeat;
+}
+
+/* ***************** ************** ************** */
+/* ***************** CONTENTS ************** */
+/* ***************** ************** ************** */
+#contents {
+    padding: 25px;
+    background:transparent url(/images/core/contents_top_left.gif) top left repeat-x;
+}
+
+/* ***************** ************** ************** */
+/* ***************** FOOTER ************** */
+/* ***************** ************** ************** */
+/* tree: #footer h1, #footer p */
+#footer.open{
+    margin: 0 0 0 300px;
+}
+
+/* !!!! SIDE BAR CHIUSO !!!! */
+#footer.closed{
+    margin-left:73px;
+}
+
+#select-container {
+    margin-bottom: 3ex;
+}
+
+
+/* ***************** ************** ************** */
+/* ***************** Barbz demo stuff ************** */
+/* ***************** ************** ************** */
+.sources_list ul {
+	width: 100%;
+	list-style: none;
+}
+
+.sources_list ul li {
+	border-bottom: 1px solid #d8d8d8;
+	width: 100%;
+	padding-bottom: 0;
+	float: left;
+}
+
+.sources_list ul li p {
+	float: left;
+	width: 100%;
+	background: #f9f9f9;
+	margin: 0;
+	padding:0 }
+
+.sources_list ul li p .source_type {
+	display: block;
+	float: left;
+	width: 10%;
+	padding:6px 1%;
+	/*background:#f8f8f8 url(img/type.png) repeat-x bottom;*/
+	/*border-bottom: 1px solid #ccc;*/
+	voice-family: "\"}\"";
+voice-family:inherit;
+	width:8%
+}
+
+.sources_list ul li p .source_title {
+	display: block;
+	float: left;
+	width: 45%;
+	font-size:12px ;	
+	background: #f2f2f2;
+	font-weight: bold;
+	padding:6px 1% ;
+	voice-family: "\"}\"";
+voice-family:inherit;
+	width:43%
+}
+
+
+
+.sources_list ul li p .source-data {
+	display: block;
+	float: left;
+	width: 35%;
+	padding:  7px 1% 7px 1%;
+	voice-family: "\"}\"";
+voice-family:inherit;
+	width:33%
+}
+
+.sources_list ul li p .more {
+	width: 10%;
+	float: left;
+	padding: 6px 0;	font-size:12px ;	
+	background: url(img/arrow.png) no-repeat right;
+	display: block;
+}
+
+
+
+.sources_list ul li p .more a{
+	color: #999;
+}
+
+a img {
+	border: 0px none;
+}
+
+/* Styles for the Person template*/
+
+div#tl {
+	margin-bottom: 30px;
+	margin-top: 30px;
+}
+
+
+.properties_list ul {
+	width: 100%;
+	list-style: none;
+}
+
+.properties_list ul li {
+	border-bottom: 1px solid #d8d8d8;
+	width: 100%;
+	padding-bottom: 0;
+	float: left;
+}
+
+.properties_list ul li p {
+	float: left;
+	width: 100%;
+	background: #f9f9f9;
+	margin: 0;
+	padding:0 }
+
+.properties_list ul li p .predicate {
+	display: block;
+	float: left;
+	width: 10%;
+	padding:6px 1%;
+	/*background:#f8f8f8 url(img/type.png) repeat-x bottom;*/
+	/*border-bottom: 1px solid #ccc;*/
+	voice-family: "\"}\"";
+	voice-family:inherit;
+	width:8%
+}
+
+.properties_list ul li p .value {
+	display: block;
+	float: left;
+	width: 45%;
+	font-size:12px ;	
+	background: #f2f2f2;
+	font-weight: bold;
+	padding:6px 1% ;
+	voice-family: "\"}\"";
+	voice-family:inherit;
+	width:43%
+}
+.person hr
+{
+	margin-top:30px;
+}

data/generators/talia_base/templates/script/configure_talia

@@ -1,4 +1,4 @@
-#!/bin/env ruby
+#!/Developer/Talia/jruby-1.3.1_2.3/bin/jruby
 
 require 'rubygems'
 gem 'activerecord'

data/generators/talia_base/templates/script/setup_talia_backend

@@ -24,6 +24,8 @@ if(Rails::VERSION::MAJOR > 2 ||(Rails::VERSION::MAJOR == 2 && Rails::VERSION::MI
   Commands::Plugin.parse!(['install', 'git://github.com/lackac/render_component.git', '-r', 'rails-edge'])
 end
 
+puts "Install the auto completion plugin"
+Commands::Plugin.parse!(['install', 'auto_complete'])
 
 puts "Install the adminstration backend"
 Rails::Generator::Scripts::Generate.new.run(%w(talia_admin))

data/lib/core_ext/platform.rb

@@ -4,6 +4,7 @@ module Platform # :nodoc:
   def jruby?
     RUBY_PLATFORM =~ /java/
   end
+  
 end
 
 extend Platform

data/lib/core_ext/string.rb

@@ -3,4 +3,10 @@ class String
   def to_permalink
     self.gsub(/\W+/, ' ').strip.downcase.titleize.gsub(/\ +/, '_')
   end
+  
+  # Give a URI object created from the current string
+  def to_uri
+    N::URI.new(self)
+  end
+  
 end

data/lib/talia_core/active_source.rb

@@ -24,6 +24,7 @@ module TaliaCore
     include RDFS::ResourceLike
     
     extend ActiveSourceParts::ClassMethods
+    extend ActiveSourceParts::Finders
     extend ActiveSourceParts::SqlHelper
     include ActiveSourceParts::PredicateHandler
     extend ActiveSourceParts::PredicateHandler::ClassMethods
@@ -49,7 +50,7 @@ module TaliaCore
       :class_name => 'TaliaCore::SemanticRelation'
     has_many :subjects, :through => :related_subjects
     
-    validates_format_of :uri, :with => /\A\S*:.*\Z/
+    validates_format_of :uri, :with => /\A\S*:.*\Z/, :message => '<{{value}}> does not look like an uri.'
     validates_uniqueness_of :uri
 
     before_destroy :remove_inverse_properties # Remove inverse properties when destroying an element
@@ -67,6 +68,11 @@ module TaliaCore
     
     validate :check_uri    
 
+    # Uri in short notation
+    def short_uri
+      N::URI.new(self.uri).to_name_s
+    end
+
     # Helper
     def value_for(thing)
       self.class.value_for(thing)
@@ -77,6 +83,11 @@ module TaliaCore
     def to_s
       self[:uri]
     end
+    
+    # Create a new uri object
+    def to_uri
+      self[:uri].to_uri
+    end
 
     # Works in the normal way for database attributes. If the value
     # is not an attribute, it tries to find objects related to this source
@@ -107,6 +118,53 @@ module TaliaCore
     alias :update_attributes_orig :update_attributes
     alias :update_attributes_orig! :update_attributes!
 
+
+    # Updates the source with the given properties. The 'mode' field indicates if
+    # and how the update will be performed. See the ImportJobHelper class for
+    # the different modes.
+    #
+    # As opposed to the *_attributes method, this will also handle file elements.
+    # The default mode is :skip (do nothing)
+    def update_source(properties, mode)
+      properties.to_options!
+      mode = :update if(self.is_a?(SourceTypes::DummySource)) # Dummy sources are always updated
+      mode ||= :skip
+      mode = mode.to_sym
+      return self if(mode == :skip) # If we're told to ignore updates
+      
+      # Deal with already existing sources
+      files = properties.delete(:files)
+      
+      if(mode == :overwrite)
+        # If we are to overwrite, delete all relations and update normally
+        self.semantic_relations.destroy_all
+        self.data_records.destroy_all
+        mode = :update
+      elsif(mode == :update && files && self.data_records.size > 0)
+        # On updating we should only remove the files if there are new ones
+        self.data_records.destroy_all
+      end
+      
+      # Add any files
+      attach_files(files) if(files)
+      
+      # Rewrite the type, if neccessary
+      type = properties[:type]
+      switch_type = type && (self.type != type)
+      # Warn to the log if we have a problematic type change
+      TaliaCore.logger.warn("WARNING: Type change from #{self.type} to #{type}") if(switch_type && !self.is_a?(SourceTypes::DummySource))
+      self.type = type if(switch_type)
+      
+      # Now we should either be adding or updating
+      assit(mode == :update || mode == :add)
+      update = (mode == :update)
+      
+      # Overwrite with or add the imported attributes
+      update ? rewrite_attributes(properties) : update_attributes(properties)
+      
+      self
+    end
+
     # Updates *all* attributes of this source. For the database attributes, this works
     # exactly like ActiveRecord::Base#update_attributes
     #
@@ -304,6 +362,7 @@ module TaliaCore
     # given, it will retrieve only the specified data element
     def data(type = nil, location= nil)
       find_type = location ? :first : :all # Find just one element if a location is given
+      type = type.name if(type.is_a?(Class))
       options = {}
       options[:conditions] = [ "type = ?", type ] if(type && !location)
       options[:conditions] = [ "type = ? AND location = ?", type, location ] if(type && location)
@@ -331,13 +390,13 @@ module TaliaCore
     # string it will be returned as a string.
     def target_for(value)
       return value if(value.kind_of?(N::URI) || value.kind_of?(ActiveSource))
-      assit_kind_of(String, value)
+      assit_block { |msg| msg << "Expected #{value.inspect} to be a String" unless(value.is_a?(String)) ; value.is_a?(String) }
       value.strip!
       if((value[0..0] == '<') && (value[-1..-1] == '>'))
         value = ActiveSource.expand_uri(value [1..-2])
         val_src = ActiveSource.find(:first, :conditions => { :uri => value })
         if(!val_src)
-          value = DummySource.new(value)
+          value = SourceTypes::DummySource.new(value)
           value.save!
         else
           value = val_src

data/lib/talia_core/active_source_parts/class_methods.rb

@@ -19,9 +19,13 @@ module TaliaCore
       # on creation. This will call the attach_files method on the object.
       def new(*args)
         the_source = if((args.size == 1) && (args.first.is_a?(Hash)))
+          options = args.first
+          options.to_options!
+
           # We have an option hash to init the source
-          files = args.first.delete(:files) || args.first.delete('files')
-          attributes = split_attribute_hash(args.first)
+          files = options.delete(:files)
+          options[:uri] = uri_string_for(options[:uri])
+          attributes = split_attribute_hash(options)
           the_source = super(attributes[:db_attributes])
           the_source.add_semantic_attributes(false, attributes[:semantic_attributes])
           the_source.attach_files(files) if(files)
@@ -41,7 +45,8 @@ module TaliaCore
       # like #new, but it will correctly initialize a source of the type given
       # in the hash. If no type is given, this will create a plain ActiveSource.
       def create_source(args)
-        type = args.delete(:type) || args.delete('type') || 'ActiveSource'
+        args.to_options!
+        type = args.delete(:type) || 'TaliaCore::ActiveSource'
         klass = type.constantize
         klass.new(args)
       end
@@ -58,12 +63,17 @@ module TaliaCore
       # [*reader*] The reader class that the import should use
       # [*progressor*] The progress reporting object, which must respond to run_with_progress(message, size, &block)
       # [*errors*] If given, all erors will be looged to this array instead of raising
-      #            an exception
+      #            an exception. See the create_multi_from method for more.
+      # [*duplicates*] How to treat alredy existing sources. See ImportJobHelper for more
+      #                documentation
+      # [*base_file_uri*] The base uri to import file from
       def create_from_xml(xml, options = {})
-        reader = options[:reader] ? options[:reader].to_s.classify.constantize : TaliaCore::ActiveSourceParts::Xml::SourceReader
-        source_properties = reader.sources_from(xml, options[:progressor])
-        self.progressor = options[:progressor]
-        sources = create_multi_from(source_properties)
+        options.to_options!
+        options.assert_valid_keys(:reader, :progressor, :errors, :duplicates, :base_file_uri)
+        reader = options[:reader] ? options.delete(:reader).to_s.classify.constantize : TaliaCore::ActiveSourceParts::Xml::SourceReader
+        source_properties = reader.sources_from(xml, options[:progressor], options.delete(:base_file_uri))
+        self.progressor = options.delete(:progressor)
+        sources = create_multi_from(source_properties, options)
         (sources.size > 1) ? sources : sources.first
       end
 
@@ -72,32 +82,35 @@ module TaliaCore
       # correctly.
       #
       # Options:
-      # [*errors*] If given, all erors will be looged to this array instead of raising
-      #            an exception
+      # [*errors*] If given, all erors will be logged to this array instead of raising
+      #            an exception. Each "entry" in the error array will be an Error object
+      #            containing the origianl stack trace of the error
+      # [*duplicates*] Indicates how to deal with sources that already exist in the
+      #                datastore. See the ImportJobHelper class for a documentation of
+      #                this option. Default is :skip
       def create_multi_from(sources, options = {})
+        options.to_options!
+        options.assert_valid_keys(:errors, :duplicates)
         source_objects = []
         run_with_progress('Writing imported', sources.size) do |progress|
           source_objects = sources.collect do |props|
+            props.to_options!
             src = nil
             begin
-              if(src = ActiveSource.find(:first, :conditions => { :uri => (props[:uri] || props['uri']) }))
-                # Deal with already existing sources
-                src.rewrite_attributes(props)
-                # Rewrite the type, if neccessary
-                type = props[:type] || props['type']
-                switch_type = type && (src.type != type)
-                # Warn to the log if we have a problematic type change
-                TaliaCore.logger.warn("WARNING: Type change from #{src.type} to #{type}") if(switch_type && !src.is_a?(DummySource))
-                src.type = type if(switch_type)
-                src
+              props[:uri] = uri_string_for(props[:uri])
+              assit(props[:uri], "Must have a valid uri at this step")
+              if(src = ActiveSource.find(:first, :conditions => { :uri => props[:uri] }))
+                src.update_source(props, options[:duplicates])
               else
                 src = ActiveSource.create_source(props)
               end
               src.save!
             rescue Exception => e
               if(options[:errors]) 
-                options[:errors] << "ERROR during import of #{props['uri'] || props[:uri]}: #{e.message}" 
-                TALIA_CORE.logger.warn("Problems importing #{props['uri'] || props[:uri]} (logged): #{e.message}")
+                err = ImportError.new("ERROR during import of #{props[:uri]}: #{e.message}")
+                err.set_backtrace(e.backtrace)
+                options[:errors] <<  err
+                TaliaCore.logger.warn("Problems importing #{props[:uri]} (logged): #{e.message}")
               else
                 raise
               end
@@ -119,41 +132,6 @@ module TaliaCore
         end
       end
 
-
-      # Finder also accepts uris as "ids". There are also some additional options
-      # that are accepted:
-      # 
-      # [*: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.
-      # [*: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)
-      def find(*args)
-        prefetching = false
-        if(args.last.is_a?(Hash))
-          options = args.last
-          prefetching =  options.delete(:prefetch_relations)
-          if(options.empty?) # If empty we remove the args hash, so that the 1-param uri search works
-            args.pop
-          else
-            prepare_options!(args.last)
-          end
-        end
-        result = if(args.size == 1 && (uri_s = uri_string_for(args[0])))
-          src = super(:first, :conditions => { :uri => uri_s })
-          raise(ActiveRecord::RecordNotFound, "Not found: #{uri_s}") unless(src)
-          src
-        else
-          super
-        end
-
-        prefetch_relations_for(result) if(prefetching)
-
-        result
-      end
-
       # Semantic version of ActiveRecord::Base#update - the id may be a record id or an URL,
       # and the attributes may contain semantic attributes. See the update_attributes method
       # for details on how the semantic attributes behave.
@@ -233,7 +211,7 @@ module TaliaCore
 
       # The attributes stored in the database
       def db_attributes
-        @db_attributes ||= ActiveSource.new.attribute_names
+        @db_attributes ||= (ActiveSource.new.attribute_names << 'id')
       end
 
       # Helper to define a "additional type" in subclasses which will 
@@ -310,70 +288,6 @@ module TaliaCore
         result
       end
 
-
-      # Takes the "advanced" options that can be passed to the find method and
-      # converts them into "standard" find options.
-      def prepare_options!(options)
-        check_for_find_through!(options)
-        check_for_type_find!(options)
-        check_for_find_through_inv!(options)
-      end
-
-      # Checks if the :find_through option is set. If so, this expects the
-      # option to have 2 values: The first representing the URL of the predicate
-      # and the second the URL or value that should be matched.
-      #
-      # An optional third parameter can be used to force an object search on the
-      # semantic_properties table (instead of active_sources) - if not present
-      # this will be auto-guessed from the "object value", checking if it appears
-      # to be an URL or not.
-      #
-      #   ...find(:find_through => [N::RDF::something, 'value', true]
-      def check_for_find_through!(options)
-        if(f_through = options.delete(:find_through))
-          assit_kind_of(Array, f_through)
-          raise(ArgumentError, "Passed non-hash conditions with :find_through") if(options.has_key?(:conditions) && !options[:conditions].is_a?(Hash))
-          raise(ArgumentError, "Cannot pass custom join conditions with :find_through") if(options.has_key?(:joins))
-          predicate = f_through[0]
-          obj_val = f_through[1]
-          search_prop = (f_through.size > 2) ? f_through[2] : !(obj_val.to_s =~ /:/)
-          options[:joins] = default_joins(!search_prop, search_prop)
-          options[:conditions] ||= {}
-          options[:conditions]['semantic_relations.predicate_uri'] = predicate.to_s
-          if(search_prop)
-            options[:conditions]['obj_props.value'] = obj_val.to_s
-          else
-            options[:conditions]['obj_sources.uri'] = obj_val.to_s
-          end
-        end
-      end
-
-      # Check for the :find_through_inv option. This expects the 2 basic values
-      # in the same way as :find_through.
-      #
-      # find(:find_through_inv => [N::RDF::to_me, my_uri]
-      def check_for_find_through_inv!(options)
-        if(f_through = options.delete(:find_through_inv))
-          assit_kind_of(Array, f_through)
-          raise(ArgumentError, "Passed non-hash conditions with :find_through") if(options.has_key?(:conditions) && !options[:conditions].is_a?(Hash))
-          raise(ArgumentError, "Cannot pass custom join conditions with :find_through") if(options.has_key?(:joins))
-          options[:joins] = default_inv_joins
-          options[:conditions] ||= {}
-          options[:conditions]['semantic_relations.predicate_uri'] = f_through[0].to_s
-          options[:conditions]['sub_sources.uri'] = f_through[1].to_s
-        end
-      end
-
-
-      # Checks for the :type option in the find options. This is the same as
-      # doing a :find_through on the rdf type
-      def check_for_type_find!(options)
-        if(f_type = options.delete(:type))
-          options[:find_through] = [N::RDF::type, f_type.to_s, false]
-          check_for_find_through!(options)
-        end
-      end
-
     end
   end
 end