spout 0.13.0.beta1 → 0.13.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 415a16b52a348d3d3c7361b6ea226e7d7aa10edc
-  data.tar.gz: '08bbf0c3477b4689a0cc4dbacc52750ec53a7eb2'
+SHA256:
+  metadata.gz: 3dd7789cc6b44bff70a193ce395bbf6a4c9433c89d6b37e021339a7146e13bf2
+  data.tar.gz: f80de69bb6dee9708bcb93d62ea3a79bbb419f5743c2b47d850cec5aa6d99da6
 SHA512:
-  metadata.gz: 97b50714ade02df37afd4fac776bbd5d4515db7e628b5acee6639d1f711c025cf6ed6c5e6bd2b9f0c0826061487adc85c44d44683520556bd3d12e43ac2a7d6f
-  data.tar.gz: 26a33f2ffdeb525e047a10efc87324d8a935a5bb47f60780ffff55237f56f39dbc70b4530abd871fc29851a2171ff38d35ac64c7c24c6bd7c038af4b7efdec2d
+  metadata.gz: 8e23b63fc17ec344fe40eff73fdb22e743059301a33d16f64a46ca834efa8d4ce5d6dc17dbcf2f0c39ad67df47a56dc2c83565660242b05023594b93d16feb65
+  data.tar.gz: f65680444341dedcdb8390277d9f615f1ed0b69a9741a8face225053f90c72026ab204e44288fb68e141a5cc2791f9e22dc7a50e69f64e99b81ce70810b57bb6

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## 0.13.0
 
 ### Enhancements
+- **General Changes**
+  - Updated to ruby 2.5.1
+  - Updated to simplecov 0.16.1
+  - Improved memory management reading large CSVs
 - **Importer Changes**
   - Added option to preserve case of input using the `--preserve-case` flag
     - `spout import <variables.csv> --preserve-case`

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2017 Remo Mueller
+Copyright (c) 2013-2018 Remo Mueller
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,7 +1,6 @@
 # Spout
 
 [![Build Status](https://travis-ci.org/sleepepi/spout.svg?branch=master)](https://travis-ci.org/sleepepi/spout)
-[![Dependency Status](https://gemnasium.com/sleepepi/spout.svg)](https://gemnasium.com/sleepepi/spout)
 [![Code Climate](https://codeclimate.com/github/sleepepi/spout/badges/gpa.svg)](https://codeclimate.com/github/sleepepi/spout)
 
 Turn your CSV data dictionary into a JSON repository. Collaborate with others to

data/lib/spout/commands/importer.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
-require "csv"
 require "json"
 require "fileutils"
 require "colorize"
 
+require "spout/helpers/csv_reader"
+
 module Spout
   module Commands
     class Importer
@@ -38,8 +39,7 @@ EOT
       end
 
       def import_variables
-        CSV.parse(File.open(@csv_file, "r:iso-8859-1:utf-8", &:read), headers: true) do |line|
-          row = line.to_hash
+        Spout::Helpers::CSVReader.read_csv(@csv_file) do |row|
           if not row.keys.include?("id")
             puts "\nMissing column header `".colorize( :red ) + "id".colorize( :light_cyan ) + "` in data dictionary.".colorize( :red ) + additional_csv_info
             exit(1)
@@ -77,8 +77,7 @@ EOT
       def import_domains
         domains = {}
 
-        CSV.parse(File.open(@csv_file, "r:iso-8859-1:utf-8", &:read), headers: true) do |line|
-          row = line.to_hash
+        Spout::Helpers::CSVReader.read_csv(@csv_file) do |row|
           if not row.keys.include?("domain_id")
             puts "\nMissing column header `".colorize( :red ) + "domain_id".colorize( :light_cyan ) + "` in data dictionary.".colorize( :red ) + additional_csv_info
             exit(1)
@@ -122,8 +121,7 @@ EOT
       end
 
       def import_forms
-        CSV.parse(File.open(@csv_file, "r:iso-8859-1:utf-8", &:read), headers: true) do |line|
-          row = line.to_hash
+        Spout::Helpers::CSVReader.read_csv(@csv_file) do |row|
           unless row.keys.include?("id")
             puts "\nMissing column header `".colorize(:red) +
                  "id".colorize(:light_cyan) +

data/lib/spout/helpers/csv_reader.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require "csv"
+
+module Spout
+  module Helpers
+    # Reads CSVs and handles conversion of characters into UTF-8 format.
+    class CSVReader
+      def self.read_csv(csv_file)
+        File.open(csv_file, "r:iso-8859-1:utf-8") do |file|
+          csv = CSV.new(file, headers: true, header_converters: ->(h) { h.to_s.downcase })
+          while line = csv.shift # rubocop:disable Lint/AssignmentInCondition
+            yield line.to_hash
+          end
+        end
+      end
+    end
+  end
+end

data/lib/spout/helpers/number_helper.rb

@@ -2,10 +2,13 @@
 
 module Spout
   module Helpers
+    # Provides method to format large numbers with delimiters.
     module NumberHelper
       def number_with_delimiter(number, delimiter = ",")
-        number.to_s.reverse.scan(/(?:\d*\.)?\d{1,3}-?/).join(",").reverse
+        number.to_s.reverse.scan(/(?:\d*\.)?\d{1,3}-?/).join(delimiter).reverse
       end
+
+      module_function :number_with_delimiter
     end
   end
 end

data/lib/spout/helpers/subject_loader.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 require "colorize"
-require "csv"
 require "json"
 
-require "spout/models/subject"
+require "spout/helpers/csv_reader"
 require "spout/helpers/semantic"
+require "spout/models/subject"
 require "spout/models/empty"
 
 module Spout
@@ -59,8 +59,8 @@ module Spout
           puts "  #{current_folder}".colorize(:white) if current_folder.to_s != "" && current_folder != last_folder
           print "    #{current_file}"
           last_folder = current_folder
-          CSV.parse(File.open(csv_file, "r:iso-8859-1:utf-8", &:read), headers: true, header_converters: lambda { |h| h.to_s.downcase }) do |line|
-            row = line.to_hash
+
+          Spout::Helpers::CSVReader.read_csv(csv_file) do |row|
             count += 1
             print "\r    #{current_file} " + "##{count}".colorize(:yellow) if (count % 10 == 0)
             @subjects << Spout::Models::Subject.create do |t|
@@ -87,7 +87,6 @@ module Spout
                 end
               end
             end
-
             # puts "Memory Used: " + (`ps -o rss -p #{$$}`.strip.split.last.to_i / 1024).to_s + " MB" if count % 1000 == 0
             break if !@number_of_rows.nil? && count - 1 >= @number_of_rows
           end

data/lib/spout/helpers/table_formatting.rb

@@ -1,20 +1,19 @@
 # frozen_string_literal: true
 
+require "spout/helpers/number_helper"
+
 module Spout
   module Helpers
+    # Formats numbers in coverage and outlier tables.
     class TableFormatting
       # def initialize(number)
       #   @number = number
       # end
 
-      def self.number_with_delimiter(number, delimiter = ",")
-        number.to_s.reverse.scan(/(?:\d*\.)?\d{1,3}-?/).join(",").reverse
-      end
-
       # type:  :count    or   :decimal
       def self.format_number(number, type, format = nil)
         if number.nil?
-          format_nil(number)
+          format_nil
         elsif type == :count
           format_count(number)
         else
@@ -22,7 +21,7 @@ module Spout
         end
       end
 
-      def self.format_nil(number)
+      def self.format_nil
         "-"
       end
 
@@ -32,7 +31,7 @@ module Spout
       #     1000          ->         "1,000"
       # Input (Numeric)   -> Output (String)
       def self.format_count(number)
-        (number == 0 || number.nil?) ? "-" : number_with_delimiter(number)
+        number.zero? || number.nil? ? "-" : Spout::Helpers::NumberHelper.number_with_delimiter(number)
       end
 
       # decimal:
@@ -44,9 +43,9 @@ module Spout
       # Input (Numeric)   -> Output (String)
       def self.format_decimal(number, format)
         precision = 1
-        precision = -Math.log10(number.abs).floor if number.abs < 1.0 && number != 0
+        precision = -Math.log10(number.abs).floor if number.abs < 1.0 && !number.zero?
 
-        number = number_with_delimiter(number.round(precision))
+        number = Spout::Helpers::NumberHelper.number_with_delimiter(number.to_f.round(precision))
         number = format % number if format
         number
       end

data/lib/spout/templates/ruby-version

@@ -1 +1 @@
-ruby-2.4.1
+ruby-2.5.1

data/lib/spout/templates/travis.yml

@@ -1,4 +1,4 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.4.1
+  - 2.5.1

data/lib/spout/version.rb

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

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

@@ -121,7 +121,7 @@ tfoot td {
                 <td><%= csv %></td>
                 <td>
                   <% if total_column_count.to_i > 0 %>
-                    <%= "%0.02f %" % (mapped_column_count * 100.0 / total_column_count) %>
+                    <%= "%0.02f %%" % (mapped_column_count * 100.0 / total_column_count) %>
                   <% else %>
                     <span class="text-muted">---</span>
                   <% end %>

data/spout.gemspec

@@ -8,7 +8,7 @@
 # gem list -r spout
 # gem install spout
 
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "spout/version"
 
@@ -25,6 +25,10 @@ Gem::Specification.new do |spec|
                        "dictionary using built-in tests, or add your own for "\
                        "further validations."
   spec.homepage      = "https://github.com/sleepepi/spout"
+
+  spec.required_ruby_version     = ">= 2.5.1"
+  spec.required_rubygems_version = ">= 2.7.6"
+
   spec.license       = "MIT"
 
   spec.files = Dir["{bin,lib}/**/*"] + ["CHANGELOG.md", "LICENSE", "Rakefile", "README.md", "spout.gemspec"]
@@ -32,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "bundler", "~> 1.13"
+  spec.add_dependency "bundler", "~> 1.16"
   spec.add_dependency "rake"
   spec.add_dependency "minitest"
   spec.add_dependency "minitest-reporters"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spout
 version: !ruby/object:Gem::Version
-  version: 0.13.0.beta1
+  version: 0.13.0.beta2
 platform: ruby
 authors:
 - Remo Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2018-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -121,6 +121,7 @@ files:
 - lib/spout/helpers/array_statistics.rb
 - lib/spout/helpers/chart_types.rb
 - lib/spout/helpers/config_reader.rb
+- lib/spout/helpers/csv_reader.rb
 - lib/spout/helpers/framework.rb
 - lib/spout/helpers/iterators.rb
 - lib/spout/helpers/json_loader.rb
@@ -202,15 +203,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: 2.7.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Turn your CSV data dictionary into a JSON repository. Collaborate with others