solis 0.117.0 → 0.119.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa9ba6d86b36ebd75e9e0280928ce458f1ae70e4c64f44832c0963870f319b2f
-  data.tar.gz: 23c8bd2bcbbb4fe97dc133b3310d1527bab161dbce43e2939b45a8fa1a9b7712
+  metadata.gz: 3c797f44180ed02342106236cb97af580057251b70187f0f73bd764f95ca93a0
+  data.tar.gz: 1fa0e2d26beafa4a52427c7ee004a37887ee436cdc647b65b16a552684c7e6b9
 SHA512:
-  metadata.gz: f15183cf04d168b3d06425bfe987d4cc446d0fad1e1b1f94532b8dfedf39b3401d39641226d91a63400f4a4e1c7096a0c995b64e2629d6d07424bae7e4c14375
-  data.tar.gz: d7219d14c2290aa045ca80a32a97df1f12fcc4aa0df31fc3628fe91dbd5e2ee7e6239474aef27f4f43caf45fb9347e8cd059a0deabff12a3b2bd754ad1e98342
+  metadata.gz: 4f69ffa1250bf724a7edcce1137d95987c9004d2001edf3c2416106369f673899e549741550f5b4c5567a1ea78be3947f7ce712282a12ac27c181d73824b7ef5
+  data.tar.gz: 76fa9c6e7d062e7d769aefa33447ec054ccbe503aac2113c0033f2911457d70ddb488d270f77ec834a13ec3af03ad1ff754d6e0a2a943fda8b5dbbdedb4e3ec9

data/lib/solis/query.rb

@@ -94,7 +94,7 @@ module Solis
         @sparql_client = Solis::Store::Sparql::Client.new(@sparql_endpoint, graph: @model.class.graph_name)
       end
       @filter = {values: ["VALUES ?type {#{target_class}}"], concepts: ['?concept a ?type .'] }
-      @sort = 'ORDER BY ?s'
+      @sort = 'ORDER BY ?concept'
       @sort_select = ''
       @language = Graphiti.context[:object]&.language || Solis::Options.instance.get[:language] || 'en'
       @query_cache = self.class.shared_query_cache
@@ -211,7 +211,7 @@ module Solis
       if core_query =~ /IN\((.*?)\)/
         #limit = $1.gsub('"','').split(',').length
       else
-        core_query += "ORDER BY ?concept LIMIT #{limit} OFFSET #{offset}"
+        core_query += " LIMIT #{limit} OFFSET #{offset}"
       end
 
       query = %(

data/lib/solis/sparql_adaptor.rb

@@ -5,7 +5,7 @@ module Solis
       {
         has_many: HasMany,
         belongs_to: BelongsTo,
-        has_one: ::Graphiti::Sideload::HasOne,
+        has_one: HasOne,
         many_to_many: ::Graphiti::Sideload::ManyToMany,
         polymorphic_belongs_to: ::Graphiti::Sideload::PolymorphicBelongsTo
       }
@@ -314,6 +314,24 @@ module Solis
   end
 
 
+  class HasOne < Graphiti::Sideload::HasOne
+    def load_params(parents, query)
+      query.hash.tap do |hash|
+        hash[:filter] ||= {}
+        unless hash[:filter].include?(:id)
+          all_ids = parents.map{|m| m.instance_variable_get("@#{query.association_name.to_s}")}.flatten.map{|m| m.instance_variable_get("@#{primary_key}")}.uniq.compact.join(',')
+          hash[:filter].merge!({primary_key => all_ids})
+        end
+      end
+    end
+
+    private
+
+    def children_for(parent, map)
+      map.values.first
+    end
+  end
+
   class HasMany  < Graphiti::Sideload::HasMany
     def inverse_filter
       @inverse_filter || foreign_key

data/lib/solis/version.rb

@@ -1,3 +1,3 @@
 module Solis
-  VERSION = "0.117.0"
+  VERSION = "0.119.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solis
 version: !ruby/object:Gem::Version
-  version: 0.117.0
+  version: 0.119.0
 platform: ruby
 authors:
 - Mehmet Celik