ree_lib 1.0.45 → 1.0.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1833caceb1fab8b06725a1a975b37176fe614d2977bec18a0bbcde694bc8c386
-  data.tar.gz: d7a55eebaeabce9227d6d5c991bbd55ce2b70e3a2c1857bef588205320d8a911
+  metadata.gz: c74ce073851aa0f44a9d5ef2d7df9000bd595e1208300a257269cdec28de15e8
+  data.tar.gz: eb2cc59a1ae7da783c6950236288e7be4a5d6a1c42f5216fd0c7cac5728941bd
 SHA512:
-  metadata.gz: ca8d804780cdaed54a20b120bc8054568af74ca303fc2cd4e237944f1d8db6a9f26dd89fcbe31f912f5a3f966d315839267cc76208fe8a76dfbe7834faf3ab3a
-  data.tar.gz: 5840f846e9bf90ba3882454d21f9bf2df376319512a30766ba28ac41e72f70d70429dd0c4c69edc5bdf0bf4b45825c451861f46bb5b0cbbced98b58c7d625393
+  metadata.gz: 6ae3e653b7ee36a1ce7574cfe1ec091532420744b5b87e33aa121b4c01929ff989f5e5800414dc10a59e9752daf2e02bd6b51f656a6f449db2ee5c89a3242c72
+  data.tar.gz: 6a09a450be8d91aced2a457248e30b6c810ceb9857e391ccb73574e4ee546fc96345cc4dcc0ad3618c3304fe808b78ad45a1a8f69150d95625ce38bd86237151

data/Gemfile.lock

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

data/lib/ree_lib/packages/ree_http/package/ree_http/functions/build_request.rb

@@ -4,10 +4,8 @@ class ReeHttp::BuildRequest
   include Ree::FnDSL
 
   fn :build_request do
-    link :to_json, from: :ree_json
-    link :slice, from: :ree_hash
     link :not_blank, from: :ree_object
-
+    link :to_json, from: :ree_json
     link 'ree_http/constants', -> {
       HTTPS & HTTP & HTTPS_PORT & HTTP_PORT & DEFAULT_FORCE_SSL
     }
@@ -84,8 +82,8 @@ class ReeHttp::BuildRequest
 
     unless opts[:body].nil?
       request.body =
-        case request[:body]
-        when Hash then to_json[opts[:body]]
+        case opts[:body]
+        when Hash then to_json(opts[:body])
         when File then opts[:body].read
         else
           opts[:body]

data/lib/ree_lib/packages/ree_http/schemas/ree_http/functions/build_request.schema.json

@@ -41,14 +41,6 @@
 
       ]
     },
-    {
-      "target": "slice",
-      "package_name": "ree_hash",
-      "as": "slice",
-      "imports": [
-
-      ]
-    },
     {
       "target": "to_json",
       "package_name": "ree_json",

data/lib/ree_lib/packages/ree_http/spec/ree_http/functions/http_post_spec.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require 'webmock/rspec'
+require "tempfile"
 
 RSpec.describe :http_post do
   link :http_post, from: :ree_http
@@ -70,6 +71,26 @@ RSpec.describe :http_post do
         body: "abc"
       )
 
+      http_post(
+        host,
+        body: { foo: "bar" }
+      )
+      expect(WebMock).to have_requested(:post, host).with(body: "{\"foo\":\"bar\"}")
+
+      begin
+        tempfile = Tempfile.new
+        tempfile.write("hello world")
+        tempfile.rewind
+
+        http_post(
+          host,
+          body: File.open(tempfile.path)
+        )
+        expect(WebMock).to have_requested(:post, host).with(body: "hello world")
+      ensure
+        tempfile&.close!
+      end
+
       # works !
       # response = http_post(
       #   'http://127.0.0.1:8085/end',

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.45
+  version: 1.0.47
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-10 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