autographql 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a344ec93114c212ee1fd878531ebac02deb094b
-  data.tar.gz: f4ada4a255109550cb3f35a56ec7197419a0b2e5
+  metadata.gz: 1e503466113c7bc7a2cc79a2157d98c2e7a07949
+  data.tar.gz: 3589c398d5a468a75d66ae3f77c366b47e2ffcc8
 SHA512:
-  metadata.gz: 6f786b1fee44164b78d3528fd43d36c982c59988022b160a1a7e6e3a851bb1c8c33ac878347a5ab0d158d7bfc5e03a799db078180cb1f016142a8135e32f3b67
-  data.tar.gz: 9e55f2c354eb9093eb338f7c7ad3e8cba4b33915ade4d5f9948f78fece6ee9d637e78a8a5fc7a627e04cf1c91ab143589910504d90d14b2e88c854370b2f6c0c
+  metadata.gz: dfec84b8d5bce5c5d32ee0fcb0c5628b6a79116590fc93ea394ce42aff91e968595b6503d309c7ef8e78f32873c12c23e03d6cfcecc471fcc0f337174ebe795b
+  data.tar.gz: 3e421cb7d47f3752dd99b4fd82cfcb2c0288dc97ea25ac85d896e4475f74e17fd301cface6ec86e5a40518e281efb77d83f9e09656327887d9c7d193fda8a937

data/lib/autographql.rb

@@ -5,7 +5,7 @@ require_relative 'autographql/object_type'
 
 
 module AutoGraphQL
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end
 
 

data/lib/autographql/autographql.rb

@@ -5,9 +5,15 @@ module AutoGraphQL
   extend self
 
   @@models = {}
+  @@query_type = nil
+  @@type_map = nil
 
 
   def register model, options = {}
+    unless @@query_type.nil?
+      raise RuntimeError, 'registration not allowed after generation.  please register model sooner'
+    end
+
     # sanitize options
 
     name = options.fetch(:name, model.name)
@@ -47,15 +53,28 @@ module AutoGraphQL
   end
 
 
-  # dynamically generate ::QueryType
+  protected
+
   def const_missing const
     case const
+    when :Types
+      gen_types
     when :QueryType
-      AutoGraphQL::QueryBuilder.build @@models
+      gen_query
     else
       super
     end
   end
 
 
+  private
+
+  def gen_types
+    @@type_map ||= AutoGraphQL::TypeBuilder.build @@models
+  end
+
+  def gen_query
+    @@query_type ||= AutoGraphQL::QueryBuilder.build gen_types
+  end
+
 end

data/lib/autographql/query_builder.rb

@@ -9,16 +9,16 @@ module AutoGraphQL
     extend self
 
 
-    def build models_and_opts
+    def build type_map
       # dynamically create a QueryType subclass
       Class.new GraphQL::Schema::Object do
         def self.name
           'AutoGraphQL::QueryType'
         end
 
-        type_map = AutoGraphQL::TypeBuilder.build(models_and_opts)
-
         type_map.each do |model, type|
+          # for each model, create an lookup function by ID
+
           # define field for this type
           field type.name.downcase, type, null: true do
             argument :id, GraphQL::Types::ID, required: true
@@ -32,7 +32,5 @@ module AutoGraphQL
       end
 
     end
-
-
   end
 end

data/lib/autographql/type_builder.rb

@@ -37,7 +37,15 @@ module AutoGraphQL
     def build_type model, opts
       column_types = Hash[model.columns_hash.map do |name, column|
         next nil unless opts[:fields].include? name.to_sym
-        [ name.to_sym, convert_type(model, column) ]
+
+        type = convert_type(column.type)
+        unless type
+          raise TypeError.new(
+            "unsupported type: '#{column.type}' for #{model.name}::#{column.name}"
+          )
+        end
+
+        [ name.to_sym, type ]
       end.compact]
 
       # create type
@@ -59,8 +67,25 @@ module AutoGraphQL
       methods.each do |name, type|
         name = name.to_s
 
-        if type_map.include? type
-          type = type_map[type]
+        if type.is_a? Array
+          list_type = true
+          unless type.length == 1
+            raise ArgumentError, "invalid type: #{type}"
+          end
+
+          type = type.first
+        else
+          list_type = false
+        end
+
+        type = if type_map.include? type
+          type_map[type]
+        else
+          convert_type type
+        end
+
+        if list_type
+          type = type.to_list_type
         end
 
         field = GraphQL::Field.define do
@@ -102,22 +127,25 @@ module AutoGraphQL
 
 
     # convert Active Record type to GraphQL type
-    def convert_type model, column
+    def convert_type type
+      return type if type.is_a? GraphQL::BaseType
+
+      unless type.is_a? Symbol
+        type = type.to_s.downcase.to_sym
+      end
+
       {
         boolean: GraphQL::BOOLEAN_TYPE,
         date: GraphQL::Types::DATE,
         datetime: GraphQL::Types::ISO8601DateTime,
         decimal: GraphQL::Types::DECIMAL,
         float: GraphQL::FLOAT_TYPE,
+        int: GraphQL::INT_TYPE,
         integer: GraphQL::INT_TYPE,
         json: GraphQL::Types::JSON,
         string: GraphQL::STRING_TYPE,
         text: GraphQL::STRING_TYPE,
-      }.fetch column.type do
-        raise TypeError.new(
-          "unsupported type: '#{column.type}' for #{model.name}::#{column.name}"
-        )
-      end
+      }[type]
     end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autographql
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Daniel Pepper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-14 00:00:00.000000000 Z
+date: 2018-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord