ree_lib 1.0.39 → 1.0.40

data/lib/ree_lib/packages/ree_dto/spec/ree_dto/entity_dsl_spec.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal = true
+# frozen_string_literal: true
 
 package_require('ree_dto/entity_dsl')
 

data/lib/ree_lib/packages/ree_hash/spec/ree_hash/functions/transform_values_spec.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal = true
+# frozen_string_literal: true
 
 RSpec.describe :transform_values do
   link :transform_values, from: :ree_hash

data/lib/ree_lib/packages/ree_json/spec/ree_json/functions/from_json_spec.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal = true
+# frozen_string_literal: true
 
 RSpec.describe :from_json do
   link :from_json, from: :ree_json

data/lib/ree_lib/packages/ree_json/spec/ree_json/functions/to_json_spec.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal = true
+# frozen_string_literal: true
 
 RSpec.describe :to_json do
   link :to_json, from: :ree_json

data/lib/ree_lib/packages/ree_logger/spec/ree_logger/appenders/appender_spec.rb

@@ -1,4 +1,4 @@
-#frozen_string_literal = true
+#frozen_string_literal: true
 
 package_require('ree_logger/appenders/appender')
 

data/lib/ree_lib/packages/ree_logger/spec/ree_logger/appenders/file_appender_spec.rb

@@ -1,4 +1,4 @@
-#frozen_string_literal = true
+#frozen_string_literal: true
 
 package_require('ree_logger/appenders/file_appender')
 
@@ -20,7 +20,7 @@ RSpec.describe ReeLogger::FileAppender do
 
   before(:all) do
     tmp_file_log = ENV['LOG_FILE_PATH']
-      
+
     if !is_blank(tmp_file_log)
       File.open(tmp_file_log, 'w') {|file| file.truncate(0) }
     end
@@ -28,7 +28,7 @@ RSpec.describe ReeLogger::FileAppender do
 
   after(:all) do
     tmp_file_log = ENV['LOG_FILE_PATH']
-      
+
     if !is_blank(tmp_file_log)
       File.open(tmp_file_log, 'w') {|file| file.truncate(0) }
     end

data/lib/ree_lib/packages/ree_logger/spec/ree_logger/appenders/rollbar_appender_spec.rb

@@ -1,4 +1,4 @@
-#frozen_string_literal = true
+#frozen_string_literal: true
 
 package_require('ree_logger/appenders/rollbar_appender')
 

data/lib/ree_lib/packages/ree_logger/spec/ree_logger/appenders/stdout_appender_spec.rb

@@ -1,4 +1,4 @@
-#frozen_string_literal = true
+#frozen_string_literal: true
 
 package_require('ree_logger/appenders/stdout_appender')
 

data/lib/ree_lib/packages/ree_logger/spec/ree_logger/beans/logger_spec.rb

@@ -1,10 +1,10 @@
-# frozen_string_literal = true
+# frozen_string_literal: true
 
 package_require('ree_logger/beans/logger')
 
 RSpec.describe :logger do
-  link :logger, from: :ree_logger
   link :is_blank, from: :ree_object
+  link :logger, from: :ree_logger
 
   before(:all) do
     tmp_file_log = ENV['LOG_FILE_PATH']

data/lib/ree_lib/packages/ree_logger/spec/ree_logger/formatters/colorized_formatter_spec.rb

@@ -1,4 +1,4 @@
-#frozen_string_literal = true
+#frozen_string_literal: true
 
 require 'timecop'
 package_require('ree_logger/formatters/colorized_formatter')
@@ -32,17 +32,20 @@ RSpec.describe ReeLogger::ColorizedFormatter do
   it { expect(formatter).to respond_to(:format) }
 
   it {
-    expected = "[05/11/05 00:00:00] \e[36minfo:\e[0m Some message"
-    expect(formatter.format(info_log_event, nil)).to eq(expected)
+    expect(formatter.format(info_log_event, nil))
+      .to eq("[05/11/05 00:00:00] \e[36minfo:\e[0m Some message")
+      .or eq("[05/11/05 00:00:00] info: Some message")
   }
 
   it {
-    expected = "[SomeCoolApp] [05/11/05 00:00:00] \e[36minfo:\e[0m Some message"
-    expect(formatter.format(info_log_event, "SomeCoolApp")).to eq(expected)
+    expect(formatter.format(info_log_event, "SomeCoolApp"))
+      .to eq("[SomeCoolApp] [05/11/05 00:00:00] \e[36minfo:\e[0m Some message")
+      .or eq("[SomeCoolApp] [05/11/05 00:00:00] info: Some message")
   }
 
   it {
-    expected = "[05/11/05 00:00:00] \e[31merror:\e[0m Some error message\n\e[34mPARAMETERS:\e[0m {:some_error=>\"params\"}\n\e[31mEXCEPTION:\e[0m StandardError (Help me, I am error)\n"
-    expect(formatter.format(error_log_event, nil)).to eq(expected)
+    expect(formatter.format(error_log_event, nil))
+      .to eq("[05/11/05 00:00:00] \e[31merror:\e[0m Some error message\n\e[34mPARAMETERS:\e[0m {:some_error=>\"params\"}\n\e[31mEXCEPTION:\e[0m StandardError (Help me, I am error)\n")
+      .or eq("[05/11/05 00:00:00] error: Some error message\nPARAMETERS: {:some_error=>\"params\"}\nEXCEPTION: StandardError (Help me, I am error)\n")
   }
 end

data/lib/ree_lib/packages/ree_logger/spec/ree_logger/formatters/default_formatter_spec.rb

@@ -1,4 +1,4 @@
-#frozen_string_literal = true
+#frozen_string_literal: true
 
 require 'timecop'
 package_require('ree_logger/formatters/default_formatter')

data/lib/ree_lib/packages/ree_logger/spec/ree_logger/formatters/formatter_spec.rb

@@ -1,4 +1,4 @@
-#frozen_string_literal = true
+#frozen_string_literal: true
 
 package_require('ree_logger/formatters/formatter')
 

data/lib/ree_lib/packages/ree_logger/spec/ree_logger/multi_logger_spec.rb

@@ -1,4 +1,4 @@
-#frozen_string_literal = true
+#frozen_string_literal: true
 
 require 'rollbar'
 package_require('ree_logger/multi_logger')

data/lib/ree_lib/packages/ree_migrator/spec/ree_migrator/functions/apply_migration_spec.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal = true
+# frozen_string_literal: true
 
 RSpec.describe :apply_migration do
   link :apply_migration, from: :ree_migrator

data/lib/ree_lib/packages/ree_migrator/spec/ree_migrator/functions/apply_migrations_spec.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal = true
+# frozen_string_literal: true
 
 package_require('ree_migrator/functions/apply_migrations')
 

data/lib/ree_lib/packages/ree_migrator/spec/ree_migrator/functions/migrate_db_spec.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal = true
+# frozen_string_literal: true
 
 RSpec.describe :migrate_db do
   link :migrate_db, from: :ree_migrator

data/lib/ree_lib/packages/ree_object/spec/ree_object/functions/deep_dup_spec.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal = true
+# frozen_string_literal: true
 
 RSpec.describe :deep_dup do
   link :deep_dup, from: :ree_object
@@ -15,7 +15,7 @@ RSpec.describe :deep_dup do
           @hash = {id: 1, 'test' => 2}
           @hash.default = "default"
           @object = Object.new
-        end  
+        end
       end
     }
 

data/lib/ree_lib/packages/ree_object/spec/ree_object/functions/deep_freeze_spec.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal = true
+# frozen_string_literal: true
 
 RSpec.describe :deep_freeze do
   link :deep_freeze, from: :ree_object

data/lib/ree_lib/packages/ree_object/spec/ree_object/functions/dump_as_json_spec.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal = true
+# frozen_string_literal: true
 
 RSpec.describe :dump_as_json do
   link :dump_as_json, from: :ree_object

data/lib/ree_lib/packages/ree_object/spec/ree_object/functions/is_blank_spec.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal = true
+# frozen_string_literal: true
 
 RSpec.describe :is_blank do
   link :is_blank, from: :ree_object

data/lib/ree_lib/packages/ree_object/spec/ree_object/functions/not_blank_spec.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal = true
+# frozen_string_literal: true
 
 RSpec.describe :not_blank do
   link :not_blank, from: :ree_object

data/lib/ree_lib/packages/ree_object/spec/ree_object/functions/to_hash_spec.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal = true
+# frozen_string_literal: true
 
 RSpec.describe :to_hash do
   link :to_hash, from: :ree_object

data/lib/ree_lib/packages/ree_object/spec/ree_object/functions/to_obj_spec.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal = true
+# frozen_string_literal: true
 
 RSpec.describe :to_obj do
   link :to_obj, from: :ree_object
@@ -17,7 +17,7 @@ RSpec.describe :to_obj do
           @last_name = 'Doe'
           @pass = 'pass'
         end
-      end 
+      end
     end
   }
 
@@ -39,7 +39,7 @@ RSpec.describe :to_obj do
   context "Struct" do
     it {
       obj = to_obj(Struct.new(:id, :name).new(1, 'John'))
-      
+
       expect(obj.name).to eq('John')
       expect(obj.id).to eq(1)
     }
@@ -72,7 +72,7 @@ RSpec.describe :to_obj do
       expect(obj.settings.class).to be_a(Object)
       expect(obj2.name).to eq("John")
       expect(obj2.settings.class).to be_a(Object)
-    }    
+    }
   end
 
   context "custom object" do
@@ -87,7 +87,7 @@ RSpec.describe :to_obj do
       obj = klass.new(1, object)
 
       result = to_obj(obj)
-      
+
       expect(result.id).to eq(1)
       expect(result.object.list[0]).to eq(1)
       expect(result.object.list[1]).to eq('string')
@@ -113,7 +113,7 @@ RSpec.describe :to_obj do
 
       expect(obj.respond_to?(:name)).to be false
       expect(obj.respond_to?(:work)).to be true
-    } 
+    }
 
     it {
       obj = to_obj(klass.new, exclude: [:name, {settings: [:pass]}])
@@ -121,7 +121,7 @@ RSpec.describe :to_obj do
       expect(obj.respond_to?(:name)).to be false
       expect(obj.respond_to?(:work)).to be true
       expect(obj.settings.respond_to?(:pass)).to be false
-    }    
+    }
   end
 
   context "global exclude option" do
@@ -133,7 +133,7 @@ RSpec.describe :to_obj do
       expect(obj.settings.respond_to?(:name)).to be false
       expect(obj.array[3].last_name).to eq('Doe')
       expect(obj.array[3].respond_to?(:name)).to be false
-    }    
+    }
   end
 
   context "include option" do

data/lib/ree_lib/packages/ree_roda/Package.schema.json

@@ -7,9 +7,6 @@
     "ree_roda"
   ],
   "depends_on": [
-    {
-      "name": "ree_actions"
-    },
     {
       "name": "ree_errors"
     },
@@ -25,6 +22,9 @@
     {
       "name": "ree_object"
     },
+    {
+      "name": "ree_routes"
+    },
     {
       "name": "ree_swagger"
     }
@@ -34,15 +34,22 @@
   ],
   "objects": [
     {
-      "name": "build_action_errors",
-      "schema": "packages/ree_roda/schemas/ree_roda/services/build_action_errors.schema.json",
+      "name": "build_route_errors",
+      "schema": "packages/ree_roda/schemas/ree_roda/services/build_route_errors.schema.json",
+      "tags": [
+        "fn"
+      ]
+    },
+    {
+      "name": "build_routing_tree",
+      "schema": "packages/ree_roda/schemas/ree_roda/services/build_routing_tree.schema.json",
       "tags": [
         "fn"
       ]
     },
     {
-      "name": "build_swagger_from_actions",
-      "schema": "packages/ree_roda/schemas/ree_roda/services/build_swagger_from_actions.schema.json",
+      "name": "build_swagger_from_routes",
+      "schema": "packages/ree_roda/schemas/ree_roda/services/build_swagger_from_routes.schema.json",
       "tags": [
         "fn"
       ]

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

@@ -0,0 +1,231 @@
+class Roda
+  module RodaPlugins
+    module ReeRoutes
+      def self.load_dependencies(app, opts = {})
+        package_require("ree_roda/services/build_routing_tree")
+        package_require("ree_roda/services/build_swagger_from_routes")
+        package_require("ree_json/functions/to_json")
+        package_require("ree_hash/functions/transform_values")
+        package_require("ree_object/functions/not_blank")
+
+        app.plugin :all_verbs
+      end
+
+      def self.configure(app, opts = {})
+        app.opts[:ree_routes_before] = opts[:before] if opts[:before]
+      end
+
+      module ClassMethods
+        def ree_routes(routes, swagger_title: "", swagger_description: "",
+                        swagger_version: "", swagger_url: "", api_url: "")
+          @ree_routes ||= []
+          @ree_routes += routes
+
+          opts[:ree_routes_swagger_title] = swagger_title
+          opts[:ree_routes_swagger_description] = swagger_description
+          opts[:ree_routes_swagger_version] = swagger_version
+          opts[:ree_routes_swagger_url] = swagger_url
+          opts[:ree_routes_api_url] = api_url
+
+          opts[:ree_routes_swagger] = ReeRoda::BuildSwaggerFromRoutes.new.call(
+            @ree_routes,
+            opts[:ree_routes_swagger_title],
+            opts[:ree_routes_swagger_description],
+            opts[:ree_routes_swagger_version],
+            opts[:ree_routes_api_url]
+          )
+
+          build_routes_proc
+          nil
+        end
+
+        private
+
+        def build_routes_proc
+          list = []
+          context = self
+
+          return list if @ree_routes.nil? || @ree_routes.empty?
+
+          if context.opts[:ree_routes_swagger_url]
+            list << Proc.new do |r|
+              r.get context.opts[:ree_routes_swagger_url] do
+                r.json do
+                  response.status = 200
+                  ReeJson::ToJson.new.call(context.opts[:ree_routes_swagger])
+                end
+              end
+            end
+          end
+
+          routing_tree = ReeRoda::BuildRoutingTree.new.call(@ree_routes)
+          route_tree_proc = build_traverse_tree_proc(routing_tree, context)
+
+          list << Proc.new do |r|
+            r.instance_exec(r, &route_tree_proc)
+          end
+
+          opts[:ree_routes_proc] = list
+        end
+
+        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 context.opts[:ree_routes_before]
+                  r.instance_exec(@_request, route.warden_scope, &r.scope.opts[:ree_routes_before])
+                end
+
+                # TODO: implement me when migration to roda DSL happens
+                # if route.before; end
+
+                params = r.params
+
+                if r.body
+                  body = begin
+                    JSON.parse(r.body.read)
+                  rescue => e
+                    {}
+                  end
+
+                  params = params.merge(body)
+                end
+
+                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
+
+                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
+
+                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
+          end
+        end
+
+        def build_traverse_tree_proc(tree, context)
+          has_arbitrary_param = tree.value.start_with?(":")
+          route_part = has_arbitrary_param ? tree.value.gsub(":", "") : tree.value
+          procs = []
+
+          child_procs = tree.children.map do |child|
+            build_traverse_tree_proc(child, context)
+          end
+
+          route_procs = tree.routes.map do |route|
+            route_proc(route, context)
+          end
+
+          procs << if tree.children.length > 0
+            if has_arbitrary_param
+              Proc.new do |r|
+                r.on String do |param_val|
+                  r.params[route_part] = param_val
+
+                  child_procs.each do |child_proc|
+                    r.instance_exec(r, &child_proc)
+                  end
+
+                  route_procs.each do |route_proc|
+                    r.instance_exec(r, &route_proc)
+                  end
+
+                  nil
+                end
+              end
+            else
+              Proc.new do |r|
+                r.on route_part do
+                  child_procs.each do |child_proc|
+                    r.instance_exec(r, &child_proc)
+                  end
+
+                  route_procs.each do |route_proc|
+                    r.instance_exec(r, &route_proc)
+                  end
+
+                  nil
+                end
+              end
+            end
+          else
+            Proc.new do |r|
+              if has_arbitrary_param
+                r.is String do |param_val|
+                  r.params[route_part] = param_val
+
+                  route_procs.each do |route_proc|
+                    r.instance_exec(r, &route_proc)
+                  end
+
+                  nil
+                end
+              else
+                r.is route_part do
+                  route_procs.each do |route_proc|
+                    r.instance_exec(r, &route_proc)
+                  end
+
+                  nil
+                end
+              end
+            end
+          end
+
+          Proc.new do |r|
+            procs.each do |proc|
+              r.instance_exec(r, &proc)
+            end
+          end
+        end
+      end
+
+      module RequestMethods
+        @@_actions_cache = {}
+        @@_route_serializers_cache = {}
+
+        def ree_routes
+          if scope.opts[:ree_routes_proc]
+            scope.opts[:ree_routes_proc].each do |request_proc|
+              self.instance_exec(self, &request_proc)
+            end
+          end
+          nil
+        end
+
+        private
+
+        def get_cached_action(route)
+          @@_actions_cache[route.action.object_id] ||= route.action.klass.new
+        end
+
+        def get_cached_serializer(route)
+          @@_route_serializers_cache[route.serializer.object_id] ||= route.serializer.klass.new
+        end
+      end
+    end
+
+    register_plugin(:ree_routes, Roda::RodaPlugins::ReeRoutes)
+  end
+end

data/lib/ree_lib/packages/ree_roda/package/ree_roda/services/{build_action_errors.rb → build_route_errors.rb}

@@ -1,13 +1,13 @@
-class ReeRoda::BuildActionErrors
+class ReeRoda::BuildRouteErrors
   include Ree::FnDSL
 
-  fn :build_action_errors do
+  fn :build_route_errors do
     link "ree_swagger/dto/error_dto", -> { ErrorDto }
   end
 
-  contract(ReeActions::Action => ArrayOf[ErrorDto])
-  def call(action)
-    ree_object = action.action
+  contract(ReeRoutes::Route => ArrayOf[ErrorDto])
+  def call(route)
+    ree_object = route.action
     errors = recursively_extract_errors(ree_object)
 
     errors