blix-rest 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75a4d03931f84bc3ff41a3ef9f8a5b9e640f44dc87e7a4d30377e373672624b6
-  data.tar.gz: b7c39e772620438d3c505688eda970f7b9263cd1da4c3227a52693cae6961943
+  metadata.gz: 803e59de73313dfd8a4d1e78f4c3e597ef91f94aa69a8afd126e4dfe77d25305
+  data.tar.gz: cd860e9b57fe907b8289178727db163cdad13bac474b6b4bdfe3de76b0a824a1
 SHA512:
-  metadata.gz: cfc455c42d0b8aa0243cc670cdf6c2ff499e053828a6ec24d1d1b66eded88d2518c264c41b6e0bddc9ce0b64fa7aa4fd53f612e41b31ea0e53e405f543f165b2
-  data.tar.gz: 7386158d169e991e8174ed6790c264ff0086c40c22f1b977309c8cec53d4b3e29c69cba05bfada8fd1239016af03939a36924122454b6d56acedaccb50ce0d6a
+  metadata.gz: 0554d9118f19d2bd60dbb740fdb41a2f7d4c38597d44f10effc055355098318818b117d9284947348fd71f1551eaadc3b941dae8a1e507d5aa39ea3ee89d0bf1
+  data.tar.gz: 7dfdfdf748c7ad96eb485863c741c2098df460fa4bfc7825dddab8fa05a3bedac83d7ecffe387fc604ff9fa4b09ca56e9f44cc45a592d641a58ce9a2a8591991

data/README.md

@@ -629,6 +629,7 @@ Here's a comprehensive list of helper methods available in Blix::Rest controller
 - `render_erb`: Render an ERB template
 - `req`: The Rack request object
 - `request_ip`: The IP address of the request
+- `route_options`: The options that were passed in the route definition.
 - `send_data`: Send raw data with various options
 - `send_error`: Send an error response
 - `server_cache`: Get the server cache object

data/lib/blix/rest/controller.rb

@@ -29,7 +29,8 @@ module Blix::Rest
     :format,
     :response,
     :method,
-    :server
+    :server,
+    :response_options          # can be set during a call.
   )
 
   class Controller
@@ -76,11 +77,16 @@ module Blix::Rest
     end
 
     def body
-      @_body ||= env['rack.input'].read
-      #      env['rack.input'].rewindreq.POST #env["body"]
+      @_body ||= begin
+        if env['rack.input']
+          env['rack.input'].read
+        else
+          ''
+        end
+      end
     end
 
-    # ovverride the path method to return the internal path.
+    # override the path method to return the internal path.
     def path
       p = CGI.unescape(req.path)
       p = '/' + p if p[0, 1] != '/' # ensure a leading slash on path
@@ -298,6 +304,11 @@ module Blix::Rest
       @_response.status = value.to_i
     end
 
+    def set_options(value)
+      @_context.response_options ||= {}
+      @_context.response_options.merge!(value)
+    end
+
     def add_headers(headers)
       @_response.headers.merge!(headers.map{|k,v| [k.to_s.downcase,v]}.to_h)
     end

data/lib/blix/rest/server.rb

@@ -165,15 +165,12 @@ module Blix::Rest
       blk, path_params, options = match_all if match_all && match_all[0]
 
       default_format = options && options[:default] && options[:default].to_sym
-      force_format = options && options[:force] && options[:force].to_sym
-      do_cache = options && options[:cache] && !Blix::Rest.cache_disabled
-      clear_cache = options && options[:cache_reset]
-
-      query_format = options && options[:query] && req.GET['format'] && req.GET['format'].to_sym
-
-      format = query_format || path_params[:format] || get_format_new(env, options) || default_format || :json
-
-      parser = get_parser(force_format || format)
+      force_format   = options && options[:force] && options[:force].to_sym
+      do_cache       = options && options[:cache] && !Blix::Rest.cache_disabled
+      clear_cache    = options && options[:cache_reset]
+      query_format   = options && options[:query] && req.GET['format'] && req.GET['format'].to_sym
+      format         = query_format || path_params[:format] || get_format_new(env, options) || default_format || :json
+      parser         = get_parser(force_format || format)
 
       unless parser
         if blk
@@ -196,7 +193,8 @@ module Blix::Rest
         begin
           params = env['params']
           context = Context.new(path_params, params, req, format, response, verb, self)
-          value, response_options = blk.call(context)
+          value   = blk.call(context)
+          response_options = context.response_options || {}
         rescue ServiceError => e
           set_default_headers(parser, response)
           response.set(e.status, parser.format_error(e.message), e.headers)
@@ -216,7 +214,6 @@ module Blix::Rest
           logger << e.message
           logger << e.backtrace.join("\n")
         else # no error
-          response_options ||= {}
           response.set_options(response_options)
           if response_options[:raw]
             response.content = value
@@ -233,7 +230,7 @@ module Blix::Rest
         response.set(404, parser.format_error('Invalid Url'))
       end
 
-      logger << "#{verb} #{path} total time=#{((Time.now - t1) * 1000).round(2)}ms"
+      logger << "#{verb} #{path} total time=#{((Time.now - t1) * 1000).round(2)}ms" if $VERBOSE
       [response.status.to_i, response.headers, response.content]
     end
 

data/lib/blix/rest/version.rb

@@ -1,5 +1,5 @@
 module Blix
   module Rest
-    VERSION = "0.11.1"
+    VERSION = "0.11.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blix-rest
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Clive Andrews
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-04-05 00:00:00.000000000 Z
+date: 2025-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Framework for HTTP REST services