graphql-relay 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a86533b3e1bc7030fe0016ee41e9492e25cc597
-  data.tar.gz: d80d3d7006d8f37a7f208b49c2fd3dc5f78081c2
+  metadata.gz: ae595ba777a0d485536c949f06bc7b0741a97267
+  data.tar.gz: 92fb6814d222d1965d9b31bc8c8887a091b19524
 SHA512:
-  metadata.gz: 9c0f624fba3f5e81724bdf73459cf72747f8f6f8ca9a569e15b99cd4391a72d25d098ec6f1c3932ce794d4d0db33b1ea2ec0e2292d11e7b79070989de2a0da09
-  data.tar.gz: 04e49ec547a0930ac9b26a54b5a7107dd5a61fe1f758449915c58b4ea7f4c2bbc4917a49e77fff80f0497a478b83624e1b97461dffc21694fec20d8fa6f55e03
+  metadata.gz: 8797f9ab05278a90c3b9ac4a8f6997b2b466a6cc05469ae5833dcff23bdc12570fda500ec7a66e5a05519d101573bdf0e44be809852b495b16d0070abac0a471
+  data.tar.gz: 595265221e8f5a9e44b87c1145f4ebe4af9e72a3fc0aed0ba0c72ce6c515f61bed75b7a800c1010f9d316752542f0fe200452853256b758cc7256139261b5653

data/lib/graphql/relay.rb

@@ -1,4 +1,5 @@
 require 'base64'
+require 'graphql'
 # MONKEY PATCHES 😬
 require 'graphql/definition_helpers/defined_by_config/definition_config'
 require_relative './object_type.rb'

data/lib/graphql/relay/base_connection.rb

@@ -18,13 +18,14 @@ module GraphQL
       CONNECTION_IMPLEMENTATIONS = {}
 
       # Create a connection which exposes edges of this type
-      def self.create_type(wrapped_type)
+      def self.create_type(wrapped_type, &block)
         edge_type = Edge.create_type(wrapped_type)
 
         connection_type = ObjectType.define do
           name("#{wrapped_type.name}Connection")
           field :edges, types[edge_type]
           field :pageInfo, PageInfo, property: :page_info
+          block && instance_eval(&block)
         end
 
         connection_type

data/lib/graphql/relay/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module Relay
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
   end
 end

data/spec/graphql/relay/relation_connection_spec.rb

@@ -10,11 +10,15 @@ describe GraphQL::Relay::RelationConnection do
     result["data"]["empire"]["bases"]["pageInfo"]
   end
 
+  def get_last_cursor(result)
+    result["data"]["empire"]["bases"]["edges"].last["cursor"]
+  end
+
   describe "results" do
     let(:query_string) {%|
-      query getShips($first: Int, $after: String, $last: Int, $before: String, $order: String){
+      query getShips($first: Int, $after: String, $last: Int, $before: String, $order: String, $nameIncludes: String){
         empire {
-          bases(first: $first, after: $after, last: $last, before: $before, order: $order) {
+          bases(first: $first, after: $after, last: $last, before: $before, order: $order, nameIncludes: $nameIncludes) {
             ... basesConnection
             pageInfo {
               hasNextPage
@@ -24,6 +28,7 @@ describe GraphQL::Relay::RelationConnection do
       }
 
       fragment basesConnection on BaseConnection {
+        totalCount,
         edges {
           cursor
           node {
@@ -32,6 +37,7 @@ describe GraphQL::Relay::RelationConnection do
         }
       }
     |}
+
     it 'limits the result' do
       result = query(query_string, "first" => 2)
       assert_equal(2, get_names(result).length)
@@ -48,12 +54,20 @@ describe GraphQL::Relay::RelationConnection do
       assert_equal(false, get_page_info(result)["hasNextPage"])
     end
 
+    it 'provides custom fileds on the connection type' do
+      result = query(query_string, "first" => 2)
+      assert_equal(
+        Base.where(faction_id: 2).count,
+        result["data"]["empire"]["bases"]["totalCount"]
+      )
+    end
+
     it 'slices the result' do
       result = query(query_string, "first" => 2)
       assert_equal(["Death Star", "Shield Generator"], get_names(result))
 
       # After the last result, find the next 2:
-      last_cursor = result["data"]["empire"]["bases"]["edges"].last["cursor"]
+      last_cursor = get_last_cursor(result)
 
       result = query(query_string, "after" => last_cursor, "first" => 2)
       assert_equal(["Headquarters"], get_names(result))
@@ -67,7 +81,7 @@ describe GraphQL::Relay::RelationConnection do
       assert_equal(["Death Star", "Headquarters"], get_names(result))
 
       # After the last result, find the next 2:
-      last_cursor = result["data"]["empire"]["bases"]["edges"].last["cursor"]
+      last_cursor = get_last_cursor(result)
 
       result = query(query_string, "after" => last_cursor, "first" => 2, "order" => "name")
       assert_equal(["Shield Generator"], get_names(result))
@@ -77,5 +91,30 @@ describe GraphQL::Relay::RelationConnection do
       result = query(query_string, "first" => 2, "order" => "-name")
       assert_equal(["Shield Generator", "Headquarters"], get_names(result))
     end
+
+    it 'paginates with order' do
+      result = query(query_string, "first" => 2, "order" => "name")
+      assert_equal(["Death Star", "Headquarters"], get_names(result))
+
+      # After the last result, find the next 2:
+      last_cursor = result["data"]["empire"]["bases"]["edges"].last["cursor"]
+
+      result = query(query_string, "after" => last_cursor, "first" => 2, "order" => "name")
+      assert_equal(["Shield Generator"], get_names(result))
+    end
+
+    it "applies custom arguments" do
+      result = query(query_string, "first" => 1, "nameIncludes" => "ea")
+      assert_equal(["Death Star"], get_names(result))
+
+      after = get_last_cursor(result)
+
+      result = query(query_string, "first" => 2, "nameIncludes" => "ea", "after" => after )
+      assert_equal(["Headquarters"], get_names(result))
+      before = get_last_cursor(result)
+
+      result = query(query_string, "last" => 1, "nameIncludes" => "ea", "before" => before)
+      assert_equal(["Death Star"], get_names(result))
+    end
   end
 end

data/spec/spec_helper.rb

@@ -2,7 +2,6 @@ require "codeclimate-test-reporter"
 CodeClimate::TestReporter.start
 require "sqlite3"
 require "active_record"
-require "graphql"
 require "graphql/relay"
 require "minitest/autorun"
 require "minitest/focus"

data/spec/support/star_wars_schema.rb

@@ -31,6 +31,16 @@ BaseType = GraphQL::ObjectType.define do
   field :planet, types.String
 end
 
+# Define a connection which will wrap an ActiveRecord::Relation.
+# We use an optional block to add fields to the connection type:
+BaseConnection = GraphQL::Relay::RelationConnection.create_type(BaseType) do
+  field :totalCount do
+    type types.Int
+    resolve -> (obj, args, ctx) { obj.object.count }
+  end
+end
+
+
 Faction = GraphQL::ObjectType.define do
   name "Faction"
   interfaces [NodeInterface]
@@ -49,12 +59,17 @@ Faction = GraphQL::ObjectType.define do
     # You can define arguments here and use them in the connection
     argument :nameIncludes, types.String
   end
-  connection :bases, BaseType.connection_type do
+  connection :bases, BaseConnection do
     # Resolve field should return an Array, the Connection
     # will do the rest!
     resolve -> (obj, args, ctx) {
-      Base.where(id: obj.bases)
+      all_bases = Base.where(id: obj.bases)
+      if args[:nameIncludes]
+        all_bases = all_bases.where("name LIKE ?", "%#{args[:nameIncludes]}%")
+      end
+      all_bases
     }
+    argument :nameIncludes, types.String
   end
 end
 

metadata

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