graphql-rails-resolver 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd138790cf8944a77acea1535d813421e37cdfdd
-  data.tar.gz: a61fbe2035032bf6dc0acd09ce6786635732f178
+  metadata.gz: 6ef4cb840bbd737f5fe330cbc66ced0223beb614
+  data.tar.gz: 7eee317b609f529c10f48e59cd44ffef05af1776
 SHA512:
-  metadata.gz: 5c0fe031a810c3368921b2e215da435a47a33f3694c060e91f5ca037577c5d23a3e2e1ffb78a3080446aa12b3b7e66271e42ac392803e4237e00a2fb88ba3fdf
-  data.tar.gz: ec1191eb7e4f9601f5eef38e59ea941615f2adf4d28a84f53a62c48230b8e69ac3dece258fd54cc03543216e68eb53cd245177633ade16cfec1dacee5a06f466
+  metadata.gz: fc822cad0c39a550e12678cef7224a2f4925bee0a45a5730eed08145b041c323d3c733eb21714ace5392a28a068d50ccf4d4f439d2a9ab177512ea3f12a12ccb
+  data.tar.gz: 9d4b16ab71ffcff4d036b349ec98959b8163488a73abb7cfb4ecf7dad2790ee25f17ed2a2e4beabb49dbc1ec070df3e15d10e2f83b3d5233ce30a9ee8c9c533e

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # GraphQL::Rails::Resolver
 ## CHANGELOG
 
+### Version 0.2.7
+Added conditional resolution by means of `:if` and `:unless` options 
+
+### Version 0.2.6
+Fixes issue where resolution may skip over :where
+
 ### Version 0.2.5
 Adds heirarchal resolution strategy
 

data/README.md

@@ -92,6 +92,9 @@ class Post < GraphQL::Rails::Resolver
   resolve :title
   resolve :createdAt, :where => :created_at
   resolve :updatedAt, :where => :updated_at
+  
+  # Condition resolution on title being present using the `unless` option
+  resolve :title, unless: -> (value) { value.blank? }
 
   # Resolve :featured argument with default test: if argument `featured` is present
   resolve :featured, :scope => :featured
@@ -127,7 +130,28 @@ In the examples above, the three primary arguments to `resolve` are:
 
 Alternatively you can specify a symbol representing a method name: (ie: `resolve :arg_1, :custom_method`). The resolver will use it's own method if it exists, or else it will call the method on the object itself.
 
+### Conditional resolution
+Sometimes it is necessary to condition resolution of an argument on its value. For instance, by default
+an empty string as an argument matches only records whose corresponding field is an empty string as well.
+However, you may want an empty argument to mean that this argument should be ignored and all records shall
+be matched. To achieve this, you would condition resolution of that argument on it being not empty.
+    
+You can condition resolution by passing the `:if` or `:unless` option to the `resolve` method. This option
+can take a method name (as a symbol or a string), or a `Proc` (or lambda expression for that matter), which
+will be called with the argument's value:
 
+```
+resolve :tagline, unless: -> (value) { value.blank? }
+
+resolve :tagline, if: -> (value) { value.present? }
+
+resolve :tagline, if: :check_value
+
+def check_value(value)
+   value.present?
+end
+```
+    
 
 
 ### Detecting the Model
@@ -162,3 +186,4 @@ I wanted to release this utility for the hopes of sparking interest in Rails int
 # Credits
 - Cole Turner ([@colepatrickturner](https://github.com/colepatrickturner))
 - Peter Salanki ([@salanki](https://github.com/salanki))
+- Jonas Schwertfeger ([@jschwertfeger](https://github.com/jschwertfeger))

data/lib/graphql/rails/resolver.rb

@@ -1,7 +1,7 @@
 module GraphQL
   module Rails
     class Resolver
-      VERSION = '0.2.5'
+      VERSION = '0.2.7'
 
       attr_accessor :resolvers
 
@@ -48,6 +48,9 @@ module GraphQL
             value = args[arg]
 
             resolvers.each do |method, params|
+              next unless condition_met?(params.fetch(:if, nil), true, value)
+              next unless condition_met?(params.fetch(:unless, nil), false, value)
+
               # Match scopes
               if params.key? :scope
                 scope_name = params[:scope]
@@ -74,7 +77,8 @@ module GraphQL
                 else
                   raise ArgumentError, "Unable to resolve parameter of type #{method.class} in #{self}"
                 end
-              elsif params.size < 1
+              else
+                # Resolve ID arguments
                 if is_arg_id_type? arg
                   value = resolve_id(value)
                 end
@@ -83,7 +87,7 @@ module GraphQL
                   @result = send(arg, value)
                 elsif @result.respond_to? arg and params[:where].present? == false
                   @result = @result.send(arg, value)
-                else
+                elsif @result.respond_to? :where
                   attribute =
                     if params[:where].present?
                       params[:where]
@@ -91,12 +95,16 @@ module GraphQL
                       arg
                     end
 
+                  unless @result.has_attribute?(attribute)
+                    raise ArgumentError, "Unable to resolve attribute #{attribute} on #{@result}"
+                  end
+
                   hash = {}
                   hash[attribute] = value
                   @result = @result.where(hash)
+                else
+                  raise ArgumentError, "Unable to resolve argument #{arg} in #{self}"
                 end
-              else
-                raise ArgumentError, "Unable to resolve argument #{arg} in #{self}"
               end
             end
           end
@@ -188,6 +196,16 @@ module GraphQL
         end
       end
 
+      def condition_met?(conditional, expectation, value)
+        if conditional.respond_to? :call
+          conditional.call(value) == expectation
+        elsif (conditional.is_a?(Symbol) || conditional.is_a?(String)) && self.respond_to?(conditional)
+          self.send(conditional, value) == expectation
+        else
+          true
+        end
+      end
+
       class << self
         @@id_field = :id
 
@@ -201,28 +219,28 @@ module GraphQL
           @resolvers
         end
 
-        def resolve(field, definition=nil, **otherArgs)
+        def resolve(arg, definition=nil, **otherArgs)
           @resolvers ||= {}
-          @resolvers[field] ||= []
-          @resolvers[field].push([definition, otherArgs])
+          @resolvers[arg] ||= []
+          @resolvers[arg].push([definition, otherArgs])
         end
 
-        def resolve_where(field)
+        def resolve_where(arg)
           warn "[DEPRECATION] `resolve_where` is deprecated.  Please use `resolve` instead."
-          resolve(field)
+          resolve(arg)
         end
 
-        def resolve_scope(field, test=nil, scope_name: nil, with_value: false)
+        def resolve_scope(arg, test=nil, scope_name: nil, with_value: false)
           warn "[DEPRECATION] `resolve_scope` is deprecated.  Please use `resolve` instead."
           test = lambda { |value| value.present? } if test.nil?
-          scope_name = field if scope_name.nil?
+          scope_name = arg if scope_name.nil?
 
-          resolve(field, :scope => -> (value) { test.call(value) ? scope_name : nil }, :with_value => with_value)
+          resolve(arg, :scope => -> (value) { test.call(value) ? scope_name : nil }, :with_value => with_value)
         end
 
-        def resolve_method(field)
+        def resolve_method(arg)
           warn "[DEPRECATION] `resolve_method` is deprecated.  Please use `resolve` instead."
-          resolve(field)
+          resolve(arg)
         end
       end
     end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: graphql-rails-resolver
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.7
 platform: ruby
 authors:
 - Cole Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-13 00:00:00.000000000 Z
+date: 2016-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.19.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'
 description: A utility for ease graphql-ruby integration into a Rails project.
@@ -44,11 +44,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
+- lib/graphql/rails/resolver.rb
+- lib/graphql/rails.rb
 - LICENSE
 - README.md
-- lib/graphql/rails.rb
-- lib/graphql/rails/resolver.rb
+- CHANGELOG.md
 homepage: http://rubygems.org/gems/graphql-rails-resolver
 licenses:
 - MIT
@@ -59,17 +59,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: GraphQL + Rails integration for Field Resolvers.