graphql-relay 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4efd1cd2ad74d644082dec208d0f59fee5c43973
-  data.tar.gz: 2c31b7d7c3f3661e54ec02103e622328f5c25a51
+  metadata.gz: 921751eabb371fef7f064ff0bbefccf2cd77569b
+  data.tar.gz: 19273e08230559f7d181ade786556b831925bc2f
 SHA512:
-  metadata.gz: 7475507b89ca0adf9a061be156f06ce2a8ff96dc6b09a78f23cd1c796c862e8490feed2a0afa1a60802ded7d3384b7aedafd2a2f48a13990baafe18edc5b350d
-  data.tar.gz: 9c38cc95c267429b0047b1ee140307cef4e08bde2abe832eff76cc29e3e867b7d6b5bffad51459671bebfcec0093dbc1e6cef3f99eaeeb27e0f1d194aeb37bd1
+  metadata.gz: 0871b958af3b912827669e9dbf1d4e2952edb035bcc676104223797c7116480bc1ad63205d72ef51b90429b5ee6e7bc1f1efb08546a4ea6f09c7e276c7d0fa11
+  data.tar.gz: 2f0b46a36b0843e662f164d7de45b36c51a9a938f0d81e45fa5d786b9c327b92e1ebad019339a8aa24b19e8c6078b5f7096382b674c33f2e289726e628594c53

data/README.md

@@ -74,6 +74,6 @@ Examples:
 
 ## More Resources
 
-- [GraphQL Slack](graphql-slack.herokuapp.com), come join us in the `#ruby` channel!
+- [GraphQL Slack](http://graphql-slack.herokuapp.com), come join us in the `#ruby` channel!
 - [`graphql`](https://github.com/rmosolgo/graphql-ruby) Ruby gem
 - [`graphql-relay-js`](https://github.com/graphql/graphql-relay-js) JavaScript helpers for GraphQL and Relay

data/lib/graphql/relay.rb

@@ -2,7 +2,7 @@ require 'base64'
 require 'graphql'
 # MONKEY PATCHES 😬
 require 'graphql/relay/monkey_patches/definition_config'
-require 'graphql/relay/monkey_patches/object_type'
+require 'graphql/relay/monkey_patches/base_type'
 
 require 'graphql/relay/global_node_identification'
 require 'graphql/relay/page_info'
@@ -12,3 +12,4 @@ require 'graphql/relay/array_connection'
 require 'graphql/relay/relation_connection'
 require 'graphql/relay/global_id_field'
 require 'graphql/relay/mutation'
+require 'graphql/relay/connection_field'

data/lib/graphql/relay/base_connection.rb

@@ -19,7 +19,7 @@ module GraphQL
 
       # Create a connection which exposes edges of this type
       def self.create_type(wrapped_type, &block)
-        edge_type = Edge.create_type(wrapped_type)
+        edge_type = wrapped_type.edge_type
 
         connection_type = ObjectType.define do
           name("#{wrapped_type.name}Connection")

data/lib/graphql/relay/connection_field.rb

@@ -0,0 +1,45 @@
+module GraphQL
+  module Relay
+    class ConnectionField
+      ARGUMENT_DEFINITIONS = [
+          [:first, GraphQL::INT_TYPE],
+          [:after, GraphQL::STRING_TYPE],
+          [:last, GraphQL::INT_TYPE],
+          [:before, GraphQL::STRING_TYPE],
+          [:order, GraphQL::STRING_TYPE],
+        ]
+
+      DEFAULT_ARGUMENTS = ARGUMENT_DEFINITIONS.reduce({}) do |memo, arg_defn|
+        argument = GraphQL::Argument.new
+        argument.name = arg_defn[0]
+        argument.type = arg_defn[1]
+        memo[argument.name.to_s] = argument
+        memo
+      end
+
+      # Turn A GraphQL::Field into a connection by:
+      # - Merging in the default argument
+      # - Transforming its resolve function to return a connection object
+      def self.create(underlying_field)
+        underlying_field.arguments = underlying_field.arguments.merge(DEFAULT_ARGUMENTS)
+        # TODO: make a public API on GraphQL::Field to expose this proc
+        original_resolve = underlying_field.instance_variable_get(:@resolve_proc)
+        underlying_field.resolve = get_connection_resolve(original_resolve)
+        underlying_field
+      end
+
+      private
+
+      def self.get_connection_resolve(underlying_resolve)
+        -> (obj, args, ctx) {
+          items = underlying_resolve.call(obj, args, ctx)
+          if items == GraphQL::Query::DEFAULT_RESOLVE
+            items = obj.public_send(name)
+          end
+          connection_class = GraphQL::Relay::BaseConnection.connection_for_items(items)
+          connection_class.new(items, args)
+        }
+      end
+    end
+  end
+end

data/lib/graphql/relay/monkey_patches/{object_type.rb → base_type.rb}

@@ -1,5 +1,9 @@
-class GraphQL::ObjectType
+class GraphQL::BaseType
   def connection_type
     @connection_type ||= GraphQL::Relay::BaseConnection.create_type(self)
   end
+
+  def edge_type
+    @edge_type ||= GraphQL::Relay::Edge.create_type(self)
+  end
 end

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

@@ -4,30 +4,8 @@ class GraphQL::DefinitionHelpers::DefinedByConfig::DefinitionConfig
   # - wraps the resolve proc to make a connection
   #
   def connection(name, type = nil, desc = nil, property: nil, &block)
-    # Wrap the given block to define the default args
-    definition_block = -> (config) {
-      argument :first, types.Int
-      argument :after, types.String
-      argument :last, types.Int
-      argument :before, types.String
-      argument :order, types.String
-      self.instance_eval(&block) if block_given?
-    }
-    connection_field = field(name, type, desc, property: property, &definition_block)
-    # Wrap the defined resolve proc
-    # TODO: make a public API on GraphQL::Field to expose this proc
-    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)
-    }
-    connection_field.resolve = connection_resolve
+    underlying_field = field(name, type, desc, property: property, &block)
+    connection_field = GraphQL::Relay::ConnectionField.create(underlying_field)
     fields[name.to_s] = connection_field
   end
 

data/lib/graphql/relay/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module Relay
-    VERSION = '0.4.0'
+    VERSION = '0.4.1'
   end
 end

data/spec/graphql/relay/array_connection_spec.rb

@@ -27,6 +27,7 @@ describe GraphQL::Relay::ArrayConnection do
         }
       }
     |}
+
     it 'limits the result' do
       result = query(query_string, "first" => 2)
       number_of_ships = get_names(result).length

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-relay
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-06 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -190,11 +190,12 @@ files:
 - lib/graphql/relay.rb
 - lib/graphql/relay/array_connection.rb
 - lib/graphql/relay/base_connection.rb
+- lib/graphql/relay/connection_field.rb
 - lib/graphql/relay/edge.rb
 - lib/graphql/relay/global_id_field.rb
 - lib/graphql/relay/global_node_identification.rb
+- lib/graphql/relay/monkey_patches/base_type.rb
 - lib/graphql/relay/monkey_patches/definition_config.rb
-- lib/graphql/relay/monkey_patches/object_type.rb
 - lib/graphql/relay/mutation.rb
 - lib/graphql/relay/page_info.rb
 - lib/graphql/relay/relation_connection.rb