sinja 1.1.0.pre2 → 1.1.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d785d25fe6c9bd3e61893ca5a1ec23b237d9e3cb
-  data.tar.gz: 0eb4c07d1691587fb117ebbfc6d2fb63a911ae81
+  metadata.gz: c2b7704d06378c377a7668407ccfe7dd391bf22c
+  data.tar.gz: 2a26bd92d8b7357d8561204654030e89398223d3
 SHA512:
-  metadata.gz: 0ee40f0a379063b13846967163f181c50ec7c86303155864ecf234369e41faf1d84006c3ac4d07aeff6df13cfcd7ae1010b8055e59b9d0e06d98e666700159aa
-  data.tar.gz: 6c82ef3fc4fba1670526d5f2aab3fa09ea76921cfe2c8de997f8b13fd52b110fcd45ea34c03bbfaeddc7c43dd76ded5936f71bd5acc1e12f73c47058331e280c
+  metadata.gz: c7541478e11cd932871936c7bb470169fafcc4f24133d77c2a8559c5ba5fae07e0f0a5cfd03be94b0efa6222b19cf97f452a14a87300760738fb028b13b58f96
+  data.tar.gz: abc9e3d5c75bc8324537f5d5cecad33c61c84eb82f98e2f24ba048fb74de128b5de377f7c272d3078da0dabe9c06578e0827097b358942337636fdbb5dd3d1f9

data/README.md

@@ -435,7 +435,7 @@ configure_jsonapi do |c|
 
   # You can't set this directly; see "Query Parameters" below
   #c.query_params = {
-  #  :include=>[], :fields=>{}, :filter=>{}, :page=>{}, :sort=>[]
+  #  :include=>[], :fields=>{}, :filter=>{}, :page=>{}, :sort=>{}
   #}
 
   #c.page_using = {} # see "Paging" below
@@ -467,7 +467,7 @@ and returns the corresponding object. You can, of course, use this helper
 method elsewhere in your application, such as in your `show` action helper.
 
 ```ruby
-resource :posts
+resource :posts do
   helpers do
     def find(id)
       Post[id.to_i]
@@ -908,7 +908,7 @@ parameter(s) in a `before_<action>` hook:
 resource :posts do
   helpers do
     def before_index
-      params['filter']['type'] ||= 'article'
+      params[:filter][:type] = 'article' if params[:filter].empty?
     end
   end
 
@@ -951,7 +951,7 @@ query parameter(s) in a `before_<action>` hook:
 resource :posts do
   helpers do
     def before_index
-      params['sort'] << [:title, :asc] if params['sort'].empty?
+      params[:sort][:title] = :asc if params[:sort].empty?
     end
   end
 
@@ -1009,7 +1009,7 @@ query parameter(s) in a `before_<action>` hook:
 resource :posts do
   helpers do
     def before_index
-      params['page']['number'] ||= 1
+      params[:page][:number] = 1 if params[:page].empty?
     end
   end
 

data/lib/sinja/config.rb

@@ -59,12 +59,11 @@ module Sinja
 
     def initialize
       @query_params = {
-        :fields=>{}, # passthru to JAS
         :include=>[], # passthru to JAS
+        :fields=>{}, # passthru to JAS
         :filter=>{},
         :page=>{},
-        :sort=>[],
-        :capture=>nil
+        :sort=>{}
       }
 
       @error_logger = ->(h) { logger.error('sinja') { h } }

data/lib/sinja/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Sinja
-  VERSION = '1.1.0.pre2'
+  VERSION = '1.1.0.pre3'
 end

data/lib/sinja.rb

@@ -104,10 +104,16 @@ module Sinja
       condition do
         @qcaptures ||= []
         index.to_h.all? do |key, subkeys|
-          params.key?(key.to_s) && [*subkeys].all? do |subkey|
-            @qcaptures << params[key.to_s].delete(subkey.to_s) \
-              if params[key.to_s].key?(subkey.to_s)
-          end
+          Hash === params[key.to_s] && params[key.to_s].any? &&
+            [*subkeys].all? do |subkey|
+              # TODO: What if deleting one is successful, but not another?
+              # We'll need to restore the hash to its original state.
+              @qcaptures << params[key.to_s].delete(subkey.to_s) \
+                if params[key.to_s].key?(subkey.to_s)
+            end.tap do |ok|
+              # If us deleting key(s) causes the hash to be empty, delete it.
+              params.delete(key.to_s) if ok && params[key.to_s].empty?
+            end
         end
       end
     end
@@ -122,31 +128,39 @@ module Sinja
         params.each do |key, value|
           key = key.to_sym
 
-          next if settings._sinja.query_params[key].nil?
+          # Ignore interal Sinatra query parameters (e.g. :captures) and any
+          # "known" query parameter set to `nil' in the configurable.
+          next if !env['rack.request.query_hash'].key?(key.to_s) ||
+            settings._sinja.query_params.fetch(key, :_).nil?
 
           raise BadRequestError, "`#{key}' query parameter not allowed" \
-            unless allow_params.include?(key) || value.empty?
+            unless allow_params.include?(key)
+
+          next if env['sinja.normalized'] == params.object_id
 
-          if Array === settings._sinja.query_params[key] && String === value
-            value = (params[key.to_s] = value.split(','))
+          if !(String === settings._sinja.query_params[key]) && String === value
+            params[key.to_s] = value.split(',')
           elsif !(settings._sinja.query_params[key].class === value)
             raise BadRequestError, "`#{key}' query parameter malformed"
           end
         end
 
+        return true if env['sinja.normalized'] == params.object_id
+
         settings._sinja.query_params.each do |key, value|
           next if value.nil?
 
-          key = key.to_s
-
           if respond_to?("normalize_#{key}_params")
-            params[key] = send("normalize_#{key}_params")
+            params[key.to_s] = send("normalize_#{key}_params")
           else
-            params[key] ||= value
+            params[key.to_s] ||= value
           end
         end
 
-        true
+        # Sinatra 2.0 re-initializes `params' at namespace boundaries, but
+        # Sinatra 1.4 does not, so we'll reference its object_id in the flag
+        # to make sure we only re-normalize the parameters when necessary.
+        env['sinja.normalized'] = params.object_id
       end
     end
 
@@ -213,7 +227,7 @@ module Sinja
       end
 
       def normalize_sort_params
-        return [] unless params[:sort]&.any?
+        return {} unless params[:sort]&.any?
 
         raise BadRequestError, "Unsupported `sort' query parameter(s)" \
           unless respond_to?(:sort)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinja
 version: !ruby/object:Gem::Version
-  version: 1.1.0.pre2
+  version: 1.1.0.pre3
 platform: ruby
 authors:
 - Mike Pastore