ree_lib 1.0.44 → 1.0.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b693a698326ebc9436c1b53ac0ef76b16a084f0cf164d5dbbf296f965f2c9d0
-  data.tar.gz: afcc7ad74317cb8c3c5f553430d2d486be8747b185b819d93852c56104604802
+  metadata.gz: c891f66e5e8dfeb011588bb1cdfebebd2d1ca88552a2e623eeb573d72b43fd47
+  data.tar.gz: 3c9885f0abfb06dc1cde8d9fcdcb7a5901c859dbb629c61d7939caf1eb74b242
 SHA512:
-  metadata.gz: 0bb1241355f92521c4f2ef67dfe52b55082335c8d963028ad9cf1cc4f4bd0238def3aa33f34193c1bcdf8f3968fdb118e29e27cde0b40da052969ee9b0c7d658
-  data.tar.gz: '0178d10d0f7b0063f665150c2848c7b985aae3505617bf2daaa637e5ac9ea2429fd1c9f925de8014d4d817fa06451ed5dfb2e91942d77a9a09973c8fdbb04112'
+  metadata.gz: '0726859940ca7bc5e7f32a1995ad40f42670cc41a3c829d5211b37712ef65092efb5a643cd0b000d55f1497fd4db2fa37eee991cb7e5f27185515d6f3f996cc7'
+  data.tar.gz: fed4151d293502fbf5eb73236acf2e944f3ceade748d7e73da38bbf3cf906df1153388789db47c11469c005a06fb7a79eca8736e55e0d496f1a2df252bde6047

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.44)
+    ree_lib (1.0.46)
       binding_of_caller (~> 1.0.0)
       i18n (~> 1.12.0)
       loofah (~> 2.18.0)
@@ -36,9 +36,9 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     msgpack (1.6.0)
-    nokogiri (1.14.2-x86_64-darwin)
+    nokogiri (1.14.3-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.2-x86_64-linux)
+    nokogiri (1.14.3-x86_64-linux)
       racc (~> 1.4)
     oj (3.13.23)
     pg (1.4.6)

data/lib/ree_lib/packages/ree_roda/package/ree_roda/services/build_route_errors.rb

@@ -52,7 +52,11 @@ class ReeRoda::BuildRouteErrors
       klass, :call, scope: :instance
     )
 
-    method_decorator&.errors || []
+    original_method_decorator = Ree::Contracts.get_method_decorator(
+      klass, :__original_call, scope: :instance
+    )
+
+    method_decorator&.errors || original_method_decorator&.errors || []
   end
 
   def status_from_error(error)

data/lib/ree_lib/packages/ree_roda/spec/ree_roda/services/build_swagger_from_routes_spec.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+package_require("ree_errors/validation_error")
+
+RSpec.describe :build_swagger_from_routes do
+  link :add_load_path, from: :ree_i18n
+  link :build_swagger_from_routes, from: :ree_roda
+
+  before :all do
+    add_load_path(Dir[File.join(__dir__, 'locales/*.yml')])
+
+    Ree.enable_irb_mode
+
+    module ReeRodaTestSwagger
+      include Ree::PackageDSL
+
+      package do
+        depends_on :ree_actions
+        depends_on :ree_dao
+      end
+    end
+
+    class ReeRodaTestSwagger::Cmd
+      include ReeActions::DSL
+
+      action :cmd
+
+      ActionCaster = build_mapper.use(:cast) do
+        integer :id
+      end
+
+      InvalidErr = ReeErrors::ValidationError.build(:invalid, "invalid")
+
+      contract(Any, Any => Any).throws(InvalidErr)
+      def call(access, attrs)
+        raise InvalidErr if false
+      end
+    end
+
+    class ReeRodaTestSwagger::TestRoutes
+      include ReeRoutes::DSL
+
+      routes :test_routes do
+        default_warden_scope :identity
+        opts = { from: :ree_roda_test_swagger }
+
+        post "api/actions" do
+          summary "Some action"
+          action :cmd, **opts
+        end
+      end
+    end
+
+    class TestSwaggerApp < ReeRoda::App
+      plugin :ree_routes
+
+      ree_routes ReeRodaTestSwagger::TestRoutes.new
+
+      route do |r|
+        r.ree_routes
+      end
+    end
+  end
+
+  after :all do
+    Ree.disable_irb_mode
+  end
+
+  let(:routes) { TestSwaggerApp.instance_variable_get(:@ree_routes) }
+
+  it {
+    swagger = build_swagger_from_routes(routes, "test", "test", "1.0", "https://example.com")
+
+    expect(swagger.dig(:paths, "/api/actions", :post, :responses, 422, :description))
+      .to eq("- type: **validation**, code: **invalid**, message: **invalid**")
+  }
+end

data/lib/ree_lib/packages/ree_roda/spec/ree_roda/services/locales/en.yml

@@ -0,0 +1,2 @@
+en:
+  invalid: "invalid"

data/lib/ree_lib/packages/ree_roda/spec/ree_roda/services/locales/ru.yml

@@ -0,0 +1,2 @@
+ru:
+  invalid: "invalid"

data/lib/ree_lib/packages/ree_text/package/ree_text/scrubbers/permit_scrubber.rb

@@ -3,6 +3,10 @@
 require 'set'
 
 class ReeText::PermitScrubber < Loofah::Scrubber
+  include Ree::LinkDSL
+
+  link :unescape_html
+
   attr_reader :tags, :attributes, :prune
 
   contract Kwargs[
@@ -11,7 +15,6 @@ class ReeText::PermitScrubber < Loofah::Scrubber
     attributes: Set,
   ] => Any
   def initialize(prune: false, tags: nil, attributes: nil)
-    @unescape_html = ReeText::UnescapeHtml.new
     @prune = prune
     @direction = @prune ? :top_down : :bottom_up
     @tags = tags
@@ -26,7 +29,7 @@ class ReeText::PermitScrubber < Loofah::Scrubber
 
       return CONTINUE
     end
-    
+
     return CONTINUE if node.text?
 
     unless (node.element? || node.comment?) && allowed_node?(node)
@@ -37,7 +40,7 @@ class ReeText::PermitScrubber < Loofah::Scrubber
   end
 
   protected
-  
+
   def allowed_node?(node)
     @tags.include?(node.name)
   end
@@ -74,8 +77,7 @@ class ReeText::PermitScrubber < Loofah::Scrubber
 
     if Loofah::HTML5::SafeList::ATTR_VAL_IS_URI.include?(attr_name)
       # this block lifted nearly verbatim from HTML5 sanitization
-      val_unescaped = @unescape_html
-        .call(attr_node.value)
+      val_unescaped = unescape_html(attr_node.value)
         .gsub(Loofah::HTML5::Scrub::CONTROL_CHARACTERS,'')
         .downcase
 

data/lib/ree_lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.44
+  version: 1.0.46
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-05 00:00:00.000000000 Z
+date: 2023-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ree
@@ -1131,6 +1131,9 @@ files:
 - lib/ree_lib/packages/ree_roda/spec/package_schema_spec.rb
 - lib/ree_lib/packages/ree_roda/spec/ree_roda/app_spec.rb
 - lib/ree_lib/packages/ree_roda/spec/ree_roda/services/build_routing_tree_spec.rb
+- lib/ree_lib/packages/ree_roda/spec/ree_roda/services/build_swagger_from_routes_spec.rb
+- lib/ree_lib/packages/ree_roda/spec/ree_roda/services/locales/en.yml
+- lib/ree_lib/packages/ree_roda/spec/ree_roda/services/locales/ru.yml
 - lib/ree_lib/packages/ree_roda/spec/spec_helper.rb
 - lib/ree_lib/packages/ree_routes/.gitignore
 - lib/ree_lib/packages/ree_routes/.rspec