ree_lib 1.0.77 → 1.0.78

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f828e49751333dd0c669d75a7066a838f9149d4ab8923ab788e53f84c61aae4
-  data.tar.gz: b247a24875f2c0a9caa9b5fcfbe5452e0a3c48af7d0ff2c0bd385820ce37c709
+  metadata.gz: 2c3323a878bb1c2a2d2a629f616a31ff63bc8d64dbbc8c070aa82bc8483d920e
+  data.tar.gz: f9a81546f833cc528f7407f08bd1141553e38fe8124128924ca0a6cc963a4e20
 SHA512:
-  metadata.gz: 0d3717364f0554a3e36097431856fb3db75099bb34fd57dc6eabfffa4e57baa2e66a81a59da5206e980dcfef1339c3cc50078fb1242973efbc9df67550ea0716
-  data.tar.gz: ad0297ec030fd912995b4b740685c017f0a114084cbed83579d42c507a06fd0e70eb2a267c030d12b2763f649dd201cb3d9003684b2843e3105073da8ebff4cf
+  metadata.gz: 8ecd161b8070aec4e06e9c30f7397b139d9a954476db9a73ed42d927051b07ff24b30afef38421cf999711f2f3beeb51700246e1067e6e6db5da5a8f2b3c0200
+  data.tar.gz: 5d80bb2e3a93dd25190312c4eafba0d5680e8d13d63c85b645a9fbc71d2bce807ebd8d4255bc99f7d0bdb0d33c98a39b9e8a0809fca92227739a9c7c5df345c4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.77)
+    ree_lib (1.0.78)
       binding_of_caller (~> 1.0.0)
       i18n (~> 1.12.0)
       loofah (~> 2.18.0)
@@ -45,7 +45,7 @@ GEM
     oj (3.13.23)
     pg (1.4.6)
     public_suffix (5.0.1)
-    racc (1.7.1)
+    racc (1.7.3)
     rack (3.0.5)
     rack-test (2.0.2)
       rack (>= 1.3)

data/lib/ree_lib/packages/ree_roda/package/ree_roda/plugins/ree_routes.rb

@@ -71,50 +71,54 @@ class Roda
         def route_proc(route, context)
           Proc.new do |r|
             r.send(route.request_method) do
-              r.send(route.respond_to) do
-                r.env["warden"].authenticate!(scope: route.warden_scope)
+              if route.override
+                route.override.call(r)
+              else
+                r.send(route.respond_to) do
+                  r.env["warden"].authenticate!(scope: route.warden_scope)
 
-                if context.opts[:ree_routes_before]
-                  r.instance_exec(@_request, route.warden_scope, &r.scope.opts[:ree_routes_before])
-                end
+                  if context.opts[:ree_routes_before]
+                    r.instance_exec(@_request, route.warden_scope, &r.scope.opts[:ree_routes_before])
+                  end
 
-                params = r.params
+                  params = r.params
 
-                if r.body
-                  body = begin
-                    JSON.parse(r.body.read)
-                  rescue => e
-                    {}
-                  end
+                  if r.body
+                    body = begin
+                      JSON.parse(r.body.read)
+                    rescue => e
+                      {}
+                    end
 
-                  params = params.merge(body)
-                end
+                    params = params.merge(body)
+                  end
 
-                not_blank = ReeObject::NotBlank.new
+                  not_blank = ReeObject::NotBlank.new
 
-                filtered_params = ReeHash::TransformValues.new.call(params) do |k, v|
-                  v.is_a?(Array) ? v.select { not_blank.call(_1) } : v
-                end
+                  filtered_params = ReeHash::TransformValues.new.call(params) do |k, v|
+                    v.is_a?(Array) ? v.select { not_blank.call(_1) } : v
+                  end
 
-                accessor = r.env["warden"].user(route.warden_scope)
-                action_result = get_cached_action(route).call(accessor, filtered_params)
+                  accessor = r.env["warden"].user(route.warden_scope)
+                  action_result = get_cached_action(route).call(accessor, filtered_params)
 
-                if route.serializer
-                  serialized_result = get_cached_serializer(route).serialize(action_result)
-                else
-                  serialized_result = {}
-                end
+                  if route.serializer
+                    serialized_result = get_cached_serializer(route).serialize(action_result)
+                  else
+                    serialized_result = {}
+                  end
 
-                case route.request_method
-                when :post
-                  r.response.status = 201
-                  ReeJson::ToJson.new.call(serialized_result)
-                when :put, :delete, :patch
-                  r.response.status = 204
-                  ""
-                else
-                  r.response.status = 200
-                  ReeJson::ToJson.new.call(serialized_result)
+                  case route.request_method
+                  when :post
+                    r.response.status = 201
+                    ReeJson::ToJson.new.call(serialized_result)
+                  when :put, :delete, :patch
+                    r.response.status = 204
+                    ""
+                  else
+                    r.response.status = 200
+                    ReeJson::ToJson.new.call(serialized_result)
+                  end
                 end
               end
 
@@ -152,7 +156,7 @@ class Roda
                     route_procs.each do |route_proc|
                       r.instance_exec(r, &route_proc)
                     end
-                    
+
                     nil
                   end
 

data/lib/ree_lib/packages/ree_roda/spec/ree_roda/app_spec.rb

@@ -116,6 +116,20 @@ RSpec.describe ReeRoda::App do
           serializer :serializer, **opts
         end
 
+        get "api/action/:action_id/test_override" do
+          summary "Subaction"
+          warden_scope :visitor
+          sections "some_action"
+          action :action_cmd, **opts
+          serializer :serializer, **opts
+          override do |r|
+            r.json do
+              r.response.status = 200
+              "result"
+            end
+          end
+        end
+
         get "api/action/:id/subaction" do
           summary "Subaction"
           warden_scope :visitor
@@ -233,6 +247,12 @@ RSpec.describe ReeRoda::App do
     expect(last_response.body).to eq("{\"result\":\"action_cmd\"}")
   }
 
+  it {
+    get "api/action/:action_id/test_override"
+    expect(last_response.status).to eq(200)
+    expect(last_response.body).to eq("result")
+  }
+
   it {
     post "api/action/1/subaction/2"
     expect(last_response.status).to eq(201)

data/lib/ree_lib/packages/ree_routes/package/ree_routes/route.rb

@@ -2,7 +2,7 @@
 
 class ReeRoutes::Route
   attr_accessor :summary, :request_method, :serializer, :respond_to,
-                :sections, :action, :route, :warden_scope, :path
+                :sections, :action, :route, :warden_scope, :path, :override
 
   def valid?
     !action.nil? && !summary.nil? && !warden_scope.nil?

data/lib/ree_lib/packages/ree_routes/package/ree_routes/route_builder.rb

@@ -31,6 +31,12 @@ class ReeRoutes::RouteBuilder
     nil
   end
 
+  contract Block => nil
+  def override(&proc)
+    @route.override = proc
+    nil
+  end
+
   contract String => String
   def summary(str)
     @route.summary = str

data/lib/ree_lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReeLib
-  VERSION = "1.0.77"
+  VERSION = "1.0.78"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.77
+  version: 1.0.78
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-18 00:00:00.000000000 Z
+date: 2023-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ree