Merge pull request rmosolgo#358 from zyixc/v1.0.0

Change documentation enum_type to include ActiveRecord::Base

Author: rmosolgo

lib/graphql/enum_type.rb

@@ -55,6 +55,21 @@ module GraphQL
   #     args[:favoriteLanguage] # => :rb
   #   }
   #
+  # @example Enum whose values are different in ActiveRecord-land
+  #   class Language < ActiveRecord::BaseType
+  #     enum language: {
+  #       rb: 0
+  #     }
+  #   end
+  #
+  #   # Now enum type should be defined as
+  #   GraphQL::EnumType.define do
+  #     # ...
+  #     # use the `value:` keyword:
+  #     value("RUBY", "Lisp? Smalltalk?", value: 'rb')
+  #   end
+  #
+
   class EnumType < GraphQL::BaseType
     accepts_definitions :values, value: GraphQL::Define::AssignEnumValue
 

spec/graphql/enum_type_spec.rb

@@ -15,6 +15,8 @@
   it "coerces result values to value's value" do
     assert_equal("YAK", enum.coerce_result("YAK"))
     assert_equal("COW", enum.coerce_result(1))
+    assert_equal("REINDEER", enum.coerce_result('reindeer'))
+    assert_equal("DONKEY", enum.coerce_result(:donkey))
   end
 
   it "raises when a result value can't be coerced" do

spec/graphql/introspection/type_type_spec.rb

@@ -23,9 +23,11 @@
   ]}
 
   let(:dairy_animals) {[
-    {"name"=>"COW",   "isDeprecated"=> false },
-    {"name"=>"GOAT",  "isDeprecated"=> false },
-    {"name"=>"SHEEP", "isDeprecated"=> false },
+    {"name"=>"COW",       "isDeprecated"=> false },
+    {"name"=>"DONKEY",    "isDeprecated"=> false },
+    {"name"=>"GOAT",      "isDeprecated"=> false },
+    {"name"=>"REINDEER",  "isDeprecated"=> false },
+    {"name"=>"SHEEP",     "isDeprecated"=> false },
   ]}
   it "exposes metadata about types" do
     expected = {"data"=> {

spec/support/dairy_app.rb

@@ -33,10 +33,12 @@ class NoSuchDairyError < StandardError; end
 DairyAnimalEnum = GraphQL::EnumType.define do
   name "DairyAnimal"
   description "An animal which can yield milk"
-  value("COW",    "Animal with black and white spots", value: 1)
-  value("GOAT",   "Animal with horns")
-  value("SHEEP",  "Animal with wool")
-  value("YAK",    "Animal with long hair", deprecation_reason: "Out of fashion")
+  value("COW",      "Animal with black and white spots", value: 1)
+  value("DONKEY",   "Animal with fur", value: :donkey)
+  value("GOAT",     "Animal with horns")
+  value("REINDEER", "Animal with horns", value: 'reindeer')
+  value("SHEEP",    "Animal with wool")
+  value("YAK",      "Animal with long hair", deprecation_reason: "Out of fashion")
 end
 
 CheeseType = GraphQL::ObjectType.define do