graphql-relay 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d0bd634a71aa2be9428940eab50e6f6e7c9853f
-  data.tar.gz: f32a8964ce51f8f905805ccde48e841e8d1ccf5a
+  metadata.gz: a7bcced67ab9b1c147555d570968aab04fa4d695
+  data.tar.gz: 585864fd46e046a9b2566e0392732634da32e215
 SHA512:
-  metadata.gz: 186e7f8a0ad72dfbaf01580f796e5c39370f14025b65d8d28ce71ea9104c627e3a3d5fc60b3bf37300fba219c9067deffe555d18d79f488f2b325851a7e8c6bf
-  data.tar.gz: c586420ab30495c62ef769e6b319dfdd6f46174476412715623cccf485a6352c54bcda0220a84bef2477dbdb6d595cdd6a0e0a2a33e58101f44f597797f40dfe
+  metadata.gz: 7048333381510bd9a4af3232e3c794cde527541ae7d6760e9bc4d46ce19773d74b905585651704138ee35be5ab58420b22c0784dc51225cbf8db53a3bb6cb163
+  data.tar.gz: 7c47839af39a5e4916496ef15259d7d9ba1b3098e3fa606d63cbe1c307fbec42ed027904709bf5e0241b4843cf78a01a26de887ee55d1d64327f3aaf3c9916ee

data/lib/graphql/relay/connection_field.rb

@@ -29,7 +29,7 @@ module GraphQL
       # @param [GraphQL::Field] A field which returns items to be wrapped as a connection
       # @return [GraphQL::Field] A field which serves a connections
       def self.create(underlying_field)
-        underlying_field.arguments = underlying_field.arguments.merge(DEFAULT_ARGUMENTS)
+        underlying_field.arguments = underlying_field.arguments.reverse_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(underlying_field.name, original_resolve)

data/lib/graphql/relay/global_node_identification.rb

@@ -11,7 +11,7 @@ module GraphQL
       attr_accessor :object_from_id_proc, :type_from_object_proc
 
       class << self
-        attr_reader :instance
+        attr_accessor :instance
         def new(*args, &block)
           @instance = super
         end
@@ -66,7 +66,13 @@ module GraphQL
       # Use the provided config to
       # get a type for a given object
       def type_from_object(object)
-        @type_from_object_proc.call(object)
+        type_result = @type_from_object_proc.call(object)
+        if !type_result.is_a?(GraphQL::BaseType)
+          type_str = "#{type_result} (#{type_result.class.name})"
+          raise "type_from_object(#{object}) returned #{type_str}, but it should return a GraphQL type"
+        else
+          type_result
+        end
       end
 
       # Use the provided config to

data/lib/graphql/relay/mutation.rb

@@ -17,7 +17,7 @@ module GraphQL
     #     input_field :name, !types.String
     #     input_field :itemId, !types.ID
     #
-    #     return_field :item, Item
+    #     return_field :item, ItemType
     #
     #     resolve -> (inputs, ctx) {
     #       item = Item.find_by_id(inputs[:id])

data/lib/graphql/relay/relation_connection.rb

@@ -1,6 +1,8 @@
 module GraphQL
   module Relay
     class RelationConnection < BaseConnection
+      DEFAULT_ORDER = "id"
+
       def cursor_from_node(item)
         order_value = item.public_send(order_name)
         cursor_parts = [order, order_value]
@@ -8,7 +10,7 @@ module GraphQL
       end
 
       def order
-        @order ||= (super || "id")
+        @order ||= (super || DEFAULT_ORDER)
       end
 
       private
@@ -64,7 +66,7 @@ module GraphQL
       def order_direction
         @order_direction ||= order.start_with?("-") ? :desc : :asc
       end
-      
+
       def table_name
         @table_name ||= object.table.table_name
       end

data/lib/graphql/relay/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module Relay
-    VERSION = '0.4.5'
+    VERSION = '0.5.0'
   end
 end

data/spec/graphql/relay/global_node_identification_spec.rb

@@ -47,12 +47,30 @@ describe GraphQL::Relay::GlobalNodeIdentification do
     end
   end
 
+  describe "type_from_object" do
+    describe "when the return value is not a BaseType" do
+      it "raises an error " do
+        err = assert_raises {
+          GraphQL::Relay::GlobalNodeIdentification.instance.type_from_object(:test_error)
+        }
+        assert_includes err.message, "not_a_type (Symbol)"
+      end
+    end
+  end
+
   describe 'making a second instance' do
+    before do
+      @first_instance = GraphQL::Relay::GlobalNodeIdentification.instance
+    end
+
+    after do
+      GraphQL::Relay::GlobalNodeIdentification.instance = @first_instance
+    end
+
     it 'overrides the first instance' do
-      first_instance = GraphQL::Relay::GlobalNodeIdentification.instance
       GraphQL::Relay::GlobalNodeIdentification.define {}
       second_instance = GraphQL::Relay::GlobalNodeIdentification.instance
-      refute_equal(first_instance, second_instance)
+      refute_equal(@first_instance, second_instance)
     end
   end
 end

data/spec/graphql/relay/relation_connection_spec.rb

@@ -65,17 +65,6 @@ describe GraphQL::Relay::RelationConnection do
       assert_equal(["Death Star", "Shield Generator"], 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 = get_last_cursor(result)
-
-      result = query(query_string, "after" => last_cursor, "first" => 2, "order" => "name")
-      assert_equal(["Shield Generator"], get_names(result))
-    end
-
     it 'paginates with reverse order' do
       result = query(query_string, "first" => 2, "order" => "-name")
       assert_equal(["Shield Generator", "Headquarters"], get_names(result))
@@ -126,4 +115,37 @@ describe GraphQL::Relay::RelationConnection do
       assert_equal(3, bases.length)
     end
   end
+
+  describe "overriding default order" do
+    let(:query_string) {%|
+      query getBases {
+        empire {
+          basesByName { ... basesFields }
+          bases { ... basesFields }
+        }
+      }
+      fragment basesFields on BaseConnection {
+        edges {
+          node {
+            name
+          }
+        }
+      }
+    |}
+
+    def get_names(result, field_name)
+      bases = result["data"]["empire"][field_name]["edges"]
+      base_names = bases.map { |b| b["node"]["name"] }
+    end
+
+    it "applies the default value" do
+      result = query(query_string)
+
+      bases_by_id   = ["Death Star", "Shield Generator", "Headquarters"]
+      bases_by_name = ["Death Star", "Headquarters", "Shield Generator"]
+
+      assert_equal(bases_by_id, get_names(result, "bases"))
+      assert_equal(bases_by_name, get_names(result, "basesByName"))
+    end
+  end
 end

data/spec/support/star_wars_schema.rb

@@ -13,7 +13,11 @@ NodeIdentification = GraphQL::Relay::GlobalNodeIdentification.define do
   end
 
   type_from_object -> (object) do
-    STAR_WARS_DATA["Faction"].values.include?(object) ? Faction : Ship
+    if object == :test_error
+      :not_a_type
+    else
+      STAR_WARS_DATA["Faction"].values.include?(object) ? Faction : Ship
+    end
   end
 end
 
@@ -75,6 +79,9 @@ Faction = GraphQL::ObjectType.define do
   end
 
   connection :basesClone, BaseConnection
+  connection :basesByName, BaseConnection, property: :bases do
+    argument :order, types.String, default_value: "name"
+  end
 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.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql