ree_lib 1.0.39 → 1.0.40

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

@@ -0,0 +1,144 @@
+class ReeRoda::BuildRoutingTree
+  include Ree::FnDSL
+
+  fn :build_routing_tree
+
+  class RoutingTree
+    attr_accessor :children, :value, :depth, :routes, :type, :parent
+  
+    def initialize(value, depth, type, parent = nil, routes = [])
+      @value = value
+      @depth = depth
+      @parent = parent
+      @type = type
+      @routes = []
+      @children = []
+    end
+  
+    def find_by_value(
+      tree: self,
+      value: nil,
+      type: :param,
+      depth: 0
+    )
+      return tree if tree.depth == depth && tree.value == value
+      if tree.depth < depth
+        res = tree.children.map do |c|
+          find_by_value(tree: c, value: value, type: type, depth: depth)
+        end.flatten.compact
+
+        return res.size > 1 ? res : res.first
+      end
+    end
+
+    def children_have_value?(value)
+      !!self.children.find { |c| c.value == value }
+    end
+
+    def add_child(value, depth, type)
+      new_child = self.class.new(value, depth, type, self.value)
+      self.children << new_child
+      self.children = self.children.sort { _1.value.match?(/\:/) ? 1 : 0 }
+
+      return new_child
+    end
+
+    def add_route(route)
+      self.routes << route
+    end
+
+    def print_tree(tree = self)
+      puts "#{get_offset(tree.depth)}#{tree.value} - #{tree.depth}"
+      if tree.children.length > 0
+        tree.children.each do |child|
+          print_tree(child)
+        end
+      end
+
+      nil
+    end
+
+    def print_proc_tree(tree = self)
+      param_value = tree.value.start_with?(":") ? String : "\"#{tree.value}\""
+      if tree.routes.length == 0
+        if tree.children.length > 0
+          puts "#{get_offset(tree.depth)}r.on #{param_value} do"
+          tree.children.each do |child|
+            print_proc_tree(child)
+          end
+          puts "#{get_offset(tree.depth)}end"
+        end
+
+        nil
+      else
+        if tree.children.length > 0
+          puts "#{get_offset(tree.depth)}r.on #{param_value} do"
+          tree.children.each do |child|
+            print_proc_tree(child)
+          end
+          tree.routes.each do |route|
+            puts "#{get_offset(tree.depth + 1)}r.#{route.request_method} do"
+            puts "#{get_offset(tree.depth + 1)}end"
+          end
+          puts "#{get_offset(tree.depth)}end"
+        else
+          puts "#{get_offset(tree.depth)}r.is #{param_value} do"
+          tree.routes.each do |route|
+            puts "#{get_offset(tree.depth + 1)}r.#{route.request_method} do"
+            puts "#{get_offset(tree.depth + 1)}end"
+          end
+          puts "#{get_offset(tree.depth)}end"
+        end
+      end
+
+      nil
+    end
+
+    private
+
+    def get_offset(depth)
+      " " * (depth + 1) * 2
+    end
+  end
+
+  contract(ArrayOf[ReeRoutes::Route] => Nilor[RoutingTree])
+  def call(routes)
+    tree = nil
+    routes.each do |route|
+      splitted = route.path.split("/")
+
+      parent_tree = tree
+      splitted.each_with_index do |v, j|
+        if tree.nil?
+          tree = RoutingTree.new(v, j, :string)
+          parent_tree = tree
+          next
+        end
+
+        current = parent_tree.find_by_value(value: v, depth: j)
+        if current
+          parent_tree = current
+
+          current.add_route(route) if j == (splitted.length - 1)
+        else
+          if !parent_tree.children_have_value?(v)
+            if parent_tree.children.any? { |c| c.type == :param } && v.start_with?(":")
+              param_child = parent_tree.children.find { |c| c.type == :param }
+              param_child.add_route(route) if j == (splitted.length - 1)
+              parent_tree = param_child
+
+              next
+            end
+
+            new_tree = parent_tree.add_child(v, j, v.start_with?(":") ? :param : :string)
+            parent_tree = new_tree
+          end
+
+          parent_tree.add_route(route) if j == (splitted.length - 1)
+        end
+      end
+    end
+    
+    tree
+  end
+end

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

@@ -0,0 +1,54 @@
+class ReeRoda::BuildSwaggerFromRoutes
+  include Ree::FnDSL
+
+  fn :build_swagger_from_routes do
+    link :build_route_errors
+    link :build_schema, from: :ree_swagger
+    link "ree_swagger/dto/endpoint_dto", -> { EndpointDto }
+  end
+
+  contract(ArrayOf[ReeRoutes::Route], String, String, String, String => Hash)
+  def call(routes, title, description, version, api_url)
+    endpoints = routes.map do |route|
+      method_decorator = Ree::Contracts.get_method_decorator(
+        route.action.klass, :call, scope: :instance
+      )
+
+      response_status = case route.request_method
+      when :post
+        201
+      when :put, :delete, :patch
+        204
+      else
+        200
+      end
+
+      caster = if route.action.klass.const_defined?(:ActionCaster)
+        route.action.klass.const_get(:ActionCaster)
+      end
+
+      EndpointDto.new(
+        method: route.request_method,
+        sections: route.sections,
+        respond_to: route.respond_to,
+        path: route.path.start_with?("/") ? route.path : "/#{route.path}",
+        caster: caster,
+        serializer: route.serializer&.klass&.new,
+        summary: route.summary,
+        authenticate: route.warden_scope != :visitor,
+        description: method_decorator&.doc || "",
+        response_status: response_status,
+        response_description: nil,
+        errors: build_route_errors(route)
+      )
+    end
+
+    build_schema(
+      title: title,
+      description: description,
+      version: version,
+      api_url: api_url,
+      endpoints: endpoints
+    )
+  end
+end

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

@@ -4,7 +4,7 @@ module ReeRoda
   include Ree::PackageDSL
 
   package do
-    depends_on :ree_actions
+    depends_on :ree_routes
     depends_on :ree_logger
     depends_on :ree_json
     depends_on :ree_hash
@@ -15,5 +15,5 @@ module ReeRoda
 end
 
 package_require "ree_roda/plugins/ree_logger"
-package_require "ree_roda/plugins/ree_actions"
+package_require "ree_roda/plugins/ree_routes"
 package_require "ree_roda/app"

data/lib/ree_lib/packages/ree_roda/schemas/ree_roda/services/{build_action_errors.schema.json → build_route_errors.schema.json}

@@ -1,10 +1,10 @@
 {
   "schema_type": "object",
   "schema_version": "1.1",
-  "name": "build_action_errors",
-  "path": "packages/ree_roda/package/ree_roda/services/build_action_errors.rb",
+  "name": "build_route_errors",
+  "path": "packages/ree_roda/package/ree_roda/services/build_route_errors.rb",
   "mount_as": "fn",
-  "class": "ReeRoda::BuildActionErrors",
+  "class": "ReeRoda::BuildRouteErrors",
   "factory": null,
   "methods": [
     {
@@ -15,9 +15,9 @@
       "return": "ArrayOf[ReeSwagger::ErrorDto]",
       "args": [
         {
-          "arg": "action",
+          "arg": "route",
           "arg_type": "req",
-          "type": "ReeActions::Action"
+          "type": "ReeRoutes::Route"
         }
       ]
     }

data/lib/ree_lib/packages/ree_roda/schemas/ree_roda/services/build_routing_tree.schema.json

@@ -0,0 +1,28 @@
+{
+  "schema_type": "object",
+  "schema_version": "1.1",
+  "name": "build_routing_tree",
+  "path": "packages/ree_roda/package/ree_roda/services/build_routing_tree.rb",
+  "mount_as": "fn",
+  "class": "ReeRoda::BuildRoutingTree",
+  "factory": null,
+  "methods": [
+    {
+      "doc": "",
+      "throws": [
+
+      ],
+      "return": "Nilor[ReeRoda::BuildRoutingTree::RoutingTree]",
+      "args": [
+        {
+          "arg": "routes",
+          "arg_type": "req",
+          "type": "ArrayOf[ReeRoutes::Route]"
+        }
+      ]
+    }
+  ],
+  "links": [
+
+  ]
+}

data/lib/ree_lib/packages/ree_roda/schemas/ree_roda/services/{build_swagger_from_actions.schema.json → build_swagger_from_routes.schema.json}

@@ -1,10 +1,10 @@
 {
   "schema_type": "object",
   "schema_version": "1.1",
-  "name": "build_swagger_from_actions",
-  "path": "packages/ree_roda/package/ree_roda/services/build_swagger_from_actions.rb",
+  "name": "build_swagger_from_routes",
+  "path": "packages/ree_roda/package/ree_roda/services/build_swagger_from_routes.rb",
   "mount_as": "fn",
-  "class": "ReeRoda::BuildSwaggerFromActions",
+  "class": "ReeRoda::BuildSwaggerFromRoutes",
   "factory": null,
   "methods": [
     {
@@ -15,9 +15,9 @@
       "return": "Hash",
       "args": [
         {
-          "arg": "actions",
+          "arg": "routes",
           "arg_type": "req",
-          "type": "ArrayOf[ReeActions::Action]"
+          "type": "ArrayOf[ReeRoutes::Route]"
         },
         {
           "arg": "title",
@@ -44,9 +44,9 @@
   ],
   "links": [
     {
-      "target": "build_action_errors",
+      "target": "build_route_errors",
       "package_name": "ree_roda",
-      "as": "build_action_errors",
+      "as": "build_route_errors",
       "imports": [
 
       ]

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

@@ -2,7 +2,10 @@ require "rack/test"
 
 package_require("ree_roda/app")
 package_require("ree_actions/dsl")
-package_require("ree_roda/plugins/ree_actions")
+package_require("ree_routes/dsl")
+package_require("ree_roda/plugins/ree_routes")
+
+require "warden"
 
 RSpec.describe ReeRoda::App do
   include Rack::Test::Methods
@@ -17,7 +20,7 @@ RSpec.describe ReeRoda::App do
     end
 
     class ReeRodaTest::Cmd
-      include ReeActions::ActionDSL
+      include ReeActions::DSL
 
       action :cmd
 
@@ -26,13 +29,57 @@ RSpec.describe ReeRoda::App do
       end
 
       def call(access, attrs)
+        {result: "result"}
+      end
+    end
+
+    class ReeRodaTest::AnotherCmd
+      include ReeActions::DSL
+
+      action :another_cmd
+
+      ActionCaster = build_mapper.use(:cast) do
+        integer :id
+      end
+
+      def call(access, attrs)
+        {result: "another_result"}
       end
     end
 
-    class ReeRodaTest::TestActions
+    class ReeRodaTest::SubCmd
       include ReeActions::DSL
 
-      actions :test_actions do
+      action :sub_cmd
+
+      ActionCaster = build_mapper.use(:cast) do
+        integer :id
+        integer :sub_id
+      end
+
+      def call(access, attrs)
+        {result: "another_result"}
+      end
+    end
+
+    class ReeRodaTest::Serializer
+      include ReeMapper::DSL
+
+      mapper :serializer
+
+      build_mapper.use(:serialize) do
+        string :result
+      end
+
+      def call(access, attrs)
+        {result: "result"}
+      end
+    end
+
+    class ReeRodaTest::TestRoutes
+      include ReeRoutes::DSL
+
+      routes :test_routes do
         default_warden_scope :identity
         opts = {from: :ree_roda_test}
 
@@ -41,14 +88,83 @@ RSpec.describe ReeRoda::App do
           warden_scope :visitor
           sections "some_action"
           action :cmd, **opts
+          serializer :serializer, **opts
+        end
+
+        get "api/action/:id/subaction" do
+          summary "Subaction"
+          warden_scope :visitor
+          sections "some_action"
+          action :cmd, **opts
+          serializer :serializer, **opts
+        end
+
+        post "api/action/:id/subaction" do
+          summary "Some action"
+          warden_scope :visitor
+          sections "some_action"
+          action :cmd, **opts
+          serializer :serializer, **opts
+        end
+
+        post "api/action/:id/anotheraction" do
+          summary "Some action"
+          warden_scope :visitor
+          sections "some_action"
+          action :another_cmd, **opts
+          serializer :serializer, **opts
+        end
+
+        post "api/action/:id/subaction/:sub_id" do
+          summary "Some action"
+          warden_scope :visitor
+          sections "some_action"
+          action :sub_cmd, **opts
+          serializer :serializer, **opts
+        end
+
+        post "api/action/:id" do
+          summary "Some action"
+          warden_scope :visitor
+          sections "some_action"
+          action :cmd, **opts
+          serializer :serializer, **opts
         end
       end
     end
 
+    class VisitorStrategy < Warden::Strategies::Base
+      include Ree::LinkDSL
+
+      def valid?
+        true
+      end
+
+      def authenticate!
+        success!({user: "visitor"})
+      end
+    end
+
+    Warden::Strategies.add(:visitor, VisitorStrategy)
+
     class TestApp < ReeRoda::App
-      plugin :ree_actions
+      use Warden::Manager do |config|
+        config.default_strategies :visitor
+        config.default_scope = :visitor
+        config.scope_defaults :visitor, strategies: [:visitor], store: false
+
+        config.failure_app = -> (env) {
+          [
+            401,
+            {"Content-Type" => "text/plain"},
+            ["requires authentication"]
+          ]
+        }
+      end
 
-      ree_actions ReeRodaTest::TestActions.new,
+      plugin :ree_routes
+
+      ree_routes ReeRodaTest::TestRoutes.new,
         api_url: "http://some.api.url:1337",
         swagger_url: "swagger"
 
@@ -57,7 +173,7 @@ RSpec.describe ReeRoda::App do
           "success"
         end
 
-        r.ree_actions
+        r.ree_routes
       end
     end
   end
@@ -81,4 +197,22 @@ RSpec.describe ReeRoda::App do
     get "api/v1/swagger"
     expect(last_response.status).to eq(404)
   }
+
+  it {
+    get "api/action/1/subaction"
+    expect(last_response.status).to eq(200)
+    expect(last_response.body).to eq("{\"result\":\"result\"}")
+  }
+
+  it {
+    post "api/action/1/subaction/2"
+    expect(last_response.status).to eq(201)
+    expect(last_response.body).to eq("{\"result\":\"another_result\"}")
+  }
+
+  it {
+    post "api/action/1/anotheraction"
+    expect(last_response.status).to eq(201)
+    expect(last_response.body).to eq("{\"result\":\"another_result\"}")
+  }
 end