Merge remote-tracking branch 'upstream/master' into execution-error-path

Author: josh

.gitignore

@@ -9,3 +9,9 @@ gemfiles/*.lock
 .bundle/
 vendor/
 .idea/
+
+_site
+.sass-cache
+.jekyll-metadata
+gh-pages/
+guides/index.md

CHANGELOG.md

@@ -8,6 +8,21 @@
 
 ### Bug fixes
 
+## 0.18.14 (20 Sep 2016)
+
+### Breaking changes
+
+- Directives are no longer considered as "conflicts" in query validation. This is in conformity with the spec, but a change for graphql-ruby #263
+
+### Features
+
+- Query analyzers may emit errors by raising `GraphQL::AnalysisError`s during `#call` or returning a single error or an array of errors from `#final_value` #262
+
+### Bug fixes
+
+- Merge fields even when `@skip` / `@include` are not identical #263
+- Fix possible infinite loop in `FieldsWillMerge` validation #261
+
 ## 0.18.13 (19 Sep 2016)
 
 ### Bug fixes

Rakefile

@@ -26,9 +26,103 @@ task :console do
   IRB.start
 end
 
+
+
 desc "Use Racc & Ragel to regenerate parser.rb & lexer.rb from configuration files"
 task :build_parser do
   `rm lib/graphql/language/parser.rb lib/graphql/language/lexer.rb `
   `racc lib/graphql/language/parser.y -o lib/graphql/language/parser.rb`
   `ragel -R lib/graphql/language/lexer.rl`
 end
+
+namespace :site do
+  task :generate_readme_index do
+    File.open("guides/index.md", "w") do |fo|
+      fo.puts "---\npermalink: \"/\"\n---\n"
+      File.foreach("readme.md") do |li|
+        fo.puts li
+      end
+    end
+  end
+
+  desc "View the documentation site locally"
+  task :serve => :generate_readme_index do
+    require "jekyll"
+
+    # Generate the site in server mode.
+    puts "Running Jekyll..."
+    options = {
+      "source"      => File.expand_path("guides"),
+      "destination" => File.expand_path("guides/_site"),
+      "watch"       => true,
+      "serving"     => true
+    }
+    Jekyll::Commands::Build.process(options)
+    Jekyll::Commands::Serve.process(options)
+  end
+
+  desc "Commit the local site to the gh-pages branch and publish to GitHub Pages"
+  task :publish => [:generate_readme_index, :html_proofer] do
+    # Ensure the gh-pages dir exists so we can generate into it.
+    puts "Checking for gh-pages dir..."
+    unless File.exist?("./gh-pages")
+      puts "Creating gh-pages dir..."
+      sh "git clone [email protected]:rmosolgo/graphql-ruby gh-pages"
+    end
+
+    # Ensure latest gh-pages branch history.
+    Dir.chdir("gh-pages") do
+      sh "git checkout gh-pages"
+      sh "git pull origin gh-pages"
+    end
+
+    # Proceed to purge all files in case we removed a file in this release.
+    puts "Cleaning gh-pages directory..."
+    purge_exclude = %w[
+      gh-pages/.
+      gh-pages/..
+      gh-pages/.git
+      gh-pages/.gitignore
+    ]
+    FileList["gh-pages/{*,.*}"].exclude(*purge_exclude).each do |path|
+      sh "rm -rf #{path}"
+    end
+
+    # Copy site to gh-pages dir.
+    puts "Building site into gh-pages branch..."
+    ENV['JEKYLL_ENV'] = 'production'
+    require "jekyll"
+    Jekyll::Commands::Build.process({
+      "source"       => File.expand_path("guides"),
+      "destination"  => File.expand_path("gh-pages"),
+      "sass"         => { "style" => "compressed" }
+    })
+
+    File.open('gh-pages/.nojekyll', 'wb') { |f| f.puts(":dog: food.") }
+
+    # Commit and push.
+    puts "Committing and pushing to GitHub Pages..."
+    sha = `git rev-parse HEAD`.strip
+    Dir.chdir('gh-pages') do
+      sh "git add ."
+      sh "git commit --allow-empty -m 'Updating to #{sha}.'"
+      sh "git push origin gh-pages"
+    end
+    puts 'Done.'
+  end
+
+  desc "Test the generated HTML files"
+  task :html_proofer => :generate_readme_index do
+    require "html-proofer"
+
+    Dir.chdir("guides") do
+      system "bundle exec jekyll build"
+    end
+
+    config = {
+      :assume_extension => true
+    }
+
+    HTMLProofer.check_directory("./guides/_site", config).run
+  end
+end

graphql.gemspec

@@ -34,4 +34,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "appraisal"
   s.add_development_dependency "sequel"
   s.add_development_dependency "sqlite3"
+
+  # website stuff
+  s.add_development_dependency "github-pages"
+  s.add_development_dependency "html-proofer"
 end

guides/_config.yml

@@ -0,0 +1,22 @@
+title: GraphQL Ruby
+baseurl: "/graphql-ruby"
+url: "https://rmosolgo.github.io"
+
+exclude:
+  - .gitignore
+
+# Build settings
+markdown:         kramdown
+highlighter:      rouge
+
+kramdown:
+  auto_ids: true
+  hard_wrap: false
+  input: GFM
+
+defaults:
+  -
+    scope:
+      path: ""
+    values:
+      layout: "default"

guides/_layouts/default.html

@@ -0,0 +1,48 @@
+<!DOCTYPE HTML>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>GraphQL Ruby</title>
+    <link rel="stylesheet" href="{{ site.baseurl }}/css/main.css">
+    <link rel="icon" href="{{ site.baseurl }}/graphql-ruby-icon.png">
+    <meta name="generator">
+  </head>
+  <body class="hack">
+    <div class="container">
+      <div style="display: flex; justify-content: center;">
+<strong style="white-space: pre; line-height: 1.1em; display: inline-block; font-size: 8px;">
+    ▄██████▄     ▄████████    ▄████████    ▄███████▄    ▄█    █▄    ████████▄    ▄█
+   ███    ███   ███    ███   ███    ███   ███    ███   ███    ███   ███    ███  ███
+   ███    █▀    ███    ███   ███    ███   ███    ███   ███    ███   ███    ███  ███
+  ▄███         ▄███▄▄▄▄██▀   ███    ███   ███    ███  ▄███▄▄▄▄███▄▄ ███    ███  ███
+ ▀▀███ ████▄  ▀▀███▀▀▀▀▀   ▀███████████ ▀█████████▀  ▀▀███▀▀▀▀███▀  ███    ███  ███
+   ███    ███ ▀███████████   ███    ███   ███          ███    ███   ███    ███  ███
+   ███    ███   ███    ███   ███    ███   ███          ███    ███   ███  ▀ ███  ███▌    ▄
+   ████████▀    ███    ███   ███    █▀   ▄████▀        ███    █▀     ▀██████▀▄█ █████▄▄██
+                ███    ███                                                      ▀
+</strong>
+      </div>
+      <p style="text-align: center;">A GraphQL server implementation for Ruby</p>
+
+      <div class="grid -between">
+        <div class="cell -3of12">
+          <h3><a href="{% if jekyll.environment == 'development' %}/{% else %}{{ site.baseurl }}{% endif %}">Readme</a></h3>
+          <h3>Guides</h3>
+          <ul>
+            <li><a href="{{ site.baseurl }}/introduction">Introduction</a></li>
+            <li><a href="{{ site.baseurl }}/defining_your_schema">Defining a Schema</a></li>
+            <li><a href="{{ site.baseurl }}/executing_queries">Executing Queries</a></li>
+            <li><a href="{{ site.baseurl }}/code_reuse">Code Reuse</a></li>
+            <li><a href="{{ site.baseurl }}/security">Security</a></li>
+            <li><a href="{{ site.baseurl }}/testing">Testing</a></li>
+          </ul>
+          <h3><a href="http://www.rubydoc.info/github/rmosolgo/graphql-ruby">API Docs</a></h3>
+          <h3><a href="https://github.com/rmosolgo/graphql-ruby">Source Code</a></h3>
+        </div>
+        <div class="cell -9of12">
+          {{ content }}
+        </div>
+      </div>
+    </div>
+  </body>
+</html>

guides/code_reuse.md

@@ -1,10 +1,12 @@
-# Code Reuse with GraphQL
+---
+title: Code Reuse with GraphQL
+---
 
 Here are a few techniques for code reuse with graphql-ruby:
 
 - [Resolver classes](#resolver-classes)
 - [Dynamically defining types](#dynamically-defining-types)
-- [Functional composition and `resolve`](#functional-composition-and-resolve)
+- [Functional composition and `resolve`](#functional-composition--resolve)
 
 Besides reducing duplicate code, these approaches also allow you to test parts of your schema in isolation.