libdolt 0.10.1 → 0.11

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    libdolt (0.10.0)
+    libdolt (0.11)
       em_pessimistic (~> 0.1)
       em_rugged (~> 0.3)
       eventmachine (~> 1.0)
@@ -26,14 +26,14 @@ GEM
     github-markup (0.7.4)
     htmlentities (4.3.1)
     json (1.7.5)
-    makeup (0.2.0)
+    makeup (0.3.0)
       github-markup (~> 0.7)
       htmlentities (~> 4.3)
       pygments.rb (~> 0.2)
     mime-types (1.19)
     minitest (2.12.1)
     posix-spawn (0.3.6)
-    pygments.rb (0.3.1)
+    pygments.rb (0.3.2)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rake (0.9.2.2)
@@ -42,7 +42,7 @@ GEM
     tilt (1.3.3)
     tiltout (1.2.0)
       tilt (~> 1.3)
-    tzinfo (0.3.33)
+    tzinfo (0.3.35)
     when (0.1.0)
     yajl-ruby (1.1.0)
 

data/lib/libdolt/repo_actions.rb

@@ -37,11 +37,11 @@ module Dolt
     end
 
     def tree_entry(repo, ref, path, &block)
-      repository = repo_resolver.resolve(repo)
+      repository = resolve_repository(repo)
       d = repository.tree_entry(ref, path)
       d.callback do |result|
         key = result.class.to_s.match(/Blob/) ? :blob : :tree
-        block.call(nil, tpl_data(repo, ref, path, { key => result, :type => key }))
+        block.call(nil, tpl_data(repository, ref, path, { key => result, :type => key }))
       end
       d.errback { |err| block.call(err, nil) }
     end
@@ -55,15 +55,14 @@ module Dolt
     end
 
     def refs(repo, &block)
-      repository = repo_resolver.resolve(repo)
+      repository = resolve_repository(repo)
       d = repository.refs
       d.callback do |refs|
         names = refs.map(&:name)
         block.call(nil, {
-                     :repository_slug => repo,
                      :tags => expand_refs(repository, names, :tags),
                      :heads => expand_refs(repository, names, :heads)
-                   })
+                   }.merge(repository.to_hash))
       end
       d.errback { |err| block.call(err, nil) }
     end
@@ -79,21 +78,22 @@ module Dolt
     private
     def repo_resolver; @repo_resolver; end
 
+    def resolve_repository(repo)
+      ResolvedRepository.new(repo, repo_resolver.resolve(repo))
+    end
+
     def repo_action(repo, ref, path, data, method, *args, &block)
-      repository = repo_resolver.resolve(repo)
+      repository = resolve_repository(repo)
       d = repository.send(method, *args)
       d.callback do |result|
-        block.call(nil, tpl_data(repo, ref, path, { data => result }))
+        block.call(nil, tpl_data(repository, ref, path, { data => result }))
       end
       d.errback { |err| block.call(err, nil) }
     end
 
     def tpl_data(repo, ref, path, locals = {})
-      {
-        :repository_slug => repo,
-        :path => path,
-        :ref => ref
-      }.merge(locals)
+      { :path => path,
+        :ref => ref }.merge(repo.to_hash).merge(locals)
     end
 
     def expand_refs(repository, names, type)
@@ -102,4 +102,20 @@ module Dolt
       end
     end
   end
+
+  class ResolvedRepository
+    def initialize(slug, repository)
+      @repository = repository
+      @data = { :repository_slug => slug }
+      @data[:repository_meta] = repository.meta if repository.respond_to?(:meta)
+    end
+
+    def to_hash
+      @data
+    end
+
+    def method_missing(method, *args, &block)
+      @repository.send(method, *args, &block)
+    end
+  end
 end

data/lib/libdolt/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Dolt
-  VERSION = "0.10.1"
+  VERSION = "0.11"
 end

data/lib/libdolt/view/tab_width.rb

@@ -19,11 +19,8 @@
 module Dolt
   module View
     module TabWidth
-      def self.tab_width; @@tab_width; end
-      def self.tab_width=(tab_width); @@tab_width = tab_width; end
-
       def format_whitespace(text)
-        text.gsub(/\t/, " " * TabWidth.tab_width)
+        text.gsub(/\t/, " " * tab_width)
       end
     end
   end

data/libdolt.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "em-minitest-spec", "~> 1.1"
   s.add_development_dependency "rake", "~> 0.9"
   s.add_development_dependency "redcarpet", "2.2.0"
-  s.add_development_dependency "tiltout", "~>1.2"
+  s.add_development_dependency "tiltout", "~>1.4"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test}/*`.split("\n")

data/test/libdolt/repo_actions_test.rb

@@ -62,6 +62,16 @@ class Resolver
   end
 end
 
+class MetaResolver < Resolver
+  def resolve(repo)
+    repository = super
+    def repository.meta
+      "Meta data is cool"
+    end
+    repository
+  end
+end
+
 class FakeBlob; end
 
 describe Dolt::RepoActions do
@@ -284,4 +294,17 @@ describe Dolt::RepoActions do
       assert_equal expected, data
     end
   end
+
+  describe "repository meta data" do
+    it "is yielded with other data to block" do
+      resolver = MetaResolver.new
+      actions = Dolt::RepoActions.new(resolver)
+      data = nil
+      actions.blob("gitorious", "babd120", "app") { |err, d| data = d }
+
+      resolver.resolved.last.resolve_promise("Blob")
+
+      assert_equal "Meta data is cool", data[:repository_meta]
+    end
+  end
 end

data/test/libdolt/view/tab_width_test.rb

@@ -24,14 +24,14 @@ describe Dolt::View::TabWidth do
 
   describe "#format_whitespace" do
     it "limits width of whitespace" do
-      Dolt::View::TabWidth.tab_width = 4
+      def self.tab_width; 4; end
       html = format_whitespace("class File\n\tattr_reader :path\nend")
 
       assert_match(/    attr_reader/, html)
     end
 
     it "uses wide tabs in formatted blobs" do
-      Dolt::View::TabWidth.tab_width = 12
+      def self.tab_width; 12; end
       html = format_text_blob("file.rb", "class File\n\tattr_reader :path\nend")
 
       assert_match(/            attr_reader/, html)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libdolt
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: '0.11'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2012-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -226,7 +226,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -234,7 +234,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
 description: Dolt API for serving git trees and syntax highlighted blobs
 email:
 - christian@gitorious.org
@@ -331,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: libdolt
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Dolt API for serving git trees and syntax highlighted blobs