From 2fbfb85492401b2a8ac81f22b319b304afecf6c3 Mon Sep 17 00:00:00 2001 From: Yorick Peterse Date: Mon, 30 May 2016 15:55:11 +0200 Subject: Returning enums in ReferenceFilter#each_node This changes ReferenceFilter#each_node so that when it's called without a block an Enumerator is returned. --- spec/lib/banzai/filter/reference_filter_spec.rb | 36 +++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 spec/lib/banzai/filter/reference_filter_spec.rb (limited to 'spec/lib') diff --git a/spec/lib/banzai/filter/reference_filter_spec.rb b/spec/lib/banzai/filter/reference_filter_spec.rb new file mode 100644 index 00000000000..d3e7af0671c --- /dev/null +++ b/spec/lib/banzai/filter/reference_filter_spec.rb @@ -0,0 +1,36 @@ +require 'spec_helper' + +describe Banzai::Filter::ReferenceFilter, lib: true do + let(:project) { build(:project) } + + describe '#each_node' do + it 'iterates over the nodes in a document' do + document = Nokogiri::HTML.fragment('foo') + filter = described_class.new(document, project: project) + + expect { |b| filter.each_node(&b) }. + to yield_with_args(an_instance_of(Nokogiri::XML::Element)) + end + + it 'returns an Enumerator when no block is given' do + document = Nokogiri::HTML.fragment('foo') + filter = described_class.new(document, project: project) + + expect(filter.each_node).to be_an_instance_of(Enumerator) + end + + it 'skips links with a "gfm" class' do + document = Nokogiri::HTML.fragment('foo') + filter = described_class.new(document, project: project) + + expect { |b| filter.each_node(&b) }.not_to yield_control + end + + it 'skips text nodes in pre elements' do + document = Nokogiri::HTML.fragment('
foo
') + filter = described_class.new(document, project: project) + + expect { |b| filter.each_node(&b) }.not_to yield_control + end + end +end -- cgit v1.2.1 From 8a6c3f27e9dfea2c151657045e17fe66ad81b5e5 Mon Sep 17 00:00:00 2001 From: Yorick Peterse Date: Mon, 30 May 2016 15:56:05 +0200 Subject: Added ReferenceFilter#nodes This method returns an Array of the HTML nodes as yielded by ReferenceFilter#each_node. The method's return value is memoized to allow multiple calls without having to re-query the input document. --- spec/lib/banzai/filter/reference_filter_spec.rb | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'spec/lib') diff --git a/spec/lib/banzai/filter/reference_filter_spec.rb b/spec/lib/banzai/filter/reference_filter_spec.rb index d3e7af0671c..55e681f6faf 100644 --- a/spec/lib/banzai/filter/reference_filter_spec.rb +++ b/spec/lib/banzai/filter/reference_filter_spec.rb @@ -33,4 +33,13 @@ describe Banzai::Filter::ReferenceFilter, lib: true do expect { |b| filter.each_node(&b) }.not_to yield_control end end + + describe '#nodes' do + it 'returns an Array of the HTML nodes' do + document = Nokogiri::HTML.fragment('foo') + filter = described_class.new(document, project: project) + + expect(filter.nodes).to eq([document.children[0]]) + end + end end -- cgit v1.2.1 From 01575e9966805fa4c12a7a56361f511b3b61e309 Mon Sep 17 00:00:00 2001 From: Yorick Peterse Date: Mon, 30 May 2016 15:56:50 +0200 Subject: Reduce Namespace queries in UserReferenceFilter This changes UserReferenceFilter so it operates using the following steps: 1. Grab all username references from the input document. 2. Query the corresponding Namespace objects using a single query. 3. Iterate over all nodes to build links while re-using the objects queried in step 2. The impact of these changes is that a comment mentioning 5 different usernames no longer runs 5 different queries (1 for every username), instead it only runs a single query. --- spec/lib/banzai/filter/user_reference_filter_spec.rb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'spec/lib') diff --git a/spec/lib/banzai/filter/user_reference_filter_spec.rb b/spec/lib/banzai/filter/user_reference_filter_spec.rb index d7dfd6699ef..108b36a97cc 100644 --- a/spec/lib/banzai/filter/user_reference_filter_spec.rb +++ b/spec/lib/banzai/filter/user_reference_filter_spec.rb @@ -136,4 +136,23 @@ describe Banzai::Filter::UserReferenceFilter, lib: true do expect(link.attr('data-user')).to eq user.namespace.owner_id.to_s end end + + describe '#namespaces' do + it 'returns a Hash containing all Namespaces' do + document = Nokogiri::HTML.fragment("

#{user.to_reference}

") + filter = described_class.new(document, project: project) + ns = user.namespace + + expect(filter.namespaces).to eq({ ns.path => ns }) + end + end + + describe '#usernames' do + it 'returns the usernames mentioned in a document' do + document = Nokogiri::HTML.fragment("

#{user.to_reference}

") + filter = described_class.new(document, project: project) + + expect(filter.usernames).to eq([user.username]) + end + end end -- cgit v1.2.1