hmlons_web 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 437d100cbe3d433787e4ad9f88e9b5e30588ba42
-  data.tar.gz: 2d058da493b884d8068ea8ac602bbc319723d874
+  metadata.gz: 6a7e5692d27046682c7e4a3e00d1485e0ef4a216
+  data.tar.gz: 35b58d2d7f2bd78fd3c53bea8aa3256e5529a1e6
 SHA512:
-  metadata.gz: 821f5d36ef5c0b8c2f4284e0bcbe256c2a980b210c10321525903242db7bdc1c0ae2053185fba8d3a47c737a5a66b6864e53d17a91f5fcaa9ad4f8f1609d749e
-  data.tar.gz: c442f9c3b61b00e1bca5752ee381fe0b0cdb0d5dd3af1694caa9ec9090910ea9ec37120c10a7cd786890392c55dcfd0ac41932933de34e339c22136e2b53047a
+  metadata.gz: d90c1a84d61ab0122d2b25528b5ceacccfebb5fc58792ad8482c38bf6b63d9da8c25978d5428519175154e66fed9fba75e0834b3de342de1bf3db64124e43634
+  data.tar.gz: b2e95c5fa605cf757ea96a280c83e2dea2765ab809ad5d1527461a90ec0a0d24df1e4ec6f3a2d0d2167f2f9f87ac48dcd10f2d35b6131d232d4118049c2014f5

data/lib/hmlons_web/router.rb

@@ -13,11 +13,12 @@ private
   def find_route(env)
     @routes.each do |route|
       if env['REQUEST_METHOD'] == route[:method] && env['REQUEST_PATH'] =~ route[:regexp]
+        env['router.params'] = extract_params(route[:pattern], env['REQUEST_PATH'])
         return route[:app]
       end
     end
 
-    ->(_env) { [404, {}, ['page not found']] }
+    return ->(_env) { [404, {}, ['page not found']] }
   end
 
   def get(path, rack_app)
@@ -29,15 +30,41 @@ private
   end
 
   def match(http_method, path, rack_app)
-    @routes <<  { 
-      method: http_method, 
-      pattern: path, 
-      app: rack_app,
-      regexp: path_to_regexp(path)
-    }
+    rack_app = get_controller_action(rack_app) if rack_app.is_a?(String)
+    @routes << { pattern: path, app: rack_app, regexp: path_to_regexp(path), method: http_method }
   end
 
+  def get_controller_action(str)
+    controller_name, action_name = str.split('#') # tests#show => ['tests', 'show']
+    controller_name = to_upper_camel_case(controller_name)
+    Kernel.const_get(controller_name).send(:action, action_name)
+    # controller_name = public_test
+    # action_name = show
+    # PublicTestController.action('show')
+  end
+
+  def to_upper_camel_case(str)
+    str # 'public_pages/tests' => PublicPages::TestsController
+      .split('/') # ['public_pages', 'test']
+      .map { |part| part.split('_').map(&:capitalize).join } # ['PublicPages', 'Test']
+      .join('::') + 'Controller'
+  end
+
+
+  # /post/:name
   def path_to_regexp(path)
     Regexp.new('\A' + path.gsub(/:[\w-]+/, '[\w-]+') + '\Z')
   end
-end
+
+  # /post/:name
+  # /post/test_one
+  # { name: 'test_one' }
+  def extract_params(pattern, path)
+    pattern
+      .split('/') # ['post', ':name']
+      .zip(path.split('/')) # [['post', 'post'],[':name', 'post']]
+      .reject { |e| e.first == e.last } # [[':name', 'post']]
+      .map { |e| [e.first[1..-1], e.last] } # [['name', 'post']]
+      .to_h
+  end
+end

data/lib/hmlons_web/version.rb

@@ -1,3 +1,3 @@
 module HmlonsWeb
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hmlons_web
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Nik