graphql-activerecord 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb0a5e6a7aede364e37bcc2998d14080ae9f4eb4
-  data.tar.gz: a6d3c703939a2dab438abde64510c176d41504ce
+  metadata.gz: e776f9bc85c5d4a191d6fb030fe41b2de2a7a52e
+  data.tar.gz: 55a459231c7e67dfbec908637446952f41af703f
 SHA512:
-  metadata.gz: 1b29432db0e4a92b1c286e59f8e447d6b01e20ac2969b1bbd117307cbe07dd2d7561ca99f4f7c076204c97d2b59dea3d0f7339f0fb71e34a4d30253442acfd47
-  data.tar.gz: 4eb8896e974750dcd1522b259e0ae885a67aece1a6aa3e17d2e4ae52457009d8d19276a2dbda0dee38acc0878e3c0dcc3d7206624f61816d009e0c1af5676b41
+  metadata.gz: b64aa499d1d6773cbb81c333ed76ecc5bbd559793ae33e0eeeb49d002e372399e6270205b8aa62e2bee575c193073ad3f5560712ee62f873049c1532314a0ecb
+  data.tar.gz: 55f8c84efa13e1dd6233490ff44e90c970816d7fa9325c80fa64cfe7c82943d2b5ab32bc4d827a5038ab0e12510e619694f7b21a7e7235e44fede56207b982f6

data/lib/graphql/models/active_record_extension.rb

@@ -2,58 +2,43 @@ module GraphQL
   module Models
     module ActiveRecordExtension
       extend ActiveSupport::Concern
-
-      # Default options for graphql_enums
-      ENUM_OPTIONS = {
-        upcase: true
-      }
-
       class_methods do
         def graphql_enum_types
           @_graphql_enum_types ||= {}.with_indifferent_access
         end
 
         # Defines a GraphQL enum type on the model
-        def graphql_enum(attribute, **options)
-          options = ENUM_OPTIONS.merge(options)
-          options[:name] ||= "#{self.name}#{attribute.to_s.classify}"
-          options[:description] ||= "#{attribute.to_s.titleize} field on #{self.name.titleize}"
-
-          if !options.include?(:values) && !options.include?(:type)
-            if defined_enums.include?(attribute.to_s)
-              options[:values] = defined_enums[attribute.to_s].keys.map { |ev| [options[:upcase] ? ev.upcase : ev, ev.titleize] }.to_h
-            else
-              fail ArgumentError.new("Could not auto-detect the values for enum #{attribute} on #{self.name}")
-            end
+        def graphql_enum(attribute, type: nil, upcase: true)
+          # Case 1: Providing a type. Only thing to do is register the enum type.
+          if type
+            graphql_enum_types[attribute] = type
+            return type
           end
 
-          enum_type = graphql_enum_types[attribute]
-          unless enum_type
-            enum_type = options[:type] || GraphQL::EnumType.define do
-              name options[:name]
-              description options[:description]
+          # Case 2: Automatically generating the type
+          name = "#{self.name}#{attribute.to_s.classify}"
+          description = "#{attribute.to_s.titleize} field on #{self.name.titleize}"
 
-              options[:values].each do |value_name, desc|
-                value(value_name, desc)
-              end
-            end
+          if defined_enums.include?(attribute.to_s)
+            values = defined_enums[attribute.to_s].keys
+          else
+            values = DefinitionHelpers.detect_inclusion_values(self, attribute)
+          end
 
-            graphql_enum_types[attribute] = enum_type
+          if values.nil?
+            fail ArgumentError.new("Could not auto-detect the values for enum #{attribute} on #{self.name}")
           end
 
-          graphql_resolve(attribute) { send(attribute).try(:upcase) } if options[:upcase]
-          enum_type
-        end
+          type = GraphQL::EnumType.define do
+            name(name)
+            description(description)
 
-        def graphql_resolvers
-          @_graphql_resolvers ||= {}.with_indifferent_access
-        end
+            values.each do |val|
+              value(upcase ? val.upcase : val, val.to_s.titleize, value: val)
+            end
+          end
 
-        # Defines a custom method that is used to resolve this attribute's value when it is included
-        # on a GraphQL type.
-        def graphql_resolve(attribute, &block)
-          fail ArgumentError.new("#{__method__} requires a block") unless block_given?
-          graphql_resolvers[attribute] = block
+          graphql_enum_types[attribute] = type
         end
       end
     end

data/lib/graphql/models/definition_helpers/attributes.rb

@@ -95,12 +95,7 @@ module GraphQL
             if column.is_range
               DefinitionHelpers.range_to_graphql(model.public_send(attribute))
             else
-              if model_type.graphql_resolvers.include?(attribute)
-                resolve_proc = model_type.graphql_resolvers[attribute]
-                model.instance_exec(&resolve_proc)
-              else
-                model.public_send(attribute)
-              end
+              model.public_send(attribute)
             end
           end
         end

data/lib/graphql/models/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module Models
-    VERSION = "0.4.3"
+    VERSION = "0.5.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphql-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Ryan Foster