easy_data 0.0.5 → 0.0.6

data/README

@@ -13,6 +13,10 @@ At the end, execute the next task:
 
    rake easy_data:install RAILS_ENV=development
 
+To start with administration, you should assign at admin user:
+
+   rake easy_data:add_user[user,pass] RAILS_ENV=development
+
 Commandas and Query
 ======================
 

data/lib/controllers/easy_datas_controller.rb

@@ -58,6 +58,7 @@ class EasyDatasController < ActionController::Base
   def info_easy_data
       models = DataModels.load_models
       @list = []
+      @settings ||= YAML::load(File.open("#{RAILS_ROOT}/config/easy_data/setting.yaml"))
       
       models.each do |mod|
        @list << "#{mod.gsub("::","_")}"
@@ -83,6 +84,7 @@ class EasyDatasController < ActionController::Base
 
   def custom_rdf
     @models = DataModels.load_models
+    @settings ||= YAML::load(File.open("#{RAILS_ROOT}/config/easy_data/setting.yaml"))
   end
 
   def model_attributes
@@ -91,6 +93,7 @@ class EasyDatasController < ActionController::Base
     
     @model_attributes = rdf.get_attributes_model(params[:model])
     @model = params[:model]
+    
 
     render :partial => "model_attributes",:layout => nil
 
@@ -126,14 +129,22 @@ class EasyDatasController < ActionController::Base
  
        @namespace = params[:id]
        @model_attributes = rdf.get_attributes_model(params[:model])
-    
+       
        properties = (eval namespace).properties_form
-  
-       render :inline => "<span>Property:</span><%= select type+'_property',attribute,properties,{:prompt => 'Select a property...'} -%><span class='rdf_info'>(Current value: <%= current_value%>)</span>",
-                        :locals => {:properties => properties,
-                                    :type => params[:type],
-                                    :attribute => params[:attribute],
-                                    :current_value => @model_attributes[params[:type]][params[:attribute]][:property]}
+       
+       if params[:attribute]!=params[:model]
+         render :inline => "<span>Property:</span><%= select type+'_property',attribute,properties,{:prompt => 'Select a property...'} -%><span class='rdf_info'>(Current value: <%= current_value%>)</span>",
+                          :locals => {:properties => properties,
+                                      :type => params[:type],
+                                      :attribute => params[:attribute],
+                                      :current_value => @model_attributes[params[:type]][params[:attribute]][:property]}
+       else
+         render :inline => "<span>Property:</span><%= select 'property',attribute,properties,{:prompt => 'Select a property...'} -%><span class='rdf_info'>(Current value: <%= current_value%>)</span><br />",
+                          :locals => {:properties => properties,
+                                      :attribute => params[:model],
+                                      :current_value => @model_attributes[:property]}
+
+       end
      else
        render :inline => ""
      end
@@ -159,37 +170,84 @@ class EasyDatasController < ActionController::Base
     
      rdf = ModelRdf.new
      @model = params[:model]
-
-     params["rdf_type_attributes"].each do |att,value|
-       if params["attributes_property"][att] != "" && value != ""
-        rdf.update_attributes_model(params[:model],att,'namespace',value)
-        rdf.update_attributes_model(params[:model],att,'property',params["attributes_property"][att])
-        rdf.update_attributes_model(params[:model],att,'privacy',rdf.privacy(params[:privacy][att].to_i))
-       end
+     unless params["attributes_property"].nil?
+      params["rdf_type_attributes"].each do |att,value|
+        if params["attributes_property"][att] != "" && value != ""
+         rdf.update_attributes_model(params[:model],att,'namespace',value)
+         rdf.update_attributes_model(params[:model],att,'property',params["attributes_property"][att])
+         rdf.update_attributes_model(params[:model],att,'privacy',rdf.privacy(params[:privacy][att].to_i))
+        end
+      end
      end
-    
-     params["rdf_type_associations"].each do |assoc,value|
-       if value != "" && params["associations_property"][assoc] != ""
-        rdf.update_associations_model(params[:model],assoc,'namespace',value)
-        rdf.update_associations_model(params[:model],assoc,'property',params["associations_property"][assoc])
-        rdf.update_associations_model(params[:model],assoc,'privacy',rdf.privacy(params[:privacy][assoc].to_i))
-       end
+     unless params["associations_property"].nil?
+      params["rdf_type_associations"].each do |assoc,value|
+        if value != "" && params["associations_property"][assoc] != ""
+         rdf.update_associations_model(params[:model],assoc,'namespace',value)
+         rdf.update_associations_model(params[:model],assoc,'property',params["associations_property"][assoc])
+         rdf.update_associations_model(params[:model],assoc,'privacy',rdf.privacy(params[:privacy][assoc].to_i))
+        end
+      end
+     end
+     
+     rdf.update_model(params[:model],"privacy",params[:privacy][params[:model]]) if params[:privacy][params[:model]]
+     if params[:property]
+       rdf.update_model(params[:model],"namespace",params[:namespace][params[:model]])
+       rdf.update_model(params[:model],"property",params[:property][params[:model]]) 
      end
-
      rdf.save
 
      @model_attributes = rdf.get_attributes_model(@model)
      
      render :partial => "model_attributes",:layout => nil
   end
+  
+  def view_settings
+    @settings ||= YAML::load(File.open("#{RAILS_ROOT}/config/easy_data/setting.yaml"))
+    render :template => "easy_datas/view_settings", :layout => false
+  end
+
+  def settings
+     @settings ||= YAML::load(File.open("#{RAILS_ROOT}/config/easy_data/setting.yaml"))
+     @images = Dir["#{RAILS_ROOT}/public/images/*"].map{|img| [img.gsub("#{RAILS_ROOT}/public/images/",""),img.gsub("#{RAILS_ROOT}/public/images/","")]}
+     render :partial => "settings",:layout => nil
+  end
+
+  def custom_settings
+     @settings = YAML::load(File.open("#{RAILS_ROOT}/config/easy_data/setting.yaml"))
+     
+     if !params["project"]["project"].empty? && params["project"]["project"]!=@settings["project"]["name"]
+       @settings["project"]["name"] = params["project"]["project"]
+     end
+
+     if !params["project"]["logo"].empty? && params["project"]["logo"]!=@settings["project"]["logo"]
+       @settings["project"]["logo"] = params["project"]["logo"]
+     end
+
+     if !params["project"]["description"].empty? && params["project"]["description"]!=@settings["project"]["description"]
+       @settings["project"]["description"] = params["project"]["description"]
+     end
+     
+     if !params["user_admin"]["user"].empty? && !params["user_admin"]["pass"].empty?
+       (@settings["user_admin"]["user"] = params["user_admin"]["user"]) if @settings["user_admin"]["user"]!=params["user_admin"]["user"]
+       (@settings["user_admin"]["pass"] = params["user_admin"]["pass"]) if @settings["user_admin"]["pass"]!=params["user_admin"]["pass"]
+     end
+
+     if !params["access"]["ip"].empty?
+       (@settings["access"]["ip"] = params["access"]["ip"]) if params["access"]["ip"]!=@settings["access"]["ip"]
+     end
+     
+     save_settings(@settings)
+
+     render :template => "easy_datas/view_settings",:layout => false
+  end
 
   def authenticate_user
   end
 
   def login
-    admin = YAML::load(File.open("#{RAILS_ROOT}/config/easy_data/setting.yaml")) 
+    @admin = YAML::load(File.open("#{RAILS_ROOT}/config/easy_data/setting.yaml"))
 
-    if admin["user_admin"]["user"] == params[:nick] && admin["user_admin"]["password"] == params[:pass]
+    if @admin["user_admin"]["user"] == params[:nick] && @admin["user_admin"]["password"] == params[:pass]
       @current_user = params[:nick]
       session[:easy_data_session] = params[:nick]
       redirect_to :action => "custom_rdf"
@@ -223,9 +281,21 @@ class EasyDatasController < ActionController::Base
   end
 
   def authenticated
-    if session[:easy_data_session].nil?
-      redirect_to :action => "authenticate_user"
+    admin = YAML::load(File.open("#{RAILS_ROOT}/config/easy_data/setting.yaml"))
+    
+    if admin["access"]["ip"].nil? || admin["access"]["ip"].to_s == request.ip.to_s
+     if session[:easy_data_session].nil?
+       redirect_to :action => "authenticate_user"
+     end
+    else
+      render :nothing => true, :status => 404
     end
   end
 
+  def save_settings(settings)
+     file = File.open("#{RAILS_ROOT}/config/easy_data/setting.yaml",'w')
+     file.puts YAML::dump(settings)
+     file.close
+  end
+
 end

data/lib/data_models/RDFa.rb

@@ -0,0 +1,91 @@
+require "data_models/model_rdf"
+ 
+class RDFa 
+
+   def self.model(model)
+     
+   end
+
+   def self.attribute(model,attributes)
+      
+   end
+
+   ####################################
+   # HTML Tags
+   ####################################
+
+   #-----------------------------------------------Links
+   def a(model,href,attribute=nil,options=nil)
+      _html_code('a',model,attribute,"href='#{href||'#'}' "+options.to_s)
+   end
+
+   #-----------------------------------------------End Links
+   #-----------------------------------------------List_to_user
+   def ul(model,value,attribute=nil,options=nil)
+      _html_code_list('ul',model,value,options)
+   end
+ 
+   def ol(model,value,attribute=nil,options=nil)
+      _html_code_list('ol',model,value,options)
+   end
+   #-----------------------------------------------End List_to_user
+   #------------------------------------------------AUTO-CLOSED   
+   def img(model,value,attribute=nil,options=nil)
+      _html_code('img',model,nil,attribute,"src='#{value||'#'}' "+options.to_s)
+   end
+
+   def input(model,type,attribute=nil,options=nil)
+      nil
+   end
+   #------------------------------------------------END AUTO-CLOSED   
+
+   # This method is called if doesnt exist the method called by class's users
+   def method_missing(sym, *args, &block)
+     _html_code(sym.to_s,args[0],args[1],args[2],args[3])
+   end
+
+   #######################################
+   # Generate html code with RDFa info
+   #######################################
+   private
+
+   def _html_code(tag,model,value,attribute,options = "")
+    rdf_info = ModelRdf.new    
+
+    if attribute.nil? #prefix + type_of
+      options = (options || "") + rdf_info.get_prefix(model)
+      options = options + rdf_info.model(model)
+    else  #property
+      options = (options||"") + rdf_info.attribute(model,attribute)
+    end
+    
+    unless value.nil?
+     "<#{tag} #{options}>#{value}</#{tag}>"
+    else
+     "<#{tag} #{options}/>"
+    end
+   end
+
+   def _html_code_list(tag,model,value,options = "")
+    rdf_info = ModelRdf.new    
+
+    options = (options || "") + rdf_info.get_prefix(model)
+    options = options + rdf_info.model(model)
+    
+    data_model = rdf_info.get_attributes_model(model)
+
+    html = "<#{tag} #{options}>"
+    unless value.nil?
+     data_model["attributes"].each do |att,info|
+      if info[:namespace] && info[:property]
+        html << "<li property='#{info[:namespace]}:#{info[:property]}'>#{value.attributes[att]}</li>"
+      end
+     end
+    
+     html << "</#{tag}>"
+    end
+    html
+   end
+
+
+end

data/lib/data_models/linked_data_graph.rb

@@ -37,7 +37,7 @@ class LinkedDataGraph
               eval mod_assoc
            rescue
              begin
-              eval (mod_assoc.pluralize)
+              eval mod_assoc.pluralize
               mod_assoc = (mod_assoc.pluralize)
              rescue
                  (mod_assoc = info.options[:source].to_s.camelize)if info.options[:source]
@@ -57,22 +57,19 @@ class LinkedDataGraph
       
       file.puts "digraph G {"
       #file.puts 'size="15,15";'
-      file.puts "rankdir = LR;"
-      file.puts "#{model}[color=green]"
-     
+      file.puts 'graph [rotate=0, rankdir="LR"]'
+      file.puts 'node [color="#333333", style=filled,shape=box, fontname="Trebuchet MS"]'
+      file.puts 'edge [color="#666666", arrowhead="open", fontname="Trebuchet MS", fontsize="11"]'
+      file.puts model.to_s+'  [fillcolor="#116611", fontcolor="white"]'
+
       #Draw nodes
 
       graph_info[:assoc].each do |assoc|
-         file.puts "#{assoc} [color=yellow]"
+         file.puts assoc.to_s+' [fillcolor="#294b76", fontcolor="white"]'
          file.puts '"'+model+'" -> "'+assoc.to_s+'"[dir=none];'
       end
 
 
-      #Draw associations between nodes
-     # graph_info[:assoc].each do |assoc,nodes|
-     #   file.puts nodes+' [dir=none];'
-     # end      
-     
       file.puts "}"
 
       file.close

data/lib/data_models/model_rdf.rb

@@ -23,21 +23,80 @@ class ModelRdf
    def get_models
       self.model_rdf
    end
+   
+   def public?()
+      self.model_rdf[model][:privacy] == "Public"
+   end
+   
+   def private?()
+      self.model_rdf[model][:privacy] == "Private"
+   end
 
+   def hidden?()
+      self.model_rdf[model][:privacy] == "Hidden"
+   end
+
+   def get_rdf_info_model(model)
+      {:namespace => self.model_rdf[model][:namespace],:property => self.model_rdf[model][:property]}
+   end
    #Return attributes of model stored in the configuration yaml file
    def get_attributes_model(model)
       self.model_rdf[model] 
    end
+   
+   # RDFa: Return attributes of model RDF info
+   def model(model)
+     info = get_rdf_info_model(model)
+     if info[:property] && info[:property]!= "not defined"
+      " typeof='#{info[:namespace]}:#{info[:property]}'"
+     else
+      " "
+     end
+   end
+  
+   # update model rdf info
+   def update_model(model,param,value)
+      self.model_rdf[model][param.to_sym] = value
+   end
 
    # update attributes with rdf properties.
    def update_attributes_model(model,attribute,param,value)
       self.model_rdf[model]['attributes'][attribute][param.to_sym] = value
    end
    
+   # RDFa: Return attribute rdf info
+   def attribute(model,attribute)
+      att_rdf = self.model_rdf[model]['attributes'][attribute]
+      " property='#{att_rdf[:namespace]}:#{att_rdf[:property]}'"
+   end
+
    def update_associations_model(model,association,param,value)
       self.model_rdf[model]['associations'][association][param.to_sym] = value
    end
-   
+
+   # RDFa: return a string with all prefix used to describes attributes
+   def get_prefix(model)
+      prefix = []
+      data_model = get_attributes_model(model)
+      data_model["attributes"].each do |att,info|
+       if info[:namespace] && info[:namespace] != 'not defined'
+        puts info[:namespace]
+        prefix << "#{info[:namespace]}:#{(eval "EasyData::RDF::#{info[:namespace].upcase}.get_uri")} "
+       end
+      end
+      data_model["associations"].each do |assoc,info|
+       if info[:namespace] && info[:namespace] != 'not defined'
+        prefix << "#{info[:namespace]}:#{(eval "EasyData::RDF::#{info[:namespace].upcase}.get_uri")} "
+       end
+      end
+
+      if data_model[:namespace] && data_model[:namespace] != 'not defined'
+        prefix << "#{data_model[:namespace]}:#{(eval "EasyData::RDF::#{data_model[:namespace].upcase}.get_uri")}"       
+      end
+
+      prefix.uniq.join(" ")
+   end
+
    # Return privacy of a attribute 
    def privacy(index)
      @@privacy[index]
@@ -50,31 +109,34 @@ class ModelRdf
      file.close
    end
 
-   
    #######################################################################
-   # Building RDF                           
+   # Building RDF
    #######################################################################
 
    def get_model_rdf(query,model,host)
-     request = {:body => "",:header => {"xmlns:rdf"=>"http://www.w3.org/1999/02/22-rdf-syntax-ns#"}}
-     elements = {}
-     models = []
-     query.each do |element|
-       elements[element.id] = {'description' => "#{host}/#{element.class.to_s}/#id:#{element.id}",
-                               'attributes' => get_properties_tag(element),
-                               'associations' => get_associations_tag(element)
-                               }
+      if public?model.to_sym
+       request = {:body => "",:header => {"xmlns:rdf"=>"http://www.w3.org/1999/02/22-rdf-syntax-ns#"}}
+       elements = {}
+       models = []
+       query.each do |element|
+          elements[element.id] = {'description' => "#{host}/#{element.class.to_s}/#id:#{element.id}",
+                                  'attributes' => get_properties_tag(element),
+                                  'associations' => get_associations_tag(element)
+                                 }
        
-       models << element.class.to_s
-     end     
-     attributes = {}
-     request[:body] = elements
-     models.each do |mod|
-       attributes = get_attributes_model(mod) || get_attributes_model((eval mod).base_class.to_s)
-       request[:header].merge!(get_header(attributes))
-     end
-     request
-     #Generating of rdf variable
+          models << element.class.to_s
+       end     
+    
+       attributes = {}
+       request[:body] = elements
+       models.each do |mod|
+         attributes = get_attributes_model(mod) || get_attributes_model((eval mod).base_class.to_s)
+         request[:header].merge!(get_header(attributes))
+       end
+       request
+      else
+       {}
+      end
    end
 
    def get_header(attributes)

data/lib/easy_data/tasks.rb

@@ -44,7 +44,7 @@ namespace :easy_data do
    easy_data_dir = "#{RAILS_ROOT}/config/easy_data"  
 
    unless File.exist? easy_data_dir
-     File.makedirs easy_data_dir
+     Dir.mkdir easy_data_dir
    end
 
    file = File.open("#{easy_data_dir}/rdf_info.yaml","w")
@@ -90,6 +90,7 @@ namespace :easy_data do
      end
 
      FileUtils.copy(File.join(File.dirname(__FILE__), 'templates/stylesheets/easy_data_style.css'),"#{easy_data_stylesheets}/easy_data_style.css")
+     
      FileUtils.cp_r(File.join(File.dirname(__FILE__), 'templates/images/'),"#{easy_data_stylesheets}/")
      
      unless File.exist? easy_data_linked_data_graphs
@@ -110,7 +111,10 @@ namespace :easy_data do
     file = File.open("#{easy_data_dir}/setting.yaml","w")
     file.puts "#User admin:"
 
-    admin = {"user_admin" =>{"user" => args.user,"pass" => args.pass}}
+    admin = {"user_admin" =>{"user" => args.user,"pass" => args.pass},
+             "project" => {"name" => nil, "contact_email" => nil,"description" => nil},
+             "access" => {"ip" => nil}
+            }
     file.puts admin.to_yaml
 
     file.close

data/lib/easy_data/templates/easy_datas/_data_publications.html.erb

@@ -13,4 +13,20 @@
 </div>
 
 <div id="info_models" class="ed_info_models">
+
+    <span class="title_data_publications">Bienvenido al sistema de información de la interfaz RDF del proyecto <%#= proyect%></span>
+<p>
+    En el panel izquierdo se listan los modelos de la aplicación  de los cuales se han publicado sus datos para acceso mediante URI's desreferenciables. Si pincha sobre cualquiera de ellos podrá visualizar los datos publicados de éstos. Los datos se dividen en atributos, que son propios del modelo y que lo describen y, asociaciones con otros modelos. De esta forma tendrá una visión de la información que puede consultar a la aplicación mediante la interfaz RDF de la que dispone.
+</p>
+<p>
+    Si tiene alguna duda sobre el funcionamiento o el modo de acceso a los datos publicados y no encuentra soluci&oacute;n aqu&iacute; puede enviarnos un email de consulta a <%#= email_admin%>.
+</p>
+<p>
+    Un saludo.
+</p>
+
+
+
+
+
 </div>

data/lib/easy_data/templates/easy_datas/_footer.html.erb

@@ -0,0 +1,3 @@
+<div id="easy_data_footer" class="easy_data_footer">
+  <a href="https://rubygems.org/gems/easy_data" title="Web Project EasyData"><%= image_tag(image_path("/stylesheets/easy_data/images/logo_ft.png"))%></a>
+</div>

data/lib/easy_data/templates/easy_datas/_list_model_info.html.erb

@@ -0,0 +1,23 @@
+<div id="select_privacy">
+   <span>Access privacy: </span>
+     <%= select "privacy","#{model_name}", {"Hidden" => "Hidden","Public" => "Public","Privacy" => "Privacy"}%>
+   <span class="rdf_info"><%= "(Current value: #{model[:privacy]})"%></span> 
+</div>
+
+<br />
+
+<div id="<%="select_#{model_name}"%>">
+  <span>Rdf Type: </span>
+    <%= select "namespace","#{model_name}",namespaces,{:prompt => "Select a namespaces..."} -%>
+  <span class="rdf_info"><%= "(Current value: #{model[:namespace]})" %></span>
+</div>
+         
+  <%= observe_field "namespace_#{model_name}",{:url => {:controller => "easy_datas",:action => "load_properties",
+                                                       :block=>"properties_#{model_name}",:attribute => model_name,:model => model_name,:type => type},
+                                               :with => '"id="+value',
+                                               :on => :selected,
+                                               :update => "properties_#{model_name}"}
+  %>
+<br/>
+<div id="<%= "properties_#{model_name}"%>">&nbsp;</div>
+

data/lib/easy_data/templates/easy_datas/_list_properties_edit.html.erb

@@ -6,7 +6,7 @@
         <% unless properties[:privacy].nil?%> 
            <div id="select_privacy">
              <span>Access privacy: </span>
-               <%= select "privacy",att, {"Hidden" => 0,"Public" => 1,"Authenticated" => 2}%>
+               <%= select "privacy",att, {"Hidden" => "Hidden","Public" => "Public","Private" => "Private"}%>
              <span class="rdf_info"><%= "(Current value: #{properties[:privacy]})"%></span> 
            </div>
            <br />

data/lib/easy_data/templates/easy_datas/_menu.html.erb

@@ -1,8 +1,24 @@
 <div class="ed_main_menu">
   <ul>
-    <li><%= link_to_remote "Data Publications",:url => {:controller => "easy_datas",:action => "data_publicated"},:update => "information_content"%></li>
-    <li><%= link_to_remote "Linked Data",:url => {:controller => "easy_datas",:action => "load_linked_data_graph"},:update => "information_content"%></li>
-    <li><%= link_to_remote "Access to Data", :url => {:controller => "easy_datas", :action => "access_to_data"},:update => "information_content"%></li>
-    <li><%= link_to_remote "FAQ", :url => {:controller => 'easy_datas',:action => 'faq'},:update => "information_content"%></li>
+    <li class="layer_menu"><%= "#{@settings["project"]["name"]||nil} - "%>Data Publications Information</li>
+    <li class="menu_link"><%= link_to "Data Publications",{:controller => "easy_datas",:action => "info_easy_data"},
+                                                                  {:title => "Data Publications"}
+                          %>
+    </li>
+    <li class="menu_link"><%= link_to_remote "Linked Data",:url => {:controller => "easy_datas",:action => "load_linked_data_graph"},
+                                                           :update => "information_content",
+                                                           :html => {:title => "Linked Data"}
+                          %>
+    </li>
+    <li class="menu_link"><%= link_to_remote "Access to Data", :url => {:controller => "easy_datas", :action => "access_to_data"},
+                                                               :update => "information_content",
+                                                               :html => {:title => "How to access to data publications?"}
+                          %>
+    </li>
+    <li class="menu_link"><%= link_to_remote "Quiz", :url => {:controller => 'easy_datas',:action => 'faq'},
+                                                     :update => "information_content",
+                                                     :html => {:title => "Any questions?"}
+                          %>
+    </li>
   </ul>
 </div>

data/lib/easy_data/templates/easy_datas/_menu_custom.html.erb

@@ -0,0 +1,15 @@
+<div class="ed_main_menu">
+  <ul>
+    <li class="layer_menu"><%= "#{@settings["project"]["name"]||nil} - "%>Custom RDF Information</li>
+    <li class="menu_link"><%= link_to "Custom Rdf",{:controller => "easy_datas",:action => "custom_rdf"},
+                                                   {:title => "Custom RDF information"}
+                          %>
+    </li>
+    <li class="menu_link"><%= link_to_remote "Settings",:url => {:controller => "easy_datas",:action => "view_settings"},
+                                                        :update => "custom_content",
+                                                        :html => {:title => "Project Settings"}
+                          %>
+    </li> 
+    <li class="menu_link"><a href="mailto:jnillo9@gmail.com?subject='Any cuestion about EasyData'" title="Cuestion to Jnillo">Quiz</a></li>
+  </ul>
+</div>

data/lib/easy_data/templates/easy_datas/_model_attributes.html.erb

@@ -2,9 +2,25 @@
 
 <%if @model_attributes.respond_to?:each%>
    <!-- ATTRIBUTES -->
-   <span>Resource Attributes</span>
+   
+   <span class="title_data_publications">Model</span>
+   <div class="attributes_info">
+    <div id="privacy">
+      <span>Access privacy:</span>
+      <span><%= @model_attributes[:privacy] %></span> 
+    </div>
+    <div id="<%="namespace"%>">
+      <span><b>Rdf Namespace:</b></span>
+      <span><%= @model_attributes[:namespace] -%></span>
+    </div>
+    <div id="<%= "property"%>">
+      <span><b>Property:</b></span>
+      <span><%=@model_attributes[:property] %></span>
+    </div>
+   </div>
+   <span class="title_data_publications">Resource Attributes</span>
    <%= render :partial => "list_properties",:locals => {:attributes => @model_attributes["attributes"]} %> 
-   <span>Associations whit others Resources</span>
+   <span class="title_data_publications">Associations whit others Resources</span>
    <!--ASSOCIATIONS-->
    <%= render :partial => "list_properties",:locals => {:attributes => @model_attributes["associations"]} %> 
 <%else%>
@@ -14,13 +30,13 @@
      <%= link_to_remote "Edit",:url => {:controller => 'easy_datas', 
                                         :action => :model_attributes_edit, 
                                         :model => @model},
-                               :update => "#{@model}_attributes",
-                               :success => "Effect.Appear('#{@model}_attributes', { duration: 0.4 })",
+                               :update => "model_attributes",
+                               :success => "Effect.Appear('#{@model}_attributes', { duration: 0.4 });",
                                :failure => "alert('Ooops! An error occurred.')"                
      %>
 </span>
 
- <%= link_to_function "[Close]","Effect.Fade('#{@model}_attributes',{duration: .3})",:class=>"close_list"%>
+ <%= link_to_function "[Close]","Effect.Fade('model_attributes',{ duration : 0.3});",:class=>"close_list"%>
 
 </div>
 

data/lib/easy_data/templates/easy_datas/_model_attributes_edit.html.erb

@@ -1,11 +1,14 @@
 <% form_remote_tag :url => {:controller => 'easy_datas',:action => "custom_attributes",:model => @model},
-                   :update => "#{@model}_attributes" do -%>
+                   :update => "list_attributes" do -%>
+
 <div id="list_attributes" class="model_attributes">
+   <span class="title_data_publications">Model</span>
+   <%= render :partial => "list_model_info", :locals => {:model_name => @model, :model=> @model_attributes, :namespaces => @namespaces}%>
    <!-- Attributes -->
-   <span>Attributes</span>
+   <span class="title_data_publications">Attributes</span>
    <%= render :partial => "list_properties_edit",:locals => {:attributes => @model_attributes["attributes"],:model => @model,:namespaces => @namespaces,:type => "attributes"}%>
    <!--Associations-->
-   <span>Associations</span>
+   <span class="title_data_publications">Associations</span>
    <%= render :partial => "list_properties_edit",:locals => {:attributes => @model_attributes["associations"],:model => @model,:namespaces => @namespaces,:type => "associations"}%>
 <%= submit_tag "Send" %>
 <%= link_to_function "[Close]","Effect.Fade('#{@model}_attributes',{duration: .3})",:class=>"close_list"%>

data/lib/easy_data/templates/easy_datas/_model_attributes_info.html.erb

@@ -1,16 +1,17 @@
 <% if @model_attributes["attributes"]%>
-<h2> Attributes: </h2>
-<ul>
+ <span class="data_info"> Attributes: </span>
+ <ul>
   <%@model_attributes["attributes"].keys.each do |att|%>
    <li><%=att%></li>
   <%end%>
 </ul>
 <%end%>
 <%if @model_attributes["associations"] %>
-<h2> Associations: </h2>
+<span class="data_info"> Associations: </span>
 <ul>
   <%@model_attributes["associations"].keys.each do |assoc|%>
     <li><%=assoc%></li>
   <%end%>
 </ul>
 <%end%>
+

data/lib/easy_data/templates/easy_datas/_settings.html.erb

@@ -0,0 +1,30 @@
+<%- form_remote_for :settings,:url => {:controller => "easy_datas",:action=>"custom_settings"},:update => "custom_content" do%>
+
+ <table class="settings_table">
+   <tr>
+    <th colspan=2>Proyecto</th>
+   </tr>
+   <tr>
+    <td><span>Project's name(?):</span></td><td><%= text_field "project","project",:value =>@settings["project"]["name"] %></td>
+   </tr>
+   <tr>
+    <td><span>Logo(?):</span></td><td><%= select "project","logo",@images,{:selected => @settings["project"]["logo"]||nil,:prompt => "Select logo ..."}%></td>
+   </tr>
+   <tr>
+    <td><span>Description(?):</span></td><td><%= text_area "project","description","cols" => 80,"rows"=>5,:value=>@settings["project"]["description"]%></td>
+   </tr>
+   <tr><th colspan="2">Access</th>
+   <tr>
+     <td><span>User:</span></td><td><%= text_field "user_admin","user",:value=>@settings["user_admin"]["user"]%></td>
+   </tr>
+   <tr> 
+     <td><span>Password:</span></td><td><%= password_field "user_admin","pass"%></td>
+   </tr>
+   <tr> 
+     <td><span>IP:</span></td><td><%= text_field "access","ip",:value => @settings["access"]["ip"]%></td>
+   </tr>
+  </table>
+
+ <%= submit_tag %>
+
+<%end%>

data/lib/easy_data/templates/easy_datas/custom_rdf.html.erb

@@ -1,24 +1,26 @@
-<h2>Custom Rdf Information</h2>
-<span><%= link_to "[Logout]", :controller => "easy_datas",:action => "logout" %></span>
-<hr/>
+<%= render :partial => "menu_custom"%>
 <%if @models.respond_to?:each%>
- <ul>
-   <%@models.each do |model|%>
+<div id="custom_content" class="ed_info_content">
+  <div id="list_models" class="list_model_info">
+   <ul>
+    <%@models.each do |model|%>
      <li class="list_model">
-          <h2><%= model %></h2>
-          <span><%= link_to_remote "Abrir",:url => {:controller => 'easy_datas', 
-                                                    :action => :model_attributes, 
-                                                    :model => model},
-                                           :update => "#{model}_attributes",
-                                           :success => "Effect.Appear('#{model}_attributes', { duration: 0.4 })",
+          <span class="model"><%= link_to_remote model,:url => {:controller => 'easy_datas', 
+                                                       :action => :model_attributes, 
+                                                       :model => model},
+                                           :update => "model_attributes",
+                                           :success => "Effect.Appear('model_attributes', { duration: 0.4 });",
                                            :failure => "alert('Ooops! An error occurred.')"                
                  %>
           </span>
      
-     <div id="<%=model%>_attributes" class="list_attributes" style="display:none"></div>
-     </li>
-   <%end%>
- </ul>
+      </li>
+    <%end%>
+   </ul>
+  </div>
+  <div id="model_attributes" class="ed_info_models" style="display:none"></div>
+</div>
 <%else%>
  <h3> Not list model </h3>
 <%end%>
+

data/lib/easy_data/templates/easy_datas/info_easy_data.html.erb

@@ -1,7 +1,7 @@
-<h2>Easy Data: Information</h2>
-
 <%= render :partial => "menu" %>
 
 <div id="information_content" class="ed_info_content">
   <%= render :partial => "data_publications", :locals => {:list => @list} %>
 </div>
+
+

data/lib/easy_data/templates/easy_datas/view_settings.html.erb

@@ -0,0 +1,29 @@
+<span class="title_data_publications">Settings</span>
+<table class="settings_table">
+ <tr>
+  <th>Projects Data</th>
+ </tr>
+ <tr>
+  <td>Project's name: <%=@settings["project"]["name"]||""%></td>
+ </tr>
+ <tr>  
+  <td>Logo: <%=(image_tag(image_path(@settings["project"]["logo"])))unless@settings["project"]["logo"].nil?%></td>
+ </tr>
+ <tr> 
+  <td>Description: <%=@settings["project"]["description"]%></td>
+ </tr>
+ <tr><th>Access Data<th></tr>
+ <tr>
+  <td>User: <%=@settings["user_admin"]["user"]%></td>
+ </tr>
+ <tr>
+  <td>Password: <%=@settings["user_admin"]["pass"]%></td>
+ </tr>
+ <tr>
+  <td>IP: <%=@settings["access"]["ip"]%></td>
+ </tr>
+</table>
+
+<%= link_to_remote "Edit Settings",:url => {:controller => "easy_datas",:action => "settings"},
+                                   :update => "custom_content",
+                                   :html => {:title => "Project Settings"}%>

data/lib/easy_data/templates/layouts/easy_data_layout.html.erb

@@ -8,8 +8,10 @@
 
 </head>
 <body>
-    <div id="content">
+    <div id="content" class="content">
         <%= yield %>
+        <div class="push"></div>
     </div>
+    <%= render :partial => "easy_datas/footer"%>
 </body>
 </html>

data/lib/easy_data/templates/stylesheets/easy_data_style.css

@@ -1,14 +1,46 @@
-body{width:90%;padding: 2% 5%;background-color:#fbf3b4;font-family:helvetica;}
-.authenticate{background:url("../images/easy_data_logo.png")no-repeat 0 0;padding-top:130px;margin:0 auto;width:400px}
+body{width:100%;height:100%;margin:0;padding:0;font-family:helvetica;}
+a{text-decoration:none}
+.authenticate{background:url("images/easy_data_logo.png")no-repeat 0 0;padding-top:130px;margin:0 auto;width:400px}
 .authenticate form{background:#767676;width:375px;color:white;overflow:hidden;padding: 20px 30px}
 .authenticate form .lbl_auth{float:left}
 .authenticate form input{float:right}
-.authenticate form span{width:95%;display:block;overflow:hidden}h1{color:red;text-decoration:underline}
-ul{list-style:none;width:90%;float:left;}
-ul li.list_model{color:white;background:grey}
+.authenticate form span{width:95%;display:block;overflow:hidden}
+ul{list-style:none;width:90%;float:left;margin-top:30px;}
 ul div.list_attributes{overflow:hidden;background-color:white;color:black;padding:0 5%;}
+
 ul.attributes_info{width:100%;clear:left;padding:0}
 div.attributes_info{padding: 1% 3%;overflow:hidden}
 div.attributes_info div.property{border-bottom:1px black solid;padding:1em}
 div.attributes_info div.property span.attribute{font-size:1.15em;font-weight:bold;}
-div.attributes_info div.property span.rdf_info{color:grey;font-size:12px}
+.rdf_info{color:grey;font-size:12px}
+
+/*EASY DATA INFO*/
+.content{width:100%}
+
+.ed_main_menu{background:url('images/main_menu.jpg') repeat-x 0 0;overflow:hidden;width:100%;margin:0 auto;display:block;}
+.ed_main_menu ul{color:white !important;;margin:0px;width:100%;padding:0px 20%}
+.ed_main_menu ul li{float:left;width:10%;text-align:center;padding:10px 0px;}
+.ed_main_menu ul li.menu_link{width:10% !important}
+.ed_main_menu ul li.menu_link a:hover{background:url("images/bg_link.jpg") no-repeat 0 0;padding:10px 0px;cursor:pointer}
+.ed_main_menu ul li a{color:white}
+.ed_main_menu ul li.layer_menu{font-size:14px;width:300px !important;padding:11px 0;font-weight:bold;max-height:26px}
+
+
+.ed_info_content{background:url('images/shadow_menu.png') repeat-x 0 0 ;margin:0;padding:2% 20%;overflow:hidden;min-height: 100%;height: auto !important;height: 100%;margin: 0 auto -70px;}
+.list_model_info{float:left;width:40%;overflow:hidden}
+.list_model_info ul li{margin:0;overflow:hidden;color:blue;padding:5px 20px}
+.list_model_info ul li:hover{margin:0;color:blue !important;}
+.list_model_info ul li a{color:#085DAD;font-weight:bold}
+.list_model_info ul li span{float:left}
+.list_model_info ul li .model{width:80%;font-size:20px}
+.ed_info_content .list_model_info ul li a:hover{background:url("images/bg_link.jpg") no-repeat 0 0;font-weight:bold;}
+.ed_info_content .ed_info_models{float:left;width:60%;padding:4% 0;}
+.ed_info_content .settings_table{text-align:left;margin-left:5%;margin-bottom:5%;i}
+.ed_info_content .settings_table th{padding: 10px 0}
+.title_data_publications{color:#085DAD;text-decoration:underline;}
+.ed_info_content .ed_info_models .data_info{text-decoration:underline;color:#085DAD;font-size:15px;width:100%;display:block;}
+/*Footer*/
+
+.easy_data_footer,.push{height:70px;}
+.easy_data_footer{background:url("images/bg_ft.png") repeat-x 0 0;width:100%;clear:both;}
+.easy_data_footer a{margin-left:60%}

data/lib/easy_data/version.rb

@@ -1,3 +1,3 @@
 module EasyData
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/easy_data.rb

@@ -4,6 +4,7 @@ require "action_controller"
 require "controllers/easy_datas_controller"
 require "data_models/model_rdf"
 require "data_models/linked_data_graph"
+require "data_models/RDFa"
 require "routes"
 #require 'ftools'
 require 'ruby-debug'
@@ -41,7 +42,7 @@ module EasyData
       associations[ref.to_s] = {:privacy => 'Public',:namespace => 'not defined',:property => 'not defined'}
     end
 
-    {"attributes" => attributes,"associations" => associations}
+    {:privacy => "Private",:namespace => "not defined",:property => "not defined","attributes" => attributes,"associations" => associations}
   end
 
   def self.get_view_path

data/lib/routes.rb

@@ -10,6 +10,7 @@ module EasyDataRouting
            ed_views.connect 'easy_datas/authenticate_user', :action => "authenticate_user"
            
            ed_views.connect 's/data_publications', :action => 'info_easy_data'
+           ed_views.connect 'easy_datas/info_easy_data', :action => 'info_easy_data'
            ed_views.connect 'easy_datas/linked_data', :action => 'linked_data'
            ed_views.connect 'easy_datas/access_to_data', :action => 'access_to_data'
            ed_views.connect 'easy_datas/faq', :action => 'faq'
@@ -35,6 +36,9 @@ module EasyDataRouting
            ed_actions.connect 'easy_datas/load_properties/:block/:attribute', :action => 'load_properties'
            ed_actions.connect 'easy_datas/login', :action => 'login'
            ed_actions.connect 'easy_datas/custom_attributes/:model', :action => 'custom_attributes'
+           ed_actions.connect 'easy_datas/settings', :action => 'settings'
+           ed_actions.connect 'easy_datas/custom_settings', :action => 'custom_settings'
+           ed_actions.connect 'easy_datas/view_settings', :action => 'view_settings'
          end
 
        #Ajax routes:

data/lib/tasks/testing_installation.rb

@@ -3,4 +3,4 @@
 rm easy_data-0.0.*
 gem build easy_data.gemspec
 gem uninstall easy_data
-gem install ./easy_data-0.0.5.gem
+gem install ./easy_data-0.0.6.gem

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: easy_data
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - jnillo
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-08 00:00:00 +02:00
+date: 2011-08-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,6 +67,7 @@ files:
 - bin/linked_data
 - easy_data.gemspec
 - lib/controllers/easy_datas_controller.rb
+- lib/data_models/RDFa.rb
 - lib/data_models/data_models.rb
 - lib/data_models/linked_data_graph.rb
 - lib/data_models/model_rdf.rb
@@ -89,18 +90,21 @@ files:
 - lib/data_models/namespaces/wot.rb
 - lib/data_models/namespaces/xhtml.rb
 - lib/data_models/namespaces/xsd.rb
-- lib/data_models/parser_rdf.rb
 - lib/easy_data.rb
 - lib/easy_data/tasks.rb
 - lib/easy_data/templates/easy_datas/_data_publications.html.erb
+- lib/easy_data/templates/easy_datas/_footer.html.erb
 - lib/easy_data/templates/easy_datas/_linked_data_model.html.erb
 - lib/easy_data/templates/easy_datas/_linked_datas.html.erb
+- lib/easy_data/templates/easy_datas/_list_model_info.html.erb
 - lib/easy_data/templates/easy_datas/_list_properties.html.erb
 - lib/easy_data/templates/easy_datas/_list_properties_edit.html.erb
 - lib/easy_data/templates/easy_datas/_menu.html.erb
+- lib/easy_data/templates/easy_datas/_menu_custom.html.erb
 - lib/easy_data/templates/easy_datas/_model_attributes.html.erb
 - lib/easy_data/templates/easy_datas/_model_attributes_edit.html.erb
 - lib/easy_data/templates/easy_datas/_model_attributes_info.html.erb
+- lib/easy_data/templates/easy_datas/_settings.html.erb
 - lib/easy_data/templates/easy_datas/authenticate_user.html.erb
 - lib/easy_data/templates/easy_datas/custom_rdf.html.erb
 - lib/easy_data/templates/easy_datas/info_easy_data.html.erb
@@ -108,15 +112,20 @@ files:
 - lib/easy_data/templates/easy_datas/show.xml.builder
 - lib/easy_data/templates/easy_datas/show_all.html.erb
 - lib/easy_data/templates/easy_datas/show_all.xml.builder
+- lib/easy_data/templates/easy_datas/view_settings.html.erb
+- lib/easy_data/templates/images/bg_ft.png
+- lib/easy_data/templates/images/bg_link.jpg
 - lib/easy_data/templates/images/easy_data_logo.png
+- lib/easy_data/templates/images/logo_ft.png
+- lib/easy_data/templates/images/main_menu.jpg
+- lib/easy_data/templates/images/rdf_icon.jpeg
+- lib/easy_data/templates/images/shadow_menu.png
 - lib/easy_data/templates/layouts/easy_data_layout.html.erb
 - lib/easy_data/templates/rdf/request.xml.builder
 - lib/easy_data/templates/rdf/show.builder
-- lib/easy_data/templates/stylesheets/.easy_data_style.css.swp
 - lib/easy_data/templates/stylesheets/easy_data_style.css
 - lib/easy_data/version.rb
 - lib/routes.rb
-- lib/tasks/.rakes.rb.swp
 - lib/tasks/testing_installation.rb
 has_rdoc: true
 homepage: http://rubygems.org/gem/easy_data

data/lib/data_models/parser_rdf.rb

@@ -1,22 +0,0 @@
-class ParserRdf
-
-   def to_rdf(model)
-      rdf_info = ModelRdf.new
-      
-      model_rdf = {}
-
-      rdf_info.get_attributes_model(model).each do |att|
-         model_rdf << parser_attribute(att)
-      end      
-      
-      model_rdf
-
-   end
-
-
-   private
-
-   def parser_attribute(att,info_rdf)
-      {info_rdf => att}
-   end
-end