graphql-relay 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cff9bd7fdbd2903d3d9ec7b809a6503e864e8ae
-  data.tar.gz: 77f663466bc1cd668b9b2f95d6aa55cd094ed9f9
+  metadata.gz: 21069cf0c93c8778043e7e9c6fc4e4e1276ca551
+  data.tar.gz: cda365ce7b19852d7d8639344fba45c3ed0b5503
 SHA512:
-  metadata.gz: cb399be33857dd51f6359d7a11c35ae0a3a8a8ea1b82d7f226db392528d96e6106c860ba867cbf68e82ba6d9eb6623134be046b6484e1765e4d0cea05e26fa1c
-  data.tar.gz: 5fd3264c767cdf54d321f9553ca2a23a3e6818e6df4e27bdfb559a2d6ab7744a57a93e658e05f5d7c47ab25c2d467c427c1e38dcad7d4bf849344de5a68c1d9f
+  metadata.gz: cb9fe462db0cc0f6754e5b6e671123c4d1f9306b145a560f977dfaa4d5680e83344ff12fd7a89ef8e0d774e7523a4dd1c81fe546ce481725fcc505915e3e1405
+  data.tar.gz: fec3348a276e523294f19b269b55fcd9914f7170ecd6c8bbe22813fc12f2daee76f49e581db749b0eefb2d22e37def7dc208a9c7b69207a90d7b181d206a19bb

data/lib/graphql/relay/base_connection.rb

@@ -37,7 +37,7 @@ module GraphQL
           items.is_a?(items_class)
         end
         if implementation.nil?
-          raise("No connection implementation to wrap #{items.class}")
+          raise("No connection implementation to wrap #{items.class} (#{items})")
         else
           implementation[1]
         end

data/lib/graphql/relay/monkey_patches/definition_config.rb

@@ -11,7 +11,7 @@ class GraphQL::DefinitionHelpers::DefinedByConfig::DefinitionConfig
       argument :last, types.Int
       argument :before, types.String
       argument :order, types.String
-      self.instance_eval(&block)
+      self.instance_eval(&block) if block_given?
     }
     connection_field = field(name, type, desc, property: property, &definition_block)
     # Wrap the defined resolve proc
@@ -19,6 +19,11 @@ class GraphQL::DefinitionHelpers::DefinedByConfig::DefinitionConfig
     original_resolve = connection_field.instance_variable_get(:@resolve_proc)
     connection_resolve = -> (obj, args, ctx) {
       items = original_resolve.call(obj, args, ctx)
+      if items == GraphQL::Query::DEFAULT_RESOLVE
+        method_name = property || name
+        p "Obj: #{obj}  ##{method_name}"
+        items = obj.public_send(method_name)
+      end
       connection_class = GraphQL::Relay::BaseConnection.connection_for_items(items)
       connection_class.new(items, args)
     }
@@ -31,6 +36,6 @@ class GraphQL::DefinitionHelpers::DefinedByConfig::DefinitionConfig
 
   def global_id_field(field_name)
     name || raise("You must define the type's name before creating a GlobalIdField")
-    field(name, field: GraphQL::Relay::GlobalIdField.new(name))
+    field(field_name, field: GraphQL::Relay::GlobalIdField.new(name))
   end
 end

data/lib/graphql/relay/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module Relay
-    VERSION = '0.3.5'
+    VERSION = '0.3.6'
   end
 end

data/spec/graphql/relay/relation_connection_spec.rb

@@ -117,4 +117,24 @@ describe GraphQL::Relay::RelationConnection do
       assert_equal(["Death Star"], get_names(result))
     end
   end
+
+  describe "without a block" do
+    let(:query_string) {%|
+      {
+        empire {
+          noArgsBases {
+            edges {
+              node {
+                name
+              }
+            }
+          }
+        }
+    }|}
+    it "uses default resolve" do
+      result = query(query_string)
+      bases = result["data"]["empire"]["noArgsBases"]["edges"]
+      assert_equal(3, bases.length)
+    end
+  end
 end

data/spec/support/star_wars_data.rb

@@ -10,21 +10,6 @@ names = [
   'Executor',
 ]
 
-rebels  = OpenStruct.new({
-  id: '1',
-  name: 'Alliance to Restore the Republic',
-  ships:  ['1', '2', '3', '4', '5'],
-  bases: ['11', '12']
-})
-
-
-empire = OpenStruct.new({
-  id: '2',
-  name: 'Galactic Empire',
-  ships: ['6', '7', '8'],
-  bases: ['13', '14', '15']
-})
-
 ## Set up "Bases" in ActiveRecord
 # ActiveRecord::Base.logger = Logger.new(STDOUT)
 ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: ":memory:")
@@ -47,6 +32,22 @@ Base.create(id: 13, name: "Death Star", planet: nil, faction_id: 2)
 Base.create(id: 14, name: "Shield Generator", planet: "Endor", faction_id: 2)
 Base.create(id: 15, name: "Headquarters", planet: "Coruscant", faction_id: 2)
 
+
+rebels  = OpenStruct.new({
+  id: '1',
+  name: 'Alliance to Restore the Republic',
+  ships:  ['1', '2', '3', '4', '5'],
+  bases: Base.where(faction_id: 1)
+})
+
+
+empire = OpenStruct.new({
+  id: '2',
+  name: 'Galactic Empire',
+  ships: ['6', '7', '8'],
+  bases: Base.where(faction_id: 2)
+})
+
 STAR_WARS_DATA = {
   "Faction" => {
     "1" => rebels,

data/spec/support/star_wars_schema.rb

@@ -14,8 +14,6 @@ end
 
 NodeInterface, NodeField = GraphQL::Relay::Node.create(NodeImplementation.new)
 
-
-
 Ship = GraphQL::ObjectType.define do
   name "Ship"
   interfaces [NodeInterface]
@@ -71,6 +69,8 @@ Faction = GraphQL::ObjectType.define do
     }
     argument :nameIncludes, types.String
   end
+
+  connection :noArgsBases, BaseConnection, property: :bases
 end
 
 # Define a mutation. It will also:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-relay
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql