ru.Bee 1.3.2 → 1.4.0

data/lib/rubee/controllers/base_controller.rb

@@ -12,37 +12,52 @@ module Rubee
 
       if File.exist?(image_path) && File.file?(image_path)
         mime_type = Rack::Mime.mime_type(File.extname(image_path))
-        response_with object: File.read(image_path), type: :image, mime_type: mime_type
+        response_with(object: File.read(image_path), type: :image, mime_type: mime_type)
       else
-        response_with object: "Image not found", type: :text
+        response_with(object: 'Image not found', type: :text)
       end
     end
 
-    def response_with type: nil, object: nil, status: 200, mime_type: nil, render_view: nil, headers: {}, to: nil, file: nil, filename: nil, **options
+    def js
+      js_path = File.join(JS_DIR, @request.path.sub('/js/', ''))
+
+      if File.exist?(js_path) && File.file?(js_path)
+        response_with(object: File.read(js_path), type: :js)
+      else
+        response_with(object: 'Js file is not found', type: :text)
+      end
+    end
+
+    def response_with type: nil, object: nil, status: 200, mime_type: nil, render_view: nil, headers: {}, to: nil,
+      file: nil, filename: nil, **options
       case type&.to_sym
       in :json
         rendered_json = object.is_a?(Array) ? object&.map(&:to_h).to_json : object.to_json
-        return [status, headers.merge("content-type" => "application/json"), [rendered_json]]
+        [status, headers.merge('content-type' => 'application/json'), [rendered_json]]
       in :image
-        return [status, headers.merge("content-type" => mime_type), [object]]
+        [status, headers.merge('content-type' => mime_type), [object]]
+      in :js
+        [status, headers.merge('content-type' => 'application/javascript'), [object]]
       in :file
-        return [
+        [
           status,
           headers.merge(
-            "content-disposition" => "attachment; filename=#{filename}",
-            "content-type" => "application/octet-stream"
+            'content-disposition' => "attachment; filename=#{filename}",
+            'content-type' => 'application/octet-stream'
           ),
-          file
+          file,
         ]
       in :text
-        return [status, headers.merge("content-type" => "text/plain"), [object.to_s]]
+        [status, headers.merge('content-type' => 'text/plain'), [object.to_s]]
       in :unauthentificated
-        return [401, headers.merge("content-type" => "text/plain"), ["Unauthentificated"]]
+        [401, headers.merge('content-type' => 'text/plain'), ['Unauthentificated']]
       in :redirect
-        return [302, headers.merge("location" => "#{to}"), ["Unauthentificated"]]
+        [302, headers.merge('location' => to.to_s), ['Unauthentificated']]
+      in :not_found
+        [404, { 'content-type' => 'text/plain' }, ['Route not found']]
       else # rendering erb view is a default behavior
-        view_file_name = self.class.name.split("Controller").first.downcase
-        erb_file = render_view ? "#{render_view}" : "#{view_file_name}_#{@route[:action]}"
+        view_file_name = self.class.name.split('Controller').first.downcase
+        erb_file = render_view ? render_view.to_s : "#{view_file_name}_#{@route[:action]}"
         lib = Rubee::PROJECT_NAME == 'rubee' ? 'lib/' : ''
         view = render_template(erb_file, { object:, **(options[:locals] || {}) })
 
@@ -55,7 +70,7 @@ module Rubee
           ERB.new(view).result(binding)
         end
 
-        return [status, headers.merge("content-type" => "text/html"), [whole_erb]]
+        [status, headers.merge('content-type' => 'text/html'), [whole_erb]]
       end
     end
 
@@ -69,25 +84,33 @@ module Rubee
 
     def params
       inputs = @request.env['rack.input'].read
-      body = JSON.parse(@request.body.read.strip) rescue body = {}
-      body.merge!(URI.decode_www_form(inputs).to_h.transform_keys(&:to_sym)) rescue nil
+      body = begin
+        JSON.parse(@request.body.read.strip)
+             rescue StandardError
+               {}
+      end
+      begin
+        body.merge!(URI.decode_www_form(inputs).to_h.transform_keys(&:to_sym))
+      rescue StandardError
+        nil
+      end
       @params ||= extract_params(@request.path, @route[:path])
         .merge(body)
         .merge(@request.params)
         .transform_keys(&:to_sym)
-        .select { |k,v| ![:_method].include?(k.downcase.to_sym) }
+        .reject { |k, _v| [:_method].include?(k.downcase.to_sym) }
     end
 
     def headers
-      @request.env.select {|k,v| k.start_with? 'HTTP_'}
-        .collect {|key, val| [key.sub(/^HTTP_/, ''), val]}
+      @request.env.select { |k, _v| k.start_with?('HTTP_') }
+        .collect { |key, val| [key.sub(/^HTTP_/, ''), val] }
     end
 
     def extract_params(path, pattern)
       regex_pattern = pattern.gsub(/\{(\w+)\}/, '(?<\1>[^/]+)')
       regex = Regexp.new("^#{regex_pattern}$")
 
-      if match = path.match(regex)
+      if (match = path.match(regex))
         return match.named_captures&.transform_keys(&:to_sym)
       end
 

data/lib/rubee/controllers/extensions/auth_tokenable.rb

@@ -18,37 +18,39 @@ module Rubee
       def authentificated?
         methods = self.class._auth_methods
         return true if methods && !methods.include?(@route[:action].to_sym)
+
         # This is suppose to be set in the middleware, otherwise it will return false
         valid_token?
       end
 
       def valid_token?
-        @request.env["rack.session"]&.[]("authentificated")
+        @request.env['rack.session']&.[]('authentificated')
       end
 
       def authentificated_user
         # User model must be created with email and password properties at least
-        @authehtificated_user ||= User.where(email: params[:email], password: params[:password]).first
+        @authentificated_user ||= User.where(email: params[:email], password: params[:password]).first
       end
 
       def authentificate!
         return false unless authentificated_user
+
         # Generate token
         payload = { username: params[:email], exp: Time.now.to_i + EXPIRE }
         @token = JWT.encode(payload, KEY, 'HS256')
         # Set jwt token to the browser within cookie, so next browser request will include it.
         # make sure it passed to response_with headers options
-        @token_header = { "set-cookie" => "jwt=#{@token}; path=/; httponly; secure" }
+        @token_header = { 'set-cookie' => "jwt=#{@token}; path=/; httponly; secure" }
 
         true
       end
 
       def unauthentificate!
-        @request.env["rack.session"]["authentificated"] = nil if @request.env["rack.session"]&.[]("authentificated")
+        @request.env['rack.session']['authentificated'] = nil if @request.env['rack.session']&.[]('authentificated')
         @authehtificated_user = nil if @authehtificated_user
         @zeroed_token_header = {
-          "set-cookie" => "jwt=; path=/; httponly; secure; expires=thu, 01 jan 1970 00:00:00 gmt",
-          "content-type" => "application/json"
+          'set-cookie' => 'jwt=; path=/; httponly; secure; expires=thu, 01 jan 1970 00:00:00 gmt',
+          'content-type' => 'application/json',
         }
 
         true
@@ -58,7 +60,7 @@ module Rubee
         if authentificated?
           yield
         else
-          response_with type: :unauthentificated
+          response_with(type: :unauthentificated)
         end
       end
     end
@@ -69,7 +71,7 @@ module Rubee
         @auth_methods.concat(args.map(&:to_sym)).uniq!
 
         @auth_methods.each do |method|
-          around method, :handle_auth
+          around(method, :handle_auth)
         end
       end
 

data/lib/rubee/controllers/extensions/middlewarable.rb

@@ -9,7 +9,7 @@ module Middlewarable
 
   module Initializer
     def initialize(req, route)
-      app = ->(env) { super(req, route) }
+      app = ->(_env) { super(req, route) }
       self.class.middlewares.reverse_each do |middleware|
         middleware_class = Object.const_get(middleware)
         app = middleware_class.new(app, req)

data/lib/rubee/controllers/middlewares/auth_token_middleware.rb

@@ -7,13 +7,13 @@ module Rubee
 
     def call(env)
       # get token from header
-      auth_header = headers(env)["HTTP_AUTHORIZATION"]
-      token = auth_header ? auth_header[/^Bearer (.*)$/]&.gsub("Bearer ", "") : nil
+      auth_header = headers(env)['HTTP_AUTHORIZATION']
+      token = auth_header ? auth_header[/^Bearer (.*)$/]&.gsub('Bearer ', '') : nil
       # get token from cookies
-      token = @req.cookies["jwt"] unless token
+      token ||= @req.cookies['jwt']
       if valid_token?(token)
-        env["rack.session"] ||= {}
-        env["rack.session"]["authentificated"] = true
+        env['rack.session'] ||= {}
+        env['rack.session']['authentificated'] = true
       end
 
       @app.call(env)
@@ -22,7 +22,7 @@ module Rubee
     private
 
     def headers(env)
-      env.each_with_object({}) { |(k, v), h| h[k] = v if k.start_with?("HTTP_") }
+      env.each_with_object({}) { |(k, v), h| h[k] = v if k.start_with?('HTTP_') }
     end
 
     def valid_token?(token)
@@ -35,8 +35,12 @@ module Rubee
     end
 
     def decode_jwt(token)
-      decoded_array = JWT.decode(token, AuthTokenable::KEY, true, { algorithm: 'HS256' }) rescue decoded_array = []
-      decoded_array&.first&.transform_keys(&:to_sym) || {}  # Extract payload
+      decoded_array = begin
+        JWT.decode(token, AuthTokenable::KEY, true, { algorithm: 'HS256' })
+                      rescue StandardError
+                        []
+      end
+      decoded_array&.first&.transform_keys(&:to_sym) || {} # Extract payload
     end
   end
 end

data/lib/rubee/extensions/hookable.rb

@@ -16,7 +16,7 @@ module Rubee
             super(*args, &block)
           end
         end
-        prepend hooks
+        prepend(hooks)
       end
 
       def after(method, handler, **options)
@@ -31,7 +31,7 @@ module Rubee
             result
           end
         end
-        prepend hooks
+        prepend(hooks)
       end
 
       def around(method, handler, **options)
@@ -48,7 +48,7 @@ module Rubee
             end
           end
         end
-        prepend hooks
+        prepend(hooks)
       end
     end
 
@@ -58,7 +58,6 @@ module Rubee
       def conditions_met?(if_condition = nil, unless_condition = nil)
         return true if if_condition.nil? && unless_condition.nil?
 
-        if_condition_result = true
         if_condition_result =
           if if_condition.nil?
             true
@@ -67,8 +66,6 @@ module Rubee
           elsif respond_to?(if_condition)
             send(if_condition)
           end
-
-        unless_condition_result = true
         unless_condition_result =
           if unless_condition.nil?
             false

data/lib/rubee/extensions/serializable.rb

@@ -8,19 +8,19 @@ module Rubee
     module Initializer
       def initialize(attrs)
         attrs.each do |attr, value|
-          self.send("#{attr}=", value)
+          send("#{attr}=", value)
         end
       end
     end
 
     module InstanceMethods
-      def to_json
+      def to_json(*_args)
         to_h.to_json
       end
 
       def to_h
         instance_variables.each_with_object({}) do |var, hash|
-          hash[var.to_s.delete("@")] = instance_variable_get(var)
+          hash[var.to_s.delete('@')] = instance_variable_get(var)
         end
       end
     end

data/lib/rubee/models/database_objectable.rb

@@ -1,32 +1,32 @@
 module Rubee
   module DatabaseObjectable
     def self.included(base)
-      base.extend ClassMethods
-      base.include InstanceMethods
-      base.prepend Initializer
+      base.extend(ClassMethods)
+      base.include(InstanceMethods)
+      base.prepend(Initializer)
 
-      base.include Rubee::Hookable
-      base.include Rubee::Serializable
+      base.include(Rubee::Hookable)
+      base.include(Rubee::Serializable)
     end
 
     module ClassMethods
       def pluralize_class_name
-        pluralize(self.name.downcase)
+        pluralize(name.downcase)
       end
 
       def pluralize(word)
         if word.end_with?('y') && !%w[a e i o u].include?(word[-2])
-          word[0..-2] + 'ies' # Replace "y" with "ies"
+          "#{word[0..-2]}ies" # Replace "y" with "ies"
         elsif word.end_with?('s', 'x', 'z', 'ch', 'sh')
-          word + 'es' # Add "es" for certain endings
+          "#{word}es" # Add "es" for certain endings
         else
-          word + 's' # Default to adding "s"
+          "#{word}s" # Default to adding "s"
         end
       end
 
       def singularize(word)
         if word.end_with?('ies') && word.length > 3
-          word[0..-4] + 'y' # Convert "ies" to "y"
+          "#{word[0..-4]}y" # Convert "ies" to "y"
         elsif word.end_with?('es') && %w[s x z ch sh].any? { |ending| word[-(ending.length + 2)..-3] == ending }
           word[0..-3] # Remove "es" for words like "foxes", "buses"
         elsif word.end_with?('s') && word.length > 1
@@ -38,7 +38,7 @@ module Rubee
 
       def accessor_names
         instance_methods(false)
-          .select { |m| method_defined?("#{m}=") }  # Check if setter exists
+          .select { |m| method_defined?("#{m}=") } # Check if setter exists
       end
     end
 
@@ -49,4 +49,3 @@ module Rubee
     end
   end
 end
-

data/lib/rubee/models/sequel_object.rb

@@ -2,7 +2,7 @@ module Rubee
   class SequelObject
     include Rubee::DatabaseObjectable
 
-    def destroy(cascade: false, **options)
+    def destroy(cascade: false, **_options)
       if cascade
         # find all tables with foreign key
         tables_with_fk = DB.tables.select do |table|
@@ -23,26 +23,25 @@ module Rubee
       if args[:id]
         begin
           udpate(args)
-        rescue => _
+        rescue StandardError => _e
           return false
         end
 
-        true
       else
         begin
           created_object = self.class.create(args)
-        rescue => _
+        rescue StandardError => _e
           return false
         end
         self.id = created_object.id
 
-        true
       end
+      true
     end
 
-    def assign_attributes(args={})
-      to_h.each do |attr, value|
-        self.send("#{attr}=", args[attr.to_sym]) if args[attr.to_sym]
+    def assign_attributes(args = {})
+      to_h.each_key do |attr|
+        send("#{attr}=", args[attr.to_sym]) if args[attr.to_sym]
       end
     end
 
@@ -65,14 +64,14 @@ module Rubee
     class << self
       def last
         found_hash = dataset.order(:id).last
-        return self.new(**found_hash) if found_hash
+        return new(**found_hash) if found_hash
 
         nil
       end
 
       def first
         found_hash = dataset.order(:id).first
-        return self.new(**found_hash) if found_hash
+        return new(**found_hash) if found_hash
 
         nil
       end
@@ -81,9 +80,9 @@ module Rubee
       # owns_many :comments
       # > user.comments
       # > [<comment1>, <comment2>]
-      def owns_many(assoc, fk_name: nil, over: nil, **options)
+      def owns_many(assoc, fk_name: nil, over: nil, **_options)
         singularized_assoc_name = singularize(assoc.to_s)
-        fk_name ||= "#{self.name.to_s.downcase}_id"
+        fk_name ||= "#{name.to_s.downcase}_id"
 
         define_method(assoc) do
           klass = Object.const_get(singularized_assoc_name.capitalize)
@@ -102,9 +101,9 @@ module Rubee
       # owns_one :user
       # > comment.user
       # > <user>
-      def owns_one(assoc, options={})
+      def owns_one(assoc, options = {})
         Sequel::Model.one_to_one(assoc, **options)
-        fk_name ||= "#{self.name.to_s.downcase}_id"
+        fk_name ||= "#{name.to_s.downcase}_id"
         define_method(assoc) do
           Object.const_get(assoc.capitalize).where(fk_name.to_sym => id)&.first
         end
@@ -114,11 +113,11 @@ module Rubee
       # holds :user
       # > account.user
       # > <user>
-      def holds(assoc, fk_name: nil, **options)
+      def holds(assoc, fk_name: nil, **_options)
         fk_name ||= "#{assoc.to_s.downcase}_id"
         define_method(assoc) do
           target_klass = Object.const_get(assoc.capitalize)
-          target_klass.find(self.send(fk_name))
+          target_klass.find(send(fk_name))
         end
       end
 
@@ -130,33 +129,33 @@ module Rubee
 
       def dataset
         @dataset ||= DB[pluralize_class_name.to_sym]
-      rescue Exception => _
+      rescue Exception => _e
         reconnect!
         retry
       end
 
       def all
         dataset.map do |record_hash|
-          self.new(**record_hash)
+          new(**record_hash)
         end
       end
 
       def find(id)
         found_hash = dataset.where(id:)&.first
-        return self.new(**found_hash) if found_hash
+        return new(**found_hash) if found_hash
 
         nil
       end
 
       def where(args)
         dataset.where(**args).map do |record_hash|
-          self.new(**record_hash)
+          new(**record_hash)
         end
       end
 
       def order(*args)
         dataset.order(*args).map do |record_hash|
-          self.new(**record_hash)
+          new(**record_hash)
         end
       end
 
@@ -166,18 +165,18 @@ module Rubee
 
       def create(attrs)
         out_id = dataset.insert(**attrs)
-        self.new(**(attrs.merge(id: out_id)))
+        new(**attrs.merge(id: out_id))
       end
 
       def destroy_all(cascade: false)
-        all.each{ |record| record.destroy(cascade:) }
+        all.each { |record| record.destroy(cascade:) }
       end
 
       def serialize(suquel_dataset, klass = nil)
         klass ||= self
         suquel_dataset.map do |record_hash|
           target_klass_fields = DB[pluralize(klass.name.downcase).to_sym].columns
-          klass_attributes = record_hash.filter{ target_klass_fields.include? _1 }
+          klass_attributes = record_hash.filter { target_klass_fields.include?(_1) }
           klass.new(**klass_attributes)
         end
       end