mediawiki-keiki 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b786adda5c9f95e248abe9435bc3dbcd8a354460
-  data.tar.gz: 306adbb72d9dded52f103fbe802bb82d2d7fbd39
+  metadata.gz: c397300e4298a75ba04c0097e2e0d3377835bee5
+  data.tar.gz: 6f7cebf1f1c272ce55c0b63ba88f09f731de0f57
 SHA512:
-  metadata.gz: 8a42136d3437afe3b46814552ad7e0a1437d918bc8f4c2b8761c9aaa1daf50698347ce08cdc4ebcfe80a2faebdaa7bf19e4ce276d240c340b4debc5cbb401997
-  data.tar.gz: 3c1ea82e75025f37d47c2ec17664aca48dc0892d291b27298e429bae0072fe8eca07c2825685ebe5540a81e79c41865dc66ad5ac7a9e052b69633bd6700fa976
+  metadata.gz: 1544b70dd0451e5889d8f9e5f0536e1817698296abc711378d4d51b09324c92680dd37f3d1ad44783eab6d1e0adc33424c69dd4176ee1a3cbfcb183290b50441
+  data.tar.gz: 634b85441fd001cd922de31b25924ccb3980126c6041f6d3e937c3fe14fde3ef6446d2c77d0a6566cfaaf70301b313ab729d84e8a6abe9fca3a1df2d348e445e

data/lib/mediawiki-keiki/query.rb

@@ -111,7 +111,7 @@ module MediaWiki
 		def get_redirects_for(result_map, redirects)
 			result_map.each do |rm|
 				redirects.each do |r|
-					rm[:redirected] = r["to"] if r["from"] == rm[:search_term] || rm[:normalized]
+					rm[:redirected] = r["to"] if r["from"] == rm[:search_term] ||  r["from"] == rm[:normalized]
 				end
 			end
 			result_map
@@ -122,15 +122,6 @@ module MediaWiki
 			query_result["query"][map_type] # if query_result["query"][map_type]
 		end
 
-		# # Use the query maps to update the values of the result map
-		# def map_from_to(result_map, query_map)
-		# 	result_map.each do |key, value|
-		# 		query_map.each { |hash| value = hash["to"] if hash["from"] == value }
-		# 	end
-		# 	result_map
-		# end
-
-
 		private
 
 		# Private method that gets called if the query_result has not been retrieved yet; gets query and parses as a hash.

data/spec/lib/mediawiki-keiki/query_spec.rb

@@ -63,7 +63,6 @@ describe MediaWiki::Query do
 		describe "dynamic attributes" do
 
 			before do
-				# wiki_query.query_result
 				@initialized_result_map = [{:search_term => "foo"}]
 				@normalized_hash_array = [{"from"=>"foo", "to" =>"Foo"}]
 				@redirected_hash_array = [{"from" => "Foo", "to" => "Foobar"}]
@@ -91,14 +90,6 @@ describe MediaWiki::Query do
 				wiki_query.get_redirects_for(@normalized_map, @redirected_hash_array).must_equal @redirected_map
 			end
 
-			# it "must apply the noramalization map to the results map" do
-			# 	wiki_query.map_from_to({"foo"=>"foo"}, @normalized_hash_array).must_equal @normalized_map
-			# end
-
-			# it "must apply the redirects map to the normalized result map" do
-			# 	wiki_query.map_from_to(@normalized_map,@redirected_hash_array).must_equal @redirected_map
-			# end
-
 			it "must map the original query to the normalized, redirected title" do
 				wiki_query.map_query_to_results.must_equal @redirected_map
 			end
@@ -172,26 +163,193 @@ describe MediaWiki::Query do
 
 		describe "multiple pages" do
 
-			let(:wiki_query) { MediaWiki::Query.new('Partners In Health|ThoughtWorks|Accion International') }
+			let(:wiki_query) { MediaWiki::Query.new('foo|bar|a|b|c|Jimmy Fallon|Seth Rogan|Mesopotamia') }
+
+			before do
+				@expected_keys = ['foo','bar','a','b','c','Jimmy Fallon','Seth Rogan','Mesopotamia']
+				@initialized_map = [
+					{
+						:search_term => 'foo'
+					},
+					{
+						:search_term => 'bar'
+					},
+					{
+						:search_term => 'a'
+					},
+					{
+						:search_term => 'b'
+					},
+					{
+						:search_term => 'c'
+					},
+					{
+						:search_term => 'Jimmy Fallon'
+					},
+					{
+						:search_term => 'Seth Rogan'
+					},
+					{
+						:search_term => 'Mesopotamia'
+					}
+				]
+				@normalizations = [
+					{
+						'from' => 'foo',
+						'to' => 'Foo'
+					},
+					{
+						'from' => 'bar',
+						'to' => 'Bar'
+					},
+					{
+						'from' => 'a',
+						'to' => 'A'
+					},
+					{
+						'from' => 'b',
+						'to' => 'B'
+					},
+					{
+						'from' => 'c',
+						'to' => 'C'
+					}
+				]
+				@expected_normalized_map = [
+					{
+						:search_term => 'foo',
+						:normalized => 'Foo'
+					},
+					{
+						:search_term => 'bar',
+						:normalized => 'Bar'
+					},
+					{
+						:search_term => 'a',
+						:normalized => 'A'
+					},
+					{
+						:search_term => 'b',
+						:normalized => 'B'
+					},
+					{
+						:search_term => 'c',
+						:normalized => 'C'
+					},
+					{
+						:search_term => 'Jimmy Fallon'
+					},
+					{
+						:search_term => 'Seth Rogan'
+					},
+					{
+						:search_term => 'Mesopotamia'
+					}
+				]
+				@expected_results_map = [
+					{
+						:search_term => 'foo',
+						:normalized => 'Foo',
+						:redirected => 'Foobar'
+					},
+					{
+						:search_term => 'bar',
+						:normalized => 'Bar'
+					},
+					{
+						:search_term => 'a',
+						:normalized => 'A'
+					},
+					{
+						:search_term => 'b',
+						:normalized => 'B'
+					},
+					{
+						:search_term => 'c',
+						:normalized => 'C'
+					},
+					{
+						:search_term => 'Jimmy Fallon'
+					},
+					{
+						:search_term => 'Seth Rogan',
+						:redirected => 'Seth Rogen'
+					},
+					{
+						:search_term => 'Mesopotamia'
+					}
+				]
+				@redirects = [
+					{
+						'from' => 'Foo',
+						'to' => 'Foobar'
+					},
+					{
+						'from' => 'Seth Rogan',
+						'to' => 'Seth Rogen'
+					}
+				]
+				@expected_keys_with_titles = {
+					'foo'=>'Foobar',
+					'bar'=> 'Bar',
+					'a' => 'A',
+					'b' => 'B',
+					'c' => 'C',
+					'Jimmy Fallon' => 'Jimmy Fallon',
+					'Seth Rogan' => 'Seth Rogen',
+					'Mesopotamia' => 'Mesopotamia'
+				}
+			end
+
+			it "must split the search string on the bar and return individual search terms" do
+				wiki_query.query.split('|').must_equal @expected_keys
+			end
+
+			it "must initialize a results map as an array with hashses containing the :search_term" do
+				wiki_query.initialize_map.must_equal @initialized_map
+			end
+
+			it "must get the normalizations from the query result" do
+				wiki_query.get_query_map("normalized").must_equal @normalizations
+			end
+
+			it "must get the redirects from the query result" do
+				wiki_query.get_query_map("redirects").must_equal @redirects
+			end
+
+			it "must store the normalizations in the results map" do
+				wiki_query.get_normalizations_for(@initialized_map, @normalizations).must_equal @expected_normalized_map
+			end
+
+			it "must store the redirects in the results map" do
+				wiki_query.get_redirects_for(@expected_normalized_map, @redirects).must_equal @expected_results_map
+			end
 
 			it "must get a result map for each page" do
-				wiki_query.map_query_to_results.length.must_equal 3
+				wiki_query.map_query_to_results.length.must_equal 8
 			end
 
-			it "must return all of the sites" do
-				wiki_query.pages.length.must_equal 3
+			it "must get the complete results map" do
+				wiki_query.map_query_to_results.must_equal @expected_results_map
 			end
 
-			it "must tag the first page with the right query term" do
-				wiki_query.pages['Partners In Health'].title.must_equal 'Partners In Health'
+			it "must return all of the sites" do
+				wiki_query.pages.length.must_equal 8
 			end
 
-			it "must tag the second page with the right query term" do
-				wiki_query.pages['ThoughtWorks'].title.must_equal 'ThoughtWorks'
+			it "must have keys for all of the sites that match the original search terms" do
+				wiki_query.pages.keys.sort.must_equal @expected_keys.sort
 			end
 
-			it "must tag the last page with the right query term" do
-				wiki_query.pages['Accion International'].title.must_equal 'ACCION International'
+			it "must have all of the keys pointing to the right title" do
+				pages_and_titles = Hash.new
+
+				#Populates a hash with all of the keys and their corresponding page titles
+				wiki_query.pages.each do |key, value|
+					pages_and_titles[key] = value.title
+				end
+
+				pages_and_titles.must_equal @expected_keys_with_titles
 			end
 
 		end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mediawiki-keiki
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Evan Waters
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2014-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: MediaWiki Keiki