graphiti_graphql 0.1.12 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e50aa66c6cf3fda89d96665c6f2fc61fa92db821b4d00461101970d72c24eea6
-  data.tar.gz: 1e058e770b73378802fd43b3e852720d9cfa9b5b80cfc77c40ea1e2e2ea602df
+  metadata.gz: e99c86540776f6e5aa93eaa422f4919cf4434f6116bb040267bd37f3a0036ba8
+  data.tar.gz: bfac34b9d8b0f5e5e96e9169d969b5a3efbe6d01d0c3da964d27649a6b7514be
 SHA512:
-  metadata.gz: 7ecb9fda5f17d3414b2ae8a39f5e9fddb40f34ed683fc9d966c1098bd86f93422e9ee77439c8f27faed1384ab5876ee67bbfc296980f314c7f656930edee3734
-  data.tar.gz: f00540102b8cccd704a2ef2d6b7cb787c750f23858b78e425e1dc59e452065b16c9d8788065c0a0c2e87a653fac70d803f743f72ead06405f207e549e0f8e132
+  metadata.gz: 4c8d515d95e749457c887dadfaaedab1e8d9367d57565364a7a5ef969843ad13486f530a4e61623003198c7d099aa571cba2e4269b9e29a4f7941a7b700631ae
+  data.tar.gz: edfe5d07374179c3cceb6dc1fbfd05a6de8cc124759e65b659204f03eb5e0ee1c4980d0515f9b9cccb1ec6095706d7373283435804f5f618e94fb29e045d4b88

data/Gemfile.lock

@@ -3,7 +3,7 @@ PATH
   specs:
     graphiti_graphql (0.1.12)
       activesupport (>= 4.1)
-      graphiti (~> 1.3.2)
+      graphiti (~> 1.3)
       graphql (~> 1.12)
 
 GEM

data/graphiti_graphql.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "graphiti", "~> 1.3.2"
+  spec.add_dependency "graphiti", "~> 1.3"
   spec.add_dependency "activesupport", ">= 4.1"
   spec.add_dependency "graphql", "~> 1.12"
 

data/lib/graphiti_graphql/federation/resource_dsl.rb

@@ -7,11 +7,18 @@ module GraphitiGraphQL
           @type_name = type_name
         end
 
-        def has_many(relationship_name, foreign_key: nil, magic: true, &blk)
+        def has_many(
+          relationship_name,
+          foreign_key: nil,
+          field: true,
+          filter: true,
+          &blk
+        )
           @caller.federated_has_many relationship_name,
             type: @type_name,
             foreign_key: foreign_key,
-            magic: magic,
+            field: field,
+            filter: filter,
             &blk
         end
       end
@@ -34,13 +41,13 @@ module GraphitiGraphQL
         #
         # * Add to the list of external graphql-ruby types we need in schema
         # * Add a readable and filterable FK, without clobbering pre-existing
-        def federated_has_many(name, type:, magic: true, foreign_key: nil, &blk)
+        def federated_has_many(name, type:, filter: true, field: true, foreign_key: nil, &blk)
           foreign_key ||= :"#{type.underscore}_id"
           resource = FederatedResource.new(type)
           federated_resources << resource
           resource.add_relationship(:has_many, name, self, foreign_key, &blk)
 
-          return unless magic
+          return unless (filter || field)
 
           attribute = attributes.find { |name, config|
             name.to_sym == foreign_key &&
@@ -49,20 +56,31 @@ module GraphitiGraphQL
           }
           has_filter = filters.key?(foreign_key)
           if !attribute && !has_filter
-            attribute foreign_key, :integer,
-              only: [:readable, :filterable],
-              schema: false,
-              readable: :gql?,
-              filterable: :gql?
-          elsif has_filter && !attribute
+            if field
+              opts = {
+                only: [:readable],
+                schema: false,
+                readable: :gql?
+              }
+              if filter
+                opts[:only] << :filterable
+                opts[:filterable] = :gql?
+              end
+              attribute foreign_key, :integer, opts
+            elsif filter
+              filter foreign_key, :integer, schema: false
+              attributes[foreign_key][:filterable] = :gql?
+            end
+          elsif has_filter && !attribute && field
             prior = filters[foreign_key]
             attribute foreign_key, prior[:type],
               only: [:readable, :filterable],
               schema: false,
               readable: :gql?
             filters[foreign_key] = prior
-          elsif attribute && !has_filter
-            filter foreign_key, attribute[:type]
+          elsif attribute && !has_filter && filter
+            filter foreign_key, attribute[:type], schema: false
+            attributes[foreign_key][:filterable] = :gql?
           end
         end
 

data/lib/graphiti_graphql/version.rb

@@ -1,3 +1,3 @@
 module GraphitiGraphQL
-  VERSION = "0.1.12"
+  VERSION = "0.1.14"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphiti_graphql
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.14
 platform: ruby
 authors:
 - Lee Richmond
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement