Skip to content

Commit

Permalink
Condense repeated clumsy logic
Browse files Browse the repository at this point in the history
Even if this was copied, it is fugly and redundant.
This is exactly the same boolean logic in two readable lines.
  • Loading branch information
atz committed Sep 28, 2016
1 parent 37491dc commit 5a3a656
Showing 1 changed file with 11 additions and 22 deletions.
33 changes: 11 additions & 22 deletions app/helpers/browse_everything_helper.rb
@@ -1,36 +1,25 @@
module BrowseEverythingHelper

def array_to_hidden_fields(array,key)
def array_to_hidden_fields(array, key)
fields = array.to_query(key).split(Rack::Utils::DEFAULT_SEP).collect do |pair|
key,value=pair.split('=', 2).map { |str| Rack::Utils.unescape(str) }
hidden_field_tag(key,value)
key, value = pair.split('=', 2).map { |str| Rack::Utils.unescape(str) }
hidden_field_tag(key, value)
end
fields.join("\n").html_safe
end

# Extracted from Rack::Mime 1.5.2 for use with earlier versions
# of Rack/Rails
# Extracted from Rack::Mime 1.5.2 for use with earlier versions of Rack/Rails
# @param [String] value
# @param [String] matcher
# @return [TrueClass,FalseClass]
def mime_match?(value, matcher)
v1, v2 = value.split('/', 2)
m1, m2 = matcher.split('/', 2)

if m1 == '*'
if m2.nil? || m2 == '*'
return true
elsif m2 == v2
return true
else
return false
end
end

return false if v1 != m1

return true if m2.nil? || m2 == '*'

m2 == v2
return false if m1 != '*' && v1 != m1
m2.nil? || m2 == '*' || m2 == v2
end

# @param [BrowseEverything::FileEntry] file
# @return [TrueClass,FalseClass]
def is_acceptable?(file)
acceptable = params[:accept] || '*/*'
acceptable_types = acceptable.split(/,\s*/)
Expand Down

0 comments on commit 5a3a656

Please sign in to comment.