graphql 0.0.3 → 0.0.4

data/spec/graphql/{transform_spec.rb → parser/transform_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe GraphQL::Transform do
+describe GraphQL::Parser::Transform do
   let(:transform) { GraphQL::TRANSFORM }
   let(:parser) { GraphQL::PARSER }
 
@@ -8,7 +8,7 @@ describe GraphQL::Transform do
     describe 'query' do
       it 'parses node and variables' do
         tree = parser.query.parse(%{
-          like_page(<page_info>) { page { id, likes } }
+          like_page(<page_info>) { page { $fragment, likes } }
 
           <page_info>: {
             "page" : { "id": 4},
@@ -18,12 +18,17 @@ describe GraphQL::Transform do
             "page" : { "id": 4},
             "person" : {"id": 4}
           }
+
+          $fragment: {
+            id, name
+          }
           })
         res = transform.apply(tree)
         assert_equal 1, res.nodes.length
         assert_equal "like_page", res.nodes[0].identifier
         assert_equal ["<page_info>"], res.nodes[0].arguments
         assert_equal ["<page_info>", "<other>"], res.variables.map(&:identifier)
+        assert_equal ["$fragment"], res.fragments.map(&:identifier)
       end
     end
 
@@ -139,5 +144,14 @@ describe GraphQL::Transform do
         assert_equal "<page_info>", res.identifier
       end
     end
+
+    describe 'fragments' do
+      it 'gets fragments' do
+        tree = parser.fragment.parse(%{$frag: { id, name, $otherFrag }})
+        res = transform.apply(tree)
+        assert_equal "$frag", res.identifier
+        assert_equal ["id", "name", "$otherFrag"], res.fields.map(&:identifier)
+      end
+    end
   end
 end

data/spec/graphql/query_spec.rb

@@ -48,6 +48,21 @@ describe GraphQL::Query do
         end
       end
     end
+
+    describe 'when using query fragments' do
+      let(:query_string) { "post(123) { id, $publishedData } $publishedData: { published_at { month, year } }"}
+
+      it 'can yield the fragment' do
+        fragment = query.fragments["$publishedData"]
+        assert_equal "$publishedData", fragment.identifier
+        assert_equal 1, fragment.fields.length
+      end
+
+      it 'returns literal fields and fragment fields' do
+        assert_equal(123, result["123"]['id'])
+        assert_equal({"month" => 1, "year" => 2010}, result["123"]["published_at"])
+      end
+    end
     describe 'when aliasing things' do
       let(:query_string) { "post(123) { title as headline, content as what_it_says }"}
 
@@ -68,6 +83,7 @@ describe GraphQL::Query do
 
     describe 'when accessing custom fields' do
       let(:query_string) { "comment(444) { letters }"}
+
       it 'uses the custom field' do
         assert_equal "I agree", result["444"]["letters"]
       end
@@ -108,8 +124,9 @@ describe GraphQL::Query do
     end
 
     describe 'when the root call doesnt have an argument' do
-      let(:query_string) { "context() { person_name }"}
+      let(:query_string) { "context() { person_name, present }"}
       it 'calls the node with no arguments' do
+        assert_equal true, result["context"]["present"]
         assert_equal "Han Solo", result["context"]["person_name"]
       end
     end
@@ -138,13 +155,13 @@ describe GraphQL::Query do
       let(:query_string) { "post(123) { comments.first(1) { edges { cursor, node { content } } } }"}
 
       it 'executes those calls' do
-        assert_equal result, {
-            "123" => {
-              "comments" => {
-                "edges" => [
-                  { "cursor" => "444", "node" => { "content" => "I agree"} }
-                ]
-            }}}
+        expected_result = { "123" => {
+          "comments" => {
+            "edges" => [
+              { "cursor" => "444", "node" => { "content" => "I agree"} }
+            ]
+        }}}
+        assert_equal(expected_result, result)
       end
     end
 
@@ -194,6 +211,7 @@ describe GraphQL::Query do
 
   describe 'when requesting fields on a related object' do
     let(:query_string) { "comment(444) { post { title } }"}
+
     it 'finds fields on that object' do
       assert_equal "My great post", result["444"]["post"]["title"]
     end
@@ -204,7 +222,7 @@ describe GraphQL::Query do
       end
 
       it 'blows_up' do # what _should_ this do?
-        assert_raises(RuntimeError) { result }
+        assert_raises(NoMethodError) { result }
       end
     end
   end

data/spec/graphql/root_call_spec.rb

@@ -48,8 +48,22 @@ describe GraphQL::RootCall do
     end
   end
 
+  describe '.argument' do
+    it 'is reload-safe' do
+      assert_equal 2, Nodes::LikePostCall.arguments.length, "it starts with 1"
+      assert_equal "person_id", Nodes::LikePostCall.argument_at_index(1).name
+      assert_raises(RuntimeError, 'it raises before') { Nodes::LikePostCall.argument_at_index(2) }
+
+      Nodes::LikePostCall.argument.number("person_id")
+
+      assert_equal 2, Nodes::LikePostCall.arguments.length, "it stays at 1"
+      assert_equal "person_id", Nodes::LikePostCall.argument_at_index(1).name
+      assert_raises(RuntimeError, 'it raises after') { Nodes::LikePostCall.argument_at_index(2) }
+    end
+  end
+
   describe '#__type__' do
-    it 'describes the input'
+    it 'describes the arguments'
     it 'describes the response'
   end
 end

data/spec/graphql/{schema_spec.rb → schema/schema_spec.rb}

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe GraphQL::Schema do
+describe GraphQL::Schema::Schema do
   let(:schema) { GraphQL::SCHEMA }
   describe 'global instance' do
     it 'exists as GraphQL::SCHEMA' do
-      assert GraphQL::SCHEMA.is_a?(GraphQL::Schema)
+      assert GraphQL::SCHEMA.is_a?(GraphQL::Schema::Schema)
     end
   end
 
@@ -29,52 +29,9 @@ describe GraphQL::Schema do
   end
 
   describe 'querying schema' do
-  let(:query_string) { "schema() {
-    calls {
-      count,
-      edges {
-        node {
-          name,
-          returns,
-          arguments {
-            edges {
-              node {
-                name, type
-              }
-            }
-          }
-        }
-      }
-    },
-    types {
-      count,
-      edges {
-        node {
-          name,
-          fields {
-            count,
-            edges {
-              node {
-                name,
-                type,
-                calls {
-                  count,
-                  edges {
-                    node {
-                      name,
-                      arguments
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }"}
-  let(:query) { GraphQL::Query.new(query_string) }
-  let(:result) { query.as_result }
+    let(:query_string) { }
+    let(:query) { GraphQL::Query.new(query_string) }
+    let(:result) { GraphQL::SCHEMA.all }
 
     describe 'querying calls' do
       let(:upvote_post_call) { result["schema"]["calls"]["edges"].find {|e| e["node"]["name"] == "upvote_post"} }
@@ -102,9 +59,12 @@ describe GraphQL::Schema do
       let(:post_type) { result["schema"]["types"]["edges"].find { |e| e["node"]["name"] == "post" }["node"]}
       let(:content_field) { post_type["fields"]["edges"].find { |e| e["node"]["name"] == "content" }["node"]}
       let(:select_call) { content_field["calls"]["edges"].find { |e| e["node"]["name"] == "select"}["node"]}
+      let(:type_names) { result["schema"]["types"]["edges"].map {|t| t["node"]["name"] }}
 
       it 'returns all types' do
-        assert_equal 13, result["schema"]["types"]["count"]
+        types_count = 19
+        assert_equal types_count, result["schema"]["types"]["count"]
+        assert_equal types_count, type_names.length
       end
 
       it 'doesnt return types that dont expose anything' do
@@ -117,8 +77,13 @@ describe GraphQL::Schema do
         assert_equal 8, post_type["fields"]["count"]
       end
 
+      it 'has custom types' do
+        assert type_names.include?("letter_selection")
+        assert_equal "letter_selection", content_field["type"]
+      end
+
       it 'shows field type & calls' do
-        assert_equal "string", content_field["type"]
+        assert_equal "letter_selection", content_field["type"]
         assert_equal 3, content_field["calls"]["count"]
         assert_equal "select", select_call["name"]
         assert_equal "from_chars (req), for_chars (req)", select_call["arguments"]

data/spec/graphql/schema/schema_validation_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe GraphQL::Schema::SchemaValidation do
+  let(:schema) { GraphQL::SCHEMA }
+
+  it 'runs' do
+    schema.validate
+  end
+
+  describe "when the exposes_class doesnt exist" do
+    before do
+      Nodes::PostNode.exposes("BogusPost")
+    end
+    after do
+      Nodes::PostNode.exposes("Post")
+    end
+
+    it 'raises an error' do
+      assert_raises(GraphQL::ExposesClassMissingError) { schema.validate }
+    end
+  end
+
+  describe "when there's a bad field type" do
+    before do
+      Nodes::PostNode.field.bogus_kind(:bogus_title)
+    end
+    after do
+      Nodes::PostNode.remove_field(:bogus_title)
+    end
+
+    it 'raises an error' do
+      assert_raises(GraphQL::NodeNotDefinedError) { schema.validate }
+    end
+  end
+
+  describe "when a field cant find a corresponding method" do
+    before do
+      Nodes::PostNode.field.string(:bogus_title)
+    end
+    after do
+      Nodes::PostNode.remove_field(:bogus_title)
+    end
+
+    it 'raises an error' do
+      assert_raises(GraphQL::FieldNotDefinedError) { schema.validate }
+    end
+  end
+end

data/spec/support/nodes.rb

@@ -14,21 +14,26 @@ module Nodes
     end
   end
 
+
   class ApplicationConnection < GraphQL::Connection
-    default_connection!
+    type :connection
+    call :first, -> (prev_items, first) { prev_items.first(first.to_i) }
+    call :after, -> (prev_items, after) { prev_items.select {|i| i.id > after.to_i } }
+
     field.number(:count)
     field.boolean(:any)
 
     def count
-      items.count
+      target.count
     end
 
     def any
-      items.any?
+      target.any?
     end
   end
 
   class CommentsConnection < ApplicationConnection
+    type :comments
     field.number :viewer_name_length
     field.number :average_rating
 
@@ -38,33 +43,15 @@ module Nodes
     end
 
     def average_rating
-      total_rating = items.map(&:rating).inject(&:+).to_f
-      total_rating / items.size
-    end
-  end
-
-  class LetterSelectionField < GraphQL::Types::StringField
-    call :from, ->    (prev_value, chars) { prev_value[(chars.to_i)..-1] }
-    call :for, ->     (prev_value, chars) { prev_value[0, (chars.to_i)] }
-    call :select, ->  (prev_value, from_chars, for_chars) { prev_value[from_chars.to_i, for_chars.to_i] }
-    def raw_value
-      owner.content
+      total_rating = target.map(&:rating).inject(&:+).to_f
+      total_rating / target.size
     end
   end
 
-  class ApplicationConnectionField < GraphQL::Types::ConnectionField
-    type :connection
-    call :first, -> (prev_items, first) { prev_items.first(first.to_i) }
-    call :after, -> (prev_items, after) { prev_items.select {|i| i.id > after.to_i } }
-  end
-
-  class DateField < GraphQL::Types::ObjectField
+  class DateType < GraphQL::Node
+    exposes "Date"
     type :date
     call :minus_days, -> (prev_value, minus_days) { prev_value - minus_days.to_i }
-  end
-
-  class DateNode < GraphQL::Node
-    exposes "Date"
     field.number(:year)
     field.number(:month)
   end
@@ -77,7 +64,7 @@ module Nodes
     field.string(:title)
     field.letter_selection(:content)
     field.number(:length)
-    field.connection(:comments)
+    field.comments(:comments)
     field.date(:published_at)
     field.connection(:likes)
 
@@ -89,9 +76,11 @@ module Nodes
   class CommentNode < ApplicationNode
     node_for Comment
     exposes "Comment"
-    field.string :content
+    field.string(:content)
     field.letter_selection(:letters)
-    field.object(:post)
+    field.post(:post)
+
+    def letters; content; end
   end
 
   # wraps a Like, for testing explicit name
@@ -108,12 +97,26 @@ module Nodes
   class ContextNode < GraphQL::Node
     exposes "Context"
     field.string(:person_name)
+    field.boolean(:present)
 
     def cursor
       "context"
     end
+
+    def present
+      true
+    end
   end
 
+  class LetterSelectionType < GraphQL::Node
+    type :letter_selection
+    call :from, ->    (prev_value, chars) { prev_value[(chars.to_i)..-1] }
+    call :for, ->     (prev_value, chars) { prev_value[0, (chars.to_i)] }
+    call :select, ->  (prev_value, from_chars, for_chars) { prev_value[from_chars.to_i, for_chars.to_i] }
+    def as_result
+      apply_calls(target)
+    end
+  end
 
   class FindCall < GraphQL::RootCall
     abstract!

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
@@ -56,112 +56,112 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.5'
 - !ruby/object:Gem::Dependency
   name: minitest-focus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.4'
 description: A GraphQL adapter for Ruby
@@ -177,44 +177,44 @@ files:
 - lib/graphql/connection.rb
 - lib/graphql/field.rb
 - lib/graphql/field_definer.rb
-- lib/graphql/introspection/call_node.rb
+- lib/graphql/introspection/call_type.rb
 - lib/graphql/introspection/connection.rb
-- lib/graphql/introspection/field_node.rb
+- lib/graphql/introspection/field_type.rb
 - lib/graphql/introspection/root_call_argument_node.rb
-- lib/graphql/introspection/root_call_node.rb
+- lib/graphql/introspection/root_call_type.rb
 - lib/graphql/introspection/schema_call.rb
-- lib/graphql/introspection/schema_node.rb
+- lib/graphql/introspection/schema_type.rb
 - lib/graphql/introspection/type_call.rb
-- lib/graphql/introspection/type_node.rb
+- lib/graphql/introspection/type_type.rb
 - lib/graphql/node.rb
-- lib/graphql/parser.rb
+- lib/graphql/parser/parser.rb
+- lib/graphql/parser/transform.rb
 - lib/graphql/query.rb
 - lib/graphql/root_call.rb
 - lib/graphql/root_call_argument.rb
 - lib/graphql/root_call_argument_definer.rb
-- lib/graphql/schema.rb
+- lib/graphql/schema/all.rb
+- lib/graphql/schema/schema.rb
+- lib/graphql/schema/schema_validation.rb
 - lib/graphql/syntax/call.rb
 - lib/graphql/syntax/field.rb
+- lib/graphql/syntax/fragment.rb
 - lib/graphql/syntax/node.rb
 - lib/graphql/syntax/query.rb
 - lib/graphql/syntax/variable.rb
-- lib/graphql/transform.rb
-- lib/graphql/types/boolean_field.rb
-- lib/graphql/types/connection_field.rb
-- lib/graphql/types/cursor_field.rb
-- lib/graphql/types/number_field.rb
-- lib/graphql/types/object_field.rb
-- lib/graphql/types/string_field.rb
-- lib/graphql/types/type_field.rb
+- lib/graphql/types/boolean_type.rb
+- lib/graphql/types/number_type.rb
+- lib/graphql/types/object_type.rb
+- lib/graphql/types/string_type.rb
 - lib/graphql/version.rb
 - readme.md
-- spec/graphql/field_spec.rb
 - spec/graphql/node_spec.rb
-- spec/graphql/parser_spec.rb
+- spec/graphql/parser/parser_spec.rb
+- spec/graphql/parser/transform_spec.rb
 - spec/graphql/query_spec.rb
 - spec/graphql/root_call_spec.rb
-- spec/graphql/schema_spec.rb
-- spec/graphql/transform_spec.rb
+- spec/graphql/schema/schema_spec.rb
+- spec/graphql/schema/schema_validation_spec.rb
 - spec/spec_helper.rb
 - spec/support/dummy_app.rb
 - spec/support/nodes.rb
@@ -243,13 +243,13 @@ signing_key:
 specification_version: 4
 summary: GraphQL
 test_files:
-- spec/graphql/field_spec.rb
 - spec/graphql/node_spec.rb
-- spec/graphql/parser_spec.rb
+- spec/graphql/parser/parser_spec.rb
+- spec/graphql/parser/transform_spec.rb
 - spec/graphql/query_spec.rb
 - spec/graphql/root_call_spec.rb
-- spec/graphql/schema_spec.rb
-- spec/graphql/transform_spec.rb
+- spec/graphql/schema/schema_spec.rb
+- spec/graphql/schema/schema_validation_spec.rb
 - spec/spec_helper.rb
 - spec/support/dummy_app.rb
 - spec/support/nodes.rb