graphql 1.6.5 → 1.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a043673bcabc1f7cbcc834d71919a4a61dd36a6a
-  data.tar.gz: efc89423aa48aecce87434a1f0e4567fdf4de290
+  metadata.gz: c0462bdcc9e6c3950083b012a0006d25f8013bb0
+  data.tar.gz: 0a4e0f3fa8a80fea50c06aaee8b13936d2d08215
 SHA512:
-  metadata.gz: d379a08ef187cef29cec03dfb570d3064bc762ff117a5f4e912ef2b5e4cd6f512f1317b42a1e0ae5ccb0510eb505ab36e0ef8ff61c7331326523b7d49889d7d7
-  data.tar.gz: 58ddefe960ea3e4d75d9c55ba06403632974a796f6fa5a3869977b2733d5dad17e0037390848cdd738b605b89e22807e47508d64a03f4c8978f46d714cc393f0
+  metadata.gz: 6cba4584a349b14efdc077ffcaed1b94f041e0389f5782ff1bfd664e87cbbde4e180d554580f5920b854e27a0d024d18660077bd7ca2f6b9ea509e07b5605e7d
+  data.tar.gz: 4e30b92e358666030f691ab91f019001b42fc3fdf34acfaa9fa00d93a33ef4a2fb61a8358bb5ce88ce05e402efde0ac34206a219db1995b3c67c87bd666b86bd

data/lib/graphql/enum_type.rb

@@ -94,7 +94,7 @@ module GraphQL
     # @param enum_value [EnumValue] A value to add to this type's set of values
     def add_value(enum_value)
       if @values_by_name.key?(enum_value.name)
-        raise "Enum value names must be unique. `#{enum_value.name}` already exists."
+        raise "Enum value names must be unique. Value `#{enum_value.name}` already exists on Enum `#{name}`."
       end
 
       @values_by_name[enum_value.name] = enum_value

data/lib/graphql/rake_task.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 require "fileutils"
+require "graphql/rake_task/validate"
+
 module GraphQL
   # A rake task for dumping a schema as IDL or JSON.
   #

data/lib/graphql/rake_task/validate.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module GraphQL
+  class RakeTask
+    extend Rake::DSL
+
+    desc "Get the checksum of a graphql-pro version and compare it to published versions on GitHub and graphql-ruby.org"
+    task "graphql:pro:validate", [:gem_version] do |t, args|
+      version = args[:gem_version]
+      check = "\e[32m✓\e[0m"
+      ex = "\e[31m✘\e[0m"
+      puts "Validating graphql-pro v#{version}"
+      puts "  - Checking for graphql-pro credentials..."
+
+      creds = `bundle config gems.graphql.pro`[/[a-z0-9]{11}:[a-z0-9]{11}/]
+      if creds.nil?
+        puts "    #{ex} failed, please set with `bundle config gems.graphql.pro $MY_CREDENTIALS`"
+        exit(1)
+      else
+        puts "    #{check} found"
+      end
+
+      puts "  - Fetching the gem..."
+      fetch_result = `gem fetch graphql-pro -v #{version} --source https://#{creds}@gems.graphql.pro`
+      if fetch_result.empty?
+        puts "    #{ex} failed to fetch v#{version}"
+        exit(1)
+      else
+        puts "    #{check} fetched"
+      end
+
+      puts "  - Validating digest..."
+      require "digest/sha2"
+      gem_digest = Digest::SHA512.new.hexdigest(File.read("graphql-pro-#{version}.gem"))
+      require "net/http"
+      github_uri = URI("https://raw.githubusercontent.com/rmosolgo/graphql-ruby/master/guides/pro/checksums/graphql-pro-#{version}.txt")
+      # Remove final newline from .txt file
+      github_digest = Net::HTTP.get(github_uri).chomp
+
+      docs_uri = URI("https://raw.githubusercontent.com/rmosolgo/graphql-ruby/master/guides/pro/checksums/graphql-pro-#{version}.txt")
+      docs_digest = Net::HTTP.get(docs_uri).chomp
+
+      if docs_digest == gem_digest && github_digest == gem_digest
+        puts "    #{check} validated from GitHub"
+        puts "    #{check} validated from graphql-ruby.org"
+      else
+        puts "    #{ex} SHA mismatch:"
+        puts "      Downloaded:       #{gem_digest}"
+        puts "      GitHub:           #{github_digest}"
+        puts "      graphql-ruby.org: #{docs_digest}"
+        puts ""
+        puts "      This download of graphql-pro is invalid, please open an issue:"
+        puts "      https://github.com/rmosolgo/graphql-ruby/issues/new?title=graphql-pro%20digest%20mismatch%20(#{version})"
+        exit(1)
+      end
+
+      puts "\e[32m✔\e[0m graphql-pro #{version} validated successfully!"
+    end
+  end
+end

data/lib/graphql/relay/relation_connection.rb

@@ -100,7 +100,12 @@ module GraphQL
 
       # If a relation contains a `.group` clause, a `.count` will return a Hash.
       def relation_count(relation)
-        count_or_hash = relation.count
+        count_or_hash = case relation
+        when ActiveRecord::Relation
+          relation.count(:all)
+        else # eg, Sequel::Dataset, don't mess up others
+          relation.count
+        end
         count_or_hash.is_a?(Integer) ? count_or_hash : count_or_hash.length
       end
 

data/lib/graphql/static_validation/rules/variable_usages_are_allowed.rb

@@ -12,7 +12,13 @@ module GraphQL
         }
 
         context.visitor[GraphQL::Language::Nodes::Argument] << ->(node, parent) {
-          node_values = Array.wrap(node.value).select { |value| value.is_a? GraphQL::Language::Nodes::VariableIdentifier }
+          node_values = if node.value.is_a?(Array)
+            node.value
+          else
+            [node.value]
+          end
+          node_values = node_values.select { |value| value.is_a? GraphQL::Language::Nodes::VariableIdentifier }
+
           return if node_values.none?
 
           arguments = nil

data/lib/graphql/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module GraphQL
-  VERSION = "1.6.5"
+  VERSION = "1.6.6"
 end

data/spec/graphql/enum_type_spec.rb

@@ -113,9 +113,13 @@ describe GraphQL::EnumType do
 
   describe "validates enum value name uniqueness" do
     it "raises an exception when adding a duplicate enum value name" do
-      assert_raises "Enum value names must be unique. `COW` already exists." do
+      expected_message = "Enum value names must be unique. Value `COW` already exists on Enum `DairyAnimal`."
+
+      exception = assert_raises do
         enum.add_value(GraphQL::EnumType::EnumValue.define(name: "COW"))
       end
+
+      assert_equal(expected_message, exception.message)
     end
   end
 end

data/spec/graphql/relay/relation_connection_spec.rb

@@ -481,6 +481,14 @@ describe GraphQL::Relay::RelationConnection do
   end
 
   describe "for an ActiveRecord::Relation" do
+    describe "#has_next_page" do
+      it "handles joined, aliased relations" do
+        relation = StarWars::Base.select("id AS crazy_id")
+        connection = GraphQL::Relay::RelationConnection.new(relation, { first: 1 })
+        assert connection.has_next_page
+      end
+    end
+
     describe "#edge_nodes" do
       it "returns the nodes for the current page" do
         # Offset

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.6.6
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-13 00:00:00.000000000 Z
+date: 2017-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -440,6 +440,7 @@ files:
 - lib/graphql/query/variable_validation_error.rb
 - lib/graphql/query/variables.rb
 - lib/graphql/rake_task.rb
+- lib/graphql/rake_task/validate.rb
 - lib/graphql/relay.rb
 - lib/graphql/relay/array_connection.rb
 - lib/graphql/relay/base_connection.rb