KevinMidboe/linguist
1
0
Fork 0
mirror of https://github.com/KevinMidboe/linguist.git synced 2025-10-29 17:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify boolean attribute handling

Browse Source
This commit is contained in:
Brandon Keepers
2014-09-29 14:13:44 -04:00
parent 6edf4498ce
commit 1c6483a499
2 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/linguist/lazy_blob.rb
View File

@@ -30,29 +30,21 @@ module Linguist
end end
def vendored? def vendored?
if git_attributes['linguist-vendored'] if attr = git_attributes['linguist-vendored']
return result_for_key('linguist-vendored') return boolean_attribute(attr)
else else
return super return super
end end
end end
def generated? def generated?
if git_attributes['linguist-generated'] if attr = git_attributes['linguist-generated']
return result_for_key('linguist-generated') return boolean_attribute(attr)
else else
return super return super
end end
end end
def result_for_key(keyname)
key = git_attributes[keyname]
if key == "false" || key.nil?
return false
else
return true
end
end
def language def language
return @language if defined?(@language) return @language if defined?(@language)
@@ -74,6 +66,12 @@ module Linguist
end end
protected protected
# Returns true if the attribute is present and not the string "false".
def boolean_attribute(attr)
attr != "false"
end
def load_blob! def load_blob!
@data, @size = Rugged::Blob.to_buffer(repository, oid, MAX_SIZE) if @data.nil? @data, @size = Rugged::Blob.to_buffer(repository, oid, MAX_SIZE) if @data.nil?
end end

6
test/test_repository.rb
View File

@@ -81,8 +81,6 @@ class TestRepository < Test::Unit::TestCase
# TODO: get rid of this (would like this to come from git data) # TODO: get rid of this (would like this to come from git data)
file.stubs(:git_attributes).returns(git_attrs) file.stubs(:git_attributes).returns(git_attrs)
# check we're getting the correct assignment back from .gitattributes
assert file.result_for_key('linguist-generated')
# overridden in .gitattributes # overridden in .gitattributes
assert file.generated? assert file.generated?
end end
@@ -98,8 +96,6 @@ class TestRepository < Test::Unit::TestCase
# TODO: get rid of this (would like this to come from git data) # TODO: get rid of this (would like this to come from git data)
override_vendored.stubs(:git_attributes).returns(git_attrs) override_vendored.stubs(:git_attributes).returns(git_attrs)
# check we're getting the correct assignment back from .gitattributes
assert override_vendored.result_for_key('linguist-vendored')
# overridden .gitattributes # overridden .gitattributes
assert override_vendored.vendored? assert override_vendored.vendored?
end end
@@ -117,8 +113,6 @@ class TestRepository < Test::Unit::TestCase
# TODO: get rid of this (would like this to come from git data) # TODO: get rid of this (would like this to come from git data)
override_unvendored.stubs(:git_attributes).returns(git_attrs) override_unvendored.stubs(:git_attributes).returns(git_attrs)
# check we're getting the correct assignment back from .gitattributes
assert !override_unvendored.result_for_key('linguist-vendored')
# overridden .gitattributes # overridden .gitattributes
assert !override_unvendored.vendored? assert !override_unvendored.vendored?
end end