gallicagram 1.0.6 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 550bf9ebdcf99a41e01e157ba09dc5e864ef4fc531036b4afdd0501a4d5c4ad3
-  data.tar.gz: 6a18e0c6719baef37699c5035c7abc53008cca58040368fdbcf56ccb687de9f1
+  metadata.gz: d38fec4b1068d42da5daa346e992baf9215bf17d4c798c0ebca287a2453fb9a7
+  data.tar.gz: b0c072bc24228ae9c2432dc42aa6c7620f0dcb14146dac533bc1c8eaa753bd0e
 SHA512:
-  metadata.gz: bbdb13303e02606ac3eea5911787815e5f52a0081adc59f5a7c96cfcfa962ca4edfb49dc2a93c020f973771bd18facd8b10812cb9dddad7b24f0404d9ae82c74
-  data.tar.gz: 428ddb548775277156091035b04f9d72f3b4549ea39a9842bbc7294a2a93e081e6ce65db402dba921dd119235e4b3a3d9f8e3e9aeab415907a9876d243a91af2
+  metadata.gz: a450030b491f0aa6b9af684b409575756b6c30542e90e54cea60b6896cbfedc11dd89fa82e4b516bf1539d04ea89bfb253a74b427b6d808834e902b356fde974
+  data.tar.gz: 8c6338665df22d98808ab0cd817af0956fc8e34bff5c00510866a19ecea664481a1fefd120dde3cff7cad7591b3bae90be8b4d33a5b334e45479ebcab2800559

data/lib/gallicagram.rb

@@ -6,25 +6,29 @@ class Gallicagram
   
 	# query = string or array of strings
 	# corpus = ["lemonde","livres","presse"]
-	# resolution = ["year", "month"]
-	def self.search(query,corpus="lemonde",start_date="1900",end_date="2000",resolution="month",sum=false)
+	# resolution = ["mois", "annee"]
+	def self.search(query,corpus="lemonde",start_date="1900",end_date="2000",resolution="annee",sum=false)
 
 		query = [query] unless query.kind_of?(Array)
-		output = ""
+		data = ""
 		query.each_with_index do |word, index|
 			query = format_query(word, sum)
-			response = call_api(word, corpus, start_date, end_date)
+			response = call_api(word, corpus, start_date, end_date,resolution)
 			unless index == 0
 				response = response.gsub("n,gram,annee,mois,jour,total", "\n").strip
 			end
-			output << response
+			data << response
 		end
 
-		if corpus == "livres" && resolution == "month"
-			resolution = "year"
+		if corpus == "livres" && resolution == "mois"
+			resolution = "annee"
 		end
 
-		data = group_by_resolution(output, resolution)
+		if resolution == "mois"
+			data = group_by_resolution(data, resolution)
+		else  
+			data = CSV.parse(data, :headers => true)
+		end
 
 		return data
 	end
@@ -40,33 +44,23 @@ def format_query(query, sum)
 
 end
 
-def call_api(query, corpus, start_date, end_date)
+def call_api(query, corpus, start_date, end_date, resolution)
 	# We search through the Gallicagram API
-	url = "https://shiny.ens-paris-saclay.fr/guni/query?corpus=#{corpus}&mot=#{CGI.escape(query)}&from=#{start_date}&to=#{end_date}"
+	url = "https://shiny.ens-paris-saclay.fr/guni/query?corpus=#{corpus}&mot=#{CGI.escape(query)}&from=#{start_date}&to=#{end_date}&resolution=#{resolution}"
 
 	response = URI.open(url)
 
 	return response.read
 end
 
-def group_by_resolution(data, resolution)
+def group_by_resolution(data)
 	csv_parsing = CSV.parse(data, :headers => true)
 	clean_data_array = []
-	case resolution 
-	when "year"
-		csv_parsing.group_by { |word| [word["annee"], word["gram"]] }.each do |cp|
-			sum = cp[1].sum { |word| word["total"].to_i }
-			new_row = cp[0]
-			new_row << sum
-			clean_data_array << new_row
-		end
-	when "month"
-		csv_parsing.group_by { |word| [word["annee"], word["mois"], word["gram"]] }.each do |cp|
-			sum = cp[1].sum { |word| word["total"].to_i }
-			new_row = cp[0]
-			new_row << sum
-			clean_data_array << new_row
-		end
+	csv_parsing.group_by { |word| [word["annee"], word["mois"], word["gram"]] }.each do |cp|
+		sum = cp[1].sum { |word| word["total"].to_i }
+		new_row = cp[0]
+		new_row << sum
+		clean_data_array << new_row
 	end
 
 	return clean_data_array

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gallicagram
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.8
 platform: ruby
 authors:
 - Nicolas Le Roux