lucid-shopify 0.50.2 → 0.51.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f831f0a86deaa7d4ba5b5150e287c4db5380de44e91278a2f37257a45e188c9
-  data.tar.gz: 027071d699cec5c4cb1948d7a39be74afc7125f360cca3ffd0588af73a51c2b3
+  metadata.gz: 0bde6faec2cf0c1f3aebaa448053cfd08de85aaf84886fc4dfac7ee54c9b16d4
+  data.tar.gz: 9d88ca4bf4e318ecb84095c11e6ed4a7cf1466851a67bbbf9737f2be9c612040
 SHA512:
-  metadata.gz: 357be516c2a2a231db80409cac04e341ad7758fd2731e5fbd6e98a52fcdab9cbe6c42c827a714d1f5c9dfea66f45b2005f4eb918cbb3416673bc25ae49fb4cbe
-  data.tar.gz: ceb7df92ae20091390402ecae5c55ff55b427412a3ae6fc8df3de0a582c456d5c55222ce02d778739ca501fc5aaeb126bdc2ba451acc2ef195278a60364e1e51
+  metadata.gz: 15792eae82caf1d7b9990a9c18c8ef4d38a5c1a42ce9b644e2628db014d38b9316fe6c3ecc007581a0c8022ba4e93c0763b1c1ddffc69a72e2a802da21966a34
+  data.tar.gz: 9b85663e3679692a27ad2022527f101a4ac00586f044b85c3e68fae3851425c6c20d29cfa9ebe6ea55f3b45055642ad845f024d8e59ea2d7df20dd7a350fe19d

data/lib/lucid/shopify.rb

@@ -24,9 +24,9 @@ module Lucid
     autoload :DeleteWebhook, 'lucid/shopify/delete_webhook'
     autoload :Error, 'lucid/shopify/error'
     autoload :GetRequest, 'lucid/shopify/get_request'
+    autoload :GraphQLPostRequest, 'lucid/shopify/graphql_post_request'
     autoload :ParseLinkHeader, 'lucid/shopify/parse_link_header'
     autoload :PostRequest, 'lucid/shopify/post_request'
-    autoload :PostGraphQLRequest, 'lucid/shopify/post_graphql_request'
     autoload :PutRequest, 'lucid/shopify/put_request'
     autoload :RedisThrottledStrategy, 'lucid/shopify/redis_throttled_strategy'
     autoload :Request, 'lucid/shopify/request'

data/lib/lucid/shopify/client.rb

@@ -2,7 +2,7 @@
 
 require 'lucid/shopify/container'
 
-%w[delete get post post_graphql put].each { |m| require "lucid/shopify/#{m}_request" }
+%w[delete get post graphql_post put].each { |m| require "lucid/shopify/#{m}_request" }
 
 module Lucid
   module Shopify
@@ -77,9 +77,9 @@ module Lucid
         send_request.(GetRequest.new(*args))
       end
 
-      # @see PostGraphQLRequest#initialize
+      # @see GraphQLPostRequest#initialize
       def post_graphql(*args)
-        send_request.(PostGraphQLRequest.new(*args))
+        send_request.(GraphQLPostRequest.new(*args))
       end
 
       # @see PostRequest#initialize

data/lib/lucid/shopify/{post_graphql_request.rb → graphql_post_request.rb}

@@ -4,7 +4,7 @@ require 'lucid/shopify'
 
 module Lucid
   module Shopify
-    class PostGraphQLRequest < Request
+    class GraphQLPostRequest < Request
       # @private
       #
       # @param credentials [Credentials]

data/lib/lucid/shopify/response.rb

@@ -19,7 +19,7 @@ module Lucid
         # @return [String]
         def message
           if response.errors?
-            "bad response (#{response.status_code}) '#{response.error_messages.first}'"
+            "bad response (#{response.status_code}): #{response.error_messages.first}"
           else
             "bad response (#{response.status_code})"
           end
@@ -30,6 +30,19 @@ module Lucid
       ServerError = Class.new(Error)
       ShopError = Class.new(Error)
 
+      class GraphQLClientError < ClientError
+        def message
+          case
+          when response.errors?
+            "bad response: #{response.error_messages.first}"
+          when response.user_errors?
+            "bad response: #{response.user_error_messages.first}"
+          else
+            "bad response"
+          end
+        end
+      end
+
       extend Dry::Initializer
 
       include Enumerable
@@ -112,8 +125,8 @@ module Lucid
         end
 
         # GraphQL always has status 200.
-        if request.is_a?(PostGraphQLRequest) && errors?
-          raise ClientError.new(request, self)
+        if request.is_a?(GraphQLPostRequest) && (errors? || user_errors?)
+          raise GraphQLClientError.new(request, self)
         end
 
         self
@@ -131,15 +144,13 @@ module Lucid
 
       # @return [Boolean]
       def errors?
-        return true if user_errors?
-
         data_hash.has_key?('errors') # should be only on 422
       end
 
       # GraphQL user errors.
       #
       # @return [Boolean]
-      private def user_errors?
+      def user_errors?
         errors = find_user_errors
 
         !errors.nil? && !errors.empty?
@@ -151,7 +162,7 @@ module Lucid
       #
       # @return [Array, nil]
       private def find_user_errors(hash = data_hash)
-        return nil unless request.is_a?(PostGraphQLRequest)
+        return nil unless request.is_a?(GraphQLPostRequest)
 
         hash.each do |k, v|
           return v if k == 'userErrors'
@@ -169,7 +180,7 @@ module Lucid
       # @return [Hash]
       def errors
         errors = data_hash['errors']
-        errors = case
+        case
         when errors.nil?
           {}
         when errors.is_a?(String)
@@ -177,14 +188,12 @@ module Lucid
         else
           errors
         end
-
-        errors.merge(user_errors)
       end
 
       # GraphQL user errors.
       #
       # @return [Hash]
-      private def user_errors
+      def user_errors
         errors = find_user_errors
         return {} if errors.nil? || errors.empty?
         errors.map do |error|
@@ -197,7 +206,16 @@ module Lucid
 
       # @return [Array<String>]
       def error_messages
-        errors.map { |field, message| "#{field} #{message}" }
+        errors.map do |field, message|
+          "#{field} #{message}"
+        end
+      end
+
+      # @return [Array<String>]
+      def user_error_messages
+        user_errors.map do |field, message|
+          "#{message} [#{field}]"
+        end
       end
 
       # @param messages [Array<String>]

data/lib/lucid/shopify/version.rb

@@ -2,6 +2,6 @@
 
 module Lucid
   module Shopify
-    VERSION = '0.50.2'
+    VERSION = '0.51.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucid-shopify
 version: !ruby/object:Gem::Version
-  version: 0.50.2
+  version: 0.51.0
 platform: ruby
 authors:
 - Kelsey Judson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-18 00:00:00.000000000 Z
+date: 2020-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -159,8 +159,8 @@ files:
 - lib/lucid/shopify/delete_webhook.rb
 - lib/lucid/shopify/error.rb
 - lib/lucid/shopify/get_request.rb
+- lib/lucid/shopify/graphql_post_request.rb
 - lib/lucid/shopify/parse_link_header.rb
-- lib/lucid/shopify/post_graphql_request.rb
 - lib/lucid/shopify/post_request.rb
 - lib/lucid/shopify/put_request.rb
 - lib/lucid/shopify/redis_throttled_strategy.rb