blank_empty_nil_filters 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adbf79bbbb71e8dfed6243cf91759f9279b3970ad269e0f861c36172920b1e23
-  data.tar.gz: 695e3e289ad0548df29683d72cc0b254ce8772b7450eb7dc4f09fd2f421dcf20
+  metadata.gz: 35a7e5e27066b542dc53c963f9f3769ea1a9da4667c69e5edad010158fe5717d
+  data.tar.gz: dad47bacd3d2f9adfc63d42ca24dcea0ede3bb87e97ffb18bd25a3d15c39720b
 SHA512:
-  metadata.gz: bc6654261141905a9f63409dffb74caea814663102401992ee3eed3b63f0a528c5cd8fc07d2f4477786f800024a6b463087b27265b3c2b50318a8ccb1ded9242
-  data.tar.gz: 4a14c426a1e5b5c65edf90558f8843d03bb6f293e8d55ab96ead2e301782fa3f37b4c27c2773ddb2b7a4bc8371ccaefdff8e906b6531abc49e42dd8609fe5979
+  metadata.gz: 141dae5987cfd3487d8c98977c1048036793ff8d2e2c49735ea630481aa23b5c6ee273325850f4351be126f11340f7045a1480606c264ecf2d57d0680781ed16
+  data.tar.gz: 102f2f9132840745ee8ac2ca5e40a2bfd9b2e460acb32e090cb876ae63434aa4eba2e668f1cfb2500b34dcb69818435b242d267e09cb0d9572e48558f8824a04

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    blank_empty_nil_filters (0.1.2)
+    blank_empty_nil_filters (0.1.3)
 
 GEM
   remote: https://rubygems.org/

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "blank_empty_nil_filters"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/bin/test-filter-args.rb

@@ -0,0 +1,152 @@
+#!/usr/bin/env ruby
+
+$PROG = File.basename($0)
+$LOAD_PATH << File.expand_path('lib')
+
+require 'blank_empty_nil_filters'
+require 'awesome_print'
+require 'fileutils'
+require 'optparse'
+require 'pry-byebug'
+
+$opts = ARGV.getopts('hinv')
+$verobse     = $opts['v']
+$norun       = $opts['n']
+$interactive = $opts['i']
+$help        = $opts['h'] || ARGV.detect { |arg| %w[--help help].include?(arg) }
+
+def error(msg)
+  warn(msg)
+  exit -1
+end
+
+data = [
+         :lev1, ' ', '', nil, :ok1,
+         [:lev2a, ' ', '', nil, :ok2],
+         ' ', '', :ok1b,
+         [:lev2b, ' ', '', nil, :ok2b,
+           [:lev3, ' ', :ok3, '', nil],
+           nil],
+         :ok1c
+      ]
+
+def ignore_stderr
+  old_stderr = $stderr
+  $stderr = File.open('/dev/null', 'wt')
+  yield
+  $stderr.close
+ensure
+  $stderr = old_stderr
+end
+
+def capture_stdout(filepath)
+  old_stdout = $stdout
+  File.open(filepath, 'wt') do |file|
+    $stdout = file
+    yield
+  end
+ensure
+  $stdout = old_stdout
+end
+
+def diff_files(file1, file2)
+  diff_cmd = "diff -y #{file1} #{file2}"
+  puts "$ " + diff_cmd
+  puts `#{diff_cmd}`
+  puts ''
+end
+
+def is_okay?(msg)
+  msg = msg.dup + "? [yN] "
+  loop do
+    $stderr.print msg
+    ans = $stdin.gets&.chomp
+    case ans
+    when NilClass    then error "Quitting!"
+    when /yes|ye|y/i then return true
+    when /no|n/i, '' then return false
+    end
+  rescue Interrupt
+    error "Interrupted!"
+  end
+end
+
+ref_dir = 'test/ref'
+out_dir = 'test/out'
+diff_dir = 'test/diff'
+
+['test', ref_dir, out_dir, diff_dir].each do |dir|
+  unless Dir.exist?(dir)
+    $stderr.print "Creating #{dir}: "
+    ok = Dir.mkdir(dir)
+    warn(ok ? 'ok' : 'uh-oh!')
+  end
+end
+
+orig_output_filepath = 'test/out/test-original-output.txt'
+capture_stdout(orig_output_filepath) do
+  puts 'original:'
+  ignore_stderr { puts data.ai(plain: true) }
+end
+
+diffs = 0
+%i[no_empty_values no_blank_values no_nil_values].each do |filter|
+  [
+    [nil, 0], [nil, 1], [nil, 2], [nil, 3],
+    [0, nil], [0,   1], [0,   2], [0,   3],
+    [1, nil], [1,   1], [1,   2], [1,   3],
+    [2, nil], [2,   1], [2,   2], [2,   3]
+  ].each do |start, depth|
+    test_name = "#{filter}(#{start || 'nil'},#{depth || 'nil'})"
+    $stderr.printf "Testing #{test_name} .. "
+    filename = "#{$PROG}_#{test_name.gsub(/[(,)]/, '_')}output.txt"
+    out_file_path  = File.join(out_dir, filename)
+    ref_file_path  = File.join(ref_dir, filename)
+    diff_file_path = File.join(diff_dir, filename)
+    capture_stdout(out_file_path) do
+      puts "#{test_name}:"
+      new_data = data.send(filter.to_sym, start, depth)
+      ignore_stderr { puts new_data.ai(plain: true) }
+    end
+    FileUtils.touch(ref_file_path) unless File.exist?(ref_file_path)
+    if FileUtils.compare_file(ref_file_path, out_file_path)
+      warn "ok"
+      FileUtils.rm out_file_path
+    else
+      diffs += 1
+      warn "different! see #{diff_file_path}"
+      capture_stdout(diff_file_path) do
+        if File.size?(ref_file_path)
+          puts 'Diffs between reference output and test filtered data:'
+          diff_files(ref_file_path, out_file_path)
+        end
+        puts 'Diffs between original data and test filtered data:'
+        diff_files(orig_output_filepath, out_file_path)
+        if File.size?(ref_file_path)
+          puts 'Diffs between original data and reference filtered data:'
+          diff_files(orig_output_filepath, ref_file_path)
+        end
+      end
+      if $interactive
+        puts IO.read(diff_file_path)
+        if is_okay?('Are the changes okay? ')
+          FileUtils.rm ref_file_path if File.exist?(ref_file_path)
+          FileUtils.mv out_file_path, ref_file_path
+          FileUtils.rm diff_file_path
+          warn "Ref copy updated"
+        end
+      end
+    end
+  end
+end
+if diffs > 0
+  puts "There were #{diffs} differences!"
+  puts "The output files are stored in test/out"
+  puts "The reference output files are stored in test/ref"
+  puts "and the difference listings are in test/diff"
+  puts "Please review the difference listings; if the changes are acceptable,"
+  puts "then please move the corresponding output file from test/out into"
+  puts "test/ref.  If the changes are not acceptable, then please fix the bug!"
+end
+warn 'done'
+exit

data/lib/blank_empty_nil_filters.rb

@@ -6,7 +6,7 @@ module BlankEmptyNilFilters
   # These filter methods are used on both the Array and Hash extensions
   module FilterMethods
     def maybe_recurse(val, scanner, condition, start, depth, level)
-      if level >= start && (depth.nil? || level < depth)
+      if depth.nil? || level <= depth
         if val.respond_to?(scanner)
           val.send(scanner, condition, start, depth, level+1) # recurse
         else
@@ -17,8 +17,12 @@ module BlankEmptyNilFilters
       end
     end
 
-    def maybe_apply(val, condition, start, depth, level)
-      val.send(condition) if level >= start && (depth.nil? || level < depth)
+    def maybe_apply(val, condition, default, start, depth, level)
+      if level >= (start || 0) && (depth.nil? || level <= depth)
+        val.send(condition)
+      else
+        default
+      end
     end
   end
 
@@ -88,8 +92,9 @@ module BlankEmptyNilFilters
     include FilterMethods
 
     def filter_values(scanner, selector, condition, start, depth, level)
+      default = selector == :select
       map { |val| maybe_recurse(val, scanner, condition, start, depth, level) }
-        .send(selector) { |val| maybe_apply(val, condition, start, depth, level) }
+        .send(selector) { |val| maybe_apply(val, condition, default, start, depth, level) }
     end
   end
 
@@ -169,8 +174,9 @@ module BlankEmptyNilFilters
     include FilterMethods
 
     def filter_hash_values(scanner, selector, condition, start, depth, level)
+      default = selector == :select
       dup.transform_values { |val| maybe_recurse(val, scanner, condition, start, depth, level) }
-        .send(selector) { |_key, val| maybe_apply(val, condition, start, depth, level) }
+        .send(selector) { |_key, val| maybe_apply(val, condition, default, start, depth, level) }
     end
   end
 

data/lib/blank_empty_nil_filters/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BlankEmptyNilFilters
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blank_empty_nil_filters
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Alan Stebbens
@@ -249,6 +249,9 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
+- bin/console
+- bin/setup
+- bin/test-filter-args.rb
 - blank_empty_nil_filters.gemspec
 - lib/blank_empty_nil_filters.rb
 - lib/blank_empty_nil_filters/version.rb