spout 0.8.0 → 0.9.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb8b0fe57a3e006925edf7b65915c14b6086c7d5
-  data.tar.gz: 1f7ddf780a9fcde8b2fbfad145b8362bd4451f59
+  metadata.gz: 92e5535751a5e13e40a0e12f30b5ec2b908406cb
+  data.tar.gz: 58333eadcfc852dd2fbbe059c8b196cc9bbb9167
 SHA512:
-  metadata.gz: c70ac2f434d61a7bfb90e95b02da53819720b0b42efe87684f915a415ddfc52899810c6978913d64fddbee5b213b6569e46c052b1e960722989f91c532dfaf99
-  data.tar.gz: 04aa79a137afa44b6e75463f57ba365889394e5de0fd4e257c7fcbea799ede030724e73c43a3d3e735d4b2a2718d1cf50870ce31099217ad0a28f7bee02af082
+  metadata.gz: cbf63c8f770797939e7f952e4a5498dd5f145b5f3cc7b01498e5ade34ffde4b3c05a05b07d7e454805979a3f45829131436fd8e75441aa0238b61c29cc4c29cc
+  data.tar.gz: 4f2e54c50116f2c265e274143b1e704b3211392ca47cac707fe384fb7d44528a431a067ce9677d69df8f8d7d789f1ed410ac61ca0588575a742999085eb4f2c6

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.9.0
+
+### Enhancements
+- **General Changes**
+  - `spout c`, `spout o`, `spout g`, `spout p`, will now use datasets that are compatible with the data dictionary
+    - The following examples use a Data Dictionary that is currently on version 0.2.1.beta2
+    - Ex: If a dataset exists in folder 0.2.0, then this folder will be used.
+    - Ex: If datasets exist in 0.2.0, 0.2.1.beta2, and 0.2.1, then the exact match, 0.2.1.beta2, will be used.
+    - Ex: If datasets exist in 0.2.0, 0.2.1.beta1, 0.2.1, and 0.3.0, then the highest match on the minor version is used, in this case 0.2.1.
+
 ## 0.8.0 (June 27, 2014)
 
 ### Enhancements

data/lib/spout/commands/coverage.rb

@@ -50,8 +50,7 @@ module Spout
 
         @coverage_results = []
 
-        @csv_files = Dir.glob("csvs/#{@standard_version}/*.csv")
-        @csv_files.each do |csv_file|
+        @subject_loader.csv_files.each do |csv_file|
           total_column_count = @matching_results.select{|mr| mr[0].include?(csv_file)}.count
           mapped_column_count = @matching_results.select{|mr| mr[0].include?(csv_file) and mr[2].number_of_errors == 0}.count
           @coverage_results << [ csv_file, total_column_count, mapped_column_count ]

data/lib/spout/commands/outliers.rb

@@ -37,8 +37,7 @@ module Spout
 
         @outlier_results.sort!{|a,b| [a.weight, a.method] <=> [b.weight, b.method]}
 
-        @csv_files = Dir.glob("csvs/#{@standard_version}/*.csv")
-        @overall_results = @csv_files.collect do |csv_file|
+        @overall_results = @subject_loader.csv_files.collect do |csv_file|
           major_outliers = @outlier_results.select{|outlier_result| outlier_result.csv_files.include?(csv_file) and outlier_result.weight == 0 }.count
           minor_outliers = @outlier_results.select{|outlier_result| outlier_result.csv_files.include?(csv_file) and outlier_result.weight == 1 }.count
           total_outliers = major_outliers + minor_outliers

data/lib/spout/helpers/semantic.rb

@@ -0,0 +1,81 @@
+  # def dataset_folders
+  #   Dir.entries('csvs').select{|e| File.directory? File.join('csvs', e) }.reject{|e| [".",".."].include?(e)}.sort
+  # end
+module Spout
+  module Helpers
+
+    class Version
+      attr_accessor :string
+      attr_reader :major, :minor, :tiny, :build
+
+      def initialize(string)
+        @string = string.to_s
+        (@major, @minor, @tiny, @build) = @string.split('.')
+      end
+
+      def major_number
+        @major.to_i
+      end
+
+      def minor_number
+        @minor.to_i
+      end
+
+      def tiny_number
+        @tiny.to_i
+      end
+
+      def build_number
+        (@build == nil ? 1 : 0)
+      end
+
+      def rank
+        [major_number, minor_number, tiny_number, build_number]
+      end
+    end
+
+    class Semantic
+
+      attr_accessor :data_dictionary_version
+
+      def initialize(version, version_strings)
+        @data_dictionary_version = Spout::Helpers::Version.new(version)
+        @versions = version_strings.collect{ |vs| Spout::Helpers::Version.new(vs) }.sort_by(&:rank)
+      end
+
+      def valid_versions
+        @versions.select{ |v| v.major == major and v.minor == minor }
+      end
+
+      def selected_folder
+        if valid_versions.size == 0 or valid_versions.collect(&:string).include?(version)
+          version
+        else
+          valid_versions.collect(&:string).last
+        end
+      end
+
+      def version
+        @data_dictionary_version.string
+      end
+
+      def major
+        @data_dictionary_version.major
+      end
+
+      def minor
+        @data_dictionary_version.minor
+      end
+
+      def tiny
+        @data_dictionary_version.tiny
+      end
+
+      def build
+        @data_dictionary_version.build
+      end
+
+    end
+
+  end
+end

data/lib/spout/helpers/subject_loader.rb

@@ -1,13 +1,15 @@
+require 'colorize'
 require 'csv'
 require 'json'
 
 require 'spout/models/subject'
+require 'spout/helpers/semantic'
 
 module Spout
   module Helpers
     class SubjectLoader
       attr_accessor :subjects
-      attr_reader :all_methods, :all_domains
+      attr_reader :all_methods, :all_domains, :csv_files, :csv_directory
 
       def initialize(variable_files, valid_ids, standard_version, number_of_rows, visit)
         @subjects = []
@@ -18,6 +20,8 @@ module Spout
         @visit = visit
         @all_methods = {}
         @all_domains = []
+        @csv_files = []
+        @csv_directory = ''
       end
 
       def load_subjects_from_csvs!
@@ -28,8 +32,14 @@ module Spout
       def load_subjects_from_csvs_part_one!
         @subjects = []
 
-        csv_files = Dir.glob("csvs/#{@standard_version}/*.csv")
-        csv_files.each_with_index do |csv_file, index|
+        available_folders = (Dir.exist?('csvs') ? Dir.entries('csvs').select{|e| File.directory? File.join('csvs', e) }.reject{|e| [".",".."].include?(e)}.sort : [])
+
+        @semantic = Spout::Helpers::Semantic.new(@standard_version, available_folders)
+
+        @csv_directory = @semantic.selected_folder
+
+        @csv_files = Dir.glob("csvs/#{@csv_directory}/*.csv")
+        @csv_files.each_with_index do |csv_file, index|
           count = 0
           puts "Parsing: #{csv_file}"
           CSV.parse( File.open(csv_file, 'r:iso-8859-1:utf-8'){|f| f.read}, headers: true, header_converters: lambda { |h| h.to_s.downcase } ) do |line|
@@ -60,6 +70,13 @@ module Spout
           end
           puts "\n\n"
         end
+
+        if @csv_directory != @standard_version
+          puts "Using dataset in " + "csvs/#{@csv_directory}/".colorize( :green ) + " for dictionary version " + @standard_version.to_s.colorize( :green ) + "\n\n"
+        else
+          puts "Using dataset in " + "csvs/#{@standard_version}/".colorize( :green ) + "\n\n"
+        end
+
       end
 
       def load_subjects_from_csvs_part_two!

data/lib/spout/version.rb

@@ -1,9 +1,9 @@
 module Spout
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 8
+    MINOR = 9
     TINY = 0
-    BUILD = nil # nil, "pre", "rc", "rc2"
+    BUILD = "beta1" # nil, "pre", "rc", "rc2"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end

data/lib/spout/views/index.html.erb

@@ -65,11 +65,28 @@ tfoot td {
       <div class="container" style="margin-top:30px">
         <div class="jumbotron">
           <h1>You made Spout cry... :'-(</h1>
-          <p>No CSVs found in <code><%= Dir.pwd %>/csvs/<%= @standard_version %>/</code></p>
+          <p>No CSVs found in <code><%= Dir.pwd %>/csvs/<%= @subject_loader.csv_directory %>/</code></p>
         </div>
       </div>
     <% else %>
       <div style="padding: 30px 30px 10px 30px;">
+
+        <div class="row">
+          <div class="col-sm-6">
+            <div class="panel panel-info" style="text-align:center">
+              <div class="panel-heading">Data Dictionary Version</div>
+              <div class="panel-body"><strong><%= @standard_version %></strong></div>
+            </div>
+          </div>
+
+          <div class="col-sm-6">
+            <div class="panel panel-info" style="text-align:center">
+              <div class="panel-heading">Dataset Directory</div>
+              <div class="panel-body"><strong>csvs/<%= @subject_loader.csv_directory %></strong></div>
+            </div>
+          </div>
+        </div>
+
         <table class="table">
           <thead>
             <tr>
@@ -219,7 +236,7 @@ tfoot td {
               <tr>
                 <td>
                   <% csv_files.each do |csv_file| %>
-                    <code class="<%= 'success' if scr.number_of_errors == 0 %>"><%= csv_file %></code><br />
+                    <code class="<%= 'success' if scr.number_of_errors == 0 %>"><%= csv_file.gsub(/^csvs\/#{@subject_loader.csv_directory}\//, '') %></code><br />
                   <% end %>
                 </td>
                 <td><%= column %></td>

data/lib/spout/views/outliers.html.erb

@@ -77,12 +77,28 @@ tfoot td {
       <div class="container" style="margin-top:30px">
         <div class="jumbotron">
           <h1>You made Spout cry... :'-(</h1>
-          <p>No CSVs found in <code><%= Dir.pwd %>/csvs/<%= @standard_version %>/</code></p>
+          <p>No CSVs found in <code><%= Dir.pwd %>/csvs/<%= @subject_loader.csv_directory %>/</code></p>
         </div>
       </div>
     <% else %>
       <div style="padding: 30px 30px 10px 30px;">
 
+        <div class="row">
+          <div class="col-sm-6">
+            <div class="panel panel-info" style="text-align:center">
+              <div class="panel-heading">Data Dictionary Version</div>
+              <div class="panel-body"><strong><%= @standard_version %></strong></div>
+            </div>
+          </div>
+
+          <div class="col-sm-6">
+            <div class="panel panel-info" style="text-align:center">
+              <div class="panel-heading">Dataset Directory</div>
+              <div class="panel-body"><strong>csvs/<%= @subject_loader.csv_directory %></strong></div>
+            </div>
+          </div>
+        </div>
+
         <table class="table">
           <thead>
             <tr>
@@ -128,7 +144,7 @@ tfoot td {
                   <% outlier_result.csv_files.each do |csv_file| %>
                     <% css_class = 'success' if outlier_result.outliers.size == 0 %>
                     <% css_class = 'warning-pale' if outlier_result.major_outliers.size == 0 and outlier_result.minor_outliers.size > 0 %>
-                    <code class="<%= css_class %>"><%= csv_file %></code><br />
+                    <code class="<%= css_class %>"><%= csv_file.gsub(/^csvs\/#{@subject_loader.csv_directory}\//, '') %></code><br />
                   <% end %></td>
                 <td><%= outlier_result.method %></td>
                 <td><%= outlier_result.display_name.to_s[0..20] %></td>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spout
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0.beta1
 platform: ruby
 authors:
 - Remo Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -121,6 +121,7 @@ files:
 - lib/spout/helpers/iterators.rb
 - lib/spout/helpers/json_loader.rb
 - lib/spout/helpers/number_helper.rb
+- lib/spout/helpers/semantic.rb
 - lib/spout/helpers/subject_loader.rb
 - lib/spout/helpers/table_formatting.rb
 - lib/spout/models/coverage_result.rb
@@ -179,9 +180,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2