From 9b412d200bd3abacfb859b6c4d04980ea1f8d9c3 Mon Sep 17 00:00:00 2001 From: Tom Preston-Werner Date: Sun, 11 Apr 2010 12:30:45 -0600 Subject: [PATCH] return Grit::Commit objects instead of Gollum::Version --- README.md | 4 ++-- lib/gollum.rb | 1 - lib/gollum/page.rb | 8 +++----- lib/gollum/version.rb | 16 ---------------- 4 files changed, 5 insertions(+), 24 deletions(-) delete mode 100644 lib/gollum/version.rb diff --git a/README.md b/README.md index 879c3ede..efb64f09 100644 --- a/README.md +++ b/README.md @@ -245,7 +245,7 @@ Get the latest version of the given human or canonical page name: # => :markdown vsn = page.version - # => + # => vsn.id # => '3ca43e12377ea1e32ea5c9ce5992ec8bf266e3e5' @@ -253,7 +253,7 @@ Get the latest version of the given human or canonical page name: Get a list of versions for a given page: vsns = gollum.page('page-name').versions - # => [] + # => [] vsns.first.id # => '3ca43e12377ea1e32ea5c9ce5992ec8bf266e3e5' diff --git a/lib/gollum.rb b/lib/gollum.rb index aa67944d..c157356c 100644 --- a/lib/gollum.rb +++ b/lib/gollum.rb @@ -5,7 +5,6 @@ require 'github/markup' # internal require 'gollum/wiki' require 'gollum/page' -require 'gollum/version' module Gollum VERSION = '0.0.1' diff --git a/lib/gollum/page.rb b/lib/gollum/page.rb index 0d54f5df..aacdc20a 100644 --- a/lib/gollum/page.rb +++ b/lib/gollum/page.rb @@ -76,11 +76,9 @@ module Gollum # All of the versions that have touched this Page. # - # Returns an Array of Gollum::Version. + # Returns an Array of Grit::Commit. def versions - @wiki.repo.log('master', self.path).map do |v| - Version.new(v) - end + @wiki.repo.log('master', self.path) end # Find a page in the given Gollum repo. @@ -91,7 +89,7 @@ module Gollum def find(name) commit = self.wiki.repo.commits.first if page = find_page_in_tree(commit.tree, name) - page.version = Version.new(commit) + page.version = commit page else nil diff --git a/lib/gollum/version.rb b/lib/gollum/version.rb deleted file mode 100644 index 8620d25b..00000000 --- a/lib/gollum/version.rb +++ /dev/null @@ -1,16 +0,0 @@ -module Gollum - class Version - attr_accessor :commit - - def initialize(commit) - self.commit = commit - end - - # The SHA1 commit ID. - # - # The String ID. - def id - self.commit.id - end - end -end \ No newline at end of file