graphql_rails 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f63b8e5d3c98d472ff1ec382261d772e83d70d7d8af6df29da806b72f8563858
-  data.tar.gz: d075ad40f236b39d0f57e7a47469c6de5a7a3b5ebba5ab62fff30981b7e536ce
+  metadata.gz: d31436f40d036cd543c69a2b59e442d2498eb6349d61c4454dc9376e0caf4de0
+  data.tar.gz: 9b5041b648314fbff349e614e9b1f6be43f94bff32490f8de0dc4a23bb28c6a7
 SHA512:
-  metadata.gz: 5edf95451b857f27d304701402e8a18c771150385cf1fbc7a72db0d446ee7848c4de6ff0c85466fc6129e9adde4e14057c9b11b244cc388d2f6ee692547511e2
-  data.tar.gz: dfd50167b6c86ee5f371e0183eac93bb8b32d6a3572c85b2cdc1b218c3ca026afc501a44d4534728b45dd0594c4fb9ad451d8d240e1ad9a8fbf12246b2200091
+  metadata.gz: 72d4881a3aa604c19f38f53e4b77fdea562e7b804d8cec6a125789da32b6b215c298f5dcd1a747680a72c2e65571d0f30ab7b47597758fbb632bf21731f9bf70
+  data.tar.gz: 0a7ec0c5d6bf383c89b82109a4c120137e470f7e187ab8a3ab791840706abd6b0a49933b1bcead76437603fff546fc66ebd024fad8067bea6558d60499c587b0

data/.rubocop.yml

@@ -30,6 +30,10 @@ Naming/UncommunicativeMethodParamName:
     - 'in'
     - 'as'
 
+Style/ClassAndModuleChildren:
+  Exclude:
+    - spec/**/*_spec.rb
+
 AllCops:
   TargetRubyVersion: 2.5
   Exclude:

data/CHANGELOG.md

@@ -1,10 +1,25 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
 ## [Unreleased]
 
-* Fixed controller action hooks context [@povilasjurcys](https://github.com/povilasjurcys).
-* Added options for controller actions [@vastas1996](https://github.com/vastas1996).
+* Added/Changed/Deprecated/Removed/Fixed/Security: YOUR CHANGE HERE
+
+## 0.5.2 (2019-04-24)
+
+* Fixed: do not crash when using Connection types in non Ruby on Rails project [@povilasjurcys](https://github.com/povilasjurcys).
+
+## 0.5.1 (2019-04-10)
+
+* Fixed: controller action hooks context [@povilasjurcys](https://github.com/povilasjurcys).
+* Added: options for controller actions [@vastas1996](https://github.com/vastas1996).
 
 ## 0.5.0 (2019-04-03)
 
-* [#56](https://github.com/ashkan18/graphlient/pull/56) Added GraphQL input type generators [@povilasjurcys](https://github.com/povilasjurcys).
-* Added CHANGELOG [@povilasjurcys](https://github.com/povilasjurcys).
-* Fixed GraphQL word typos in documentation and code [@povilasjurcys](https://github.com/povilasjurcys).
+* Added: GraphQL input type generators [@povilasjurcys](https://github.com/povilasjurcys).
+* Added: CHANGELOG [@povilasjurcys](https://github.com/povilasjurcys).
+* Fixed: GraphQL word typos in documentation and code [@povilasjurcys](https://github.com/povilasjurcys).

data/Gemfile

@@ -10,7 +10,6 @@ group :development do
 end
 
 group :test do
-  gem 'activerecord'
   gem 'codecov', require: false
   gem 'mongoid'
   gem 'simplecov', require: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphql_rails (0.5.1)
+    graphql_rails (0.5.2)
       activesupport (>= 4)
       graphql (~> 1)
 

data/graphql_rails.gemspec

@@ -26,5 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'activerecord'
   spec.add_development_dependency 'pry-byebug'
 end

data/lib/graphql_rails/model/configuration.rb

@@ -4,6 +4,7 @@ require 'graphql_rails/attribute'
 require 'graphql_rails/model/graphql_type_builder'
 require 'graphql_rails/model/input'
 require 'graphql_rails/model/configurable'
+require 'graphql_rails/model/configuration/count_items'
 
 module GraphqlRails
   module Model
@@ -11,12 +12,6 @@ module GraphqlRails
     class Configuration
       include Configurable
 
-      COUNT_TOTAL_ITEMS = lambda do |obj, _args, _ctx|
-        obj_nodes = obj.nodes
-        obj_nodes = obj_nodes.except(:offset) if obj_nodes.is_a?(ActiveRecord::Relation)
-        obj_nodes.size
-      end
-
       def initialize(model_class)
         @model_class = model_class
       end
@@ -53,7 +48,7 @@ module GraphqlRails
       def connection_type
         @connection_type ||= begin
           graphql_type.define_connection do
-            field :total, types.Int, resolve: COUNT_TOTAL_ITEMS
+            field :total, types.Int, resolve: CountItems
           end
         end
       end

data/lib/graphql_rails/model/configuration/count_items.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module GraphqlRails
+  module Model
+    class Configuration
+      # Used when generating ConnectionType.
+      # It handles all the logic which is related with counting total items
+      class CountItems
+        def self.call(*args)
+          new(*args).call
+        end
+
+        def initialize(graphql_object, _args, _ctx)
+          @graphql_object = graphql_object
+        end
+
+        def call
+          if active_record?
+            list.except(:offset).size
+          else
+            list.size
+          end
+        end
+
+        private
+
+        attr_reader :graphql_object
+
+        def list
+          graphql_object.nodes
+        end
+
+        def active_record?
+          defined?(ActiveRecord) && list.is_a?(ActiveRecord::Relation)
+        end
+      end
+    end
+  end
+end

data/lib/graphql_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GraphqlRails
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql_rails
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Povilas Jurčys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-10 00:00:00.000000000 Z
+date: 2019-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -147,6 +161,7 @@ files:
 - lib/graphql_rails/model.rb
 - lib/graphql_rails/model/configurable.rb
 - lib/graphql_rails/model/configuration.rb
+- lib/graphql_rails/model/configuration/count_items.rb
 - lib/graphql_rails/model/graphql_input_type_builder.rb
 - lib/graphql_rails/model/graphql_type_builder.rb
 - lib/graphql_rails/model/input.rb
@@ -179,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: GraphQL server and client for rails