spout 0.8.0.beta2 → 0.8.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e4150e7322cba034877fabe6e4a6cec8bdcd444
-  data.tar.gz: 25d7aba466f6667316378a3582f6625c1f541bf7
+  metadata.gz: fabf087222afb447331381a2c617801f2436abde
+  data.tar.gz: 11dac0012791e1105212d1611c49f5d575721ef4
 SHA512:
-  metadata.gz: 04137f2579d7da8bf3bcc5ad4105d7ccfe78799656015bbdc0b3e0b34a2503522eb90312919969dad7ec0fbaa6f60231aec7f90bda1e8bbfd8817b28e06e6aea
-  data.tar.gz: 98fae07b2e79ee985c0ef849b6e0e2706c824d0f7d5c767ca2c97b24523fefd92da973b4ccb762273c814a2843f365dadbca5535a1d7f3f388aa1d5f9ead8336
+  metadata.gz: 086fa95b651d175267b289362df2712b4490ef08477a94187647bede45831276fe491eed07f12369f3bed0c0b146cb9907338b4a394c0daa9260e93e7bd55cab
+  data.tar.gz: 68c4eb9a2d958eb10f68972a8ce5c764372c2b92e2a6aa99b3a840a7b0b6fca2b3259927af783de5a2b04e33843f00a1130330b59d83ba868bbd0ae724064a05

data/lib/spout/commands/coverage.rb

@@ -11,7 +11,7 @@ module Spout
 
         @variable_files = []
         @valid_ids = []
-        @number_of_rows = 100
+        @number_of_rows = nil
 
         spout_config = YAML.load_file('.spout.yml')
         @visit = (spout_config.kind_of?(Hash) ? spout_config['visit'].to_s.strip : '')
@@ -33,13 +33,10 @@ module Spout
         end
 
         @matching_results = []
-        csv_names = ['tmp_csv_file.csv']
 
-        all_column_headers = @subjects.size > 0 ? @subjects.first.class.instance_methods(false).select{|k| k != :_visit}.reject{|k| k.to_s[-1] == '='} : []
-        all_column_headers.each do |column|
-          csv = 'tmp_csv_file.csv'
-          scr = Spout::Models::CoverageResult.new(csv, column.to_s, @subjects.collect(&column))
-          @matching_results << [ csv, column, scr ]
+        @subject_loader.all_methods.each do |method, csv_files|
+          scr = Spout::Models::CoverageResult.new(method, @subjects.collect(&method.to_sym).uniq)
+          @matching_results << [ csv_files, method, scr ]
         end
 
 
@@ -47,10 +44,11 @@ module Spout
 
         @coverage_results = []
 
-        csv_names.each do |csv_name|
-          total_column_count = @matching_results.select{|mr| mr[0] == csv_name}.count
-          mapped_column_count = @matching_results.select{|mr| mr[0] == csv_name and mr[2].number_of_errors == 0}.count
-          @coverage_results << [ csv_name, total_column_count, mapped_column_count ]
+        @csv_files = Dir.glob("csvs/#{@standard_version}/*.csv")
+        @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 ]
         end
 
         coverage_folder = File.join(Dir.pwd, 'coverage')

data/lib/spout/helpers/subject_loader.rb

@@ -5,6 +5,7 @@ module Spout
   module Helpers
     class SubjectLoader
       attr_accessor :subjects
+      attr_reader :all_methods
 
       def initialize(variable_files, valid_ids, standard_version, number_of_rows, visit)
         @subjects = []
@@ -13,6 +14,7 @@ module Spout
         @standard_version = standard_version
         @number_of_rows = number_of_rows
         @visit = visit
+        @all_methods = {}
       end
 
       def load_subjects_from_csvs!
@@ -39,6 +41,8 @@ module Spout
                 unless t.respond_to?(key)
                   t.class.send(:define_method, "#{key}") { instance_variable_get("@#{key}") }
                   t.class.send(:define_method, "#{key}=") { |value| instance_variable_set("@#{key}", value) }
+                  all_methods[key] ||= []
+                  all_methods[key] << csv_file
                 end
 
                 unless value == nil

data/lib/spout/models/coverage_result.rb

@@ -5,7 +5,7 @@ module Spout
     class CoverageResult
       attr_accessor :error, :error_message, :file_name_test, :json_id_test, :values_test, :valid_values, :csv_values, :variable_type_test, :json, :domain_test
 
-      def initialize(csv, column, csv_values)
+      def initialize(column, csv_values)
         load_json(column)
         load_valid_values
 

data/lib/spout/version.rb

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

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

@@ -116,7 +116,7 @@ tfoot td {
               <td style="text-align:middle"><p class="lead">Coverage</p></td>
               <td style="text-align:middle"><p class="lead"><%= total_count = @matching_results.count %></p></td>
               <td style="text-align:center">
-                <% matched = @matching_results.count{|csv, column, scr| scr.file_name_test} %>
+                <% matched = @matching_results.count{|csv_files, column, scr| scr.file_name_test} %>
                 <% matched_percent = (total_count == 0 ? 0 : (matched * 100.0 / total_count).floor) %>
                 <% missing_percent = 100 - matched_percent %>
                 <%= number_with_delimiter( matched ) %> of <%= number_with_delimiter( total_count ) %>
@@ -126,7 +126,7 @@ tfoot td {
                 </div>
               </td>
               <td style="text-align:center">
-                <% matched = @matching_results.count{|csv, column, scr| scr.json_id_test} %>
+                <% matched = @matching_results.count{|csv_files, column, scr| scr.json_id_test} %>
                 <% matched_percent = (total_count == 0 ? 0 : (matched * 100.0 / total_count).floor) %>
                 <% missing_percent = 100 - matched_percent %>
                 <%= number_with_delimiter( matched ) %> of <%= number_with_delimiter( total_count ) %>
@@ -136,7 +136,7 @@ tfoot td {
                 </div>
               </td>
               <td style="text-align:center">
-                <% matched = @matching_results.count{|csv, column, scr| scr.variable_type_test} %>
+                <% matched = @matching_results.count{|csv_files, column, scr| scr.variable_type_test} %>
                 <% matched_percent = (total_count == 0 ? 0 : (matched * 100.0 / total_count).floor) %>
                 <% missing_percent = 100 - matched_percent %>
                 <%= number_with_delimiter( matched ) %> of <%= number_with_delimiter( total_count ) %>
@@ -146,8 +146,8 @@ tfoot td {
                 </div>
               </td>
               <td style="text-align:center">
-                <% matched = @matching_results.count{|csv, column, scr| scr.json['type'] == 'choices' and scr.domain_test} %>
-                <% total_count = @matching_results.count{|csv, column, scr| scr.json['type'] == 'choices'} %>
+                <% matched = @matching_results.count{|csv_files, column, scr| scr.json['type'] == 'choices' and scr.domain_test} %>
+                <% total_count = @matching_results.count{|csv_files, column, scr| scr.json['type'] == 'choices'} %>
                 <% matched_percent = (total_count == 0 ? 0 : (matched * 100.0 / total_count).floor) %>
                 <% missing_percent = 100 - matched_percent %>
                 <%= number_with_delimiter( matched ) %> of <%= number_with_delimiter( total_count ) %>
@@ -166,9 +166,13 @@ tfoot td {
             </tr>
           </tfoot>
           <tbody>
-            <% @matching_results.each do |csv, column, scr| %>
+            <% @matching_results.each do |csv_files, column, scr| %>
               <tr>
-                <td><code class="<%= 'success' if scr.number_of_errors == 0 %>"><%= csv %></code></td>
+                <td>
+                  <% csv_files.each do |csv_file| %>
+                    <code class="<%= 'success' if scr.number_of_errors == 0 %>"><%= csv_file %><code><br />
+                  <% end %>
+                </td>
                 <td><%= column %></td>
                 <td>
                   <% if scr.file_name_test %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spout
 version: !ruby/object:Gem::Version
-  version: 0.8.0.beta2
+  version: 0.8.0.beta3
 platform: ruby
 authors:
 - Remo Mueller