gallicagram 1.0.9 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/gallicagram.rb +6 -24
  3. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d75ac9432d7de2a125d51816ca14ac0fd13633b9ee7e5cd5d4a6e3db83a3a462
4
- data.tar.gz: 114fb34abab5ec0a8065de59985a5e7ba05ee374f03dbd8c5977f93000a4e367
3
+ metadata.gz: 9dcee5aba79519f6fbe3e5e0061e683ae03039eabb6190a18369a5ef30232f72
4
+ data.tar.gz: f8b3a66a13656ba5ed5b704b427cf14e949481cfec2a7707bdbe8a9a79d4dc78
5
5
  SHA512:
6
- metadata.gz: 981a81960892e29ec189baf3cc3b5fe570fd57cca18a439d21a70bb511316de6a470ca9399b36eb1ef63f3b302c0a4e329498ef9f379186f88407957e6ab551a
7
- data.tar.gz: aa0bf3a9a724fb2e7264f8810cced108593c7a018baad7e4843f18ecf2a54447721b316b73ed020a3b965e1bd48f2684deffd8bc25b4e52251f1c4e378d4d413
6
+ metadata.gz: 6ed8d41d5111d5a1164fac12e8706039fe430c9b73742a208a0ce7aebf116c5bed4415882b8a7cf9b2779c6616c60099b26216dde6aca6afb7a60f3413f20f67
7
+ data.tar.gz: bbc570022e015b7b9a30983963061ee64f5bb08b3986aadd028504d58cdfa095ad63cd03232856b5f5a7bef559d964834933681827a33eb3705a51b4d919ef35
data/lib/gallicagram.rb CHANGED
@@ -10,25 +10,20 @@ class Gallicagram
10
10
  def self.search(query,corpus="lemonde",start_date="1900",end_date="2000",resolution="annee",sum=false)
11
11
 
12
12
  query = [query] unless query.kind_of?(Array)
13
- data = ""
13
+ output = ""
14
14
  query.each_with_index do |word, index|
15
15
  query = format_query(word, sum)
16
+ if corpus == "livres" && resolution == "mois"
17
+ resolution = "annee"
18
+ end
16
19
  response = call_api(word, corpus, start_date, end_date, resolution)
17
20
  unless index == 0
18
21
  response = response.gsub("n,gram,annee,mois,jour,total", "\n").strip
19
22
  end
20
- data << response
21
- end
22
-
23
- if corpus == "livres" && resolution == "mois"
24
- resolution = "annee"
23
+ output << response
25
24
  end
26
25
 
27
- if resolution == "mois"
28
- data = group_by_resolution(data)
29
- else
30
- data = CSV.parse(data, :headers => true)
31
- end
26
+ data = CSV.parse(output, :headers => true)
32
27
 
33
28
  return data
34
29
  end
@@ -51,17 +46,4 @@ def call_api(query, corpus, start_date, end_date, resolution)
51
46
  response = URI.open(url)
52
47
 
53
48
  return response.read
54
- end
55
-
56
- def group_by_resolution(data)
57
- csv_parsing = CSV.parse(data, :headers => true)
58
- clean_data_array = []
59
- csv_parsing.group_by { |word| [word["annee"], word["mois"], word["gram"]] }.each do |cp|
60
- sum = cp[1].sum { |word| word["total"].to_i }
61
- new_row = cp[0]
62
- new_row << sum
63
- clean_data_array << new_row
64
- end
65
-
66
- return clean_data_array
67
49
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gallicagram
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.9
4
+ version: 1.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nicolas Le Roux