file_scanner 2.1.1 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e8b3d765df8a8e795518d4064f14aac2cd6251b
-  data.tar.gz: d0cf2f954efb5d39c9d5acc51a324f8c6ffe7203
+  metadata.gz: 75a8147ed24cb8f74fb3eda35ead4c80ebb640ee
+  data.tar.gz: 48eb06fdab9982b14efc09f5f35213e7f6552f24
 SHA512:
-  metadata.gz: 66e819ffaf4fee4017fa6df1c5249c7f1a958c6d2f40c6acbd75e042bd97338c0b63d906e7fc9581bafffdb8625d7d8a1e9419ce25a6c8df4cd935e51f3a137b
-  data.tar.gz: 0f5f54fc7024931dad13084ba58e1e75ddd309e1d911c726ba8a196349167c9a4388ca9a76ac2e12a9331b0698eebbf71f95bef8f9e24bad4eb5786d71bb8326
+  metadata.gz: 8f5d534a0122b1a124abfb65b554bdf185d08f43cf699964b1176c3e14e8942a44e88908acea04bcbbebe7167ebbb3163ab6640a4d3739c8006655752ec9c31c
+  data.tar.gz: 75717028a39150d905fe3dd53abe0c6e8ab242b78f5020eea88c7bbf72a9cc5c3654cb563f4e301412b10c28dc0aab1f3445240bea5216b85390bf6960273173

data/README.md

@@ -98,11 +98,11 @@ end
 ```
 
 #### Limit
-In case you are still concerned about the selected paths number, you can limit it before applying the slicing (if any):
+In case you are going to apply some heavy filtering upon the selected files (i.e. reading the file in memory to get some creepy data), you can found helpful to limit the number of retuned paths before applying any filtering:
 ```ruby
-worker = FileScanner::Worker.new(loader: loader, slice: 1000, limit: 7500)
+worker = FileScanner::Worker.new(loader: loader, slice: 1000, limit: 6000)
 worker.call do |slice|
-  # perform action 1000 paths per time till reaching the specified limit
+  # filters applied on a maximum of 6000 paths, working a slice of 1000 files per time
 end
 ```
 
@@ -136,8 +136,8 @@ end
 #### Factory
 You can create loader and worker instances at once by using the available factory:
 ```ruby
-worker = FileScanner::Worker.factory(path: ENV["HOME"], extensions: %w[html txt], filters: filters, all: true, slice: 1000, limit: 7500, logger: my_logger)
+worker = FileScanner::Worker.factory(path: ENV["HOME"], extensions: %w[html txt], filters: filters, all: true, slice: 1000, limit: 6000, logger: my_logger)
 worker.call do |slice, logger|
-  # perform action 1000 paths per time till reaching the specified limit
+  # filters applied on a maximum of 6000 paths, working a slice of 1000 files per time
 end
 ```

data/lib/file_scanner/loader.rb

@@ -1,12 +1,15 @@
 module FileScanner
   class Loader
-    def initialize(path:, extensions: [])
+    def initialize(path:, extensions: [], limit: -1)
       @path = File.expand_path(path)
       @extensions = extensions
+      @limit = limit.to_i
     end
 
     def call
-      Dir.glob(files_path)
+      paths = Dir.glob(files_path)
+      return paths if @limit <= 0
+      paths.sample(@limit)
     end
 
     private def files_path

data/lib/file_scanner/version.rb

@@ -1,3 +1,3 @@
 module FileScanner
-  VERSION = "2.1.1"
+  VERSION = "2.2.1"
 end

data/lib/file_scanner/worker.rb

@@ -5,18 +5,17 @@ require "file_scanner/loader"
 module FileScanner
   class Worker
     def self.factory(path:, extensions: [], filters: [], all: false, slice: nil, limit: -1, logger: Logger.new(nil))
-      loader = Loader.new(path: path, extensions: extensions)
-      new(loader: loader, filters: filters,  slice: slice, all: all, limit: limit, logger: logger)
+      loader = Loader.new(path: path, extensions: extensions, limit: limit)
+      new(loader: loader, filters: filters,  slice: slice, all: all, logger: logger)
     end
 
     attr_reader :loader, :filters
 
-    def initialize(loader:, filters: Filters::defaults, all: false, slice: nil, limit: -1, logger: Logger.new(nil))
+    def initialize(loader:, filters: Filters::defaults, all: false, slice: nil, logger: Logger.new(nil))
       @loader = loader
       @filters = filters
       @all = !!all
       @slice = slice.to_i
-      @limit = limit.to_i
       @logger = logger
     end
 
@@ -35,14 +34,9 @@ module FileScanner
       mode
     end
 
-    private def files
-      paths = @loader.call
-      paths.select! { |file| filter(file) } || paths
-    end
-
-    private def limit
-      return files if @limit <= 0
-      files.first(@limit)
+    private def filtered
+      files = @loader.call
+      files.select! { |file| filter(file) } || files
     end
 
     private def mode
@@ -58,8 +52,8 @@ module FileScanner
     end
 
     private def slices
-      return [limit] if @slice.zero?
-      limit.each_slice(@slice)
+      return [filtered] if @slice.zero?
+      filtered.each_slice(@slice)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: file_scanner
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.1
 platform: ruby
 authors:
 - costajob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-16 00:00:00.000000000 Z
+date: 2017-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler