graphiform 0.2.12 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68647a1e2a4781554b98f3e34e4b8d517bdee49c76459aa8445dffb13dd59f07
-  data.tar.gz: b66dcc28e233bf23a4468a1af531d1c650c50bf3d3054687e43831ee6fd3826f
+  metadata.gz: 24d0d05956c47d3c131958d9b273951c53d313f28dd622a5f841724ce18e1a4a
+  data.tar.gz: 82bd9b1ba24f07a5abc4cb164bd64ea8d217409d434613b543a2441edf5ba202
 SHA512:
-  metadata.gz: 9d87c2c3723f8e643a3370bce93a86231466aa6f8d90ef264b308942cc6b7d832e1c4db4e9ab3a503d6f13804f3beedaef70106fd253c7fb67f9ad4863af01b4
-  data.tar.gz: 6f4c3e3784b7c70aea0044fff3bda3dd9c79780e5835ee2ea2593025be264da83798a6379ea0f9acbbe807e08fb237946f7e04910c746f17a480ad083247bc2b
+  metadata.gz: b5480858bde4de83a235a691ee1e7ec05f49f7348d44e0e8b3fd6e739ab17211f1f4ea7e0e651cd43edbe7b34b4227c429c7c87d542bea668a406cd679fff9b5
+  data.tar.gz: 96d29abd576caf4dfe334f10df9eddf89a32055c9677bcb600dccb07529a24d7531c5a2fb9e5a25595626164e9398bc900a0211b07537269a09472240480416a

data/lib/graphiform.rb

@@ -21,7 +21,29 @@ module Graphiform
   end
 
   def self.configuration
-    @configuration ||= {}
+    @configuration ||= {
+      scalar_mappings: {
+        string: GraphQL::Types::String,
+        text: GraphQL::Types::String,
+        # nchar: GraphQL::Types::String,
+
+        date: GraphQL::Types::ISO8601Date,
+
+        time: GraphQL::Types::ISO8601DateTime,
+        datetime: GraphQL::Types::ISO8601DateTime,
+        timestamp: GraphQL::Types::ISO8601DateTime,
+
+        integer: GraphQL::Types::Int,
+
+        float: GraphQL::Types::Float,
+        decimal: GraphQL::Types::Float,
+
+        boolean: GraphQL::Types::Boolean,
+
+        json: GraphQL::Types::JSON,
+        jsonb: GraphQL::Types::JSON,
+      },
+    }
   end
 
   def self.configure

data/lib/graphiform/association_source.rb

@@ -17,7 +17,9 @@ module Graphiform
     end
 
     def query(values)
-      query = @model.where(@attribute => values)
+      query = @model
+      query = query.merge(@model.instance_exec(&@options[:scope])) if @options[:scope].present?
+      query = query.where(@attribute => values)
 
       query = query.includes(@options[:includes]) if @options[:includes].present? && query.respond_to?(:includes)
       query = query.apply_filters(@options[:where].to_h) if @options[:where].present? && query.respond_to?(:apply_filters)

data/lib/graphiform/core.rb

@@ -204,6 +204,7 @@ module Graphiform
                   AssociationSource,
                   association_def.klass,
                   join_keys.key,
+                  scope: association_def.scope,
                   where: args[:where],
                   sort: args[:sort],
                   multi: true,
@@ -229,7 +230,7 @@ module Graphiform
             return object.public_send(association_def.name) if skip_dataloader
 
             value = object.public_send(join_keys.foreign_key)
-            dataloader.with(AssociationSource, association_def.klass, join_keys.key, case_sensitive: case_sensitive).load(value)
+            dataloader.with(AssociationSource, association_def.klass, join_keys.key, scope: association_def.scope, case_sensitive: case_sensitive).load(value)
           end
         end
       end

data/lib/graphiform/helpers.rb

@@ -19,24 +19,7 @@ module Graphiform
     def self.graphql_type_single(active_record_type)
       return active_record_type unless active_record_type.respond_to?(:to_sym)
 
-      case active_record_type.to_sym
-      when :string, :text
-        GraphQL::Types::String
-      when :date
-        GraphQL::Types::ISO8601Date
-      when :time, :datetime, :timestamp
-        GraphQL::Types::ISO8601DateTime
-      when :integer
-        GraphQL::Types::Int
-      when :float, :decimal
-        GraphQL::Types::Float
-      when :boolean
-        GraphQL::Types::Boolean
-      when :json, :jsonb
-        GraphQL::Types::JSON
-      else
-        active_record_type
-      end
+      Graphiform.configuration[:scalar_mappings][active_record_type.to_sym] || active_record_type
     end
 
     def self.resolver?(val)
@@ -78,6 +61,10 @@ module Graphiform
         association_def.present? &&
         !association_def.polymorphic? &&
         !association_def.through_reflection? &&
+        (
+          !association_def.scope ||
+          association_def.scope.arity.zero?
+        ) &&
         !keys.is_a?(Array) &&
         !dataloader.is_a?(GraphQL::Dataloader::NullDataloader)
       )

data/lib/graphiform/version.rb

@@ -1,3 +1,3 @@
 module Graphiform
-  VERSION = '0.2.12'.freeze
+  VERSION = '0.2.13'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiform
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
 platform: ruby
 authors:
 - jayce.pulsipher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-19 00:00:00.000000000 Z
+date: 2021-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord