cert_open_data_visualizer 0.0.6 → 0.0.7

data/Gemfile.lock

@@ -1,13 +1,16 @@
 PATH
   remote: .
   specs:
-    cert_open_data_visualizer (0.0.5)
+    cert_open_data_visualizer (0.0.6)
+      haml (~> 4.0.4)
       httparty (~> 0.12.0)
       sinatra (~> 1.4.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    haml (4.0.4)
+      tilt
     httparty (0.12.0)
       json (~> 1.8)
       multi_xml (>= 0.5.2)

data/cert_open_data_visualizer.gemspec

@@ -18,6 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+gem 'sinatra'
+gem 'haml'
+
+  spec.add_dependency "haml", "~> 4.0.4 "
   spec.add_dependency "sinatra", "~> 1.4.4 "
   spec.add_dependency "httparty", "~> 0.12.0 "
   spec.add_development_dependency "bundler", "~> 1.3"

data/lib/cert_open_data_visualizer.rb

@@ -27,7 +27,9 @@ class CertDataVisualizer
   end
 
   def clean_cache!
+    puts "Cleaning cache!"
     CertOpenDataVisualizer::DummyCacher.new.clean!
+    puts "Done!"
   end
 
   def fetch!

data/lib/cert_open_data_visualizer/dummy_cacher.rb

@@ -9,9 +9,8 @@ module CertOpenDataVisualizer
     end
 
     # Yep, well just overwrite it if it exists
-    def cache_file(path)
-      FileUtils.mkdir_p( File.join(Dir.tmpdir, "cert"))
-      FileUtils.cp(path, File.join(Dir.tmpdir, "cert"))
+    def cache_file(file)
+      FileUtils.cp(file, path)
     end
 
     def write_file_to_cache(filename, contents)

data/lib/cert_open_data_visualizer/frontend/Readme.md

@@ -2,14 +2,15 @@
 
 ## How to use
 
-*precondition* ruby 1.9.3 or newer version installed
+When running using `cert_open_data_visualizer` gem
 
-Install required gems
-`bundle install`
-
-Run frontend
-`bundle exec rackup`
-
-Then open your browser [http://127.0.0.1:9292](http://127.0.0.1:9292)
+```bash
+ $ cert_open_data_visualizer app
+ == Sinatra/1.4.4 has taken the stage on 4567 for development with backup from Thin
+ >> Thin web server (v1.5.1 codename Straight Razor)
+ >> Maximum connections set to 1024
+ >> Listening on localhost:4567, CTRL+C to stop
+```
+Open your browser to [http://127.0.0.1:9292](http://127.0.0.1:9292)
 
 On top of website are links for homepage, page to view graphs and page to clear cache, reload and reparse data

data/lib/cert_open_data_visualizer/version.rb

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

data/lib/cert_open_data_visualizer/visualize.rb

@@ -3,6 +3,7 @@ module CertOpenDataVisualizer
   require 'httparty'
   require 'tmpdir'
   require 'csv'
+
   class Visualize
     attr_accessor :all_data, :cacher
     CSV_DATA_URL = "http://pilvilinna.cert.fi/opendata/autoreporter/csv.zip"
@@ -20,6 +21,7 @@ module CertOpenDataVisualizer
 
     def maybe_download
       if @cacher.file_exists?("cert.zip")
+        puts "Loading data from cache"
         @cacher.get_from_cache("cert.zip")
       else
         download
@@ -29,6 +31,7 @@ module CertOpenDataVisualizer
     def download
       puts "Downloading, may take a while depending on your connection"
       data = HTTParty.get(CSV_DATA_URL).body
+      puts "Done"
       write_tmp_file(data)
     end
 
@@ -56,6 +59,8 @@ module CertOpenDataVisualizer
         csvs.reject! {|row| row[0].include?('#') || row[5].nil? || row[5] == ""}
         csvs
       end
+      puts "Done"
+      csvs
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cert_open_data_visualizer
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -11,6 +11,22 @@ bindir: bin
 cert_chain: []
 date: 2013-12-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.4
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -94,11 +110,8 @@ files:
 - lib/cert_open_data_visualizer/cli.rb
 - lib/cert_open_data_visualizer/dummy_cacher.rb
 - lib/cert_open_data_visualizer/formatter.rb
-- lib/cert_open_data_visualizer/frontend/Gemfile
-- lib/cert_open_data_visualizer/frontend/Gemfile.lock
 - lib/cert_open_data_visualizer/frontend/Readme.md
 - lib/cert_open_data_visualizer/frontend/app.rb
-- lib/cert_open_data_visualizer/frontend/config.ru
 - lib/cert_open_data_visualizer/frontend/public/bootstrap.min.css
 - lib/cert_open_data_visualizer/frontend/public/bootstrap.min.js
 - lib/cert_open_data_visualizer/frontend/public/javascripts/bootstrap.min.js

data/lib/cert_open_data_visualizer/frontend/Gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'cert_open_data_visualizer', '~>0.0.5'
-gem 'sinatra'
-gem 'haml'
-

data/lib/cert_open_data_visualizer/frontend/Gemfile.lock

@@ -1,28 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    cert_open_data_visualizer (0.0.5)
-      httparty (~> 0.12.0)
-    haml (4.0.4)
-      tilt
-    httparty (0.12.0)
-      json (~> 1.8)
-      multi_xml (>= 0.5.2)
-    json (1.8.1)
-    multi_xml (0.5.5)
-    rack (1.5.2)
-    rack-protection (1.5.1)
-      rack
-    sinatra (1.4.4)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    tilt (1.4.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  cert_open_data_visualizer (~> 0.0.5)
-  haml
-  sinatra

data/lib/cert_open_data_visualizer/frontend/config.ru

@@ -1,3 +0,0 @@
-require './app'
-
-run App.new