hw1 - Demchenko

hw1/fibonacci.rb

@@ -0,0 +1,18 @@
+class Fibonacci
+	include Enumerable
+
+	def initialize (n)
+		@n = n
+	end
+
+	def each
+	    a, b = 0, 1
+	    @n.times do
+			temp = a
+			a = b
+			b = temp + b
+			yield a
+	    end
+	end
+
+end

hw2/app/app.rb

@@ -1,4 +1,9 @@
 Application = Router.new do
   get '/test', ->(env) { [200, {}, ['get test']] }
   post '/test', ->(env) { [200, {}, ['post test']] }
+
+
+  get '/post/:post_id/comment/:comment_id', ->(env) { [200, {}, ["Post id: #{env['params']['post_id']}, comment id: #{env['params']['comment_id']}"]] }
+  get '/post/:post_id', ->(env) { [200, {}, ["Post id: #{env['params']['post_id']}"]] }
+
 end

hw2/lib/router.rb

@@ -1,6 +1,6 @@
 class Router
   def call(env)
-    @routes[env['REQUEST_METHOD']][env['REQUEST_PATH']].call(env)
+    select_route(env).call(env)
   end
 
 private
@@ -20,6 +20,31 @@ def post(path, rack_app)
 
   def match(http_method, path, rack_app)
     @routes[http_method] ||= {}
-    @routes[http_method][path] = rack_app
+    @routes[http_method][regexp_method(path)] = {
+      :app => rack_app,
+      :pattern => path
+    }
   end
-end
+
+  def regexp_method(path) 
+    pattern = Regexp.new(path.gsub(/:[a-zA-Z0-9_]+/, '[a-zA-Z0-9_]+'))
+    return pattern
+  end
+
+  def select_route(env) 
+    @routes[env['REQUEST_METHOD']].each do |path_regexp, route|
+      if env['REQUEST_PATH'] =~ path_regexp
+        env['params'] = get_params(route[:pattern], env['REQUEST_PATH'])
+        return route[:app]
+      end
+    end
+    return ->(env) {[404, {}, ['Page not found']]}
+  end 
+
+  def get_params(pattern, path) 
+    pattern.split('/')
+    .zip(path.split('/'))
+    .reject{|e| e.first==e.last}
+    .map{|e| [e.first[1..-1], e.last]}.to_h
+  end
+end

hw2/spec/lib/router_spec.rb

@@ -4,15 +4,8 @@
       get '/test', ->(env) { [200, {}, ['get test']] }
       post '/test', ->(env) { [200, {}, ['post test']] }
 
-      ##
-      # TODO: router should match path by pattern like
-      # Pattern: /posts/:name
-      # Paths:
-      # /post/about_ruby
-      # /post/43
-      # Cover this with tests.
-      #
-      get '/post/:name', ->(env) { [200, {}, ['post show page']] }
+      get '/post/:post_id/comment/:comment_id', ->(env) { [200, {}, ["Post id: #{env['params']['post_id']}, comment id: #{env['params']['comment_id']}"]] }
+      get '/post/:post_id', ->(env) { [200, {}, ["Post id: #{env['params']['post_id']}"]] }
     end
   end
 
@@ -31,4 +24,28 @@
       expect(subject.call(env)).to eq [200, {}, ['post test']]
     end
   end
+
+  context 'when request is GET with param post_id' do
+    let(:env) {{ 'REQUEST_PATH' => '/post/43', 'REQUEST_METHOD' => 'GET'}}
+
+    it 'matches request' do 
+        expect(subject.call(env)).to eq [200, {}, ['Post id: 43']]
+    end
+  end
+
+  context 'when request is GET with params post_id and comment_id' do
+    let(:env) {{ 'REQUEST_PATH' => '/post/43/comment/77', 'REQUEST_METHOD' => 'GET'}}
+
+    it 'matches request' do 
+        expect(subject.call(env)).to eq [200, {}, ['Post id: 43, comment id: 77']]
+    end
+  end
+
+  context 'when page is not exist' do
+    let(:env) {{ 'REQUEST_PATH' => '/winter', 'REQUEST_METHOD' => 'GET'}}
+
+    it 'matches request' do 
+        expect(subject.call(env)).to eq [404, {}, ['Page not found']]
+    end
+  end
 end