Feature: Support multi lingual - add show_language argument to the at…

…tributes getters (#39)

* update define_method

* update solution mapper

* update get_preload_value

lib/goo/base/settings/settings.rb

@@ -255,9 +255,13 @@ def shape_attribute(attr)
             self.instance_variable_set("@#{attr}",value)
           end
           define_method("#{attr}") do |*args|
+            attr_value = self.instance_variable_get("@#{attr}")
+            attr_value = attr_value.values.first if  attr_value.is_a?(Hash) && !args.include?(:show_with_language)
+
+
             if self.class.handler?(attr)
               if @loaded_attributes.include?(attr)
-                return self.instance_variable_get("@#{attr}")
+                return attr_value
               end
               value = self.send("#{self.class.handler(attr)}")
               self.instance_variable_set("@#{attr}",value)
@@ -266,7 +270,7 @@ def shape_attribute(attr)
             end
 
             if (not @persistent) or @loaded_attributes.include?(attr)
-              return self.instance_variable_get("@#{attr}")
+                return attr_value
             else
               # TODO: bug here when no labels from one of the main_lang available... (when it is called by ontologies_linked_data ontologies_submission)
               raise Goo::Base::AttributeNotLoaded, "Attribute `#{attr}` is not loaded for #{self.id}. Loaded attributes: #{@loaded_attributes.inspect}."

lib/goo/sparql/mixins/solution_lang_filter.rb

@@ -18,10 +18,12 @@ def enrich_models(models_by_id)
           ## if the requested language is ALL, we can enrich the models with the objects by language
           objects_by_lang.each do |id, predicates|
             model = models_by_id[id]
-            predicates.each do |predicate, values|
-              if @attributes_to_translate.any? { |attr| predicate.eql?(attr) }
-                save_model_values(model, values, predicate, unmapped) 
-              end
+            predicates.each do |predicate, values|   
+
+              if values.values.all? { |v| v.all? { |x| literal?(x) && x.plain?} }
+                save_model_values(model, values, predicate, unmapped)
+
+              end 
             end
           end  
         end
@@ -101,7 +103,6 @@ def language_match?(language)
 
         def store_objects_by_lang(id, predicate, object, language)
           # store objects in this format: [id][predicate][language] = [objects]
-
           return if requested_lang.is_a?(Array) && !requested_lang.include?(language)
 
           language_key = language.downcase  
@@ -124,6 +125,7 @@ def get_model_attribute_value(model, predicate)
 
 
         def add_unmapped_to_model(model, predicate, value)
+
           if model.respond_to? :klass # struct
             model[:unmapped] ||= {}
             model[:unmapped][predicate] ||= []
@@ -134,16 +136,10 @@ def add_unmapped_to_model(model, predicate, value)
         end
 
         def save_model_values(model, values, predicate, unmapped)
-          if unmapped
-            add_unmapped_to_model(model, predicate, values)
-          else
-
-            if !list_attributes?(predicate)
-              values = values.map { |k, v| [k, v.first] }.to_h
-            end
+          add_unmapped_to_model(model, predicate, values) if unmapped
+          values = values.map { |k, v| [k, v.first] }.to_h unless list_attributes?(predicate)
 
-            model.send("#{predicate}=", values, on_load: true)
-          end
+          model.send("#{predicate}=", values, on_load: true)
         end
 
         def unmapped_get(model, predicate)

lib/goo/sparql/solutions_mapper.rb

@@ -98,7 +98,7 @@ def map_each_solutions(select)
 
         models_unmapped_to_array(@models_by_id) if @unmapped
 
-        
+
         @models_by_id
       end
 
@@ -189,8 +189,8 @@ def add_object_to_model(id, objects, predicate)
       def get_preload_value(id, object, predicate)
         pre_val = nil
         if predicate_preloaded?(id, predicate)
-          pre_val = preloaded_value(id, predicate)
-          pre_val = pre_val.select { |x| x.id == object }.first if pre_val.is_a?(Array)
+          pre_val = preloaded_value(id, predicate)          
+          pre_val = pre_val.select { |x|  x.id  == object  }.first if pre_val.is_a?(Array)
         end
         pre_val
       end