./lib/dolt/sinatra/multi_repo_browser.rb in dolt-0.29.0 vs ./lib/dolt/sinatra/multi_repo_browser.rb in dolt-0.30.0

@@ -1,8 +1,8 @@
 # encoding: utf-8
 #--
-#   Copyright (C) 2012 Gitorious AS
+#   Copyright (C) 2012-2013 Gitorious AS
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU Affero General Public License as published by
 #   the Free Software Foundation, either version 3 of the License, or
 #   (at your option) any later version.
@@ -13,95 +13,81 @@
 #   GNU Affero General Public License for more details.
 #
 #   You should have received a copy of the GNU Affero General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #++
-require "sinatra/base"
-require "dolt/sinatra/actions"
+require "dolt/sinatra/repo_browser"
 require "libdolt/view/multi_repository"
-require "libdolt/view/blob"
-require "libdolt/view/tree"
 
 module Dolt
   module Sinatra
-    class MultiRepoBrowser < ::Sinatra::Base
+    class MultiRepoBrowser < RepoBrowser
       include Dolt::View::MultiRepository
-      include Dolt::View::Blob
-      include Dolt::View::Tree
 
-      def initialize(lookup, renderer)
-        @lookup = lookup
-        @renderer = renderer
-        super()
+      def self.repo_ref_path_pattern(action)
+        %r{/([^/]+)/#{action}/([^:]+)(?::|%3(?:a|A))(.*)}
       end
 
-      not_found { renderer.render("404") }
-
       get "/" do
         response["Content-Type"] = "text/html"
         body(renderer.render(:index, { :repositories => lookup.repositories }))
       end
 
       get "/:repo" do
         redirect "/#{params[:repo]}/tree/HEAD:"
       end
 
-      get "/*/tree/*:*" do
+      get repo_ref_path_pattern('tree') do |repo, ref, path| # "/*/tree/*:*
         begin
-          repo, ref, path = params[:splat]
           dolt.tree(repo, ref, path)
         rescue Exception => err
           dolt.render_error(err, repo, ref)
         end
       end
 
       get "/*/tree/*" do
         dolt.force_ref(params[:splat], "tree", "HEAD")
       end
 
-      get "/*/blob/*:*" do
+      get repo_ref_path_pattern('blob') do |repo, ref, path| # "/*/blob/*:*
         begin
-          repo, ref, path = params[:splat]
           dolt.blob(repo, ref, path)
         rescue Exception => err
           dolt.render_error(err, repo, ref)
         end
       end
 
       get "/*/blob/*" do
         dolt.force_ref(params[:splat], "blob", "HEAD")
       end
 
-      get "/*/raw/*:*" do
+      get repo_ref_path_pattern('raw') do |repo, ref, path| # "/*/raw/*:*
         begin
-          repo, ref, path = params[:splat]
           dolt.raw(repo, ref, path)
         rescue Exception => err
           dolt.render_error(err, repo, ref)
         end
       end
 
       get "/*/raw/*" do
         dolt.force_ref(params[:splat], "raw", "HEAD")
       end
 
-      get "/*/blame/*:*" do
+      get repo_ref_path_pattern('blame') do |repo, ref, path| # "/*/blame/*:*
         begin
-          repo, ref, path = params[:splat]
           dolt.blame(repo, ref, path)
         rescue Exception => err
           dolt.render_error(err, repo, ref)
         end
       end
 
       get "/*/blame/*" do
         dolt.force_ref(params[:splat], "blame", "HEAD")
       end
 
-      get "/*/history/*:*" do
+      get repo_ref_path_pattern('history') do |repo, ref, path| # "/*/history/*:*
         begin
-          repo, ref, path = params[:splat]
           dolt.history(repo, ref, path, (params[:commit_count] || 20).to_i)
         rescue Exception => err
           dolt.render_error(err, repo, ref)
         end
       end
@@ -116,24 +102,18 @@
         rescue Exception => err
           dolt.render_error(err, repo, nil)
         end
       end
 
-      get "/*/tree_history/*:*" do
+      get repo_ref_path_pattern('tree_history') do |repo, ref, path| # "/*/tree_history/*:*
         begin
-          repo, ref, path = params[:splat]
           dolt.tree_history(repo, ref, path)
         rescue Exception => err
           dolt.render_error(err, repo, ref)
         end
       end
 
       private
-      attr_reader :repo, :lookup, :renderer
-
-      def dolt
-        @dolt ||= Dolt::Sinatra::Actions.new(self, lookup, renderer)
-      end
 
       def force_ref(args, action, ref)
         redirect(args.shift + "/#{action}/#{ref}:" + args.join)
       end
     end