easy-jsonapi 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f07199316723dad3e81762871162c088abf1a0d4a6c5096e2033bace38ab2339
-  data.tar.gz: 58691051c1a6e488155ddc878695a3c186a4c852aedd967f0e914fb5dfe2fa0b
+  metadata.gz: 3a2175abfb1437c53be0b73deaa02f061d108b76e75dfb624fb075ae8c041765
+  data.tar.gz: 24b66e0fd2bd217670d69acc71bfb69dc05dff8fb24d78ca801ee1d918dde4a6
 SHA512:
-  metadata.gz: 6922ea8ef89f1ac9c28943ddb946bc12066268aec49ac402a997367e945388453fb09b3f67c1155c40a622b9df19c62dfa28e95bc087c978c65f7aa7545c4b66
-  data.tar.gz: 99b888ed918f0b783b4bf22a61b76b6b44ac0fffc8b4fc414727a32e5ac621f1573233526a37f1efb54394be7618d52afe7401309c63523018a8d9ee2457b5a3
+  metadata.gz: 6dec2506c365e14b658e6daaff3c386d146bc9b5de1762a06a2d70fb06544fded3591a48b314d2c0bc9ce1ac71b1a74b67c29de5291715d3a86514ba72d8cd24
+  data.tar.gz: 8452d415ae232cde5530ddafdff6fd8fd7f8a40ad1fe42a6295de8b4986abb107c0c3a02b222d082af913ff4094cb0755f4a4b7d1228af4d2fde485f2b5d0a37

data/.github/workflows/publish.yml

@@ -51,7 +51,7 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
       with:
-        tag_name: 1.0.5
-        release_name: Release 1.0.5
+        tag_name: 1.0.6
+        release_name: Release 1.0.6
         draft: false
         prerelease: false

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # CHANGELOG
 
-## 1.0.5 - 2020-03-30
+## 1.0.6 - 2020-03-20
+
+- Fixed bug in JSONAPI::Middleware that was not checking for environment variables properly
+
+## 1.0.5 - 2020-03-20
 
 - Fixed bug in JSONAPI::Exceptions::HeadersExceptions that didn't check for user required headers requirements
 - Fixed bug in JSONAPI::Exceptions::QueryParamExceptions that didn't check for user required query param requirements

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    easy-jsonapi (1.0.5)
+    easy-jsonapi (1.0.6)
       oj (~> 3.10)
 
 GEM

data/README.md

@@ -126,7 +126,7 @@ use JSONAPI::Middleware
 
 The easy-jsonapi middleware can operate in development or production mode.
 
-If `ENV['RACK_ENV']` is set to `:development` or not set at all, the middleware will be operating in development mode.
+If `ENV['RACK_ENV']` is set to `'development'` or not set at all, the middleware will be operating in development mode.
 
 When the middleware is in development mode it will raise an exception wherever it finds the http request to be non JSONAPI compliant.
 
@@ -137,7 +137,7 @@ The types of exceptions it will raise are:
 - `JSONAPI::Exceptions::QueryParamExceptions::InvalidQueryParam` when an included query parameter is non-compliant
 - `JSONAPI::Exceptions::DocumentExceptions::InvalidDocument` when the body is included and non-compliant
 
-If `ENV['RACK_ENV']` is set to something other than  `:development`, then the middleware will return the appropriate status code error given the JSON:API clause the headers, query params, or document violates.
+If `ENV['RACK_ENV']` is set to something other than  `'development'`, then the middleware will return the appropriate status code error given the JSON:API clause the headers, query params, or document violates.
 
 ### User Configurations
 

data/easy-jsonapi.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'easy-jsonapi'
-  spec.version       = '1.0.5'
+  spec.version       = '1.0.6'
   spec.authors       = ['Joshua DeMoss, Joe Viscomi']
   spec.email         = ['demoss.joshua@gmail.com']
 

data/lib/easy/jsonapi/exceptions/headers_exceptions.rb

@@ -25,9 +25,11 @@ module JSONAPI
 
       # Check http verb vs included headers
       # @param env [Hash] The rack environment variable
-      def self.check_request(env, body, config_manager = nil, opts = {})
+      # @param config_manager [JSONAPI::ConfigManager] The manager of user configurations
+      # @param opts [Hash] Includes http_method, path, and contains_body values
+      def self.check_request(env, config_manager = nil, opts = {})
         check_compliance(env, config_manager, opts)
-        check_http_method_against_headers(env, body)
+        check_http_method_against_headers(env, opts[:contains_body])
       end
 
       # Check jsonapi compliance
@@ -78,30 +80,30 @@ module JSONAPI
         #   error if the combination doesn't make sense
         # @param (see #compliant?)
         # @raise InvalidHeader the invalid header incombination with the http verb
-        def check_http_method_against_headers(env, body)
+        def check_http_method_against_headers(env, contains_body)
           case env['REQUEST_METHOD']
           when 'GET'
-            check_get_against_hdrs(env, body)
+            check_get_against_hdrs(env, contains_body)
           when 'POST' || 'PATCH' || 'PUT'
-            check_post_against_hdrs(env, body)
+            check_post_against_hdrs(env, contains_body)
           when 'DELETE'
-            check_delete_against_hdrs(env, body)
+            check_delete_against_hdrs(env, contains_body)
           end
         end
 
         # Raise error if a GET request has a body or a content type header
         # @param (see #compliant?)
-        def check_get_against_hdrs(env, body)
-          raise_error('GET requests cannot have a body.') unless body == ""
+        def check_get_against_hdrs(env, contains_body)
+          raise_error('GET requests cannot have a body.') if contains_body
           raise_error("GET request cannot have a 'CONTENT_TYPE' http header.") unless env['CONTENT_TYPE'].nil?
         end
 
         # POST, PUT, and PATCH request must have a content type header,
         #   a body, and a content-type and accept header that accepts jsonapi
         # @param (see #compliant?)
-        def check_post_against_hdrs(env, body)
+        def check_post_against_hdrs(env, contains_body)
           raise_error("POST, PUT, and PATCH requests must have a 'CONTENT_TYPE' header.") unless env['CONTENT_TYPE']
-          raise_error('POST, PUT, and PATCH requests must have a body.') if body == ""
+          raise_error('POST, PUT, and PATCH requests must have a body.') unless contains_body
           
           return if env['CONTENT_TYPE'] == 'application/vnd.api+json' && accepts_jsonapi?(env)
           
@@ -110,8 +112,8 @@ module JSONAPI
         end
 
         # Raise error if DELETE hdr has a body or a content type header
-        def check_delete_against_hdrs(env, body)
-          raise_error('DELETE requests cannot have a body.') unless body == ""
+        def check_delete_against_hdrs(env, contains_body)
+          raise_error('DELETE requests cannot have a body.') if contains_body
           raise_error("DELETE request cannot have a 'CONTENT_TYPE' http header.") unless env['CONTENT_TYPE'].nil?
         end
         

data/lib/easy/jsonapi/middleware.rb

@@ -23,8 +23,8 @@ module JSONAPI
     #   and error if any section is found to be non-compliant.
     # @param env The rack envirornment hash
     def call(env)
-      if in_maintenance_mode?(env)
-        return maintenance_response(env)
+      if in_maintenance_mode?
+        return maintenance_response
       end
 
       if jsonapi_request?(env)
@@ -38,17 +38,15 @@ module JSONAPI
     private
 
     # Checks the 'MAINTENANCE' environment variable
-    # @param (see #call)
     # @return [TrueClass | FalseClass]
-    def in_maintenance_mode?(env)
-      !env['MAINTENANCE'].nil?
+    def in_maintenance_mode?
+      !ENV['MAINTENANCE'].nil?
     end
 
     # Return 503 with or without msg depending on environment
-    # @param (see #call)
     # @return [Array] Http Error Responses
-    def maintenance_response(env)
-      if environment_development?(env)
+    def maintenance_response
+      if environment_development?
         [503, {}, ['MAINTENANCE envirornment variable set']]
       else
         [503, {}, []]
@@ -91,28 +89,28 @@ module JSONAPI
       # Store separately so you can rewind for next middleware or app
       body = env['rack.input'].read
       env['rack.input'].rewind
-      opts = { http_method: env['REQUEST_METHOD'], path: env['PATH_INFO'] }
+      opts = { http_method: env['REQUEST_METHOD'], path: env['PATH_INFO'], contains_body: body != "" }
 
-      header_error = check_headers_compliance(env, body, config_manager, opts)
+      header_error = check_headers_compliance(env, config_manager, opts)
       return header_error unless header_error.nil?
 
       req = Rack::Request.new(env)
-      param_error = check_query_param_compliance(env, req.GET, config_manager, opts)
+      param_error = check_query_param_compliance(req.GET, config_manager, opts)
       return param_error unless param_error.nil?
       
       return unless env['CONTENT_TYPE']
 
-      body_error = check_req_body_compliance(env, body, config_manager, opts)
+      body_error = check_body_compliance(body, config_manager, opts)
       return body_error unless body_error.nil?
     end
 
     # Checks whether the http headers are jsonapi compliant
     # @param (see #call)
     # @return [NilClass | Array] Nil meaning no error or a 400 level http response
-    def check_headers_compliance(env, body, config_manager, opts)
-      JSONAPI::Exceptions::HeadersExceptions.check_request(env, body, config_manager, opts)
+    def check_headers_compliance(env, config_manager, opts)
+      JSONAPI::Exceptions::HeadersExceptions.check_request(env, config_manager, opts)
     rescue JSONAPI::Exceptions::HeadersExceptions::InvalidHeader, JSONAPI::Exceptions::UserDefinedExceptions::InvalidHeader => e
-      raise if environment_development?(env)
+      raise if environment_development?
 
       [e.status_code, {}, []]
     end
@@ -120,10 +118,10 @@ module JSONAPI
     # @param query_params [Hash] The rack request query_param hash
     # @raise If the query parameters are not JSONAPI compliant
     # @return [NilClass | Array] Nil meaning no error or a 400 level http response
-    def check_query_param_compliance(env, query_params, config_manager, opts)
+    def check_query_param_compliance(query_params, config_manager, opts)
       JSONAPI::Exceptions::QueryParamsExceptions.check_compliance(query_params, config_manager, opts)
     rescue JSONAPI::Exceptions::QueryParamsExceptions::InvalidQueryParameter, JSONAPI::Exceptions::UserDefinedExceptions::InvalidQueryParam => e
-      raise if environment_development?(env)
+      raise if environment_development?
       
       [e.status_code, {}, []]
     end
@@ -131,14 +129,14 @@ module JSONAPI
     # @param env (see #call)
     # @param req (see #check_query_param_compliance)
     # @raise If the document body is not JSONAPI compliant
-    def check_req_body_compliance(env, body, config_manager, opts)
+    def check_body_compliance(body, config_manager, opts)
       JSONAPI::Exceptions::DocumentExceptions.check_compliance(body, config_manager, opts)
     rescue JSONAPI::Exceptions::DocumentExceptions::InvalidDocument, JSONAPI::Exceptions::UserDefinedExceptions::InvalidDocument => e
-      raise if environment_development?(env)
+      raise if environment_development?
 
       [e.status_code, {}, []]
     rescue JSONAPI::Exceptions::JSONParseError
-      raise if environment_development?(env)
+      raise if environment_development?
 
       [400, {}, []]
     end
@@ -151,8 +149,8 @@ module JSONAPI
     end
 
     # @param (see #call)
-    def environment_development?(env)
-      env['RACK_ENV'].to_s.downcase == 'development' || env['RACK_ENV'].nil?
+    def environment_development?
+      ENV['RACK_ENV'].to_s.downcase == 'development' || ENV['RACK_ENV'].nil?
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy-jsonapi
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Joshua DeMoss, Joe Viscomi