gql 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84b1f6dbe8ad680fd457f4f14dbd0183b4b18d46
-  data.tar.gz: 192058fde95f568491e87c6edd719b9a4c85b1c1
+  metadata.gz: 6ab57728a3f404a0dc03938f49211795ec0919f9
+  data.tar.gz: b56f90154a8ee4253c76f66404861c53b18254b0
 SHA512:
-  metadata.gz: dee4291ac7f769adf121c145b8f2a2a93bd0a3417aba29e218120cc2106045f2e4f19cbcd2491b778aff4531f6c04d88acb39500bae1d24763be054131cfe29a
-  data.tar.gz: ae67282c3aa9cf8b48155429c7f6714f16562ba3ff77fdf9f4a9edcfabc8fae59d02b7472490599f3959b36a2af82971ad8ff36754be8f3b8b61cf71d757ff64
+  metadata.gz: 22ee10af77dc8cd90b0692b1ca4c91ff36a0bb71e3bd11f0412fc2a9622c784475f38985e6c055e8339a6cc22b7b794ef9309373fbf8c8b7940d67aa18d718c8
+  data.tar.gz: f4c135e4a7325589051a06004a166ab3cd198ce41077da5cfce3673dc76150968faa5f2db98057ad744e78575ab1ee2c247cd69b509f3f185a6bc7f9d3e0b8e3

data/lib/gql/config.rb

@@ -78,7 +78,7 @@ module GQL
 
     private
       def switch_debug_on
-        Field.object :__type__, -> { field_class }, class: Schema::Field
+        Field.object :__type__, -> { field_class }, object_class: Schema::Field
         Field.send :remove_const, :ExecutionContext if Field.const_defined?(:ExecutionContext)
         Field.const_set :ExecutionContext, Field::ExecutionContextDebug
       end

data/lib/gql/errors.rb

@@ -2,7 +2,7 @@ require 'active_support/core_ext/array/conversions'
 require 'active_support/core_ext/string/inflections'
 
 module GQL
-  class Error < StandardError
+  class Error < RuntimeError
     attr_reader :code, :handle
 
     def initialize(msg, code = 100, handle = nil)
@@ -70,16 +70,7 @@ module GQL
       end
     end
 
-    class FieldClassNotSet < Error
-      def initialize(node_class, name)
-        msg =  "#{node_class} must have a #{name.humanize(capitalize: false)} set. "
-        msg << "Set it with `self.#{name} = My#{name.camelize}Class'."
-
-        super(msg, 122)
-      end
-    end
-
-    class InvalidFieldClass < Error
+    class InvalidClass < Error
       def initialize(node_class, super_class)
         msg = "#{node_class} must be a (subclass of) #{super_class}."
 
@@ -87,16 +78,10 @@ module GQL
       end
     end
 
-    class NoMethodError < Error
-      attr_reader :cause
-
-      def initialize(field_class, id, cause)
-        @cause = cause
-
-        msg =  "Undefined method `#{id}' for #{field_class}. "
-        msg << "Did you try to add a field of type `#{id}'? "
-        msg << "If so, you have to register your field type first "
-        msg << "like this: `GQL.field_types[:#{id}] = My#{id.to_s.camelize}'. "
+    class UnknownFieldType < Error
+      def initialize(type, using_class)
+        msg =  "The field type `#{type}' used in #{using_class} is not known."
+        msg << "Register your field type with: `GQL.field_types[:#{type}] = My#{type.to_s.camelize}'. "
         msg << "The following field types are currently registered: "
         msg << GQL.field_types.keys.sort.map { |key| "`#{key}'" }.to_sentence
 

data/lib/gql/lazy.rb

@@ -7,22 +7,30 @@ module GQL
     class << self
       def build_class(id, proc, options)
         Class.new(self).tap do |field_class|
-          field_class.owner = options.delete(:owner)
-          field_class.type = options.delete(:type)
-          field_class.id = id
-          field_class.proc = proc
+          field_class.owner   = options.delete(:owner)
+          field_class.type    = options.delete(:type)
+          field_class.id      = id
+          field_class.proc    = proc
           field_class.options = options
         end
       end
 
-      def resolve
-        owner.remove_field id
+      def spur
+        return spur_unknown_field_type if type.is_a? ::Symbol
+
         owner.add_field id, proc, options.merge(type: Registry.fetch(type))
       end
+
+      private
+        def spur_unknown_field_type
+          field_type = GQL.field_types[type]
+          raise Errors::UnknownFieldType.new(type, owner) unless field_type
+          owner.send type, id, proc, options
+        end
     end
 
     def value
-      field_class = self.class.resolve
+      field_class = self.class.spur
 
       field = field_class.new(ast_node, target, variables, context)
       field.value

data/lib/gql/mixins/has_calls.rb

@@ -53,7 +53,8 @@ module GQL
           end
 
           def call_class_from_spec(spec)
-            return Class.new(spec) unless spec.is_a?(Proc)
+            return LazyCall.new(spec) if spec.is_a?(::String)
+            return Class.new(spec) unless spec.is_a?(::Proc)
 
             Class.new(Call).tap do |call_class|
               call_class.class_eval do
@@ -102,7 +103,7 @@ module GQL
           end
 
           def result_class_from_mapping_spec(spec)
-            Object.build_class :result, nil, class: spec
+            Object.build_class :result, nil, object_class: spec
           end
       end
 
@@ -115,6 +116,21 @@ module GQL
         def call_class_for_id(id)
           self.class.calls[id] or raise Errors::CallNotFound.new(id, self.class)
         end
+
+        class LazyCall
+          attr_reader :call_class_name
+          attr_accessor :id, :result_class
+
+          def initialize(call_class_name)
+            @call_class_name = call_class_name
+          end
+
+          def execute(caller_class, ast_node, target, variables, context)
+            real_call_class = Registry.fetch(call_class_name, Call)
+            call_class = caller_class.add_call(id, real_call_class, returns: result_class)
+            call_class.execute caller_class, ast_node, target, variables, context
+          end
+        end
     end
   end
 end

data/lib/gql/mixins/has_fields.rb

@@ -54,15 +54,15 @@ module GQL
             define_field_method method, type
             send method, *args, &block
           else
-            super
+            options = args.extract_options!.merge(type: method.to_sym)
+            args = args.push(options)
+            add_field(*args, &block)
           end
-        rescue NoMethodError => exc
-          raise Errors::NoMethodError.new(self, method, exc)
         end
 
         private
           def build_field_class(type, id, proc, options)
-            if type.is_a? ::String
+            if type.is_a?(::String) || type.is_a?(::Symbol)
               Lazy.build_class id, proc, options.merge(owner: self, type: type)
             else
               Registry.fetch(type).build_class id, proc, options

data/lib/gql/object.rb

@@ -6,7 +6,7 @@ module GQL
 
     class << self
       def build_class(id, proc, options = {})
-        object_class = options.delete(:class) || options.delete(:as)
+        object_class = options.delete(:object_class) || options.delete(:as)
         object_class = ::Hash.new(object_class) unless object_class.is_a?(::Hash)
 
         Class.new(self).tap do |klass|

data/lib/gql/registry.rb

@@ -17,8 +17,6 @@ module GQL
 
     def fetch(key, baseclass = Field)
       cache[key] || begin
-        raise Errors::FieldClassNotSet.new(baseclass, 'TODO') if key.nil?
-
         const, name =
           if key.instance_of? ::Class
             [key, key.name]
@@ -26,7 +24,7 @@ module GQL
             [key.constantize, key]
           end
 
-        raise Errors::InvalidFieldClass.new(const, baseclass) unless const <= baseclass
+        raise Errors::InvalidClass.new(const, baseclass) unless const <= baseclass
 
         cache.update name => const, const => const
 

data/lib/gql/schema/call.rb

@@ -5,7 +5,7 @@ module GQL
 
       string  :id
       string  :name
-      object  :result_class, -> { target.result_class || CallerClass }, class: Field
+      object  :result_class, -> { target.result_class || CallerClass }, object_class: Field
       array   :parameters,   -> { (target.proc || target.instance_method(:execute)).parameters }, item_class: Parameter
 
       def scalar_value

data/lib/gql/version.rb

@@ -1,3 +1,3 @@
 module GQL
-  VERSION = '0.0.20'
+  VERSION = '0.0.21'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gql
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - Martin Andert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: minitest-perf
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement