Changeset 56

Timestamp:

04/24/06 21:41:53 (7 years ago)

Author:

dema

Message:

Fixed exemplo-di.yml to work with the fixed YAML parser in Ruby 1.8.4

Location:

trunk

Files:

• db/exemplo-di.yml (modified) (6 diffs)
• lib/model_loader.rb (modified) (3 diffs)
• lib/query_builder.rb (modified) (2 diffs)

trunk/db/exemplo-di.yml

@@ -1 +1 @@
 Classes:
   Pessoa:
-    attrs: [ nome: String, email: Email, homepage: Url, telefone: String, foto: Image ]
-    links: [ [Trabalha: AreaDePesquisa ], [Escreve: Publicacao, EscritaPor] ]
+    attrs: [ { nome: String }, { email: Email }, { homepage: Url }, { telefone: String }, { foto: Image } ]
+    links: [ [ { Trabalha: AreaDePesquisa } ], [ { Escreve: Publicacao }, EscritaPor] ]
     label: nome
     indices:
@@ -15 +15 @@
   Professor:
     base: Pessoa
-    attrs: [ titulacao: String, origem_titulacao: String, ano_titulacao: String, atuacao: Text ]
-    links: [ [Orienta: Aluno, EhOrientadoPor] ]
+    attrs: [ { titulacao: String }, { origem_titulacao: String }, { ano_titulacao: String }, { atuacao: Text } ]
+    links: [ [ { Orienta: Aluno }, EhOrientadoPor ] ]
     label: nome
     indices:
@@ -25 +25 @@
   Aluno:
     base: Pessoa
-    attrs: [ matricula: String ]
-    links: [ [EhOrientadoPor: Professor, Orienta] ]
+    attrs: [ { matricula: String } ]
+    links: [ [ { EhOrientadoPor: Professor }, Orienta] ]
     label: nome
     anchors:
@@ -34 +34 @@
         label: self.nome
   Publicacao:
-    attrs: [ titulo: String, ano: String, observacao: Text ]
-    links: [ [EscritaPor: Pessoa, Escreve] ]
+    attrs: [ { titulo: String }, { ano: String }, { observacao: Text } ]
+    links: [ [ { EscritaPor: Pessoa }, Escreve] ]
     label: titulo
     indices:
@@ -43 +43 @@
         position: 1
   AreaDePesquisa:
-    attrs: [ nome: String, apresentacao: Text ]
-    links: [ [TemProfessorPesquisador: Professor, Trabalha], [TemAlunoPesquisador: Aluno, Trabalha] ]
+    attrs: [ { nome: String }, { apresentacao: Text } ]
+    links: [ [ { TemProfessorPesquisador: Professor }, Trabalha], [ { TemAlunoPesquisador: Aluno }, Trabalha ] ]
     label: nome
     indices:
@@ -81 +81 @@
       params: [ [Pessoa, Pessoa] ]
     PublicacaoAlfa: 
-      query: "[ alpha, type: Publicacao, order: titulo ]"
+      query: "[ alpha, { type: Publicacao }, { order: titulo } ]"
 Indexes:
   Alunos:

trunk/lib/model_loader.rb

@@ -6 +6 @@
 
 class ModelLoader
-        attr_reader :classes, :contexts, :indices, :links, :model, :nodes
+  attr_reader :classes, :contexts, :indices, :links, :model, :nodes
   
   module WarnIfNil
@@ -56 +56 @@
         position = 0
         link.first.each do |link_name, link_target| 
-          @stdout.puts "Link: #{link_name} in Class: #{classe_nome}"
+          @stdout.puts "Link: #{classe_nome} #{link_name} #{link_target}"
           @links[link_name] = Link.create("name" => link_name, "nav_class" => @classes[classe_nome], "target_nav_class" => @classes[link_target], "position" => position) 
           position += 1
@@ -72 +72 @@
       end
     end
+  
   end
 

trunk/lib/query_builder.rb

@@ -1 +1 @@
 class QueryBuilder
 
-        TEMPLATES = {
-                :alpha => "
-                  SELECT * FROM {id} rdf:type {sr:@@type}; serql:directType {type}; [ sr:@@order {@@order} ]
-                  ORDER BY @@order USING NAMESPACE sr = <http://sr#>",
-                :x_by_y => "
-                  SELECT DISTINCT id, type, @@order FROM {id} rdf:type {sr:@@source_type}; serql:directType {type}; [ sr:@@order {@@order} ],
-                  {link} sr:node_id {id}; rdf:type {sr:@@link_type}; sr:target_node_id {?} rdf:type {sr:@@target_type} 
-                  ORDER BY @@order USING NAMESPACE sr = <http://sr#>",
-                :y_by_x => "
-                  SELECT DISTINCT id, type, @@order FROM {id} rdf:type {sr:@@source_type}; serql:directType {type}; [ sr:@@order {@@order} ],
-                  {link} sr:target_node_id {id}; rdf:type {sr:@@link_type}; sr:node_id {?} rdf:type {sr:@@target_type} 
-                  ORDER BY @@order USING NAMESPACE sr = <http://sr#>"
-        }
-        
-        class << self
-
-          def params_for(template)
-            tmpl = TEMPLATES[template]
-            raise "Invalid template key" if tmpl.nil? 
-            params = tmpl.scan(/@@(\w+)/).flatten.uniq
-                        params.size > 0 ? params : nil
-                end
-                
+  TEMPLATES = {
+    :alpha => "
+      SELECT * FROM {id} rdf:type {sr:@@type}; serql:directType {type}; [ sr:@@order {@@order} ]
+      ORDER BY @@order USING NAMESPACE sr = <http://sr#>",
+    :x_by_y => "
+      SELECT DISTINCT id, type, @@order FROM {id} rdf:type {sr:@@source_type}; serql:directType {type}; [ sr:@@order {@@order} ],
+      {link} sr:node_id {id}; rdf:type {sr:@@link_type}; sr:target_node_id {?} rdf:type {sr:@@target_type} 
+      ORDER BY @@order USING NAMESPACE sr = <http://sr#>",
+    :y_by_x => "
+      SELECT DISTINCT id, type, @@order FROM {id} rdf:type {sr:@@source_type}; serql:directType {type}; [ sr:@@order {@@order} ],
+      {link} sr:target_node_id {id}; rdf:type {sr:@@link_type}; sr:node_id {?} rdf:type {sr:@@target_type} 
+      ORDER BY @@order USING NAMESPACE sr = <http://sr#>"
+  }
+  
+  class << self
+    def params_for(template)
+      tmpl = TEMPLATES[template]
+      raise "Invalid template key" if tmpl.nil? 
+      params = tmpl.scan(/@@(\w+)/).flatten.uniq
+      params.size > 0 ? params : nil
+    end
+    
     def parse(query)
     
@@ -38 +37 @@
       end
     rescue => ex
-      raise "Invalid QueryBuilder expression - #{ex}"
+      raise "Invalid QueryBuilder expression:\r\n#{ex}\r\n#{ex.backtrace}"
     end