cert_open_data_visualizer 0.0.7 → 0.0.8

data/README.md

@@ -39,10 +39,13 @@ $ cert_open_data_visualizer #=> prints help
 #=>   clean  - cleanes cache
 #=>   fetch  - fetches new data if neccessary
 #=>   app    - launces web server for visualizations in http://127.0.0.1:4567
+#=>   city   - `city hel` - list details for each city containing `hel`
 #=>
-#=> `first` and `second` may download and parse data when neccesary.
+#=> Commands may download and parse data when neccesary.
+#=> Data is cached so running commands gest faster when repeating those.
 #=>
-#=> This includes a file cache, for faster results.
+
+#=> A file cache is utilised for faster results.
 #=> ie. information is calculated only when necessary, and cached for
 #=> further use. Cache may be cleared using `clean`
 
@@ -51,6 +54,10 @@ $ cert_open_data_visualizer first #=> Prints output specified by exercise descri
 $ cert_open_data_visualizer second #=> Prints output specified by exercise description
 
 $ cert_open_data_visualizer clean #=> Cleans cache
+
+$ cert_open_data_visualizer city hel # Lists cities containing word given as parameter
+                                     # If multiple parameters are given, results are
+                                     # listed separately for each
 ```
 
 #### Example using this as a library

data/lib/cert_open_data_visualizer.rb

@@ -26,6 +26,12 @@ class CertDataVisualizer
     puts second_format
   end
 
+  def filter_by_city(*citys)
+    citys.each do |city|
+      @formatter.filter_by_city(city)
+    end
+  end
+
   def clean_cache!
     puts "Cleaning cache!"
     CertOpenDataVisualizer::DummyCacher.new.clean!

data/lib/cert_open_data_visualizer/cli.rb

@@ -14,17 +14,18 @@ module CertOpenDataVisualizer
                   first: "print_first_format",
                   second: "print_second_format",
                   app: "start-app",
+                  city: "filter_by_city",
                   help: "print_help"}
 
       return help if @argv[0].nil?
-      command = @argv[0].to_sym
+      command = @argv.shift.to_sym
 
       exec = commands[command]
 
       return run_app if exec == "start-app"
 
       return help if exec == "print_help"
-      return visualizer.send(exec) if exec
+      return visualizer.send(exec, *argv) if exec
       puts "Invalid command #{command}"
     end
 
@@ -39,10 +40,11 @@ Commands are:
   clean  - cleanes cache
   fetch  - fetches new data if neccessary
   app    - launces web server for visualizations in http://127.0.0.1:4567
+  city   - `city hel` - list details for each city containing `hel`
 
-`first` and `second` may download and parse data when neccesary.
+Commands may download and parse data when neccesary.
 
-This includes a file cache, for faster results.
+A file cache is utilised for faster results.
 ie. information is calculated only when necessary, and cached for
 further use. Cache may be cleared using `clean`
 EOF

data/lib/cert_open_data_visualizer/formatter.rb

@@ -46,6 +46,55 @@ module CertOpenDataVisualizer
       incidents_str
     end
 
+    def filter_by_city(name)
+      # get everything matching
+      load_data! if @data.nil?
+      filterd = @data.select do |line|
+        line[8].downcase.include? name
+      end
+
+      # create hash for formatting
+      results = generate_city_hash(filterd)
+      # print in nice format
+      print_city_results(results)
+    end
+
+    def generate_city_hash(list)
+      results = {}
+      list.each do |l|
+        country, city, main, sub = l[7], l[8], l[5], l[6]
+        if results[country].nil?
+          results[country] = { city => { main => { sub => 1 } }}
+        elsif results[country][city].nil?
+          results[country][city] = {main => { sub => 1 } }
+        elsif results[country][city][main].nil?
+          results[country][city][main] = { sub => 1 }
+        elsif results[country][city][main][sub].nil?
+          results[country][city][main][sub] = 1
+        else
+          results[country][city][main][sub] += 1
+        end
+      end
+      results
+    end
+
+    def print_city_results(results)
+      results.keys.each do |country|
+        puts "#{country}:"
+        next if results[country].nil?
+        results[country].keys.each do |city|
+          puts "  #{city}:"
+          next if results[country][city].nil?
+          results[country][city].keys.each do |main|
+            puts "    #{main}:"
+            next if results[country][city][main].nil?
+            results[country][city][main].keys.each do |sub|
+              puts "      #{sub}: #{results[country][city][main][sub] }"
+            end
+          end
+        end
+      end
+    end
 
     private
     def count_main_incidents

data/lib/cert_open_data_visualizer/version.rb

@@ -1,3 +1,3 @@
 module CertOpenDataVisualizer
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/cert_open_data_visualizer/visualize.rb

@@ -3,6 +3,7 @@ module CertOpenDataVisualizer
   require 'httparty'
   require 'tmpdir'
   require 'csv'
+  require 'json'
 
   class Visualize
     attr_accessor :all_data, :cacher
@@ -14,15 +15,14 @@ module CertOpenDataVisualizer
 
     def parse
       maybe_download
-      files = extract_and_list_files
-      read_and_merge_files(files)
+      files = maybe_extract_and_list_files
+      maybe_read_and_merge_files(files)
       self
     end
 
     def maybe_download
       if @cacher.file_exists?("cert.zip")
-        puts "Loading data from cache"
-        @cacher.get_from_cache("cert.zip")
+        puts "File found in cache, not downloading"
       else
         download
       end
@@ -32,20 +32,28 @@ module CertOpenDataVisualizer
       puts "Downloading, may take a while depending on your connection"
       data = HTTParty.get(CSV_DATA_URL).body
       puts "Done"
-      write_tmp_file(data)
+      write_tmp_file("cert.zip", data)
     end
 
-    def write_tmp_file(contents)
-      @cacher.write_file_to_cache "cert.zip", contents
+    def write_tmp_file(filename, contents)
+      @cacher.write_file_to_cache filename, contents
     end
 
-    def extract_and_list_files
-      @cacher.unzip_file("cert.zip")
+    def maybe_extract_and_list_files
+      if @cacher.file_exists? "cert.zip" and not @cacher.file_exists? "certfi_autoreporter_opendata_2006.csv"
+        @cacher.unzip_file("cert.zip")
+      end
       @cacher.find_files_matching("*.csv")
     end
 
-    def read_and_merge_files(files)
-      @all_data = get_csvs(files)
+    def maybe_read_and_merge_files(files)
+      if @cacher.file_exists? "all_data.json"
+        @all_data = JSON.parse(File.read(@cacher.get_from_cache("all_data.json")))
+      else
+        @all_data = get_csvs(files)
+        write_tmp_file("all_data.json", @all_data.to_json)
+      end
+      @all_data
     end
 
     private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cert_open_data_visualizer
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors: