easy_data 0.0.6 → 0.0.7

data/.gitignore

@@ -6,3 +6,4 @@ lib/task/testing_installation.rb
 bin/linked_data
 init.rb
 setup.rb
+.rvmrc

data/.idea/EasyData.iml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="RUBY_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="haml (v3.0.25, RVM: ruby-1.9.2-p180 [easy_data]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="hpricot (v0.8.4, RVM: ruby-1.9.2-p180 [easy_data]) [gem]" level="application" />
+  </component>
+</module>
+

data/.idea/encodings.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+</project>
+

data/.idea/misc.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DependencyValidationManager">
+    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+  </component>
+  <component name="ProjectResources">
+    <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
+  </component>
+  <component name="ProjectRootManager" version="2" project-jdk-name="RVM: ruby-1.9.2-p180 [easy_data]" project-jdk-type="RUBY_SDK" />
+</project>
+

data/.idea/modules.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/EasyData.iml" filepath="$PROJECT_DIR$/.idea/EasyData.iml" />
+    </modules>
+  </component>
+</project>
+

data/.idea/vcs.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
+

data/Gemfile

@@ -2,3 +2,5 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in linked_data.gemspec
 gemspec
+
+º

data/Rakefile

@@ -2,3 +2,11 @@ require 'bundler/gem_tasks'
 
 require 'yard'  #Documentation gem
 require 'hpricot'
+
+require 'rake'
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'test'
+  t.pattern = 'test/*_test.rb'
+end

data/easy_data.gemspec

@@ -1,7 +1,6 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
 
-
 require "easy_data/version"
 
 Gem::Specification.new do |s|
@@ -16,7 +15,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "easy_data"
 
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.test_files    = `git ls-files test/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
  

data/lib/controllers/easy_datas_controller.rb

@@ -9,46 +9,64 @@ class EasyDatasController < ActionController::Base
   before_filter :authenticated, :only => [:custom_rdf]
 
   def show
-       
-      model = eval params[:model].to_s
+     begin  
+        model = (eval params[:model].to_s)  
       
-      conditions = parser_params(params)
+        conditions = parser_params(params)
      
       rdf = ModelRdf.new      
       
-      unless conditions.empty?
-        @reply = model.find :all, :conditions => conditions || nil
-      end
-
-      @host="http://"+request.env["HTTP_HOST"]          
+      no_valid = lambda{|c| c.nil?||c.empty?}
       
-      @rdf_model = rdf.get_model_rdf(@reply,params[:model],"http://"+request.env["HTTP_HOST"])
+      @reply = model.find :all, :conditions => {:id => params[:id]}
+           
+      unless @reply.nil?
+        @host="http://"+request.env["HTTP_HOST"]          
       
+        @rdf_model = rdf.get_model_rdf(@reply,params[:model],"http://"+request.env["HTTP_HOST"])
+      end
+       
       @xml = Builder::XmlMarkup.new
       
-      respond_to do |format|
-        format.html
-        format.xml # render :template => "/rdf/request.xml.builder"   
+        if no_valid.call(@rdf_model[:header]) || @reply.nil?  # If the URI not available or data no publicated
+           render :nothing => true, :status => 400
+        else  
+           respond_to do |format|
+             format.html
+             format.xml                     # render :template => "/rdf/request.xml.builder"   
+           end
+        end
+      rescue
+          render :nothing => true, :status => 404
       end
-      
   end
 
   def show_all
-      model = eval params[:model].to_s
+      begin
+        model = eval params[:model].to_s
       
-      rdf = ModelRdf.new      
+        rdf = ModelRdf.new      
       
-      @reply = model.find :all
+        no_valid = lambda{|c| c.nil?||c.empty?}
+ 
+        @reply = model.find :all || nil
       
-      @host="http://"+request.env["HTTP_HOST"]          
+        @host="http://"+request.env["HTTP_HOST"]          
       
-      @rdf_model = rdf.get_model_rdf(@reply,params[:model],"http://"+request.env["HTTP_HOST"])
+        @rdf_model = rdf.get_model_rdf(@reply,params[:model],"http://"+request.env["HTTP_HOST"])
       
-      @xml = Builder::XmlMarkup.new
+        @xml = Builder::XmlMarkup.new
       
-      respond_to do |format|
-        format.html
-        format.xml # render :template => "/rdf/request.xml.builder"   
+        if no_valid.call(@rdf_model[:header]) || @reply.nil?  # If the URI not available or data no publicated
+          render :nothing => true, :status => 404
+        else
+          respond_to do |format|
+            format.html
+            format.xml # render :template => "/rdf/request.xml.builder"   
+          end
+        end
+      rescue
+         render :nothing => true, :status => 404
       end
   end
 
@@ -56,14 +74,15 @@ class EasyDatasController < ActionController::Base
   # 
   #
   def info_easy_data
-      models = DataModels.load_models
+      rdf = ModelRdf.new
+      models = rdf.get_not_hidden_models
       @list = []
       @settings ||= YAML::load(File.open("#{RAILS_ROOT}/config/easy_data/setting.yaml"))
       
       models.each do |mod|
        @list << "#{mod.gsub("::","_")}"
       end
-
+    
       respond_to do |format|
         format.html
         format.xml
@@ -90,13 +109,10 @@ class EasyDatasController < ActionController::Base
   def model_attributes
     
     rdf = ModelRdf.new
-    
     @model_attributes = rdf.get_attributes_model(params[:model])
     @model = params[:model]
-    
 
     render :partial => "model_attributes",:layout => nil
-
   end
 
   def model_attributes_edit
@@ -149,15 +165,22 @@ class EasyDatasController < ActionController::Base
        render :inline => ""
      end
   end
-  
+
   def load_linked_data_graph
      if params[:model]
       @model = params[:model]
+      @associations = ModelRdf.new.get_associations_model(@model) 
+      @host = "http://"+request.env["HTTP_HOST"]
       render :partial => "linked_data_model"
      else
-      models = DataModels.load_models
+      rdf = ModelRdf.new
+      models = []
+      DataModels.load_models.each do |mod|
+        unless rdf.hidden?(mod) 
+          models << mod
+        end
+      end
       @list = []
-      
       models.each do |mod|
        @list << "#{mod.gsub("::","_")}"
       end
@@ -167,33 +190,39 @@ class EasyDatasController < ActionController::Base
   end
 
   def custom_attributes
-    
+
      rdf = ModelRdf.new
      @model = params[:model]
-     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))
+
+     params["rdf_type_attributes"].each do |att,value|
+        rdf.update_attributes_model(params[:model],att,'namespace',value) if value != ""
+        if params["attributes_property"] && !params["attributes_property"][att].nil?
+         rdf.update_attributes_model(params[:model],att,'property',params["attributes_property"][att])  
         end
-      end
+        rdf.update_attributes_model(params[:model],att,'privacy',params[:privacy][att])
      end
-     unless params["associations_property"].nil?
-      params["rdf_type_associations"].each do |assoc,value|
-        if value != "" && params["associations_property"][assoc] != ""
+     
+     
+     params["rdf_type_associations"].each do |assoc,value|
+        
+        if value != ""
          rdf.update_associations_model(params[:model],assoc,'namespace',value)
+        end
+        if params["associations_property"] && params["associations_property"][assoc]
          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
+         rdf.update_associations_model(params[:model],assoc,'privacy',params[:privacy][assoc])
+        
      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)
@@ -226,20 +255,27 @@ class EasyDatasController < ActionController::Base
      if !params["project"]["description"].empty? && params["project"]["description"]!=@settings["project"]["description"]
        @settings["project"]["description"] = params["project"]["description"]
      end
+
+     if !params["project"]["email"].empty? && params["project"]["email"]!=@settings["project"]["contact_email"]
+       @settings["project"]["contact_email"] = params["project"]["email"]
+     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
+     (@settings["access"]["ip"] = params["access"]["ip"]) if params["access"]["ip"]!=@settings["access"]["ip"] && params["access"]["ip"]!= ""
      
      save_settings(@settings)
 
      render :template => "easy_datas/view_settings",:layout => false
   end
+  
+  def refresh_information
+     EasyData.refresh_information
+     redirect_to :action => "custom_rdf"
+  end
 
   def authenticate_user
   end
@@ -264,12 +300,15 @@ class EasyDatasController < ActionController::Base
 
   private 
 
+  # Extract all parameters to build the query.
+  # @param [Hash] request's parameters 
+  # @return [Hahs] Conditions hash
   def parser_params (parameters = nil)
      
      conditions = {}
     
      if !parameters.empty?
-       parameters.each do |key,value|
+       parameters.each do |key,value| #Delete all elements that aren't need to query
          unless ["controller","action","method","format","model"].include?key
            conditions[key.to_sym] = value
          end   

data/lib/data_models/RDFa.rb

@@ -2,21 +2,13 @@ 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)
+   def a(model,href,value,attribute=nil,options=nil)
+      _html_code('a',model,value,attribute,"href='#{href||'#'}' "+options.to_s)
    end
 
    #-----------------------------------------------End Links
@@ -38,7 +30,7 @@ class RDFa
       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])
@@ -49,14 +41,25 @@ class RDFa
    #######################################
    private
 
+   # This method generate a HTML tag with RDFa information included.
+   # @param [String] Html tag
+   # @param [String] Model's name
+   # @param [String] Tag content.
+   # @param [String] model's attribute
+   # @param [String] css and html tag options
+   # @return [String] Html tag with RDFa information
    def _html_code(tag,model,value,attribute,options = "")
-    rdf_info = ModelRdf.new    
+    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)
+      if attribute!=model
+       options = (options||"") + rdf_info.attribute(model,attribute)
+      else
+       options = (options||"") + rdf_info.model(model)
+      end
     end
     
     unless value.nil?
@@ -66,6 +69,12 @@ class RDFa
     end
    end
 
+   # This method generate a HTML list tag with RDFa information included.
+   # @param [String] Html tag
+   # @param [String] Model's name
+   # @param [String] Tag content
+   # @param [String] css and html tag options
+   # @return [String] Html list tag with RDFa information
    def _html_code_list(tag,model,value,options = "")
     rdf_info = ModelRdf.new    
 

data/lib/data_models/data_models.rb

@@ -1,21 +1,26 @@
 module DataModels
-  
+  # This method reads all models that the project hash.
+  # @return [Array] The proyect models list. 
   def self.load_models
 
-     models = []
-     models_valids = []
+     models = []   #All models will be in this list.
+     models_valids = [] #This list is only to models with database table associated.
      mod = nil
 
+     #Get all models in Model's folder
      Dir["#{RAILS_ROOT}/app/models/**/*.rb"].each do |file|
        models << file.gsub(RAILS_ROOT+'/app/models/',"").gsub('.rb','').classify
      end
      
+     # Here, get the correct model's name: Singular or Plural
      models.each do |model|
        begin
          mod = eval model
+         mod.columns
        rescue
          begin
            mod = eval model.pluralize
+           mod.columns
          rescue
            mod = nil
          end
@@ -28,14 +33,21 @@ module DataModels
      models_valids
   end
 
+  # This method return all model's attributes.
+  # @param [String] model's name
+  # @return [Array] model's attribute list.
   def self.model_attributes(model)      
       model.columns.map{|att| att.name}.join(", ")
   end
 
+  # This method return all model's relations
+  # @param [String] model's name
+  # @return [Hash] hash with all relations and relations type
   def self.model_relations(model)
 
     relations = {}
-	
+    
+    #Build the hash with relation name and relation's type.	
     model.reflections.each do |relation,values|  
       relations[relation] = {"model" => values.class_name,"type" => values.macro.to_s} 
     end   	
@@ -43,10 +55,15 @@ module DataModels
     relations
   end
 
+  # Return all RDF information stored in yaml file.
+  # @return [Hash] hash with all information stored in yaml file.
   def self.build_models_yaml_file
     self.models
   end
 
+  # Return data model.
+  # @param [String] model's name
+  # @return [Hash] data model's information.
   def self.get_model_data(model)
     begin 
       eval model