relay-rb 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a49741538c409a6e3ee34d698b4f2622dad3ce1
-  data.tar.gz: d0d793be807f2827b2d269bd91159e912cfa1d05
+  metadata.gz: ec87b91c9635a192ce21a0721fb344b408762a05
+  data.tar.gz: f4e272b8c28c13c7893f9a545e387d159a0c33d1
 SHA512:
-  metadata.gz: dd78e0f67fb94f95b719fb629061969e8ee4fa0601d2176d4e54c5501cd16afc7ce973ea48c0a69d9c04823b074b3f53c6eaf365b594f014fc190b14c079155d
-  data.tar.gz: a5bad862afe77abb1584245ac014a661e74d48cf0801a7d8ece33f7201aba9322dfe7924b00305b786e9d7eab9c175cdb24bd823d14c275dc0ba1151f8c9643f
+  metadata.gz: 9eacea395189fa90297b5f25a5d8ad6a16dd65d73529cc0fb964db918ba313e96c39ef68110e5b4bef6ca06e453d5fb859a53506ff996a2b8915d51cc2aea9dd
+  data.tar.gz: 2df31c8fb5d99dcec342670de712c0bc18ec66e6cbdb53f8a5451bc1d05406efa289af876c81784ba8d858a9ca06af0bde5f42cef610f5c22d97459376b2da02

data/lib/relay/connection/connection.rb

@@ -10,48 +10,6 @@ module Relay
       GraphQL::GraphQLArgument.new(:last, GraphQL::GraphQLInt)
     ]
 
-    class ConnectionConfiguration < GraphQL::Configuration::Base
-      slot :name,               String
-      slot :node_type,          GraphQL::GraphQLObjectType
-      slot :edge_fields,       [GraphQL::GraphQLField], singular: :edge_field
-      slot :connection_fields, [GraphQL::GraphQLField], singular: :connection_field
-    end
-
-    def self.connection_definitions(configuration)
-      name, node_type = configuration.name, configuration.node_type
-
-      edge_type = GraphQL::GraphQLObjectType.new do
-        name        name + 'Edge'
-        description 'An edge in a connection'
-
-        field :node, node_type do
-          description 'The item at the end of the edge'
-        end
-
-        field :cursor, ! GraphQL::GraphQLString do
-          description 'A cursor for use in pagination'
-        end
-
-        fields configuration.edge_fields
-      end
-
-      connection_type = GraphQL::GraphQLObjectType.new do
-        name          name + 'Connection'
-        description   'A connection to a list of items.'
-
-        field :pageInfo, !PageInfoType do
-          description 'Information to aid in pagination.'
-        end
-
-        field :edges, +edge_type do
-          description 'Information to aid in pagination.'
-        end
-
-        fields configuration.connection_fields
-      end
-
-      return edge_type, connection_type
-    end
 
     PageInfoType = GraphQL::GraphQLObjectType.new do
       name          'PageInfo'
@@ -74,5 +32,51 @@ module Relay
       end
     end
 
+
+    class CompositeTypeConfiguration < GraphQL::Configuration::Base
+      slot :name,               String
+      slot :node_type,          GraphQL::GraphQLObjectType
+      slot :edge_fields,       [GraphQL::GraphQLField], singular: :edge_field
+      slot :connection_fields, [GraphQL::GraphQLField], singular: :connection_field
+    end
+
+
+    class CompositeType < GraphQL::Configuration::Configurable
+      configure_with CompositeTypeConfiguration
+
+      def connection
+        @connection ||= GraphQL::GraphQLObjectType.new(connection_arguments)
+      end
+
+      def edge_type
+        @edge_type ||= GraphQL::GraphQLObjectType.new(edge_type_arguments)
+      end
+
+      private
+
+      def connection_arguments
+        {
+          name:         name + 'Connection',
+          description:  'A connection to a list of items.',
+          fields: @configuration.connection_fields.concat([
+            { name: 'pageInfo', type: !PageInfoType,  description: 'Information to aid in pagination.' },
+            { name: 'edges',    type: +edge_type,     description: 'Information to aid in pagination.' }
+          ])
+        }
+      end
+
+      def edge_type_arguments
+        {
+          name: name + 'Edge',
+          description: 'An edge in a connection.',
+          fields: @configuration.edge_fields.concat([
+            { name: :node,    type: @configuration.node_type, description: 'The item at the end of the edge.' },
+            { name: :cursor,  type: !GraphQL::GraphQLString,  description: 'A cursor for use in pagination.'  }
+          ])
+        }
+      end
+    end
+
+
   end
 end

data/lib/relay/version.rb

@@ -1,3 +1,3 @@
 module Relay
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/connection/connection_spec.rb

@@ -12,20 +12,18 @@ RSpec.describe 'Relay Connection' do
     User.new('Tim')
   ]
 
-  friend_edge, friend_connection = Relay::Connection.connection_definitions(
-    Relay::Connection::ConnectionConfiguration.new do
-      name        'Friend'
-      node_type   -> { ConnectionUserType }
-
-      edge_field :friendship_time, GraphQL::GraphQLString do
-        resolve -> { 'Yesterday' }
-      end
-
-      connection_field :total_count, GraphQL::GraphQLInt do
-        resolve -> { Users.size }
-      end
+  FriendConnection = Relay::Connection::CompositeType.new do
+    name        'Friend'
+    node_type   -> { ConnectionUserType }
+
+    edge_field :friendship_time, GraphQL::GraphQLString do
+      resolve -> { 'Yesterday' }
+    end
+
+    connection_field :total_count, GraphQL::GraphQLInt do
+      resolve -> { Users.size }
     end
-  )
+  end
 
   ConnectionUserType = GraphQL::GraphQLObjectType.new do
     name 'User'
@@ -33,7 +31,7 @@ RSpec.describe 'Relay Connection' do
     field :name, GraphQL::GraphQLString
 
     field :friends do
-      type friend_connection
+      type FriendConnection.connection
       args Relay::Connection::ConnectionArguments
       resolve lambda { |user, params|
         Relay::Connection.connection_from_array(Users, params)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relay-rb
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Eugene Kovalev