nsrr 5.0.0.rc → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bede463148a3b2d49ab6cee7bb06752ea66d5fc734e0b26bcbc8196c30d1efef
-  data.tar.gz: e06176db3eb823bd8e052d6d3270ba35ad5dc6b0eb85684026eaea2926edabdd
+  metadata.gz: 4b100c526a2c495b60d331025f5d41a7b42c7665483198feaf75f7cf1b02790a
+  data.tar.gz: 22fc81dc33d64b6bd080003269115153094fbaec519ac8f0b4cfabeb8b4a0fcf
 SHA512:
-  metadata.gz: 6f8f81733ef8e78800bcd0cd36d676bdeefa7f937d6f2054e16affde246f66144ba6de117869a6cacef3f865d8a99b3510502cb3546d05881d87702fd3452d07
-  data.tar.gz: 7b201b307096b4a889b1348870548f6a5f1e026ca605700cd808249891a0f9800a0e6824e3f9d31964a15fdbfbe55b5c9c9caabee69f409d481446cfe72187d0
+  metadata.gz: 4128e2ab10af765f53ebb7f78aa2ec1404ad3b70b66a4dccf464ca3e451ca6e6f33c08920f785a02e691b33a9455d3b49e204cc51ffa5bf609f46467b553f806
+  data.tar.gz: 906cacc94f180fab43e6adeafc76534dfd414b73e8c31bda2e045e2b5126b4d599114c5a1582112503b0bc3ef3fec8c10f81a69c8fc89ea8f38d9cadeecd5d29

data/CHANGELOG.md

@@ -1,4 +1,23 @@
-## 5.0.0
+## 8.0.0 (August 7, 2021)
+
+### Bug Fix
+- Fixed a bug that prevented folders and files with spaces in their paths from
+  being downloaded
+
+## 7.0.0 (April 18, 2021)
+
+### Enhancements
+- **General Changes**
+  - Added `--file` option to specify a regular expression to match a file name,
+    (by @k0kubun)
+
+## 6.0.0 (January 16, 2021)
+
+### Enhancements
+- **General Changes**
+  - Added compatibility for Ruby 3.0.0
+
+## 5.0.0 (May 7, 2019)
 
 ### Enhancements
 - **General Changes**

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2016-2019 National Sleep Research Resource
+Copyright (c) 2016-2021 National Sleep Research Resource
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -7,7 +7,7 @@ The official ruby gem built to simplify file downloads and dataset integration t
 
 ## Prerequisites
 
-You must have **Ruby 2.4+ installed** on your system to use the NSRR gem.
+You must have **Ruby 2.7+ installed** on your system to use the NSRR gem.
 
 - [Install Ruby on Windows](https://github.com/remomueller/documentation/blob/master/windows/130-ruby.md)
 - [Install Ruby on Mac](https://github.com/remomueller/documentation/blob/master/macos/130-install-rvm.md)
@@ -65,6 +65,26 @@ You can combine the file check flag with the folder depth flag as well.
 nsrr download shhs/datasets --shallow --fast
 ```
 
+You can specify a regular expression to filter files that are downloaded.
+
+```console
+nsrr download nchsdb/health_data --file="^PROCEDURE.*\.csv$"
+```
+
+```console
+      create nchsdb/health_data/
+     skipped DEMOGRAPHIC.csv
+     skipped DIAGNOSIS.csv
+     skipped ENCOUNTER.csv
+     skipped MEASUREMENT.csv
+     skipped MEDICATION.csv
+  downloaded PROCEDURE.csv
+  downloaded PROCEDURE_SURG_HX.csv
+     skipped SLEEP_ENC_ID.csv
+     skipped SLEEP_STUDY.csv
+     skipped Sleep_Study_Data_File_Format.pdf
+```
+
 ### Open the console and download entire datasets
 
 ```console

data/lib/nsrr/commands/download.rb

@@ -21,6 +21,7 @@ module Nsrr
         (@token, argv) = parse_parameter_with_value(argv, ["token"], "")
         (@file_comparison, argv) = parse_parameter(argv, ["fast", "fresh", "md5"], "md5")
         (@depth, argv) = parse_parameter(argv, ["shallow", "recursive"], "recursive")
+        (@file, argv) = parse_parameter_with_value(argv, ["file"], "")
         @dataset_slug = argv[1].to_s.split("/").first
         @full_path = (argv[1].to_s.split("/")[1..-1] || []).join("/")
       end
@@ -35,7 +36,7 @@ module Nsrr
           @token = Nsrr::Helpers::Authorization.get_token(@token) if @token.to_s == ""
           @dataset = Dataset.find(@dataset_slug, @token)
           if @dataset
-            @dataset.download(@full_path, depth: @depth, method: @file_comparison)
+            @dataset.download(@full_path, depth: @depth, method: @file_comparison, file: Regexp.new(@file))
           else
             puts "\nThe dataset " + @dataset_slug.white + " was not found."
             datasets = all_datasets
@@ -80,7 +81,7 @@ module Nsrr
         result = default
         options.each do |option|
           argv.each do |arg|
-            result = arg.gsub(/^--#{option}=/, "") if arg =~ /^--#{option}=\w/
+            result = arg.gsub(/^--#{option}=/, "") if arg =~ /^--#{option}=[^\s]/
           end
         end
         [result, argv]

data/lib/nsrr/helpers/download_request.rb

@@ -17,8 +17,7 @@ module Nsrr
       attr_reader :url, :error, :file_size
 
       def initialize(url, download_folder)
-        escaped_url = URI.escape(url)
-        @url = URI.parse(escaped_url)
+        @url = URI.parse(url.gsub(/\s/, "%20"))
         @http = Net::HTTP.new(@url.host, @url.port)
         if @url.scheme == "https"
           @http.use_ssl = true
@@ -26,8 +25,6 @@ module Nsrr
         end
         @download_folder = download_folder
         @file_size = 0
-      rescue
-        @error = "Invalid Token"
       end
 
       # Writes file segments to disk immediately instead of storing in memory

data/lib/nsrr/models/dataset.rb

@@ -69,6 +69,7 @@ module Nsrr
 
         begin
           puts "           File Check: " + options[:method].to_s.white
+          puts "           File Regex: " + options[:file].inspect.white
           puts "                Depth: " + options[:depth].to_s.white
           puts ""
           if @download_token.nil?
@@ -100,6 +101,12 @@ module Nsrr
         create_folder_for_path(full_path)
 
         files(full_path).select(&:is_file).each do |file|
+          unless file.file_name.match?(options[:file])
+            puts "     skipped".blue + " #{file.file_name}"
+            @files_skipped += 1
+            next
+          end
+
           current_folder = ::File.join(slug.to_s, file.folder.to_s)
           result = file.download(options[:method], current_folder, @download_token)
           case result

data/lib/nsrr/version.rb

@@ -2,10 +2,10 @@
 
 module Nsrr
   module VERSION #:nodoc:
-    MAJOR = 5
+    MAJOR = 8
     MINOR = 0
     TINY = 0
-    BUILD = "rc" # "pre", "beta1", "beta2", "rc", "rc2", nil
+    BUILD = nil # "pre", "beta1", "beta2", "rc", "rc2", nil
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join(".")
   end

data/nsrr.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.description   = "The official ruby gem to download files and datasets from the [NSRR](https://sleepdata.org)"
   spec.homepage      = "https://github.com/nsrr/nsrr-gem"
 
-  spec.required_ruby_version = ">= 2.4.6"
+  spec.required_ruby_version = ">= 2.7.2"
   spec.required_rubygems_version = ">= 2.6.3"
 
   spec.license       = "MIT"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nsrr
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc
+  version: 8.0.0
 platform: ruby
 authors:
 - Remo Mueller
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-06 00:00:00.000000000 Z
+date: 2021-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,7 +84,7 @@ homepage: https://github.com/nsrr/nsrr-gem
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -92,15 +92,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.6
+      version: 2.7.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 2.6.3
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.16
+signing_key:
 specification_version: 4
 summary: Download files easily from the NSRR website, https://sleepdata.org
 test_files: []