graphql-rails 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a7c5384076b014463594f7ff514f7575c158d7e
-  data.tar.gz: ffc42b92d06723a1ea3605d1c11f2ccb2fd1f880
+  metadata.gz: 2982060c7ec7314e4c7daf5b37e708c4df649e7f
+  data.tar.gz: e9d139a3bb0eac9b9dfd228bbbb6b7f5c11f5bbd
 SHA512:
-  metadata.gz: ba44e7314732609e798b8bff7bbf931f26673af2aa835c5af3e65be9fa35a230c66f79c2ce2e0a2b2d854e7892029268ac15ead3ebb78bbb8a475ff1d4903068
-  data.tar.gz: 25341849de64f37b1691a3735749a695a8769eaf6c3076aa1249fe7797d7939dda2e10d36c1d0a9229484627f3483de58cdab6a3f3a78cc12b8a45014577cd9b
+  metadata.gz: 45ad67d595721cf99425f8bea6cfa6845a01132b943f6c374da92e1c21597581482703f05a8150aa49e8b88c75def2d031efe5f698031003513465ffa788c66c
+  data.tar.gz: 8ed5ba12d1b161031c39dfb6a61646aecd994834a5c589b745dcce44b3c067eef7f76625f7deb4ece6efe8fa1d4216aad9fa3791eaa99188085bff89b29261cd

data/lib/graphql/rails/dsl.rb

@@ -13,6 +13,8 @@ module GraphQL
         instance_eval(&block)
       end
 
+      private
+
       def method_missing(method, *args, &block)
         begin
           @self.send(method, *args, &block)

data/lib/graphql/rails/extensions/cancan.rb

@@ -18,7 +18,7 @@ module GraphQL
           end
         end
 
-        def skip_authorization_check(*args)
+        def self.skip_authorization_check(*args)
           self.before_filter(*args) do |instance|
             instance.instance_variable_set(:@authorized, true)
           end

data/lib/graphql/rails/extensions/mongoid.rb

@@ -48,6 +48,7 @@ module GraphQL
         # mappings for common built-in scalar types.
         def types
           @types ||= {
+            Boolean => GraphQL::BOOLEAN_TYPE,
             ::Mongoid::Boolean => GraphQL::BOOLEAN_TYPE,
             BSON::ObjectId => GraphQL::STRING_TYPE,
           }
@@ -91,13 +92,23 @@ module GraphQL
                 next
               end
 
+              # Check that relationship has a valid type.
+              begin
+                klass = relationship.klass
+              rescue
+                Rails.logger.warn(
+                  "Skipping relationship with invalid class: #{relationship.name}"
+                )
+                next
+              end
+
               if relationship.many?
                 connection Types.to_field_name(relationship.name) do
-                  type -> { Types.resolve(relationship.klass).connection_type }
+                  type -> { Types.resolve(klass).connection_type }
                 end
               else
                 field Types.to_field_name(relationship.name) do
-                  type -> { Types.resolve(relationship.klass) }
+                  type -> { Types.resolve(klass) }
                 end
               end
             end

data/lib/graphql/rails/node_identification.rb

@@ -2,6 +2,7 @@ module GraphQL
   module Rails
     # Implements globally-unique object IDs for Relay compatibility.
     NodeIdentification = GraphQL::Relay::GlobalNodeIdentification.define do
+      # TODO: Add security checks.
       object_from_id -> (id, ctx) do
         Types.lookup(*NodeIdentification.from_global_id(id))
       end

data/lib/graphql/rails/operations.rb

@@ -43,11 +43,44 @@ module GraphQL
         Schema.add_query definition.field
       end
 
-      # TODO: Implement mutations and subscriptions.
+      # Define a mutation operation.
+      # Definitions should have the following form:
+      #
+      #   mutation :feed_cat => {appetite: Integer, last_meal: DateTime} do
+      #     description 'This mutation feeds the cat and returns its appetite'
+      #     argument :cat_id, Integer, :required
+      #     argument :mouse_id, Integer, :required
+      #     resolve do
+      #       cat = Cat.find(args[:cat_id])
+      #       mouse = Mouse.find(args[:mouse_id])
+      #       raise 'Cannot find cat or mouse' if cat.nil? || mouse.nil?
+      #
+      #       cat.feed(mouse)
+      #       {appetite: cat.appetite, last_meal: DateTime.now}
+      #     end
+      #   end
+      def self.mutation(hash, &block)
+        hash = extract_pair(hash)
+        unless hash[:type].is_a?(Hash)
+          raise 'Mutations must be specified with Hash results'
+        end
+        Rails.logger.debug "Adding mutation: #{Types.to_field_name(hash[:name])}"
+
+        definition = MutationDefinition.new(self)
+        definition.run(&block)
+        definition.run do
+          name hash[:name]
+          type hash[:type]
+        end
+        Schema.add_mutation definition.field
+      end
+
+      # TODO: Implement subscriptions.
 
       private
 
       # DSL for query definition.
+      # TODO: Support resolve-only blocks.
       class QueryDefinition < DSL
         attr_reader :field
 
@@ -71,9 +104,10 @@ module GraphQL
         end
 
         def argument(name, type, required = false)
-          argument = ::GraphQL::Argument.new
-          argument.name = Types.to_field_name(name)
-          argument.type = Types.resolve(type, required == :required)
+          argument = ::GraphQL::Argument.define do
+            name Types.to_field_name(name)
+            type Types.resolve(type, required == :required)
+          end
           @field.arguments[argument.name] = argument
         end
 
@@ -104,10 +138,92 @@ module GraphQL
         end
       end
 
+      # DSL for mutation definition.
+      class MutationDefinition < QueryDefinition
+        def initialize(klass)
+          super
+          @input = ::GraphQL::InputObjectType.new
+          @output = ::GraphQL::ObjectType.new
+        end
+
+        def type(hash)
+          hash.each do |name, type|
+            field = ::GraphQL::Field.define do
+              name Types.to_field_name(name)
+              type Types.resolve(type)
+            end
+            @output.fields[field.name] = field
+          end
+        end
+
+        def argument(name, type, required = false)
+          argument = ::GraphQL::Argument.define do
+            name Types.to_field_name(name)
+            type Types.resolve(type, required == :required)
+          end
+          @input.arguments[argument.name] = argument
+        end
+
+        def field
+          input = @input
+          input.name = "#{@field.name}Input"
+          input.description = "Generated input type for #{@field.name}"
+          input.arguments['clientMutationId'] = ::GraphQL::Argument.define do
+            name 'clientMutationId'
+            type Types.resolve(::String)
+            description 'Unique identifier for client performing mutation'
+          end
+
+          output = @output
+          output.name = "#{@field.name}Output"
+          output.description = "Generated output type for #{@field.name}"
+          output.fields['clientMutationId'] = ::GraphQL::Field.define do
+            name 'clientMutationId'
+            type Types.resolve(::String)
+            description 'Unique identifier for client performing mutation'
+          end
+
+          @field.type = output
+          @field.arguments['input'] = ::GraphQL::Argument.define do
+            name 'input'
+            type Types.resolve(input, true)
+          end
+          @field
+        end
+
+        def resolve(&block)
+          field.resolve = -> (obj, args, ctx) do
+            # Instantiate the Operations class with state on this query.
+            instance = @klass.new({
+              op: :mutation, name: @name, type: @type,
+              obj: obj, args: args[:input], ctx: ctx, context: ctx
+            })
+
+            begin
+              # Run callbacks for this Operations class.
+              instance.run_callbacks(:perform_operation) do
+                # Call out to the app-defined resolver.
+                result = instance.instance_eval(&block)
+                result[:clientMutationId] = args[:clientMutationId]
+                ::OpenStruct.new(result)
+              end
+            rescue => e
+              # Surface messages from standard errors in GraphQL response.
+              ::GraphQL::ExecutionError.new(e.message)
+            rescue ::Exception => e
+              # Log and genericize other runtime errors.
+              Rails.logger.error "Unexpected exception during mutation: #{@name}"
+              Rails.logger.exception e
+              ::GraphQL::ExecutionError.new('Internal error')
+            end
+          end
+        end
+      end
+
       # Extract parts from a hash passed to the operation definition DSL.
       def self.extract_pair(hash)
         unless hash.length == 1
-          raise 'Hash must contain a single :name => Type pair.'
+          raise 'Hash must contain a single :name => Type pair'
         end
         {name: hash.keys.first, type: hash.values.first}
       end

data/lib/graphql/rails/schema.rb

@@ -26,6 +26,7 @@ module GraphQL
         @schema ||= GraphQL::Schema.new begin
           TYPES.reduce({
             max_depth: Rails.config.max_depth,
+            types: [ExerciseTaskType]
           }) do |schema, type|
             fields = @fields[type]
             unless fields.empty?

data/lib/graphql/rails/types.rb

@@ -61,11 +61,10 @@ module GraphQL
       # applying an optional namespace.
       def to_type_name(name, namespace = '')
         return namespace + to_type_name(name) unless namespace.blank?
-        if Rails.config.camel_case
-          name.to_s.camelize(:upper)
-        else
-          name.to_s
-        end
+        name = name.to_s
+        name = name.camelize(:upper) if Rails.config.camel_case
+        name = name.gsub(/\W/, '_')
+        name
       end
 
       # Convert a field name to a string with the correct convention.
@@ -86,7 +85,6 @@ module GraphQL
       def types
         @types ||= {
           String => GraphQL::STRING_TYPE,
-          Boolean => GraphQL::BOOLEAN_TYPE,
 
           Fixnum => GraphQL::INT_TYPE,
           Integer => GraphQL::INT_TYPE,

data/lib/graphql/rails/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module Rails
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

data/spec/graphql/rails/config_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe GraphQL::Rails do
+  describe '.configure' do
+    it 'yields the configuration object' do
+      config = nil
+      GraphQL::Rails.configure do |c|
+        config = c
+      end
+      expect(config).to eq GraphQL::Rails.config
+    end
+  end
+
+  describe '.config' do
+    it 'has attribute accessors' do
+      GraphQL::Rails.config.debug = false
+      expect(GraphQL::Rails.config.debug).to be false
+    end
+  end
+end

data/spec/graphql/rails/dsl_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+class TestDSL < GraphQL::Rails::DSL
+  attr_reader :value
+
+  def initialize(value)
+    @value = value
+  end
+
+  def add(value)
+    @value += value
+  end
+end
+
+describe GraphQL::Rails::DSL do
+  let(:dsl) { TestDSL.new(0) }
+
+  it 'resolves DSL instance variables' do
+    dsl.run do
+      expect(@value).to be 0
+    end
+  end
+
+  it 'resolves DSL instance methods' do
+    dsl.run do
+      add 2
+      add 4
+    end
+    expect(dsl.value).to be 6
+  end
+
+  def meaning_of_life
+    42
+  end
+
+  it "resolves methods from the block's context" do
+    dsl.run do
+      add meaning_of_life
+    end
+    expect(dsl.value).to be meaning_of_life
+  end
+end

data/spec/graphql/rails/types_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+class TestType; end
+TestGraphQLType = GraphQL::BaseType.new
+
+describe GraphQL::Rails::Types do
+  describe '.resolve' do
+    context 'when type is nil' do
+      it { expect(GraphQL::Rails::Types.resolve(nil)).to raise_error }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,7 @@
+require 'graphql/rails'
+
+class Array
+  def second
+    self[1]
+  end
+end

metadata

@@ -1,71 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: graphql-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - James Reggio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-08 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   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
   name: graphql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
 - !ruby/object:Gem::Dependency
   name: graphql-relay
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: graphiql-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
 description: |
   Zero-configuration GraphQL + Relay support for Rails. Adds a route to process
   GraphQL operations and provides a visual editor (GraphiQL) during development.
@@ -78,9 +92,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - app/controllers/graphql/rails/schema_controller.rb
 - config/initializers/graphiql.rb
 - config/routes.rb
+- lib/graphql/rails.rb
 - lib/graphql/rails/callbacks.rb
 - lib/graphql/rails/config.rb
 - lib/graphql/rails/controller_extensions.rb
@@ -93,9 +109,11 @@ files:
 - lib/graphql/rails/schema.rb
 - lib/graphql/rails/types.rb
 - lib/graphql/rails/version.rb
-- lib/graphql/rails.rb
 - lib/tasks/graphql_rails_tasks.rake
-- LICENSE
+- spec/graphql/rails/config_spec.rb
+- spec/graphql/rails/dsl_spec.rb
+- spec/graphql/rails/types_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/jamesreggio/graphql-rails
 licenses:
 - MIT
@@ -106,18 +124,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Zero-configuration GraphQL + Relay support for Rails
-test_files: []
+test_files:
+- spec/graphql/rails/config_spec.rb
+- spec/graphql/rails/dsl_spec.rb
+- spec/graphql/rails/types_spec.rb
+- spec/spec_helper.rb