cm-graphql 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 399397ce48d209a73cae1bce70fd001bef2c90257da752f15d96bb2fd9cfd48a
-  data.tar.gz: 3ecbfb7570da22557b9ff06a4eb09118b8aa5ad3b6683668568a8ef99bf94ed7
+  metadata.gz: bfe03ea1105356f62c221657ccf7e1ac08f138cc537a1e28bf70f9ad1aa0e0b7
+  data.tar.gz: 8275b35c3ba06d16d1be8a32ea6fd0e528c9a6db7c63793d84f2d1e65d62a734
 SHA512:
-  metadata.gz: 05c6cf5b383aac925bfa67885a589eac1fc274b922f2523a54398dcbd79d89582bd19fd20aac378382eb194a497a2385a1de3fc9fa4e558d56ccaf3f40772c80
-  data.tar.gz: 997ce8c7ae2213b1007b21a9f4ac8f1d8d002b5ef2d0f50fc5a392dc19d24a3a04b717050898fb40d75ad68f86f389afe6032c616c32166618dfdbd10b2e9402
+  metadata.gz: 742fa1b707f8fd4e726879779293563da46f8c901f64987fd0897d0ccb6aafcf60a9fb010aa7e58d109da244584bbdc5074ac2d8ef142f6bfdc5c5727b3989da
+  data.tar.gz: 7ee1c3308c49eb9f5b14ce47c2b2d710160c8087b2bc645326ffb3e3a6b355e68614ca7856879659a14b546225dc19730dd13f22edfd311f0314b1d1f05b4811

data/.github/CODEOWNERS

@@ -0,0 +1 @@
+* @Mahaveer1141 @anbublacky @mikevic

data/.gitignore

@@ -0,0 +1 @@
+.idea

data/Gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    cm-graphql (0.0.5)
-      graphiql-rails (~> 1.9)
-      graphql (~> 2.2, >= 2.2.5)
-      graphql-rails_logger (~> 1.2, >= 1.2.4)
+    cm-graphql (0.0.6)
+      graphiql-rails (>= 1.9)
+      graphql (>= 2.2.5)
+      graphql-rails_logger (>= 1.2.4)
       kaminari (~> 1.2, >= 1.2.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.1.2)
-      actionview (= 7.1.2)
-      activesupport (= 7.1.2)
+    actionpack (7.1.3.3)
+      actionview (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
@@ -20,19 +20,19 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actionview (7.1.2)
-      activesupport (= 7.1.2)
+    actionview (7.1.3.3)
+      activesupport (= 7.1.3.3)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activemodel (7.1.2)
-      activesupport (= 7.1.2)
-    activerecord (7.1.2)
-      activemodel (= 7.1.2)
-      activesupport (= 7.1.2)
+    activemodel (7.1.3.3)
+      activesupport (= 7.1.3.3)
+    activerecord (7.1.3.3)
+      activemodel (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
       timeout (>= 0.4.0)
-    activesupport (7.1.2)
+    activesupport (7.1.3.3)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -43,29 +43,29 @@ GEM
       mutex_m
       tzinfo (~> 2.0)
     base64 (0.2.0)
-    bigdecimal (3.1.5)
-    builder (3.2.4)
-    concurrent-ruby (1.2.2)
+    bigdecimal (3.1.8)
+    builder (3.3.0)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     crass (1.0.6)
-    drb (2.2.0)
-      ruby2_keywords
-    erubi (1.12.0)
-    graphiql-rails (1.9.0)
+    drb (2.2.1)
+    erubi (1.13.0)
+    fiber-storage (1.0.0)
+    graphiql-rails (1.10.1)
       railties
-      sprockets-rails
-    graphql (2.2.5)
-      racc (~> 1.4)
+    graphql (2.3.17)
+      base64
+      fiber-storage
     graphql-rails_logger (1.2.4)
       actionpack (> 5.0)
       activesupport (> 5.0)
       railties (> 5.0)
       rouge (~> 3.0)
-    i18n (1.14.1)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    io-console (0.7.1)
-    irb (1.11.1)
-      rdoc
+    io-console (0.7.2)
+    irb (1.14.1)
+      rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -82,18 +82,18 @@ GEM
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    mini_portile2 (2.8.5)
-    minitest (5.20.0)
+    mini_portile2 (2.8.7)
+    minitest (5.25.1)
     mutex_m (0.2.0)
-    nokogiri (1.16.0)
+    nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.16.0-arm64-darwin)
+    nokogiri (1.16.7-arm64-darwin)
       racc (~> 1.4)
     psych (5.1.2)
       stringio
-    racc (1.7.3)
-    rack (3.0.8)
+    racc (1.8.1)
+    rack (3.1.7)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -108,35 +108,27 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.1.2)
-      actionpack (= 7.1.2)
-      activesupport (= 7.1.2)
+    railties (7.1.3.3)
+      actionpack (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
-    rake (13.1.0)
-    rdoc (6.6.2)
+    rake (13.2.1)
+    rdoc (6.7.0)
       psych (>= 4.0.0)
-    reline (0.4.2)
+    reline (0.5.10)
       io-console (~> 0.5)
     rouge (3.30.0)
-    ruby2_keywords (0.0.5)
-    sprockets (4.2.1)
-      concurrent-ruby (~> 1.0)
-      rack (>= 2.2.4, < 4)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
-      sprockets (>= 3.0.0)
-    stringio (3.1.0)
-    thor (1.3.0)
+    stringio (3.1.1)
+    thor (1.3.2)
     timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    webrick (1.8.1)
-    zeitwerk (2.6.12)
+    webrick (1.8.2)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   arm64-darwin-20

data/app/graphql/types/base_connection.rb

@@ -0,0 +1,29 @@
+module Types
+  class BaseConnection < Types::BaseObject
+    # add `nodes` and `pageInfo` fields, as well as `edge_type(...)` and `node_nullable(...)` overrides
+    include GraphQL::Types::Relay::ConnectionBehaviors
+
+    field :total_count, Integer, "Total # of objects returned from this Plural Query", null: false
+    def total_count
+      object.nodes&.count
+    end
+
+    field :total_page_count, Integer, "Total # of pages, based on total count and pagesize", null: false
+    def total_page_count
+      return 1 unless object.nodes&.count&.positive?
+      # get total count and create array with total count as first item
+      my_total_count = object.nodes&.count
+      possible_page_sizes = [my_total_count]
+
+      # add first and last argument counts to the array if they exist
+      possible_page_sizes.push(object.arguments[:first]) if object.arguments[:first]
+      possible_page_sizes.push(object.arguments[:last]) if object.arguments[:last]
+
+      # get the smallest of the array items
+      actual_page_size = possible_page_sizes.min
+
+      # return the total_count divided by the page size, rounded up
+      (my_total_count / actual_page_size.to_f).ceil
+    end
+  end
+end

data/app/graphql/types/inputs/image_resolution.rb

@@ -0,0 +1,12 @@
+module Types
+  module Inputs
+    class ImageResolution < Base::Filter
+      graphql_name 'ImageResolution'
+
+      description 'Additional attributes needed for Image Resolution'
+
+      argument :width,         Integer,  nil,  required: true
+      argument :height,        Integer,  nil,  required: true
+    end
+  end
+end

data/app/graphql/types/objects/base/attachment_type.rb

@@ -2,7 +2,9 @@ module Types::Objects::Base
   class AttachmentType < Types::BaseObject
     field :id,          Int,      nil, null: false
     field :filename,    String,   nil, null: false
-    field :url,         String,   nil, null: false
+    field :url,         String,   nil, null: false do
+      argument :resolution, Types::Inputs::ImageResolution, required: false, default_value: nil
+    end
     field :base64,      String,   nil, null: false
 
     def id
@@ -21,13 +23,22 @@ module Types::Objects::Base
       end
     end
 
-    def url
-      if object.class.eql?(ActiveStorage::Variant)
-        Rails.application.routes.url_helpers.rails_representation_url(object)
-      elsif defined?(object.service_url)
-        object.service_url
+    def url(resolution:)
+      resized_image = resize_image(resolution&.width, resolution&.height, object)
+      if resized_image.class.eql?(ActiveStorage::Variant) || resized_image.class.eql?(ActiveStorage::VariantWithRecord)
+        Rails.application.routes.url_helpers.rails_representation_url(resized_image)
+      elsif defined?(resized_image.service_url)
+        resized_image.service_url
+      else
+        resized_image.url
+      end
+    end
+
+    def resize_image(width, height, attachment)
+      if width.present? && height.present? && (attachment.attached? && attachment.content_type.include?('image'))
+        attachment.variant(resize_to_fill: [width, height])
       else
-        object.url
+        attachment
       end
     end
 

data/cm-graphql.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'cm-graphql'
-  spec.version       = '0.0.5'
+  spec.version       = '0.0.7'
   spec.date          = '2022-09-14'
   spec.summary       = 'A gem to setup grapqhl basics like pagination, file upload'
   spec.description   = 'A gem to setup grapqhl basics like pagination, file upload'
-  spec.authors       = ['Aditya Tiwari', 'Anbazhagan Palani']
-  spec.email         = ['taditya.tiwari007@gmail.com', 'anbu@commutatus.com']
+  spec.authors       = ['Anbazhagan Palani']
+  spec.email         = ['anbu@commutatus.com']
   spec.homepage      = 'https://github.com/commutatus/template-paging-api'
   spec.license       = 'MIT'
   spec.files         = Dir.chdir(File.expand_path(__dir__)) do
@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 3.0.0'
 
-  spec.add_runtime_dependency 'graphiql-rails', '~> 1.9'
-  spec.add_runtime_dependency 'graphql', '~> 2.2', '>= 2.2.5'
-  spec.add_runtime_dependency 'graphql-rails_logger', '~> 1.2', '>= 1.2.4'
+  spec.add_runtime_dependency 'graphiql-rails', '>= 1.9'
+  spec.add_runtime_dependency 'graphql', '>= 2.2.5'
+  spec.add_runtime_dependency 'graphql-rails_logger', '>= 1.2.4'
   spec.add_runtime_dependency 'kaminari', '~> 1.2', '>= 1.2.2'
 end

data/config/initializers/active_record_extension.rb

@@ -1,3 +1,5 @@
+require_relative '../../app/models/concerns/paginator'
+
 ActiveSupport.on_load(:active_record) do
   module ActiveRecord
     class Base

data/lib/generators/cm_graphql/add_graphql_generator.rb

@@ -8,6 +8,7 @@ module CmGraphql
       def add_graphql
         generate 'graphql:install'
         template 'graphql_schema.rb', "app/graphql/#{Rails.application.class.module_parent_name.underscore}_schema.rb"
+        copy_file 'base_connection.rb', 'app/graphql/types/base_connection.rb'
         gsub_file 'app/controllers/graphql_controller.rb', '# protect_from_forgery with: :null_session', 'protect_from_forgery with: :null_session'
       end
     end

data/lib/generators/cm_graphql/templates/base_connection.rb

@@ -0,0 +1,29 @@
+module Types
+  class BaseConnection < Types::BaseObject
+    # add `nodes` and `pageInfo` fields, as well as `edge_type(...)` and `node_nullable(...)` overrides
+    include GraphQL::Types::Relay::ConnectionBehaviors
+
+    field :total_count, Integer, "Total # of objects returned from this Plural Query", null: false
+    def total_count
+      object.nodes&.count
+    end
+
+    field :total_page_count, Integer, "Total # of pages, based on total count and pagesize", null: false
+    def total_page_count
+      return 1 unless object.nodes&.count&.positive?
+      # get total count and create array with total count as first item
+      my_total_count = object.nodes&.count
+      possible_page_sizes = [my_total_count]
+
+      # add first and last argument counts to the array if they exist
+      possible_page_sizes.push(object.arguments[:first]) if object.arguments[:first]
+      possible_page_sizes.push(object.arguments[:last]) if object.arguments[:last]
+
+      # get the smallest of the array items
+      actual_page_size = possible_page_sizes.min
+
+      # return the total_count divided by the page size, rounded up
+      (my_total_count / actual_page_size.to_f).ceil
+    end
+  end
+end

metadata

@@ -1,10 +1,9 @@
 --- !ruby/object:Gem::Specification
 name: cm-graphql
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
-- Aditya Tiwari
 - Anbazhagan Palani
 autorequire:
 bindir: exe
@@ -15,23 +14,20 @@ dependencies:
   name: graphiql-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.9'
 - !ruby/object:Gem::Dependency
   name: graphql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.5
@@ -39,9 +35,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.5
@@ -49,9 +42,6 @@ dependencies:
   name: graphql-rails_logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.4
@@ -59,9 +49,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.4
@@ -87,12 +74,13 @@ dependencies:
         version: 1.2.2
 description: A gem to setup grapqhl basics like pagination, file upload
 email:
-- taditya.tiwari007@gmail.com
 - anbu@commutatus.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/CODEOWNERS"
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -100,12 +88,14 @@ files:
 - app/graphql/mutations/authenticated_mutation.rb
 - app/graphql/mutations/base_mutation.rb
 - app/graphql/queries/base_query.rb
+- app/graphql/types/base_connection.rb
 - app/graphql/types/enums/base/sort_column.rb
 - app/graphql/types/enums/base/sort_direction.rb
 - app/graphql/types/inputs/base/attachment.rb
 - app/graphql/types/inputs/base/filter.rb
 - app/graphql/types/inputs/base/paging.rb
 - app/graphql/types/inputs/base/sort.rb
+- app/graphql/types/inputs/image_resolution.rb
 - app/graphql/types/objects/base/attachment_type.rb
 - app/graphql/types/objects/base/paging_type.rb
 - app/models/concerns/attachable.rb
@@ -118,6 +108,7 @@ files:
 - lib/cm-graphql/engine.rb
 - lib/generators/cm_graphql/add_graphql_generator.rb
 - lib/generators/cm_graphql/list_api_generator.rb
+- lib/generators/cm_graphql/templates/base_connection.rb
 - lib/generators/cm_graphql/templates/graphql_schema.rb
 - lib/generators/cm_graphql/templates/list_type.rb
 - lib/generators/cm_graphql/templates/query_type.rb
@@ -141,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.5.15
 signing_key:
 specification_version: 4
 summary: A gem to setup grapqhl basics like pagination, file upload