graphiti 1.0.beta.13 → 1.0.beta.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2739a153d71dc4e1c98b527f4f0daddede47e76a
-  data.tar.gz: 6cfdad699578ad75c3de819063069b187b7b0a5c
+  metadata.gz: b4ff13da582bf6e68e92f1b694d9fe17e4674e49
+  data.tar.gz: ff7d0c4a107bfaa7680edcc821572df7a3a38c1a
 SHA512:
-  metadata.gz: e5c8039936b98b458c37004dc5c9ccdbc9d8de147baac4f43ea0bc657caf8fcca58661a1b9572b49632bb40ea64f297570b7f8004ce0d18155cf1701f1307d65
-  data.tar.gz: fbcceabcb306a16f189c9ea82fc91d4960fbac7310ce8d3d04617582d97bc45345c8005abdab22c27303c87729f39b482069a44649c2a8ba9932099ab9f23e15
+  metadata.gz: 32f81168be3c5b9207c0a8d5143f2efbaff904aade2161dea0cbf4af9f19b723a43f725283dce5116ae3cd30a3a46ff678d55f7cedea0f134b29a7faacfa41e1
+  data.tar.gz: 9cb0bb2e85f0d98555ad5f2092a4800758e84377221e4ef47666f70c2966414f76376e8068dbb2871ea5c18d2ca89c21c5c50415ff311768ac0eeb57f35da486

data/lib/graphiti/query.rb

@@ -135,6 +135,8 @@ module Graphiti
               arr << { key => value }
             elsif !type && top_level? && validate!(key, :sortable)
               arr << { key => value }
+            elsif nested?("#{type}.#{key}")
+              arr << { key => value }
             end
           end
         end
@@ -215,6 +217,7 @@ module Graphiti
 
     def nested?(name)
       return false unless association?
+
       split = name.to_s.split('.')
       query_names = split[0..split.length-2].map(&:to_sym)
       my_names = parents.map(&:association_name).compact + [association_name].compact
@@ -257,7 +260,13 @@ module Graphiti
     def sort_hashes
       sorts = @params[:sort].split(',')
       sorts.each do |s|
-        type, attr = s.split('.')
+        attr = nil
+        type = s
+        if s.include?('.')
+          split = s.split('.')
+          attr = split.pop
+          type = split.join('.')
+        end
 
         if attr.nil? # top-level
           next if @association_name

data/lib/graphiti/schema.rb

@@ -21,14 +21,15 @@ module Graphiti
     end
 
     def initialize(resources)
-      @resources = resources
+      @resources = resources.sort_by(&:name)
     end
 
     def generate
       {
         resources: generate_resources,
         endpoints: generate_endpoints,
-        types: generate_types
+        types: generate_types,
+        base_url: resources.map(&:base_url)[0]
       }
     end
 

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.0.beta.13"
+  VERSION = "1.0.beta.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.0.beta.13
+  version: 1.0.beta.14
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-04 00:00:00.000000000 Z
+date: 2018-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable