spout 0.7.0.beta2 → 0.7.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3de0f88d079aec8277e7ab748043453fff69155e
-  data.tar.gz: b171cd8981f8b75f82c0ae80f119f9bd4b78c4e3
+  metadata.gz: 39c5c9a4eeab5b1ca4ff5aec2dde015d1bf15f52
+  data.tar.gz: db62fec6e3b1cc5b2b419537ec45c2eb9a8d85ce
 SHA512:
-  metadata.gz: 0000efe51e39bce8cbcc61490b85c8f9ca706a8b5c7f842ef33a60a8c0da299e2372be330441840bb759af522c046c91d967750f3342e6900338b3c1dcd59c9d
-  data.tar.gz: 6a8bd5e53598466b29171ffc30102497aa9e3532a102602320247a1f407d1e7f10e667c15c42741ae1f281b90736c8a5288c11c5d4f334a8537d00d39c8b5b58
+  metadata.gz: 5943c0cd60831bcbc2ff5b7d9077f34edc70b1019e45816fedcf0147a1c697fa90c1ad932dba124fc84e46c903584d68c7ff54a440431acd4d2ec3b73abc7d4b
+  data.tar.gz: efce7795ffda11a683a1b70efc9f1e7238463baa4e30335e6b4d7c2297ce86db7f9879277f1345d594b91159ad33d95502891b4b51e8931b5956f56ec02207fb

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ### Enhancements
 - Added `spout graphs` command that generates pie charts and histograms of each variable in a dataset
+  - The following flags are available:
+    - `spout g --type-numeric`
+    - `spout g --type-integer`
+    - `spout g --type-choices`
+    - `spout g --size-lg`
+    - `spout g --size-sm`
+    - `spout g --type-numeric --size-sm`
+  - For specific variables the following can be used:
+    - `spout g --id-<variable_id>`
 
 ## 0.6.0 (March 7, 2014)
 

data/README.md

@@ -156,7 +156,19 @@ This command will take some time, and requires [PhantomJS](http://phantomjs.org/
 spout graphs
 ```
 
-Generated graphs will be placed in: `./graphs/`
+The following flags can be passed to the `spout graphs` command:
+
+- `spout g --type-numeric`
+- `spout g --type-integer`
+- `spout g --type-choices`
+- `spout g --size-lg`
+- `spout g --size-sm`
+- `spout g --type-numeric --size-sm`
+
+For specific variables the following can be used:
+  - `spout g --id-<variable_id>`
+
+Generated graphs are placed in: `./graphs/`
 
 ### Export to the Hybrid Data Dictionary format from your JSON repository
 

data/lib/spout/actions.rb

@@ -22,7 +22,7 @@ module Spout
       when 'coverage', '-coverage', '--coverage', 'c', '-c'
         coverage_report(argv)
       when 'graphs', '-graphs', '--graphs', 'g', '-g'
-        generate_graphs(argv)
+        generate_graphs(argv.last(argv.size - 1))
       else
         help
       end
@@ -125,8 +125,19 @@ EOT
         system "bundle exec rake spout:coverage"
       end
 
-      def generate_graphs(argv)
-        system "bundle exec rake spout:graphs"
+      def flag_values(flags, param)
+        flags.select{|f| f[0..((param.size + 3) - 1)] == "--#{param}-" and f.length > param.size + 3}.collect{|f| f[(param.size + 3)..-1]}
+      end
+
+      def generate_graphs(flags)
+        params = {}
+        params['types']        = flag_values(flags, 'type')
+        params['variable_ids'] = flag_values(flags, 'id')
+        params['sizes']        = flag_values(flags, 'size')
+
+        params_string = params.collect{|key, values| "#{key}=#{values.join(',')}"}.join(' ')
+
+        system "bundle exec rake spout:graphs #{params_string}"
       end
 
     private

data/lib/spout/commands/graphs.rb

@@ -7,7 +7,7 @@ module Spout
   module Commands
     class Graphs
 
-      def initialize
+      def initialize(types, variable_ids, sizes)
 
         total_index_count = Dir.glob("variables/**/*.json").count
 
@@ -20,7 +20,7 @@ module Spout
         Dir.glob("csvs/*.csv").each do |csv_file|
           puts "Working on: #{csv_file}"
           t = Time.now
-          csv_table = CSV.table(csv_file,  encoding: 'iso-8859-1').by_col!
+          csv_table = CSV.table(csv_file, encoding: 'iso-8859-1').by_col!
           puts "Loaded #{csv_file} in #{Time.now - t} seconds."
 
           total_header_count = csv_table.headers.count
@@ -30,6 +30,8 @@ module Spout
               json = JSON.parse(File.read(variable_file)) rescue json = nil
               next unless json
               next unless ["choices", "numeric", "integer"].include?(json["type"])
+              next unless types.size == 0 or types.include?(json['type'])
+              next unless variable_ids.size == 0 or variable_ids.include?(json['id'].to_s.downcase)
 
               basename = File.basename(variable_file).gsub(/\.json$/, '').downcase
               col_data = csv_table[header]
@@ -40,14 +42,14 @@ module Spout
                 next unless domain_json
 
                 create_pie_chart_options_file(col_data, tmp_options_file, domain_json)
-              when "numeric", "integer"
+              when 'numeric', 'integer'
                 create_line_chart_options_file(col_data, tmp_options_file, json["units"])
               else
                 next
               end
 
-              run_phantom_js("#{basename}-lg.png", 600, tmp_options_file)
-              run_phantom_js("#{basename}.png",     75, tmp_options_file)
+              run_phantom_js("#{basename}-lg.png", 600, tmp_options_file) if sizes.size == 0 or sizes.include?('lg')
+              run_phantom_js("#{basename}.png",     75, tmp_options_file) if sizes.size == 0 or sizes.include?('sm')
             end
           end
         end

data/lib/spout/tasks/engine.rake

@@ -125,7 +125,10 @@ namespace :spout do
   desc 'Match CSV dataset with JSON repository'
   task :graphs do
     require 'spout/commands/graphs'
-    Spout::Commands::Graphs.new()
+    types         = ENV['types'].to_s.split(',').collect{|t| t.to_s.downcase}
+    variable_ids  = ENV['variable_ids'].to_s.split(',').collect{|vid| vid.to_s.downcase}
+    sizes         = ENV['sizes'].to_s.split(',').collect{|s| s.to_s.downcase}
+    Spout::Commands::Graphs.new(types, variable_ids, sizes)
   end
 
 end

data/lib/spout/version.rb

@@ -3,7 +3,7 @@ module Spout
     MAJOR = 0
     MINOR = 7
     TINY = 0
-    BUILD = "beta2" # nil, "pre", "rc", "rc2"
+    BUILD = "beta3" # nil, "pre", "rc", "rc2"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spout
 version: !ruby/object:Gem::Version
-  version: 0.7.0.beta2
+  version: 0.7.0.beta3
 platform: ruby
 authors:
 - Remo Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake