app/helpers/browse_everything_helper.rb in browse-everything-0.10.5 vs app/helpers/browse_everything_helper.rb in browse-everything-0.11.0

- old
+ new

@@ -1,37 +1,26 @@ 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*/) acceptable_types << 'application/x-directory' acceptable_types.any? { |type| mime_match?(file.type, type) }