dolt 0.19.0 → 0.20.0

data/dolt.gemspec

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

data/lib/dolt/sinatra/actions.rb

@@ -53,24 +53,24 @@ module Dolt
         HTML
       end
 
-      def raw(repo, ref, path)
+      def raw(repo, ref, path, custom_data = {})
         if oid = lookup_ref_oid(repo, ref)
           redirect(raw_url(repo, oid, path)) and return
         end
 
-        blob(repo, ref, path, {
+        blob(repo, ref, path, custom_data, {
                :template => :raw,
                :content_type => "text/plain",
                :template_options => { :layout => nil }
              })
       end
 
-      def blob(repo, ref, path, options = { :template => :blob })
+      def blob(repo, ref, path, custom_data = {}, options = { :template => :blob })
         if oid = lookup_ref_oid(repo, ref)
           redirect(blob_url(repo, oid, path)) and return
         end
 
-        data = actions.blob(repo, u(ref), path)
+        data = (custom_data || {}).merge(actions.blob(repo, u(ref), path))
         blob = data[:blob]
         return redirect(tree_url(repo, ref, path)) if blob.class.to_s !~ /\bBlob/
         add_headers(response, options.merge(:ref => ref))
@@ -80,12 +80,12 @@ module Dolt
         error(err, repo, ref)
       end
 
-      def tree(repo, ref, path)
+      def tree(repo, ref, path, custom_data = {})
         if oid = lookup_ref_oid(repo, ref)
           redirect(tree_url(repo, oid, path)) and return
         end
 
-        data = actions.tree(repo, u(ref), path)
+        data = (custom_data || {}).merge(actions.tree(repo, u(ref), path))
         tree = data[:tree]
         return redirect(blob_url(repo, ref, path)) if tree.class.to_s !~ /\bTree/
         add_headers(response, :ref => ref)
@@ -94,56 +94,56 @@ module Dolt
         error(err, repo, ref)
       end
 
-      def tree_entry(repo, ref, path)
+      def tree_entry(repo, ref, path, custom_data = {})
         if oid = lookup_ref_oid(repo, ref)
           redirect(tree_entry_url(repo, oid, path)) and return
         end
 
-        data = actions.tree_entry(repo, u(ref), path)
+        data = (custom_data || {}).merge(actions.tree_entry(repo, u(ref), path))
         add_headers(response, :ref => ref)
         body(renderer.render(data.key?(:tree) ? :tree : :blob, data))
       rescue Exception => err
         error(err, repo, ref)
       end
 
-      def blame(repo, ref, path)
+      def blame(repo, ref, path, custom_data = {})
         if oid = lookup_ref_oid(repo, ref)
           redirect(blame_url(repo, oid, path)) and return
         end
 
-        data = actions.blame(repo, u(ref), path)
+        data = (custom_data || {}).merge(actions.blame(repo, u(ref), path))
         add_headers(response, :ref => ref)
         body(renderer.render(:blame, data))
       rescue Exception => err
         error(err, repo, ref)
       end
 
-      def history(repo, ref, path, count)
+      def history(repo, ref, path, count, custom_data = {})
         if oid = lookup_ref_oid(repo, ref)
           redirect(history_url(repo, oid, path)) and return
         end
 
-        data = actions.history(repo, u(ref), path, count)
+        data = (custom_data || {}).merge(actions.history(repo, u(ref), path, count))
         add_headers(response, :ref => ref)
         body(renderer.render(:commits, data))
       rescue Exception => err
         error(err, repo, ref)
       end
 
-      def refs(repo)
-        data = actions.refs(repo)
+      def refs(repo, custom_data = {})
+        data = (custom_data || {}).merge(actions.refs(repo))
         add_headers(response, :content_type => "application/json")
         body(renderer.render(:refs, data, :layout => nil))
       rescue Exception => err
         error(err, repo, nil)
       end
 
-      def tree_history(repo, ref, path, count = 1)
+      def tree_history(repo, ref, path, count = 1, custom_data = {})
         if oid = lookup_ref_oid(repo, ref)
           redirect(tree_history_url(repo, oid, path)) and return
         end
 
-        data = actions.tree_history(repo, u(ref), path, count)
+        data = (custom_data || {}).merge(actions.tree_history(repo, u(ref), path, count))
         add_headers(response, :content_type => "application/json", :ref => ref)
         body(renderer.render(:tree_history, data, :layout => nil))
       rescue Exception => err
@@ -151,7 +151,8 @@ module Dolt
       end
 
       def resolve_repository(repo)
-        actions.resolve_repository(repo)
+        @cache ||= {}
+        @cache[repo] ||= actions.resolve_repository(repo)
       end
 
       private

data/test/dolt/sinatra/actions_test.rb

@@ -38,6 +38,14 @@ describe Dolt::Sinatra::Actions do
       assert_equal "blob:Blob", app.body
     end
 
+    it "renders the blob template with custom data" do
+      renderer = Test::Renderer.new("Blob")
+      app = Test::SinatraApp.new(Test::Actions.new(Stub::Blob.new), renderer)
+      app.blob("gitorious", "master", "app/models/repository.rb", { :who => 42 })
+
+      assert_equal 42, renderer.data[:who]
+    end
+
     it "redirects tree views to tree action" do
       app = Test::SinatraApp.new(Test::Actions.new(Stub::Tree.new), Test::Renderer.new("Tree"))
       app.blob("gitorious", "master", "app/models")
@@ -93,6 +101,14 @@ describe Dolt::Sinatra::Actions do
       assert_equal "tree:Tree", app.body
     end
 
+    it "renders template with custom data" do
+      renderer = Test::Renderer.new("Tree")
+      app = Test::SinatraApp.new(Test::Actions.new(Stub::Tree.new), renderer)
+      app.tree("gitorious", "master", "app/models", { :who => 42 })
+
+      assert_equal 42, renderer.data[:who]
+    end
+
     it "redirects blob views to blob action" do
       app = Test::SinatraApp.new(Test::Actions.new(Stub::Blob.new), Test::Renderer.new("Tree"))
       app.tree("gitorious", "master", "app/models/repository.rb")
@@ -150,6 +166,14 @@ describe Dolt::Sinatra::Actions do
       assert_equal "tree:Tree", app.body
     end
 
+    it "renders template with custom data" do
+      renderer = Test::Renderer.new("Tree")
+      app = Test::SinatraApp.new(Test::Actions.new(Stub::Tree.new), renderer)
+      app.tree_entry("gitorious", "master", "app/models", { :who => 42 })
+
+      assert_equal 42, renderer.data[:who]
+    end
+
     it "renders trees with the tree template as html" do
       app = Test::SinatraApp.new(Test::Actions.new(Stub::Blob.new), Test::Renderer.new("Blob"))
       app.tree_entry("gitorious", "master", "app/models")
@@ -193,6 +217,14 @@ describe Dolt::Sinatra::Actions do
       assert_equal "raw:Text", app.body
     end
 
+    it "renders template with custom data" do
+      renderer = Test::Renderer.new("Text")
+      app = Test::SinatraApp.new(Test::Actions.new(Stub::Blob.new), renderer)
+      app.raw("gitorious", "master", "app/models/repository.rb", { :who => 42 })
+
+      assert_equal 42, renderer.data[:who]
+    end
+
     it "redirects tree views to tree action" do
       app = Test::SinatraApp.new(Test::Actions.new(Stub::Tree.new), Test::Renderer.new("Tree"))
       app.raw("gitorious", "master", "app/models")
@@ -238,6 +270,14 @@ describe Dolt::Sinatra::Actions do
       assert_equal "blame:Text", app.body
     end
 
+    it "renders template with custom data" do
+      renderer = Test::Renderer.new("Text")
+      app = Test::SinatraApp.new(Test::Actions.new(Stub::Blob.new), renderer)
+      app.blame("gitorious", "master", "app/models/repository.rb", { :who => 42 })
+
+      assert_equal 42, renderer.data[:who]
+    end
+
     it "unescapes ref" do
       actions = Test::Actions.new(Stub::Blob.new)
       app = Test::SinatraApp.new(actions, Test::Renderer.new("Blob"))
@@ -273,6 +313,14 @@ describe Dolt::Sinatra::Actions do
       assert_equal "commits:Text", app.body
     end
 
+    it "renders template with custom data" do
+      renderer = Test::Renderer.new("Text")
+      app = Test::SinatraApp.new(Test::Actions.new(Stub::Blob.new), renderer)
+      app.history("gitorious", "master", "app/models/repository.rb", 10, { :who => 42 })
+
+      assert_equal 42, renderer.data[:who]
+    end
+
     it "unescapes ref" do
       actions = Test::Actions.new(Stub::Blob.new)
       app = Test::SinatraApp.new(actions, Test::Renderer.new("Blob"))
@@ -297,6 +345,14 @@ describe Dolt::Sinatra::Actions do
       assert_equal "application/json", app.response["Content-Type"]
       assert_equal "refs:JSON", app.body
     end
+
+    it "renders template with custom data" do
+      renderer = Test::Renderer.new("Text")
+      app = Test::SinatraApp.new(Test::Actions.new(Stub::Blob.new), renderer)
+      app.refs("gitorious", { :who => 42 })
+
+      assert_equal 42, renderer.data[:who]
+    end
   end
 
   describe "#tree_history" do
@@ -308,6 +364,14 @@ describe Dolt::Sinatra::Actions do
       assert_equal "tree_history:JSON", app.body
     end
 
+    it "renders template with custom data" do
+      renderer = Test::Renderer.new("Text")
+      app = Test::SinatraApp.new(Test::Actions.new(Stub::Tree.new), renderer)
+      app.tree_history("gitorious", "master", "app/models", 1, { :who => 42 })
+
+      assert_equal 42, renderer.data[:who]
+    end
+
     it "unescapes ref" do
       actions = Test::Actions.new(Stub::Tree.new)
       app = Test::SinatraApp.new(actions, Test::Renderer.new("Tree"))

data/test/test_helper.rb

@@ -120,6 +120,7 @@ module Test
   end
 
   class Renderer
+    attr_reader :data
     def initialize(body = ""); @body = body; end
 
     def render(action, data, options = {})

metadata

@@ -1,24 +1,25 @@
 --- !ruby/object:Gem::Specification
 name: dolt
 version: !ruby/object:Gem::Version
+  version: 0.20.0
   prerelease: 
-  version: 0.19.0
 platform: ruby
 authors:
 - Christian Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
+  name: libdolt
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.21'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -26,15 +27,15 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.21'
-  name: libdolt
 - !ruby/object:Gem::Dependency
-  type: :runtime
+  name: thin
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -42,15 +43,15 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
-  name: thin
 - !ruby/object:Gem::Dependency
-  type: :runtime
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -58,15 +59,15 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-  name: sinatra
 - !ruby/object:Gem::Dependency
-  type: :runtime
+  name: tiltout
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -74,15 +75,15 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
-  name: tiltout
 - !ruby/object:Gem::Dependency
-  type: :runtime
+  name: json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -90,15 +91,15 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
-  name: json
 - !ruby/object:Gem::Dependency
-  type: :runtime
+  name: trollop
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -106,15 +107,15 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-  name: trollop
 - !ruby/object:Gem::Dependency
-  type: :development
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -122,15 +123,15 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-  name: minitest
 - !ruby/object:Gem::Dependency
-  type: :development
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -138,15 +139,15 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
-  name: rake
 - !ruby/object:Gem::Dependency
-  type: :development
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -154,7 +155,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
-  name: rack-test
 description: Dolt serves git trees and syntax highlighted blobs
 email:
 - christian@gitorious.org
@@ -247,8 +247,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: dolt
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Dolt serves git trees and syntax highlighted blobs
 test_files: []
+has_rdoc: