talia_core 0.4.2 → 0.4.3

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 4
 :major: 0
-:patch: 2
+:patch: 3

data/generators/generator_helpers.rb

@@ -19,6 +19,26 @@ module GeneratorHelpers
     m.migration_template "migrations/#{template_name}", "db/migrate", :migration_file_name => template_name.gsub(/\.rb\Z/, '')
   end
   
+  # This is more of a quick hack, but the functionality requires extra plugins
+  # and by installing them from the generator everything can be done with
+  # one single command
+  def install_plugin(plugin_url)
+    system("#{ruby_bin} #{plugin_script} install #{plugin_url}")
+  end
+  
+  # Path to the plugin (installer) script
+  def plugin_script
+    @plugin_script ||= File.join(RAILS_ROOT, 'script', 'plugin')
+  end
+  
+  # Path to the ruby binary that we're currently using
+  def ruby_bin
+    @ruby_bin ||= begin
+      c = ::Config::CONFIG
+      File.join(c['bindir'], c['ruby_install_name']) << c['EXEEXT']
+    end
+  end
+  
 end
 
 # This monkeypatches a problem in the generator that causes it to have 
@@ -32,15 +52,28 @@ module Rails
         
         alias :orig_migration_string :next_migration_string
         
+        def migration_xtime
+          @migration_xtime ||= Time.now
+        end
+        
+        def migration_time
+          @migration_time ||= migration_xtime.utc.strftime('%Y%m%d%H%M')
+        end
+        
         def migration_count
-          @m_count ||= 0
+          @m_count ||= begin
+            Dir.glob("#{RAILS_ROOT}/#{@migration_directory}/#{migration_time}*.rb").inject(migration_xtime.sec) do |max, file|
+              n = File.basename(file)[12..13].to_i
+              (n > max) ? n : max
+            end
+          end
           @m_count += 1
           @m_count
         end
 
         def next_migration_string(padding = 3)
           return orig_migration_string(padding) unless(ActiveRecord::Base.timestamped_migrations)
-          (Time.now.utc.strftime("%Y%m%d%H%M") + ("%.2d" % migration_count))
+          migration_time + ("%.2d" % migration_count)
         end
         
       end

data/generators/talia_admin/talia_admin_generator.rb

@@ -13,6 +13,12 @@ class TaliaAdminGenerator < Rails::Generator::Base
       files_in m, 'controllers', 'app/'
       files_in m, 'public'
       files_in m, 'test'
+      
+      m.directory 'app/models'
+      m.file 'models/role.rb', 'app/models/role.rb', :collision => :force
+      
+      m.directory 'db/migrate'
+      make_migration m, "populate_users.rb"
     end
   end
 

data/generators/talia_admin/templates/controllers/admin/background_controller.rb

@@ -1,3 +1,5 @@
+require 'bj'
+
 class Admin::BackgroundController < ApplicationController
   layout 'admin', :except => [:update_progress]
   require_role 'admin'

data/generators/talia_admin/templates/controllers/admin/roles_controller.rb

@@ -0,0 +1,8 @@
+class Admin::RolesController < ApplicationController
+  require_role 'admin'
+  layout 'admin'
+  
+  active_scaffold :role do |config|
+    # config.columns[:users].association.reverse = :user
+  end
+end

data/generators/talia_admin/templates/controllers/admin/sources_controller.rb

@@ -1,71 +1,9 @@
-require 'paginator'
-
 class Admin::SourcesController < ApplicationController
-  include TaliaCore
   require_role 'admin'
   layout 'admin'
-  cache_sweeper :av_media_sweeper, :only => :update
   
-  # GET /admin/sources
-  # GET /admin/sources.xml
-  def index
-    @sources = TaliaCore::Source.paginate :page => params[:page], :per_page => 10
-    
-    respond_to do |format|
-      format.html # index.html.erb
-      format.xml  { render :xml => @sources }
-      format.js do
-        render :update do |page|
-          page.replace_html 'sources', :partial => 'sources'
-        end
-      end
-    end
-  end
-
-  # GET /admin/sources/1/edit
-  def edit
-    @source = TaliaCore::Source.find_by_partial_uri(params[:id])
+  active_scaffold 'TaliaCore::ActiveSource' do |config|
+    config.columns = [:uri, :type]
   end
 
-  # PUT /admin/sources/1
-  # PUT /admin/sources/1.xml
-  def update
-    @source = TaliaCore::Source.find_by_id(params[:id])
-
-    respond_to do |format|
-      if @source.update_attributes(params[:source])
-        flash[:notice] = 'Source was successfully updated.'
-        format.html { redirect_to :action => "index" }
-        format.xml  { head :ok }
-      else
-        format.html { render :action => "edit" }
-        format.xml  { render :xml => @source.errors, :status => :unprocessable_entity }
-      end
-    end
-  end
-  
-  # GET /admin/sources/data/1
-  def data
-    # We need to specify the clause, because of Source#find overwrite the
-    # default behavior.
-    @source = TaliaCore::Source.find_by_id(params[:id])
-    
-    respond_to do |format|
-      format.js do
-        render :update do |page|
-          page.replace_html 'list', :partial => 'list'
-          page.insert_html :top, 'data', :partial => 'notice', :locals => { :text => 'Your file has been saved.'}
-          page[:data_notice].visual_effect :highlight
-          page[:data_notice].visual_effect :fade, :duration => 3
-          page.delay(3.1) { page.remove :data_notice }
-        end
-      end
-    end
-  end
-  
-  # GET /admin/sources/auto_complete_for_source/aaa
-  def auto_complete_for_source
-    @items = TaliaCore::Source.find_by_uri_token(params[:source][:predicates_attributes].first[:titleized])
-    render :inline => "<%= auto_complete_result @items, 'titleized' %>"
-  end
 end

data/generators/talia_admin/templates/controllers/admin/users_controller.rb

@@ -1,48 +1,10 @@
 class Admin::UsersController < ApplicationController
   require_role 'admin'
   layout 'admin'
-  PER_PAGE = 10
-
-  def index
-    @users = User.paginate(:page => params[:page], :per_page => PER_PAGE)
-  end
-  
-  def show
-    @user = User.find(params[:id])
-  end
-  
-  def new
-    @user = User.new
-  end
   
-  def create
-    @user = User.new(params[:user])
-    
-    if @user.save
-      flash[:notice] = "User was successfully created."
-      redirect_to :action => 'show', :id => @user
-    else
-      render :action => 'new'
-    end
+  active_scaffold :user do |config|
+    config.columns = [:login, :name, :email, :password, :password_confirmation, :roles]
+    list.columns.exclude :password, :password_confirmation
   end
   
-  def edit
-    @user = User.find(params[:id])
-  end
-  
-  def update
-    @user = User.find(params[:id])
-    
-    if @user.update_attributes(params[:user])
-      flash[:notice] = "User was successfully updated."
-      redirect_to :action => 'show', :id => @user
-    else
-      render :action => 'edit'
-    end
-  end
-  
-  def destroy
-    User.find(params[:id]).destroy
-    redirect_to :action => 'index'
-  end
 end

data/generators/talia_admin/templates/controllers/admin_controller.rb

@@ -2,6 +2,6 @@ class AdminController < ApplicationController
   require_role 'admin'
 
   def index
-    @links = %w(users custom_templates translations) # sources removed as non-working
   end
+  
 end

data/generators/talia_admin/templates/helpers/admin/roles_helper.rb

@@ -0,0 +1,2 @@
+module Admin::RolesHelper
+end

data/generators/talia_admin/templates/helpers/admin/users_helper.rb

@@ -1,2 +1,11 @@
 module Admin::UsersHelper
+  
+  def password_form_column(record, field_name)
+    password_field_tag field_name, record.password
+  end
+  
+  def password_confirmation_form_column(record, field_name)
+    password_field_tag field_name, record.password_confirmation
+  end
+  
 end

data/generators/talia_admin/templates/helpers/admin_helper.rb

@@ -8,4 +8,23 @@ module AdminHelper
         ["Print Page", "javascript:print();"]
       ] )
   end
+  
+  # Returns the title for the whole page. This returns the value
+  # set in the controller, or a default value
+  def page_title
+    @page_title || TaliaCore::SITE_NAME
+  end
+  
+  # Show each <tt>flash</tt> status (<tt>:notice</tt>, <tt>:error</tt>) only if it's present.
+  def show_flash
+    [:notice, :error].collect do |status|
+      %(<div id="#{status}">#{flash[status]}</div>) unless flash[status].nil?
+    end
+  end
+  
+  # Defines the pages that are visible in the menu
+  def active_pages
+    %w(users background sources) # translations not working at the moment, templates not ready for generic use
+  end
+  
 end

data/generators/{talia_base → talia_admin}/templates/migrations/populate_users.rb

@@ -1,9 +1,12 @@
 class PopulateUsers < ActiveRecord::Migration
   def self.up
     admins = Role.create :name => 'admin'
-    Role.create :name => 'user'
-    admin = User.create :login => 'admin', :email => 'admin@admins.foob',  :password => 'admin', :password_confirmation => 'admin'
+    users = Role.create :name => 'user'
+    admin = User.create :login => 'admin', :email => 'admin@admins.com',  :password => 'adminadmin', :password_confirmation => 'adminadmin'
     admin.roles << admins
+    admins.save!
+    users.save!
+    admin.save!
   end
 
   def self.down

data/generators/talia_admin/templates/models/role.rb

@@ -0,0 +1,3 @@
+class Role < ActiveRecord::Base
+  has_and_belongs_to_many :users
+end

data/generators/talia_admin/templates/public/stylesheets/backend.css

@@ -255,7 +255,7 @@ div.main_menu_box a{
 	float: left;
 	text-align:center;
 	padding: 0 20px;
-
+	margin-right: 30px;
 	font-size: 20px;
 	font-family:Georgia, "Times New Roman", Times, serif;
 }
@@ -267,14 +267,11 @@ div.main_menu_box a:hover{
 }
 
 #users_access a{
-	margin-right: 30px;
 }
 #sources_access a{
-	margin-right: 30px;
 }
 
 #custom_templates_access a{
-	margin-right: 30px;
 }
 
 #translations_access a{

data/generators/talia_admin/templates/views/admin/index.html.erb

@@ -1,5 +1,5 @@
-<% for link in @links %>
-  <div id="<%= link  %>_access" class="main_menu_box">
-    <%= link_to h(link.titleize), :controller => "admin/#{h(link)}" %>
+<% for admin_page in active_pages %>
+  <div id="<%= admin_page  %>_access" class="main_menu_box">
+    <%= link_to h(admin_page.titleize), :controller => "admin/#{h(admin_page)}" %>
   </div>
 <% end %>

data/generators/talia_admin/templates/views/admin/sources/_show.html.erb

@@ -0,0 +1,13 @@
+<% @source = TaliaCore::ActiveSource.find(:first, :conditions => { :id => params[:id] }, :prefetch_relations => true) %>
+
+<h1><%= @source[N::DCNS.title].first || N::URI.new(@source).to_name_s %></h1>
+<% for pred in @source.direct_predicates %>
+<h2><%= N::URI.new(pred).to_name_s %></h2>
+<ul>
+	<% for prop in @source[pred] %>
+	<li>
+		<%= prop.is_a?(TaliaCore::ActiveSource) ? link_to(N::URI.new(prop.uri).to_name_s, prop.uri.to_s) : prop.to_s %>
+	</li>
+	<% end %>
+</ul>
+<% end %>

data/generators/talia_admin/templates/views/layouts/admin.html.erb

@@ -32,11 +32,11 @@
       
       <div id="menu">
         <ul>
-          <li><%= link_to('Home', '/') %>
-          <li><%= link_to('Users', :controller => 'admin/users')  %></li>
-          <li><%= link_to('Translations', :controller => 'admin/translations') %></li>
-		  <li><%= link_to('Templates', :controller => 'admin/custom_templates')%>
-          <li><%= link_to('Logout', '/logout') %></li>
+		  <li><%= link_to('Home', '/') %>
+		  <% for admin_page in active_pages %>
+		  <li><%= link_to(admin_page.titleize, :controller => "admin/#{admin_page}")%></li>
+		  <% end %>
+          <li><%= link_to('Logout', :controller => 'sessions', :action => 'destroy') %></li>
         </ul>
       </div>
       

data/generators/talia_base/talia_base_generator.rb

@@ -4,14 +4,9 @@ class TaliaBaseGenerator < Rails::Generator::Base
   
   include GeneratorHelpers
   
-  def manifest
-    puts "Trying to install the plugins before generation"
-    plugin_script = File.join(RAILS_ROOT, 'script', 'plugin')
-    c = ::Config::CONFIG
-    ruby = File.join(c['bindir'], c['ruby_install_name']) << c['EXEEXT']
-    
-    system("#{ruby} #{plugin_script} install git://github.com/activescaffold/active_scaffold.git")
-    system("#{ruby} #{plugin_script} install git://github.com/timcharper/role_requirement.git")
+  def manifest    
+    install_plugin("git://github.com/activescaffold/active_scaffold.git")
+    install_plugin("git://github.com/timcharper/role_requirement.git")
     
     record do |m|
       # Some initialization stuff
@@ -24,6 +19,7 @@ class TaliaBaseGenerator < Rails::Generator::Base
       m.directory 'script'
       m.file 'script/configure_talia', 'script/configure_talia', :shebang => DEFAULT_SHEBANG, :chmod => 0755
       m.file 'script/prepare_images', 'script/prepare_images', :shebang => DEFAULT_SHEBANG, :chmod => 0755
+      m.file 'script/setup_talia_backend', 'script/setup_talia_backend', :shebang => DEFAULT_SHEBANG, :chmod => 0755
       
       # The whole app shebang of files
       files_in m, 'app'
@@ -31,14 +27,15 @@ class TaliaBaseGenerator < Rails::Generator::Base
       # The default ontologies
       files_in m, 'ontologies'
       
+      # Set up the rake tasks, only if we come from a gem
+      if(Gem.source_index.find_name('talia_core').first)
+        m.directory 'lib/tasks'
+        m.file 'tasks/talia_core.rk', 'lib/tasks/talia_core.rake'
+      end
+      
       # Add the migrations
       m.directory 'db/migrate'
       m.file "migrations/constraint_migration.rb", "db/migrate/constraint_migration.rb"
-      make_migration m, "create_sessions.rb"
-      make_migration m, "create_users.rb"
-      make_migration m, "create_open_id.rb"
-      make_migration m, "create_roles.rb"
-      make_migration m, "populate_users.rb"
       make_migration m, "create_active_sources.rb"
       make_migration m, "create_semantic_relations.rb"
       make_migration m, "create_semantic_properties.rb"
@@ -49,11 +46,7 @@ class TaliaBaseGenerator < Rails::Generator::Base
       make_migration m, "create_progress_jobs.rb"
       make_migration m, "bj_migration.rb"
       
-      # Set up the rake tasks, only if we come from a gem
-      if(Gem.source_index.find_name('talia_core').first)
-        m.directory 'lib/tasks'
-        m.file 'tasks/talia_core.rk', 'lib/tasks/talia_core.rake'
-      end
+      m.readme 'README'
     end
   end
   

data/generators/talia_base/templates/README

@@ -0,0 +1,15 @@
+
+The Core classes were successfully installed. You can now run
+
+script/configure_talia
+
+to set up the main configuration for database and RDF store. You can also 
+create the configuration by hand.
+
+WARNING: Talia can create HUGE loge files, depending on the level. It is
+highly recommended that you at least add something like this to your
+environment.rb file:
+
+config.logger = Logger.new("#{RAILS_ROOT}/log/#{RAILS_ENV}.log", 3, 104857600)
+
+After you are set up, you can start importing data.

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

@@ -1,14 +1,25 @@
 class SourcesController < ApplicationController
   include TaliaCore
   
-  before_filter :setup_format
-  
+  before_filter :setup_format, :except => [ 'dispatch', 'index' ]
+
   PER_PAGE = 10
   
   # GET /sources
   # GET /sources.xml
   def index
-    
+    @rdf_types ||= self.class.source_types
+
+    conditions = if(filter = params[:filter])
+      { :find_through => [N::RDF.type, N::URI.make_uri(filter, '+')] }
+    else
+      {}
+    end
+    if(will_paginate?)
+      @sources = TaliaCore::ActiveSource.paginate(conditions.merge(:page => params[:page]))
+    else
+      @sources = TaliaCore::ActiveSource.find(:all, conditions)
+    end
   end
 
   # GET /sources/1
@@ -43,9 +54,26 @@ class SourcesController < ApplicationController
     render :text => predicates, :status => status
   end
   
-  private 
-  
+  # Semantic dispatch. This will try to auto-handle URLs that are not otherwise
+  # caught and see if a source exists. If the source exists, the system will
+  # try to figure out how to render it. In this case, all relations on the source are
+  # automaticaly prefetched when it's loaded.
+  def dispatch
+    @source = TaliaCore::ActiveSource.find(params[:dispatch_uri], :prefetch_relations => true)
+    @types = @source.types
+    @types.each do |type|
+      caller = type.to_name_s('_')
+      self.send(caller) if(self.respond_to?(caller))
+    end
+    respond_to do |format|
+      format.xml { render :text => @source.to_xml }
+      format.rdf { render :text => @source.to_rdf }
+      format.html { render :action => template_for(@source) }
+    end
+  end
   
+  private 
+
   # Hack around routing limitation: We use the @ instead of the dot as a delimiter
   def setup_format
     split_id = params[:id].split('@')
@@ -54,9 +82,99 @@ class SourcesController < ApplicationController
     params[:format] = (split_id.size > 1) ? split_id.last : 'html'
   end
   
+  private
+
+  # Indicates if pagination is available.
+  def will_paginate?
+    return @will_paginate if(@will_paginate != nil)
+    return true if(defined?(WillPaginate))
+    begin
+      require 'rubygems'
+      require 'will_paginate'
+      @will_paginate = true
+    rescue MissingSourceFile
+      logger.warn('will_paginate cannot be found, pagination is not available')
+      @will_paginate = false
+    end
+    @will_paginate
+  end
+
+  # Returns the first matching template for the given source.
+  #
+  # * If the source has RDF types, it will try to find the first template
+  #   that matches one of the RDF types. If one is found is it returned.
+  # * Otherwise, it will look for a default template matching the source's
+  #   runtime class.
+  # * If no other template is found, this will return the default template name
+  def template_for(source)
+    source.types.each do |type|
+      if(template = template_map[type.uri.to_s])
+        return template
+      end
+    end
+    template = template_map[source.class.name.demodulize]
+    template ? template : "semantic_templates/default/default"
+  end
+
+  def template_map
+    self.class.template_map
+  end
+
+  class << self
+
+    def template_map
+      return @template_map if(@template_map && (ActiveSupport::Dependencies.mechanism != :require))
+      @template_map = {}
+      Dir["#{template_path}/*"].each do |dir|
+        next unless(File.directory?(dir) && File.basename(dir) != 'default')
+        map_templates_in(dir)
+      end
+      map_default_templates
+      @template_map
+    end
+
+    def template_path
+      @template_path ||= File.join(RAILS_ROOT, 'app', 'views', 'sources', 'semantic_templates')
+    end
+
+    def source_types
+      return @source_types if(@source_types)
+      @source_types = Query.new(N::URI).select(:type).distinct.where(:source, N::RDF.type, :type).execute
+      @source_types
+    end
+
+    private
+
+    # Creates a hash that can be used for looking up the correct semantic
+    # template for a source. This scans the template directory and connects
+    # the templates to the right RDF types
+    def map_templates_in(dir)
+      namespace = N::Namespace[File.basename(dir)]
+      namsp_object = N::Namespace[namespace]
+      TaliaCore.logger.warn("WARNING: Template files in #{dir} are never used, no namespace: #{namespace}.") unless(namesp_object)
+      return unless(namesp_object)
+      Dir["#{dir}/*"].each do |template|
+        next unless(File.file?(template))
+        template = template_basename(template)
+        @template_map[(namsp_object + template).to_s] = "semantic_templates/#{namespace}/#{template}"
+      end
+    end
   
-  def get_uri
-    
+    # Map the "default" templates to runtime types
+    def map_default_templates
+      Dir["#{template_path}/default/*"].each do |templ|
+        templ_name = template_basename(templ)
+        next unless(File.file?(templ) && templ_name != 'default' )
+        @template_map[templ_name.camelize] = "semantic_templates/default/#{templ_name}"
+      end
+    end
+  
+    # Get the "basename" of a template
+    def template_basename(template_file)
+      base = File.basename(template_file)
+      base.gsub(/\..*\Z/, '')
+    end
+
   end
   
 end

data/generators/talia_base/templates/app/helpers/sources_helper.rb

@@ -1,39 +1,23 @@
 module SourcesHelper
-  
-  # Renders the data
-  def render_source_data
-    result = ""
-    if(@source.data_records.size > 0)
-      @source.data_records.each do |data_record|
-        case(data_record.mime_type)
-        when 'text/html'
-          result += "<h3>HTML Data: #{data_record.location}</h3>"
-          result += "<div>"
-          result += widget(:html_data, :data => data_record)
-          result += "</div>"
-        when 'text/xml'
-          result += "<pre><code>"
-          result += data_record.get_escaped_content_string
-          result += "</code></pre>"
-        when 'text/plain'
-          result += "<h3>Plain Text Data: #{data_record.location}</h3>"
-          result += "<pre> #{data_record.all_text} </pre>"
-        else
-          result += "<h3>Found data object of type #{data_record.class} (#{data_record.mime_type}): #{data_record.location}</h3>"
-        end
-      end
-    else
-      result ="<h3>Sorry mate, no data objects here</h3>"
-    end
-    
-    result
+
+  # Link to the index
+  def index_link
+    link_to 'index', :action => 'index'
   end
-  
-  def source_toolbar
-    widget(:toolbar, :buttons => [ 
-        ["Lucca", {:action => 'show', :id => 'Lucca'}], 
-        ["All", {:action => 'index'} ],
-        ["Print Page", "javascript:print();"]
-      ] )
+
+  # Checks if the current filter points to the given type
+  def current_filter?(ctype)
+    (ctype.to_name_s('+') == params[:filter])
   end
+
+  # Links to filter for the given type
+  def filter_link_for(ctype)
+    link_to ctype.to_name_s, :action => 'index', :filter => ctype.to_name_s('+')
+  end
+
+  # Gets the title for a source
+  def title_for(source)
+    (source[N::DCNS.title].first || N::URI.new(source.uri).local_part)
+  end
+
 end

data/generators/talia_base/templates/app/views/sources/index.html.erb

@@ -1,2 +1,13 @@
 <h1>Sources found: <%= @sources.total_entries  %></h1>
-<%= widget(:grouped_list, :id => 'main_list', :group_property => :type, :group_values => @types, :group_increment => @group_increment) %>
+
+<div class="tags">
+<% for type in @rdf_types %>
+  <span class="<%= current_filter?(type) ? 'tag_selected' : 'tag' %>"><%= filter_link_for(type) %></span>
+<% end %>
+</div>
+
+<% for source in @sources %>
+  <p><%= link_to title_for(source), source.uri.to_s %> (<%= source.class.name  %>)</p>
+<% end  %>
+
+<%= will_paginate @sources %>