dolt 0.29.0 → 0.30.0

data/dolt.gemspec

@@ -11,7 +11,7 @@ end
 
 Gem::Specification.new do |s|
   s.name        = "dolt"
-  s.version     = "0.29.0"
+  s.version     = "0.30.0"
   s.authors     = ["Christian Johansen"]
   s.email       = ["christian@gitorious.org"]
   s.homepage    = "http://gitorious.org/gitorious/dolt"

data/lib/dolt/sinatra/multi_repo_browser.rb

@@ -1,6 +1,6 @@
 # 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
@@ -15,27 +15,18 @@
 #   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 }))
@@ -45,9 +36,8 @@ module Dolt
         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)
@@ -58,9 +48,8 @@ module Dolt
         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)
@@ -71,9 +60,8 @@ module Dolt
         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)
@@ -84,9 +72,8 @@ module Dolt
         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)
@@ -97,9 +84,8 @@ module Dolt
         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)
@@ -118,9 +104,8 @@ module Dolt
         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)
@@ -128,11 +113,6 @@ module Dolt
       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)

data/lib/dolt/sinatra/repo_browser.rb

@@ -0,0 +1,47 @@
+# encoding: utf-8
+#--
+#   Copyright (C) 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.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   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 "libdolt/view/blob"
+require "libdolt/view/tree"
+
+module Dolt
+  module Sinatra
+    class RepoBrowser < ::Sinatra::Base
+      include Dolt::View::Blob
+      include Dolt::View::Tree
+
+      not_found { renderer.render("404") }
+
+      def initialize(lookup, renderer)
+        @lookup = lookup
+        @renderer = renderer
+        super()
+      end
+
+      private
+
+      attr_reader :lookup, :renderer
+
+      def dolt
+        @dolt ||= Dolt::Sinatra::Actions.new(self, lookup, renderer)
+      end
+
+    end
+  end
+end

data/lib/dolt/sinatra/single_repo_browser.rb

@@ -1,6 +1,6 @@
 # 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
@@ -15,35 +15,29 @@
 #   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/single_repository"
-require "libdolt/view/blob"
-require "libdolt/view/tree"
 
 module Dolt
   module Sinatra
-    class SingleRepoBrowser < ::Sinatra::Base
+    class SingleRepoBrowser < RepoBrowser
       include Dolt::View::SingleRepository
-      include Dolt::View::Blob
-      include Dolt::View::Tree
+
+      def self.ref_path_pattern(action)
+        %r{/#{action}/([^:]+)(?::|%3(?:a|A))(.*)}
+      end
 
       def initialize(repo, lookup, renderer)
         @repo = repo
-        @lookup = lookup
-        @renderer = renderer
-        super()
+        super(lookup, renderer)
       end
 
-      not_found { renderer.render("404") }
-
       get "/" do
         redirect("/tree/HEAD:")
       end
 
-      get "/tree/*:*" do
+      get ref_path_pattern('tree') do |ref, path| # "/tree/*:*
         begin
-          ref, path = params[:splat]
           dolt.tree(repo, ref, path)
         rescue Exception => err
           dolt.render_error(err, repo, ref)
@@ -54,9 +48,8 @@ module Dolt
         dolt.force_ref(params[:splat], "tree", "HEAD")
       end
 
-      get "/blob/*:*" do
+      get ref_path_pattern('blob') do |ref, path| # "/blob/*:*
         begin
-          ref, path = params[:splat]
           dolt.blob(repo, ref, path)
         rescue Exception => err
           dolt.render_error(err, repo, ref)
@@ -67,9 +60,8 @@ module Dolt
         dolt.force_ref(params[:splat], "blob", "HEAD")
       end
 
-      get "/raw/*:*" do
+      get ref_path_pattern('raw') do |ref, path| # "/raw/*:*
         begin
-          ref, path = params[:splat]
           dolt.raw(repo, ref, path)
         rescue Exception => err
           dolt.render_error(err, repo, ref)
@@ -80,9 +72,8 @@ module Dolt
         dolt.force_ref(params[:splat], "raw", "HEAD")
       end
 
-      get "/blame/*:*" do
+      get ref_path_pattern('blame') do |ref, path| # "/blame/*:*
         begin
-          ref, path = params[:splat]
           dolt.blame(repo, ref, path)
         rescue Exception => err
           dolt.render_error(err, repo, ref)
@@ -93,9 +84,8 @@ module Dolt
         dolt.force_ref(params[:splat], "blame", "HEAD")
       end
 
-      get "/history/*:*" do
+      get ref_path_pattern('history') do |ref, path| # "/history/*:*
         begin
-          ref, path = params[:splat]
           dolt.history(repo, ref, path, (params[:commit_count] || 20).to_i)
         rescue Exception => err
           dolt.render_error(err, repo, ref)
@@ -114,9 +104,8 @@ module Dolt
         end
       end
 
-      get "/tree_history/*:*" do
+      get ref_path_pattern('tree_history') do |ref, path| # "/tree_history/*:*
         begin
-          ref, path = params[:splat]
           dolt.tree_history(repo, ref, path)
         rescue Exception => err
           dolt.render_error(err, repo, ref)
@@ -124,11 +113,8 @@ module Dolt
       end
 
       private
-      attr_reader :repo, :lookup, :renderer
 
-      def dolt
-        @dolt ||= Dolt::Sinatra::Actions.new(self, lookup, renderer)
-      end
+      attr_reader :repo
 
       def force_ref(args, action, ref)
         redirect("/#{action}/#{ref}:" + args.join)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dolt
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libdolt
@@ -174,82 +174,12 @@ files:
 - ./dolt.gemspec
 - ./lib/dolt/sinatra/actions.rb
 - ./lib/dolt/sinatra/multi_repo_browser.rb
+- ./lib/dolt/sinatra/repo_browser.rb
 - ./lib/dolt/sinatra/single_repo_browser.rb
 - ./test/dolt/sinatra/actions_test.rb
 - ./test/dolt/sinatra/multi_repo_browser_test.rb
 - ./test/dolt/sinatra/single_repo_browser_test.rb
 - ./test/test_helper.rb
-- vendor/ui/.gitignore
-- vendor/ui/.gitmodules
-- vendor/ui/Makefile
-- vendor/ui/autolint.js
-- vendor/ui/buster.js
-- vendor/ui/css/gitorious.css
-- vendor/ui/css/syntax-highlight.css
-- vendor/ui/dist/gitorious3-capillary.min.js
-- vendor/ui/dist/gitorious3.min.css
-- vendor/ui/dist/gitorious3.min.js
-- vendor/ui/favicon.ico
-- vendor/ui/iconic/lock_stroke.svg
-- vendor/ui/images/f5f5f5-980x1.png
-- vendor/ui/images/gitorious.png
-- vendor/ui/images/gitorious2013.png
-- vendor/ui/images/powered-by.png
-- vendor/ui/images/white-980x1.png
-- vendor/ui/js/src/app.js
-- vendor/ui/js/src/cache.js
-- vendor/ui/js/src/capillary.js
-- vendor/ui/js/src/components/abbrev.js
-- vendor/ui/js/src/components/blob.js
-- vendor/ui/js/src/components/capillary.js
-- vendor/ui/js/src/components/clone-name-suggestion.js
-- vendor/ui/js/src/components/clone-url-selection.js
-- vendor/ui/js/src/components/collapse.js
-- vendor/ui/js/src/components/comments.js
-- vendor/ui/js/src/components/commit-linker.js
-- vendor/ui/js/src/components/dropdown.js
-- vendor/ui/js/src/components/ganalytics.js
-- vendor/ui/js/src/components/live-markdown-preview.js
-- vendor/ui/js/src/components/loading.js
-- vendor/ui/js/src/components/oid-ref-interpolator.js
-- vendor/ui/js/src/components/profile-menu.js
-- vendor/ui/js/src/components/rails-links.js
-- vendor/ui/js/src/components/ref-selector.js
-- vendor/ui/js/src/components/repository.js
-- vendor/ui/js/src/components/select-details.js
-- vendor/ui/js/src/components/slugify.js
-- vendor/ui/js/src/components/timeago.js
-- vendor/ui/js/src/components/tree-history.js
-- vendor/ui/js/src/components/url.js
-- vendor/ui/js/src/components/user-repo-view-state.js
-- vendor/ui/js/src/gitorious.js
-- vendor/ui/js/src/json-request.js
-- vendor/ui/js/src/logger.js
-- vendor/ui/js/src/spacer.js
-- vendor/ui/js/test-libs/jquery-1.9.1.min.js
-- vendor/ui/js/test/cache-test.js
-- vendor/ui/js/test/components/abbrev-test.js
-- vendor/ui/js/test/components/blob-test.js
-- vendor/ui/js/test/components/clone-name-suggestion-test.js
-- vendor/ui/js/test/components/clone-url-selection-test.js
-- vendor/ui/js/test/components/comments-test.js
-- vendor/ui/js/test/components/commit-linker-test.js
-- vendor/ui/js/test/components/live-markdown-preview-test.js
-- vendor/ui/js/test/components/profile-menu-test.js
-- vendor/ui/js/test/components/ref-selector-test.js
-- vendor/ui/js/test/components/repository-admin-test.js
-- vendor/ui/js/test/components/repository-watching-test.js
-- vendor/ui/js/test/components/timeago-test.js
-- vendor/ui/js/test/components/tree-history-test.js
-- vendor/ui/js/test/components/url-template-test.js
-- vendor/ui/js/test/test-helper.js
-- vendor/ui/lib/bootstrap/css/bootstrap-responsive.min.css
-- vendor/ui/lib/bootstrap/css/bootstrap.min.css
-- vendor/ui/lib/bootstrap/img/glyphicons-halflings-white.png
-- vendor/ui/lib/bootstrap/img/glyphicons-halflings.png
-- vendor/ui/lib/bootstrap/js/bootstrap.min.js
-- vendor/ui/package.json
-- vendor/ui/todo.org
 - bin/dolt
 homepage: http://gitorious.org/gitorious/dolt
 licenses: []
@@ -271,9 +201,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: dolt
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Dolt serves git trees and syntax highlighted blobs
 test_files: []
-has_rdoc: 

data/vendor/ui/.gitignore

@@ -1,4 +0,0 @@
-node_modules
-dist/cull.min.js
-dist/dome.min.js
-dist/spin.min.js

data/vendor/ui/.gitmodules

@@ -1,39 +0,0 @@
-[submodule "js/lib/culljs"]
-	path = js/lib/culljs
-	url = https://github.com/culljs/culljs.git
-[submodule "js/lib/dome"]
-	path = js/lib/dome
-	url = https://github.com/culljs/dome.git
-[submodule "js/lib/reqwest"]
-	path = js/lib/reqwest
-	url = https://github.com/ded/reqwest.git
-[submodule "js/lib/spin.js"]
-	path = js/lib/spin.js
-	url = https://github.com/fgnass/spin.js.git
-[submodule "lib/bane"]
-	path = lib/bane
-	url = https://github.com/busterjs/bane.git
-[submodule "js/lib/bane"]
-	path = js/lib/bane
-	url = https://github.com/busterjs/bane.git
-[submodule "js/lib/when"]
-	path = js/lib/when
-	url = https://github.com/cujojs/when.git
-[submodule "js/lib/showdown"]
-	path = js/lib/showdown
-	url = https://github.com/coreyti/showdown.git
-[submodule "js/lib/uinit"]
-	path = js/lib/uinit
-	url = https://git.gitorious.org/gitorious/uinit.git
-[submodule "js/lib/samsam"]
-	path = js/lib/samsam
-	url = git@github.com:busterjs/samsam.git
-[submodule "js/lib/timeago"]
-	path = js/lib/timeago
-	url = https://github.com/cjohansen/timeago.git
-[submodule "js/lib/raphael"]
-	path = js/lib/raphael
-	url = https://github.com/DmitryBaranovskiy/raphael.git
-[submodule "js/lib/capillary"]
-	path = js/lib/capillary
-	url = https://git.gitorious.org/capillary/capillary-js.git

data/vendor/ui/Makefile

@@ -1,48 +0,0 @@
-GTS3_DEPS=js/lib/spin.js/spin.js js/lib/when/when.js js/lib/bane/lib/bane.js js/lib/reqwest/reqwest.js js/lib/uinit/lib/uinit.js js/lib/showdown/src/showdown.js js/lib/timeago/timeago.js
-
-GTS3_UTILS=js/src/app.js js/src/cache.js js/src/json-request.js
-
-GTS3_COMPONENTS=js/src/components/dropdown.js js/src/components/ganalytics.js js/src/components/abbrev.js js/src/components/url.js js/src/components/ref-selector.js js/src/components/tree-history.js js/src/components/commit-linker.js js/src/components/user-repo-view-state.js js/src/components/profile-menu.js js/src/components/clone-url-selection.js js/src/components/blob.js js/src/components/live-markdown-preview.js js/src/components/timeago.js js/src/components/collapse.js js/src/components/repository.js js/src/components/rails-links.js js/src/components/clone-name-suggestion.js js/src/components/loading.js js/src/components/oid-ref-interpolator.js js/src/components/comments.js js/src/components/slugify.js js/src/components/select-details.js
-
-CAPILLARY_SOURCES=js/lib/raphael/raphael-min.js js/src/spacer.js js/lib/capillary/lib/capillary.js js/lib/capillary/lib/capillary/branch.js js/lib/capillary/lib/capillary/graph.js js/lib/capillary/lib/capillary/formatters/scale.js js/lib/capillary/lib/capillary/formatters/svg-data.js js/lib/capillary/lib/capillary/formatters/raphael.js  js/lib/capillary/lib/capillary/formatters/message-markup.js js/src/components/capillary.js js/src/capillary.js
-
-all: dist/gitorious3.min.css dist/gitorious3-capillary.min.js dist/gitorious3.min.js
-
-rebuild: clean all
-
-node_modules/.bin/uglifyjs:
-	npm install uglify-js
-
-js/lib/culljs/dist/cull.js:
-	cd js/lib/culljs && npm install && node build -s -n
-
-js/lib/dome/dist/dome.js:
-	cd js/lib/dome && npm install && node build -s -n
-
-dist/gitorious3-dependencies.min.js: $(GTS3_DEPS) js/lib/culljs/dist/cull.js js/lib/dome/dist/dome.js node_modules/.bin/uglifyjs
-	cat js/lib/culljs/dist/cull.js \
-	    js/lib/dome/dist/dome.js \
-	    $(GTS3_DEPS) | ./node_modules/.bin/uglifyjs -m -c > dist/gitorious3-dependencies.min.js
-	du -h dist/gitorious3-dependencies.min.js
-
-dist/gitorious3-components.min.js: $(GTS3_UTILS) $(GTS3_COMPONENTS) js/src/gitorious.js node_modules/.bin/uglifyjs
-	cat $(GTS3_UTILS) $(GTS3_COMPONENTS) js/src/gitorious.js | ./node_modules/.bin/uglifyjs -m -c > dist/gitorious3-components.min.js
-	du -h dist/gitorious3-components.min.js
-
-dist/gitorious3.min.js: dist/gitorious3-dependencies.min.js dist/gitorious3-components.min.js
-	cat dist/gitorious3-dependencies.min.js dist/gitorious3-components.min.js > dist/gitorious3.min.js
-	du -h dist/gitorious3.min.js
-
-dist/gitorious3-capillary.min.js: $(CAPILLARY_SOURCES) node_modules/.bin/uglifyjs
-	cat $(CAPILLARY_SOURCES) ./node_modules/.bin/uglifyjs -m -c > dist/gitorious3-capillary.min.js
-	du -h dist/gitorious3-capillary.min.js
-
-dist/gitorious3.min.css: css/gitorious.css css/syntax-highlight.css
-	juicer merge -f -o dist/gitorious3.min.css css/gitorious.css
-	du -h dist/gitorious3.min.css
-
-clean:
-	rm -fr 
-	rm -fr js/lib/culljs/dist
-	rm -fr js/lib/dome/dist
-