graphql_rails 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 349d2e706f6e37ea205a07dff6da8ef90b0cfa7cb4de5e1307085a445ccb45d3
-  data.tar.gz: ae79e6ea80653f21b61ba563bbc9e2cbba97fd317f2cf9e3c09c87b0a223ce60
+  metadata.gz: f3c30cddc8d921388e200982dc22033da8a3decd449fa44a228d320a52bfd18a
+  data.tar.gz: a783527f323172eac78cf725beea3b931b94f9ad2b8477e59d8cf395c8122c43
 SHA512:
-  metadata.gz: e92b5d83d83fe272da215aaa00d0e228e2bd7d293dcdcf3d9d6a004c10bfd0fdf1b9cfa481e47a07af2091983da98fcafef501e4b328c4c8caafd6a9f91f65f3
-  data.tar.gz: 308a6b503baad6c87dbcac947e1115a63cdbbe379be19bd2ecb5d108239409ace03c9a20a5acdbe1736f3f58cf30fe5935b57a34c5c4a7f4a56ea76d156ce5b9
+  metadata.gz: f76e5e25f3c1e58c557b8dbeb77d0dba51815c9dd442c6adcd30e82481fb4b999831c2bf8b4beaae05c79e18226d04db6069b35e68bb845a201e171aa9000fb2
+  data.tar.gz: 7ca367ea5bbaf9341f0326f77eef2c515b29f233d8fb3000586cf3f16ecba1cd96f4e93dbe5106750fcd4ca2a99b7e7ca58e3b4aabde7eeab56bd0c94d58be31

data/Gemfile.lock

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

data/docs/components/controller.md

@@ -20,9 +20,25 @@ end
 
 ### *permit*
 
+to define attributes which are accepted by each controller action, you need to call `permit` method, like this:
+
 ```ruby
 class UsersController < GraphqlRails::Controller
-  action(:create).describe('Creates user')
+  action(:create).permit(:id!, :some_string_value)
+
+  def create
+    User.create(params)
+  end
+end
+```
+
+permitted values will be available via `params` method in controller action. By default all attributes will have `String` type. Also you can add exclamation mark after attribute name if you want to forbid `nil` value for that attribute.
+
+If you want to use custom input type, you can define it like this:
+
+```ruby
+class UsersController < GraphqlRails::Controller
+  action(:create).permit(:id!, some_integer_value: :int!, something_custom: YourGraphqlInputType)
 
   def create
     User.create(params)

data/lib/graphql_rails/attribute.rb

@@ -48,7 +48,7 @@ module GraphqlRails
     end
 
     def parse_type(type)
-      type = TypeParser.new(type).call
+      type = TypeParser.new(type).graphql_type
 
       original_name['!'] ? type.to_non_null_type : type
     end

data/lib/graphql_rails/controller/action_configuration.rb

@@ -8,7 +8,7 @@ module GraphqlRails
   class Controller
     # stores all graphql_rails contoller specific config
     class ActionConfiguration
-      attr_reader :attributes, :return_type, :pagination_options
+      attr_reader :attributes, :pagination_options
 
       def initialize_copy(other)
         super
@@ -27,6 +27,7 @@ module GraphqlRails
       end
 
       def paginated(pagination_options = {})
+        @return_type = nil
         @pagination_options = pagination_options
         permit(:before, :after, first: :int, last: :int)
       end
@@ -45,8 +46,9 @@ module GraphqlRails
         self
       end
 
-      def returns(new_return_type)
-        @return_type = TypeParser.new(new_return_type).call
+      def returns(custom_return_type)
+        @return_type = nil
+        @custom_return_type = custom_return_type
         self
       end
 
@@ -58,8 +60,28 @@ module GraphqlRails
         !!pagination_options # rubocop:disable Style/DoubleNegation
       end
 
+      def return_type
+        @return_type ||= build_return_type
+      end
+
       private
 
+      attr_reader :custom_return_type
+
+      def build_return_type
+        return nil if custom_return_type.nil?
+
+        if paginated?
+          type_parser.graphql_model ? type_parser.graphql_model.graphql.connection_type : nil
+        else
+          type_parser.graphql_type
+        end
+      end
+
+      def type_parser
+        TypeParser.new(custom_return_type)
+      end
+
       def permit_attribute(name, type = nil)
         field_name = name.to_s.remove(/!\Z/)
         attributes[field_name] = Attribute.new(name.to_s, type)

data/lib/graphql_rails/type_parser.rb

@@ -31,7 +31,7 @@ module GraphqlRails
       @unparsed_type = unparsed_type
     end
 
-    def call
+    def graphql_type
       return unparsed_type if raw_graphql_type?
 
       if list?
@@ -41,6 +41,12 @@ module GraphqlRails
       end
     end
 
+    def graphql_model
+      type_class = inner_type_name.safe_constantize
+      return unless type_class.respond_to?(:graphql)
+      type_class
+    end
+
     private
 
     attr_reader :unparsed_type
@@ -96,8 +102,8 @@ module GraphqlRails
     end
 
     def dynamicly_defined_type
-      type_class = inner_type_name.safe_constantize
-      return unless type_class.respond_to?(:graphql)
+      type_class = graphql_model
+      return unless type_class
 
       type_class.graphql.graphql_type
     end

data/lib/graphql_rails/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql_rails
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Povilas Jurčys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-15 00:00:00.000000000 Z
+date: 2019-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql