libdolt 0.24.0 → 0.25.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    libdolt (0.24.0)
+    libdolt (0.25.0)
       htmlentities (~> 4.3)
       json (~> 1.7)
       makeup (~> 0.2)

data/lib/libdolt.rb

@@ -18,7 +18,7 @@
 require "libdolt/version"
 require "libdolt/disk_repo_resolver"
 require "libdolt/gitorious_repo_resolver"
-require "libdolt/repo_actions"
+require "libdolt/repository_lookup"
 require "libdolt/view"
 
 module Dolt

data/lib/libdolt/{repo_actions.rb → repository_lookup.rb}

@@ -21,18 +21,24 @@ require "time"
 class Time; def to_json(*args); "\"#{iso8601}\""; end; end
 
 module Dolt
-  class RepoActions
+  class RepositoryLookup
     def initialize(repo_resolver, archiver = nil)
       @repo_resolver = repo_resolver
       @archiver = archiver
     end
 
     def blob(repo, ref, path)
-      repo_action(repo, ref, path, :blob, :rev_parse, "#{ref}:#{path}")
+      repository = resolve_repository(repo)
+      tpl_data(repository, ref, path, {
+          :blob => repository.rev_parse("#{ref}:#{path}")
+        })
     end
 
     def tree(repo, ref, path)
-      repo_action(repo, ref, path, :tree, :tree, ref, path).merge({:readme => readme(repo, ref, path)})
+      repository = resolve_repository(repo)
+      tpl_data(repository, ref, path, {
+          :tree => repository.tree(ref, path)
+        }).merge(:readme => readme(repo, ref, path))
     end
 
     def tree_entry(repo, ref, path)
@@ -45,11 +51,17 @@ module Dolt
     end
 
     def blame(repo, ref, path)
-      repo_action(repo, ref, path, :blame, :blame, ref, path)
+      repository = resolve_repository(repo)
+      tpl_data(repository, ref, path, {
+          :blame => repository.blame(ref, path)
+        })
     end
 
     def history(repo, ref, path, count)
-      repo_action(repo, ref, path, :commits, :log, ref, path, count)
+      repository = resolve_repository(repo)
+      tpl_data(repository, ref, path, {
+          :commits => repository.log(ref, path, count)
+        })
     end
 
     def refs(repo)
@@ -62,7 +74,10 @@ module Dolt
     end
 
     def tree_history(repo, ref, path, count)
-      repo_action(repo, ref, path, :tree, :tree_history, ref, path, count)
+      repository = resolve_repository(repo)
+      tpl_data(repository, ref, path, {
+          :tree => repository.tree_history(ref, path, count)
+        })
     end
 
     def archive(repo, ref, format)
@@ -85,14 +100,6 @@ module Dolt
     private
     def repo_resolver; @repo_resolver; end
 
-    def repo_action(repo, ref, path, data, method, *args)
-      repository = resolve_repository(repo)
-
-      tpl_data(repository, ref, path, {
-          data => repository.send(method, *args)
-        })
-    end
-
     def tpl_data(repo, ref, path, locals = {})
       { :path => path,
         :ref => ref }.merge(repo.to_hash).merge(locals)

data/lib/libdolt/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Dolt
-  VERSION = "0.24.0"
+  VERSION = "0.25.0"
 end

data/test/libdolt/{repo_actions_test.rb → repository_lookup_test.rb}

@@ -16,7 +16,7 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #++
 require "test_helper"
-require "libdolt/repo_actions"
+require "libdolt/repository_lookup"
 require "ostruct"
 require "mocha/setup"
 
@@ -41,15 +41,15 @@ class MetaResolver < Resolver
   end
 end
 
-describe Dolt::RepoActions do
+describe Dolt::RepositoryLookup do
   before do
     @resolver = Resolver.new
-    @actions = Dolt::RepoActions.new(@resolver)
+    @lookup = Dolt::RepositoryLookup.new(@resolver)
   end
 
   describe "#blob" do
     it "returns path, blob, repo, ref and base_tree_url" do
-      data = @actions.blob("gitorious", "fc5f5fb50b435e18", "lib/foo.rb")
+      data = @lookup.blob("gitorious", "fc5f5fb50b435e18", "lib/foo.rb")
       assert_equal "gitorious", data[:repository_slug]
       assert_equal "fc5f5fb50b435e18", data[:ref]
       assert Rugged::Blob === data[:blob]
@@ -58,7 +58,7 @@ describe Dolt::RepoActions do
 
   describe "#tree" do
     it "returns tree, repo and ref" do
-      data = @actions.tree("gitorious", "fc5f5fb50b435e18", "lib")
+      data = @lookup.tree("gitorious", "fc5f5fb50b435e18", "lib")
       repo = @resolver.resolved.last
       assert_equal "264c348a80906538018616fa16fc35d04bdf38b0", data[:tree].oid
       assert_equal "fc5f5fb50b435e18", data[:ref]
@@ -70,7 +70,7 @@ describe Dolt::RepoActions do
     it "includes readmes which can be rendered" do
       readme_name = "README.org"
       Makeup::Markup.stubs(:can_render?).with(readme_name).returns(true)
-      data = @actions.tree("gitorious","fc5f5fb50b435e18","")
+      data = @lookup.tree("gitorious","fc5f5fb50b435e18","")
       repo = @resolver.resolved.last
       assert_equal "#{readme_name}", data[:readme][:path]
     end
@@ -78,13 +78,13 @@ describe Dolt::RepoActions do
 
   describe "#tree_entry" do
     it "returns tree, repo and ref" do
-      data = @actions.tree_entry("gitorious", "fc5f5fb50b435e18", "")
+      data = @lookup.tree_entry("gitorious", "fc5f5fb50b435e18", "")
       repo = @resolver.resolved.last
       assert_equal :tree, data[:type]
     end
 
     it "returns blob, repo and ref" do
-      data = @actions.tree_entry("gitorious", "fc5f5fb50b435e18", "lib/foo.rb")
+      data = @lookup.tree_entry("gitorious", "fc5f5fb50b435e18", "lib/foo.rb")
 
       assert_equal "lib/foo.rb", data[:path]
       assert_equal "fc5f5fb50b435e18", data[:ref]
@@ -94,12 +94,12 @@ describe Dolt::RepoActions do
 
   describe "#blame" do
     it "resolves repository" do
-      @actions.blame("gitorious", "master", "lib")
+      @lookup.blame("gitorious", "master", "lib")
       assert_equal 1, @resolver.resolved.size
     end
 
     it "returns blame, repo and ref" do
-      data = @actions.blame("gitorious", "fc5f5fb50b435e18", "lib")
+      data = @lookup.blame("gitorious", "fc5f5fb50b435e18", "lib")
       assert Dolt::Git::Blame === data[:blame]
       assert_equal "gitorious", data[:repository_slug]
       assert_equal "fc5f5fb50b435e18", data[:ref]
@@ -109,7 +109,7 @@ describe Dolt::RepoActions do
 
   describe "#history" do
     it "returns commits, repo and ref" do
-      data = @actions.history("gitorious", "fc5f5fb50b435e18", "app", 2)
+      data = @lookup.history("gitorious", "fc5f5fb50b435e18", "app", 2)
 
       assert_equal({
           :commits => [],
@@ -122,7 +122,7 @@ describe Dolt::RepoActions do
 
   describe "#refs" do
     it "returns repositories, tags and heads" do
-      data = @actions.refs("gitorious")
+      data = @lookup.refs("gitorious")
 
       assert data[:tags].detect {|name, ref|
         name == "testable-tag" && ref == "fc5f5fb50b435e183925b341909610aace90a413"
@@ -132,7 +132,7 @@ describe Dolt::RepoActions do
 
   describe "#tree_history" do
     it "returns repository, path, ref and history" do
-      data = @actions.tree_history("gitorious", "testable-tag", "", 1)
+      data = @lookup.tree_history("gitorious", "testable-tag", "", 1)
       assert_equal "testable-tag", data[:ref]
       assert_equal 2, data[:tree].length
       assert_equal "", data[:path]
@@ -142,8 +142,8 @@ describe Dolt::RepoActions do
   describe "repository meta data" do
     it "is returned with other data" do
       resolver = MetaResolver.new
-      actions = Dolt::RepoActions.new(resolver)
-      data = actions.blob("gitorious", "fc5f5fb50b435e18", "lib")
+      lookup = Dolt::RepositoryLookup.new(resolver)
+      data = lookup.blob("gitorious", "fc5f5fb50b435e18", "lib")
 
       assert_equal "Meta data is cool", data[:repository_meta]
     end
@@ -152,7 +152,7 @@ describe Dolt::RepoActions do
   describe "#rev_parse_oid" do
     it "resolves ref oid" do
       oid = "fc5f5fb50b435e183925b341909610aace90a413"
-      assert_equal oid, @actions.rev_parse_oid("gitorious", "testable-tag")
+      assert_equal oid, @lookup.rev_parse_oid("gitorious", "testable-tag")
     end
  end
 end

data/views/commits.erb

@@ -35,11 +35,11 @@
           <%= commit[:summary] %>
         </p>
         <p>
-          <a class="event-author" href="/~">
+          <span class="gts-commit-author">
             <img width="24" height="24" src="<%= gravatar(commit[:author][:email]) %>" alt="avatar" class="gts-avatar">
             <%= commit[:author][:name] %>
-          </a>
-          <span class="event-time"><%= commit[:date].strftime("%H:%M") %></span>
+          </span>
+          <span class="gts-commit-time"><%= commit[:date].strftime("%H:%M") %></span>
         </p>
       </div>
     <% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libdolt
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -211,7 +211,7 @@ files:
 - lib/libdolt/git/submodule.rb
 - lib/libdolt/git/tree.rb
 - lib/libdolt/gitorious_repo_resolver.rb
-- lib/libdolt/repo_actions.rb
+- lib/libdolt/repository_lookup.rb
 - lib/libdolt/version.rb
 - lib/libdolt/view.rb
 - lib/libdolt/view/binary_blob_embedder.rb
@@ -254,7 +254,7 @@ files:
 - test/libdolt/git/blame_test.rb
 - test/libdolt/git/commit_test.rb
 - test/libdolt/git/repository_test.rb
-- test/libdolt/repo_actions_test.rb
+- test/libdolt/repository_lookup_test.rb
 - test/libdolt/templates/blame_test.rb
 - test/libdolt/templates/blob_test.rb
 - test/libdolt/templates/commits_test.rb