eredor 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '07877c607d2d4cd1c6ad3bf504d48f8cc19c70bd6cfacfe344dd17ac2d479796'
-  data.tar.gz: cee85827f625435e7e93a205c3ba50403ca68cdb8794fb49bb5f5bf72051ff63
+  metadata.gz: 15c1d4fafd9ce4bb8c38fdab4c657392cdb8af9ef2a1179eb1d615948062604a
+  data.tar.gz: 2ce2e3ce4769c37e0e41ddd1da9e0bc2222c1a16f29dec4c42cf8a04e870c6e8
 SHA512:
-  metadata.gz: 64e1c90f1d916710ba2af39917f1dcb59fe7ea381cc733a538e24ced5dad8c3e8aa4e432686aea5663dd05bbb8b589fc47849ced65f22c5909442c5bced64032
-  data.tar.gz: 4a68d9b223c815b08c367bf932dbf2cde65212ba6bd39a91abbfc616c50d892708e57445acab89122f581eeb91cd55d32fe4072ba86b101a030255d029109dd0
+  metadata.gz: cda31701aaae451ce87c7abb7661164e0952a62180d74abe967126fb737127553352a0edfc274f703396eec4f0f97841028d5bd46e715d0227b728d1e5237f30
+  data.tar.gz: 4b4f5d92c2025c212fb5026c9c7f9df3b0e7241ecf585d08c882dc4e025808e6fa9877d3de365e6f6b7d8bf1bbd06249b1c62403959f8b96f212982ce1e348bf

data/lib/eredor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Eredor
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/eredor.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 
 require_relative "eredor/version"
 
@@ -26,18 +26,17 @@ module Eredor
     def handle
       method = @request.request_method.to_sym
       path   = @request.path
-      body   = %w[POST PUT PATCH].include?(method.to_s) ? @request.POST : nil
-      query  = @request.GET
+      params = @request.params
 
       @routes[method].each do |route|
         if route[:pattern]
           match = route[:pattern].match(path)
           next unless match
 
-          params = extract_params(match, route[:keys])
-          return call_handler(route, params, body, query)
+          params.merge!(extract_params(match))
+          return call_handler(route, params)
         elsif route[:path] == path
-          return call_handler(route, {}, body, query)
+          return call_handler(route, params)
         end
       end
 
@@ -49,34 +48,23 @@ module Eredor
     def register_route(method, path, &block)
       raise(StandardError, "A block must be given") unless block_given?
 
-      keys = []
-      regex_path = path.gsub(/:(\w+)/) do |match|
-        keys << match[1..-1].to_sym
-        "(?<#{keys.last}>[^/]+)"
-      end
-
-      route = { path: path, handler: block }
-      route[:pattern] = /\A#{regex_path}\z/ if keys.any?
-      route[:keys] = keys if keys.any?
+      regex_path = path.gsub(/:(\w+)/) { |m| "(?<#{m[1..-1]}>[^/]+)" }
+      pattern = /\A#{regex_path}\z/
 
-      @routes[method] << route
+      @routes[method] << {
+        path: path,
+        pattern: path.include?(":") ? pattern : nil,
+        handler: block
+      }
     end
 
-    def extract_params(match, keys)
-      keys.each_with_object({}) do |key, h|
-        h[key] = match[key.to_s]
-      end
+    def extract_params(match)
+      match.named_captures.transform_keys(&:to_sym)
     end
 
-    def call_handler(route, params, body, query)
-      env = {
-        params: params,
-        body: body,
-        query: query
-      }
-      result = route[:handler].call(env)
+    def call_handler(route, params)
+      result = route[:handler].call(params)
 
-      # Permitir retorno flexível
       case result
       when Array || Rack::Response then result # já está no formato [status, headers, body]
       when String then [200, { "content-type" => "text/html" }, [result]]
@@ -91,11 +79,10 @@ module Eredor
   end
 
   class BaseController
-    attr_reader :params, :request
+    attr_reader :params
 
-    def initialize(request)
-      @params = request.params
-      @request = request
+    def initialize(params)
+      @params = params
     end
 
     def render(file)
@@ -107,13 +94,12 @@ module Eredor
     private
 
     def get_view(file)
-      File.read("../views/#{controller_name}/#{file}.html.erb")
+      File.read("./app/views/#{controller_name}/#{file}.html.erb")
     end
 
     def controller_name
-      controller = self.class.name
-      controller.gsub!(/Controller/, "")
-      controller.downcase!
+      controller = self.class.name.to_s
+      controller.gsub(/Controller/, "").downcase
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eredor
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Guilherme Ribeiro