Merge pull request #107 from jekyll/expose-source

Expose site source
jekyll · Aug 15, 2017 · c252a75 · c252a75
2 parents 60f6805 + 43e425b
commit c252a75
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/lib/jekyll-github-metadata/metadata_drop.rb b/lib/jekyll-github-metadata/metadata_drop.rb
@@ -58,6 +58,7 @@ def keys
       def_delegator :repository, :latest_release,              :latest_release
       def_delegator :repository, :private?,                    :private
       def_delegator :repository, :license,                     :license
+      def_delegator :repository, :source,                      :source
 
       def versions
         @versions ||= begin

diff --git a/lib/jekyll-github-metadata/repository.rb b/lib/jekyll-github-metadata/repository.rb
@@ -13,7 +13,7 @@ class Repository
       #
       # Returns a symbol representing the instance method
       def self.def_hash_delegator(hash, key, method)
-        define_method(method || key) do
+        define_method(method) do
           public_send(hash)[key.to_s]
         end
       end
@@ -25,6 +25,7 @@ def self.def_hash_delegator(hash, key, method)
       def_hash_delegator :repo_info,      :has_downloads, :show_downloads?
       def_hash_delegator :repo_info,      :private,       :private?
       def_hash_delegator :latest_release, :url,           :latest_release_url
+      def_hash_delegator :source,         :branch,        :git_ref
 
       def_delegator :uri, :host,   :domain
       def_delegator :uri, :scheme, :url_scheme
@@ -121,12 +122,8 @@ def latest_release
         memoize_value :@latest_release, Value.new(proc { |c| c.latest_release(nwo) })
       end
 
-      def git_ref
-        if repo_pages_info["source"]
-          repo_pages_info["source"]["branch"]
-        else
-          user_page? ? "master" : "gh-pages"
-        end
+      def source
+        repo_pages_info["source"] || repo_compat.source
       end
 
       def project_page?

diff --git a/lib/jekyll-github-metadata/repository_compat.rb b/lib/jekyll-github-metadata/repository_compat.rb
@@ -55,6 +55,13 @@ def domain
           end
       end
 
+      def source
+        {
+          "branch" => (repo.user_page? ? "master" : "gh-pages"),
+          "path"   => "/",
+        }
+      end
+
       private
 
       def enterprise_url

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -150,6 +150,7 @@ def expected_values
     "latest_release"       => %r!assets_url!,
     "private"              => false,
     "license"              => %r!"key"=>"mit"!,
+    "source"               => { "branch" => "gh-pages", "path" => "/" },
   }
 end