nsrr 0.4.0.beta1 → 6.0.0

data/lib/nsrr/commands/update.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'colorize'
-require 'nsrr/helpers/json_request'
+require "nsrr/helpers/color"
+require "nsrr/helpers/json_request"
 
 module Nsrr
   module Commands
@@ -17,19 +17,19 @@ module Nsrr
       end
 
       def start
-        (json, _status) = Nsrr::Helpers::JsonRequest.get('https://rubygems.org/api/v1/gems/nsrr.json')
+        (json, _status) = Nsrr::Helpers::JsonRequest.get("https://rubygems.org/api/v1/gems/nsrr.json")
         if json
-          if json['version'] == Nsrr::VERSION::STRING
-            puts 'The nsrr gem is ' + 'up-to-date'.colorize(:green) + '!'
+          if json["version"] == Nsrr::VERSION::STRING
+            puts "The nsrr gem is " + "up-to-date".green + "!"
           else
             puts
-            puts "A newer version (v#{json['version']}) is available! Type the following command to update:"
+            puts "A newer version (v#{json["version"]}) is available! Type the following command to update:"
             puts
-            puts '  gem install nsrr --no-document'.colorize(:white)
+            puts "  gem install nsrr --no-document".white
             puts
           end
         else
-          puts 'Unable to connect to RubyGems.org. Please try again later.'
+          puts "Unable to connect to RubyGems.org. Please try again later."
         end
       end
     end

data/lib/nsrr/helpers/authorization.rb

@@ -1,22 +1,23 @@
 # frozen_string_literal: true
 
-require 'nsrr/helpers/json_request'
+require "nsrr/helpers/color"
+require "nsrr/helpers/json_request"
 
 module Nsrr
   module Helpers
     # Helper to verify that user is authenticated.
     class Authorization
       def self.get_token(token)
-        puts  '  Get your token here: ' + "#{Nsrr::WEBSITE}/token".colorize(:blue).on_white.underline
-        puts  '  Your input is hidden while entering token.'.colorize(:white)
-        print '     Enter your token: '
-        token = STDIN.noecho(&:gets).chomp if token.to_s.strip == ''
+        puts  "  Get your token here: " + "#{Nsrr::WEBSITE}/token".bg_gray.blue.underline
+        puts  "  Your input is hidden while entering token.".white
+        print "     Enter your token: "
+        token = STDIN.noecho(&:gets).chomp if token.to_s.strip == ""
         token.strip!
         (response, _status) = Nsrr::Helpers::JsonRequest.get("#{Nsrr::WEBSITE}/api/v1/account/profile.json", auth_token: token)
-        if response.is_a?(Hash) && response['authenticated']
-          puts 'AUTHORIZED'.colorize(:green) + ' as ' + "#{response['first_name']} #{response['last_name']}".colorize(:white)
+        if response.is_a?(Hash) && response["authenticated"]
+          puts "AUTHORIZED".green + " as " + "#{response["first_name"]} #{response["last_name"]}".white
         else
-          puts 'UNAUTHORIZED'.colorize(:red) + ' Public Access Only'
+          puts "UNAUTHORIZED".red + " Public Access Only"
         end
         token
       end

data/lib/nsrr/helpers/color.rb

@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+# Adds ANSI colors to string class.
+class String
+  def black
+    "\e[30m#{self}\e[0m"
+  end
+
+  def red
+    "\e[31m#{self}\e[0m"
+  end
+
+  def green
+    "\e[32m#{self}\e[0m"
+  end
+
+  def brown
+    "\e[33m#{self}\e[0m"
+  end
+
+  def yellow
+    brown
+  end
+
+  def blue
+    "\e[34m#{self}\e[0m"
+  end
+
+  def magenta
+    "\e[35m#{self}\e[0m"
+  end
+
+  def cyan
+    "\e[36m#{self}\e[0m"
+  end
+
+  def gray
+    "\e[37m#{self}\e[0m"
+  end
+
+  def white
+    "\e[39m#{bold}\e[0m"
+  end
+
+  def bg_black
+    "\e[40m#{self}\e[0m"
+  end
+
+  def bg_red
+    "\e[41m#{self}\e[0m"
+  end
+
+  def bg_green
+    "\e[42m#{self}\e[0m"
+  end
+
+  def bg_brown
+    "\e[43m#{self}\e[0m"
+  end
+
+  def bg_blue
+    "\e[44m#{self}\e[0m"
+  end
+
+  def bg_magenta
+    "\e[45m#{self}\e[0m"
+  end
+
+  def bg_cyan
+    "\e[46m#{self}\e[0m"
+  end
+
+  def bg_gray
+    "\e[47m#{self}\e[0m"
+  end
+
+  def bold
+    "\e[1m#{self}\e[22m"
+  end
+
+  def italic
+    "\e[3m#{self}\e[23m"
+  end
+
+  def underline
+    "\e[4m#{self}\e[24m"
+  end
+
+  def blink
+    "\e[5m#{self}\e[25m"
+  end
+
+  def reverse_color
+    "\e[7m#{self}\e[27m"
+  end
+
+  def colorless
+    gsub(/\e\[\d{1,2}m/, "")
+  end
+end

data/lib/nsrr/helpers/constants.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-Nsrr::WEBSITE = 'https://sleepdata.org'
+Nsrr::WEBSITE = "https://sleepdata.org"

data/lib/nsrr/helpers/download_request.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'openssl'
-require 'net/http'
-require 'uri'
+require "openssl"
+require "net/http"
+require "uri"
 
 module Nsrr
   module Helpers
@@ -17,34 +17,31 @@ 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)
         @http = Net::HTTP.new(@url.host, @url.port)
-        if @url.scheme == 'https'
+        if @url.scheme == "https"
           @http.use_ssl = true
           @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
         end
         @download_folder = download_folder
         @file_size = 0
-      rescue
-        @error = 'Invalid Token'
       end
 
       # Writes file segments to disk immediately instead of storing in memory
       def get
         return unless @error.nil?
-        local_file = ::File.open(@download_folder, 'wb')
+        local_file = ::File.open(@download_folder, "wb")
         partial = true
         @http.request_get(@url.path) do |response|
           case response.code
-          when '200'
+          when "200"
             response.read_body do |segment|
               local_file.write(segment)
             end
             @file_size = ::File.size(@download_folder)
             partial = false
-          when '302'
-            @error = 'Token Not Authorized to Access Specified File'
+          when "302"
+            @error = "Token Not Authorized to Access Specified File"
           else
             @error = "#{response.code} #{response.class.name}"
           end

data/lib/nsrr/helpers/hash_helper.rb

@@ -5,7 +5,10 @@ module Nsrr
     # Converts hash with string keys into hash with keys as symbols.
     class HashHelper
       def self.symbolize_keys(hash)
-        hash.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+        hash.inject({}) do |memo, (k, v)|
+          memo[k.to_sym] = v
+          memo
+        end
       end
     end
   end

data/lib/nsrr/helpers/json_request.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
-require 'openssl'
-require 'net/http'
-require 'json'
-require 'cgi'
+require "openssl"
+require "net/http"
+require "json"
+require "cgi"
+
+require "nsrr/helpers/color"
 
 module Nsrr
   module Helpers
@@ -30,41 +32,52 @@ module Nsrr
         @url = URI.parse(url)
 
         @http = Net::HTTP.new(@url.host, @url.port)
-        if @url.scheme == 'https'
+        if @url.scheme == "https"
           @http.use_ssl = true
           @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
         end
       rescue
         @error = "Invalid URL: #{url.inspect}"
-        puts @error.colorize(:red)
+        puts @error.red
       end
 
       def get
         return unless @error.nil?
+
         full_path = @url.path
-        query = ([@url.query] + @params).flatten.compact.join('&')
-        full_path += "?#{query}" if query.to_s != ''
+        query = ([@url.query] + @params).flatten.compact.join("&")
+        full_path += "?#{query}" if query.to_s != ""
         response = @http.start do |http|
           http.get(full_path)
         end
-        [JSON.parse(response.body), response]
-      rescue => e
-        puts "GET Error: #{e}".colorize(:red)
+        if response.body
+          [JSON.parse(response.body), response]
+        else
+          [nil, response]
+        end
+      rescue => e # JSON::ParserError, Net::ReadTimeout
+        puts "GET error: #{e}".red
+        [nil, nil]
       end
 
       def post
         return unless @error.nil?
+
         response = @http.start do |http|
-          http.post(@url.path, @params.flatten.compact.join('&'))
+          http.post(@url.path, @params.flatten.compact.join("&"))
+        end
+        if response.body
+          [JSON.parse(response.body), response]
+        else
+          [nil, response]
         end
-        [JSON.parse(response.body), response]
-      rescue => e
-        puts "POST ERROR: #{e}".colorize(:red)
-        nil
+      rescue => e # JSON::ParserError, Net::ReadTimeout
+        puts "POST error: #{e}".red
+        [nil, nil]
       end
 
       def patch
-        @params << '_method=patch'
+        @params << "_method=patch"
         post
       end
 
@@ -79,10 +92,10 @@ module Nsrr
         if value.is_a? Hash
           value.collect do |k,v|
             key_value_to_string(k, v, current_scope)
-          end.join('&')
+          end.join("&")
         elsif value.is_a? Array
           value.collect do |v|
-            key_value_to_string('', v, current_scope)
+            key_value_to_string("", v, current_scope)
           end
         else
           "#{current_scope}=#{CGI.escape(value.to_s)}"

data/lib/nsrr/models/all.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require 'nsrr/models/dataset'
+require "nsrr/models/dataset"

data/lib/nsrr/models/dataset.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require 'colorize'
-require 'fileutils'
-require 'irb'
-require 'io/console'
+require "fileutils"
+require "irb"
+require "io/console"
 
-require 'nsrr/helpers/constants'
-require 'nsrr/helpers/hash_helper'
-require 'nsrr/helpers/json_request'
-require 'nsrr/helpers/authorization'
+require "nsrr/helpers/constants"
+require "nsrr/helpers/color"
+require "nsrr/helpers/hash_helper"
+require "nsrr/helpers/json_request"
+require "nsrr/helpers/authorization"
 
-require 'nsrr/models/file'
+require "nsrr/models/file"
 
 module Nsrr
   module Models
@@ -18,20 +18,19 @@ module Nsrr
     # allowing dataset files to be downloaded.
     class Dataset
       def self.find(slug, token = nil)
-        (json, _status) = Nsrr::Helpers::JsonRequest.get("#{Nsrr::WEBSITE}/api/v1/datasets/#{slug}.json", auth_token: token)
-        if json
-          new(json, token)
-        else
-          nil
-        end
+        (json, _status) = Nsrr::Helpers::JsonRequest.get(
+          "#{Nsrr::WEBSITE}/api/v1/datasets/#{slug}.json",
+          auth_token: token
+        )
+        new(json, token) if json
       end
 
       attr_accessor :download_token
       attr_reader :slug, :name
 
       def initialize(json = {}, token = nil)
-        @slug = json['slug']
-        @name = json['name']
+        @slug = json["slug"]
+        @name = json["name"]
         @files = {}
         @download_token = token
         @downloaded_folders = []
@@ -52,16 +51,16 @@ module Nsrr
 
       # Options include:
       # method:
-      #   'md5'       => [default] Checks if a downloaded file exists with the exact md5 as the online version, if so, skips that file
-      #   'fresh'     => Downloads every file without checking if it was already downloaded
-      #   'fast'      => Only checks if a download file exists with the same file size as the online version, if so, skips that file
+      #   "md5"       => [default] Checks if a downloaded file exists with the exact md5 as the online version, if so, skips that file
+      #   "fresh"     => Downloads every file without checking if it was already downloaded
+      #   "fast"      => Only checks if a download file exists with the same file size as the online version, if so, skips that file
       # depth:
-      #   'recursive' => [default] Downloads files in selected path folder and all subfolders
-      #   'shallow'   => Only downloads files in selected path folder
+      #   "recursive" => [default] Downloads files in selected path folder and all subfolders
+      #   "shallow"   => Only downloads files in selected path folder
       def download(full_path = nil, *args)
         options = Nsrr::Helpers::HashHelper.symbolize_keys(args.first || {})
-        options[:method] ||= 'md5'
-        options[:depth] ||= 'recursive'
+        options[:method] ||= "md5"
+        options[:depth] ||= "recursive"
         @folders_created = 0
         @files_downloaded = 0
         @downloaded_bytes = 0
@@ -69,9 +68,9 @@ module Nsrr
         @files_failed = 0
 
         begin
-          puts '           File Check: ' + options[:method].to_s.colorize(:white)
-          puts '                Depth: ' + options[:depth].to_s.colorize(:white)
-          puts ''
+          puts "           File Check: " + options[:method].to_s.white
+          puts "                Depth: " + options[:depth].to_s.white
+          puts ""
           if @download_token.nil?
             @download_token = Nsrr::Helpers::Authorization.get_token(@download_token)
           end
@@ -80,17 +79,17 @@ module Nsrr
 
           download_helper(full_path, options)
         rescue Interrupt, IRB::Abort
-          puts "\n   Interrupted".colorize(:red)
+          puts "\n   Interrupted".red
         end
 
         @downloaded_megabytes = @downloaded_bytes / (1024 * 1024)
 
         puts "\nFinished in #{Time.now - @start_time} seconds." if @start_time
-        puts "\n#{@folders_created} folder#{'s' if @folders_created != 1} created".colorize(:white) + ', ' +
-             "#{@files_downloaded} file#{'s' if @files_downloaded != 1} downloaded".colorize(:green) + ', ' +
-             "#{@downloaded_megabytes} MiB#{'s' if @downloaded_megabytes != 1} downloaded".colorize(:green) + ', ' +
-             "#{@files_skipped} file#{'s' if @files_skipped != 1} skipped".colorize(:light_blue) + ', ' +
-             "#{@files_failed} file#{'s' if @files_failed != 1} failed".colorize(@files_failed == 0 ? :white : :red) + "\n\n"
+        puts "\n#{@folders_created} folder#{"s" if @folders_created != 1} created".white + ", " +
+             "#{@files_downloaded} file#{"s" if @files_downloaded != 1} downloaded".green + ", " +
+             "#{@downloaded_megabytes} MiB#{"s" if @downloaded_megabytes != 1} downloaded".green + ", " +
+             "#{@files_skipped} file#{"s" if @files_skipped != 1} skipped".blue + ", " +
+             "#{@files_failed} file#{"s" if @files_failed != 1} failed".send(@files_failed.zero? ? :white : :red) + "\n\n"
         nil
       end
 
@@ -104,16 +103,16 @@ module Nsrr
           current_folder = ::File.join(slug.to_s, file.folder.to_s)
           result = file.download(options[:method], current_folder, @download_token)
           case result
-          when 'fail'
+          when "fail"
             @files_failed += 1
-          when 'skip'
+          when "skip"
             @files_skipped += 1
           else
             @files_downloaded += 1
             @downloaded_bytes += result
           end
         end
-        if options[:depth] == 'recursive'
+        if options[:depth] == "recursive"
           files(full_path).reject(&:is_file).each do |file|
             download_helper(file.full_path, options)
           end
@@ -128,7 +127,7 @@ module Nsrr
       end
 
       def create_folder(folder)
-        puts '      create'.colorize(:white) + " #{folder}"
+        puts "      create".white + " #{folder}"
         FileUtils.mkdir_p folder
         @folders_created += 1
       end