gql 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ab57728a3f404a0dc03938f49211795ec0919f9
-  data.tar.gz: b56f90154a8ee4253c76f66404861c53b18254b0
+  metadata.gz: 0b8d0bd13d8d50371e8a27403e0939d0c313c816
+  data.tar.gz: 854371b7797057ad99cb47a1e04ab912cf6aa7d0
 SHA512:
-  metadata.gz: 22ee10af77dc8cd90b0692b1ca4c91ff36a0bb71e3bd11f0412fc2a9622c784475f38985e6c055e8339a6cc22b7b794ef9309373fbf8c8b7940d67aa18d718c8
-  data.tar.gz: f4c135e4a7325589051a06004a166ab3cd198ce41077da5cfce3673dc76150968faa5f2db98057ad744e78575ab1ee2c247cd69b509f3f185a6bc7f9d3e0b8e3
+  metadata.gz: d52b45346facafa3c994dce27ffc6f8d708a4a3c26fb9878ee013fd904c993fa5ece24d6ee38e79fd1007f029064c2cece59fe0b55beac711f0af2d8dd599bf5
+  data.tar.gz: 18fa4cd86fbb2c6a094f77dc00fa68efd82f5efd6f4b1831b0b7973fae416e5d417d2f808f0fbe70885879515d2d2431cfadca6ff74bb76ab98dfa24ed8aeeb4

data/lib/gql/array.rb

@@ -7,21 +7,23 @@ module GQL
     class << self
       def build_class(id, proc, options = {})
         item_class = options.delete(:item_class) || self.item_class
-        item_class = ::Hash.new(item_class) unless item_class.is_a?(::Hash)
+        item_class = Object.build_class(:item, -> { target }, object_class: item_class)
 
         Class.new(self).tap do |field_class|
           field_class.id = id
           field_class.proc = proc
           field_class.item_class = item_class
+
+          if item_class && item_class.name.nil?
+            field_class.const_set :Item, item_class
+          end
         end
       end
     end
 
     def value
       target.map do |item|
-        field_class = Registry.fetch(self.class.item_class[item.class])
-
-        field = field_class.new(ast_node, item, variables, context)
+        field = self.class.item_class.new(ast_node, item, variables, context)
         field.value
       end
     end

data/lib/gql/call.rb

@@ -19,6 +19,10 @@ module GQL
         result.value
       end
 
+      def parameters
+        (proc || instance_method(:execute)).parameters
+      end
+
       private
         def substitute_variables(args, variables)
           args.map { |arg| substitute_variable arg, variables }

data/lib/gql/config.rb

@@ -8,14 +8,6 @@ module GQL
       @@root_class = value
     end
 
-    def root_target_proc
-      @@root_target_proc ||= -> context { nil }
-    end
-
-    def root_target_proc=(value)
-      @@root_target_proc = value
-    end
-
     def field_types
       @@field_types ||= {
         array:      'GQL::Array',
@@ -39,6 +31,14 @@ module GQL
       @@default_list_class = value
     end
 
+    def root_target_proc
+      @@root_target_proc ||= -> { nil }
+    end
+
+    def root_target_proc=(value)
+      @@root_target_proc = value
+    end
+
     def default_field_proc
       @@default_field_proc ||= -> id { -> { target.public_send(id) } }
     end
@@ -71,23 +71,13 @@ module GQL
 
       return if value == @@debug
 
-      value ? switch_debug_on : switch_debug_off
-
-      @@debug = value
-    end
-
-    private
-      def switch_debug_on
-        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
-
-      def switch_debug_off
+      if value
+        Field.object :__type__, -> { field_class }, object_class: 'GQL::Schema::Field'
+      else
         Field.remove_field :__type__
-        Field.send :remove_const, :ExecutionContext if Field.const_defined?(:ExecutionContext)
-        Field.const_set :ExecutionContext, Field::ExecutionContextNoDebug
       end
 
+      @@debug = value
+    end
   end
 end

data/lib/gql/errors.rb

@@ -71,8 +71,8 @@ module GQL
     end
 
     class InvalidClass < Error
-      def initialize(node_class, super_class)
-        msg = "#{node_class} must be a (subclass of) #{super_class}."
+      def initialize(klass, baseclass)
+        msg = "#{klass} must be a (subclass of) #{baseclass}."
 
         super(msg, 123)
       end

data/lib/gql/executor.rb

@@ -8,16 +8,12 @@ module GQL
     end
 
     def execute(context = {}, vars = {})
-      field_class = GQL.root_class
+      raise Errors::RootClassNotSet unless GQL.root_class
 
-      raise Errors::RootClassNotSet if field_class.nil?
-
-      variables.update vars
-
-      target = GQL.root_target_proc.call(context)
-
-      field = Registry.fetch(field_class).new(ast_root, target, variables, context)
-      field.value
+      root_class = Registry.fetch(GQL.root_class)
+      root_class.id = ast_root.id
+      root_class.proc = GQL.root_target_proc
+      root_class.execute self.class, ast_root, nil, variables.merge(vars), context
     end
   end
 end

data/lib/gql/field.rb

@@ -6,6 +6,8 @@ require 'gql/mixins/has_fields'
 
 module GQL
   class Field
+    ExecutionContext = Struct.new(:target, :context, :field_class)
+
     class_attribute :id, :proc, instance_accessor: false, instance_predicate: false
 
     class << self
@@ -15,6 +17,14 @@ module GQL
           field_class.proc = proc
         end
       end
+
+      def execute(parent, ast_node, target, variables, context)
+        args    = [target, context, GQL.debug ? parent : nil]
+        target  = ExecutionContext.new(*args).instance_exec(&proc)
+        field   = new(ast_node, target, variables, context)
+
+        field.value
+      end
     end
 
     extend Mixins::Common

data/lib/gql/mixins/has_calls.rb

@@ -80,8 +80,8 @@ module GQL
               case spec
               when ::Array
                 result_class_from_connection_spec spec.dup
-              when ::Hash
-                result_class_from_mapping_spec spec.dup
+              when ::Hash, ::Proc
+                result_class_from_object_spec spec.dup
               else
                 spec
               end
@@ -102,7 +102,7 @@ module GQL
             Connection.build_class :result, nil, options
           end
 
-          def result_class_from_mapping_spec(spec)
+          def result_class_from_object_spec(spec)
             Object.build_class :result, nil, object_class: spec
           end
       end
@@ -110,7 +110,7 @@ module GQL
       private
         def value_of_call(ast_call)
           call_class = call_class_for_id(ast_call.id)
-          call_class.execute(self.class, ast_call, target, variables, context)
+          call_class.execute self.class, ast_call, target, variables, context
         end
 
         def call_class_for_id(id)
@@ -126,10 +126,22 @@ module GQL
           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
+            spurred = spur_call_class(caller_class, id)
+            spurred.execute caller_class, ast_node, target, variables, context
           end
+
+          def parameters
+            call_class.parameters
+          end
+
+          private
+            def call_class
+              @call_class ||= Registry.fetch(call_class_name, Call)
+            end
+
+            def spur_call_class(caller_class, id)
+              caller_class.add_call id, call_class, returns: result_class
+            end
         end
     end
   end

data/lib/gql/mixins/has_fields.rb

@@ -103,36 +103,13 @@ module GQL
             field.value
           else
             field_class = field_class_for_id(ast_field.id)
-            next_target = target_for_field(target, field_class.proc)
-
-            field = field_class.new(ast_field, next_target, variables, context)
-            field.value
+            field_class.execute self.class, ast_field, target, variables, context
           end
         end
 
         def field_class_for_id(id)
           self.class.fields[id] or raise Errors::FieldNotFound.new(id, self.class)
         end
-
-        def target_for_field(current_target, proc)
-          args = [current_target, context]
-          args.push self.class if GQL.debug
-
-          method = self.class.const_get(:ExecutionContext).new(*args)
-          method.execute proc
-        end
-
-        class ExecutionContextNoDebug < Struct.new(:target, :context)
-          def execute(method, args = [])
-            instance_exec(*args, &method)
-          end
-        end
-
-        class ExecutionContextDebug < Struct.new(:target, :context, :field_class)
-          def execute(method, args = [])
-            instance_exec(*args, &method)
-          end
-        end
     end
   end
 end

data/lib/gql/number.rb

@@ -1,6 +1,6 @@
 module GQL
   class Number < Scalar
     # This is just an example call. Monkeypatch class to add your own.
-    call :is_zero, -> { target.zero? }, returns: Boolean
+    call :is_zero, -> { target.zero? }, returns: 'GQL::Boolean'
   end
 end

data/lib/gql/object.rb

@@ -2,26 +2,51 @@ require 'active_support/core_ext/class/attribute'
 
 module GQL
   class Object < Field
-    class_attribute :object_class, instance_accessor: false, instance_predicate: false
+    class_attribute :object_proc, instance_accessor: false, instance_predicate: false
 
     class << self
       def build_class(id, proc, options = {})
         object_class = options.delete(:object_class) || options.delete(:as)
-        object_class = ::Hash.new(object_class) unless object_class.is_a?(::Hash)
+        object_proc  = object_proc_for_class(object_class)
 
         Class.new(self).tap do |klass|
           klass.id = id
           klass.proc = proc
-          klass.object_class = object_class
+          klass.object_proc = object_proc
         end
       end
+
+      private
+        def object_proc_for_class(object_class)
+          case object_class
+          when ::Hash
+            -> target { object_class[target.class] }
+          when ::Class, ::String
+            -> _ { object_class }
+          when ::Proc
+            object_class
+          else
+            nil # raise error?
+          end
+        end
     end
 
     def value
-      field_class = Registry.fetch(self.class.object_class[target.class])
+      field_class = Registry.fetch(object_proc_result)
 
       field = field_class.new(ast_node, target, variables, context)
       field.value
     end
+
+    private
+      def object_proc_result
+        proc = self.class.object_proc
+
+        if proc.arity == 1
+          proc.call target
+        else
+          proc.call target, context
+        end
+      end
   end
 end

data/lib/gql/schema/call.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/try'
+
 module GQL
   module Schema
     class Call < GQL::Field
@@ -6,7 +8,7 @@ module GQL
       string  :id
       string  :name
       object  :result_class, -> { target.result_class || CallerClass }, object_class: Field
-      array   :parameters,   -> { (target.proc || target.instance_method(:execute)).parameters }, item_class: Parameter
+      array   :parameters,   -> { target.parameters }, item_class: Parameter
 
       def scalar_value
         target.name

data/lib/gql/schema/list.rb

@@ -1,11 +1,19 @@
 module GQL
   module Schema
     class List < GQL::Field
+      RESULT_PROC = -> target, _ { target.superclass == GQL::Call ? 'GQL::Schema::Call' : 'GQL::Schema::Field' }
+
       call :count, returns: GQL::Number
       number :count
 
       call :reverse
       call :first, -> size { target.first(size) }
+
+      call :find, returns: RESULT_PROC do |id|
+        item = target.find { |item| item.id.to_s == id.to_s }
+        raise(GQL::Error, "id not found: #{id}") unless item
+        item.respond_to?(:spur) ? item.spur : item
+      end
     end
   end
 end

data/lib/gql/string.rb

@@ -3,6 +3,6 @@ module GQL
     # These are just example calls. Monkeypatch class to add your own.
     call :upcase
     call :downcase
-    call :length, returns: Number
+    call :length, returns: 'GQL::Number'
   end
 end

data/lib/gql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gql
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - Martin Andert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-14 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake