file_scanner 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75a8147ed24cb8f74fb3eda35ead4c80ebb640ee
-  data.tar.gz: 48eb06fdab9982b14efc09f5f35213e7f6552f24
+  metadata.gz: 5e94d61fa43f097a1912390317cde01b2119b997
+  data.tar.gz: 12a767ee4da87adf667e5cdee448e3f473a8a233
 SHA512:
-  metadata.gz: 8f5d534a0122b1a124abfb65b554bdf185d08f43cf699964b1176c3e14e8942a44e88908acea04bcbbebe7167ebbb3163ab6640a4d3739c8006655752ec9c31c
-  data.tar.gz: 75717028a39150d905fe3dd53abe0c6e8ab242b78f5020eea88c7bbf72a9cc5c3654cb563f4e301412b10c28dc0aab1f3445240bea5216b85390bf6960273173
+  metadata.gz: 526f96d30f7e39d148eaed24e90266ba44edfb1c509618691be479e66fda569e3d001903f9e05234fea0e60a4a7749b0d1bc0534fe125be9a1621357d9126388
+  data.tar.gz: 8c86dfc6a68ddd431a4656f7c833759f46717d89d8d89d967b0912de12505b562df93b3512474bbe111481c40b9eb810cf01e1f1d27b3966abb64a9617f5dc4f

data/README.md

@@ -14,7 +14,6 @@
     * [Limit](#limit)
     * [Enumerator](#enumerator)
     * [Logger](#logger)
-    * [Factory](#factory)
 
 ## Scope
 This gem is aimed to collect a set of file paths starting by a wildcard rule, filter them by any/all default/custom filters (access time, matching name and size range) and apply a set of actions via a block call.
@@ -132,12 +131,3 @@ worker.call do |slice, logger|
   FileUtils.rm_rf(slice)
 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: 6000, logger: my_logger)
-worker.call do |slice, logger|
-  # filters applied on a maximum of 6000 paths, working a slice of 1000 files per time
-end
-```

data/lib/file_scanner/version.rb

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

data/lib/file_scanner/worker.rb

@@ -4,17 +4,12 @@ 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, 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, logger: Logger.new(nil))
       @loader = loader
       @filters = filters
-      @all = !!all
+      @mode = mode(all)
       @slice = slice.to_i
       @logger = logger
     end
@@ -29,24 +24,18 @@ module FileScanner
       raise e
     end
 
-    private def fetch_mode(mode)
-      return :any? unless @filters.respond_to?(mode)
-      mode
-    end
-
     private def filtered
-      files = @loader.call
-      files.select! { |file| filter(file) } || files
+      @loader.call.select { |file| filter(file) }
     end
 
-    private def mode
-      return :all? if @all
+    private def mode(all)
+      return :all? if all
       :any?
     end
 
     private def filter(file)
-      @filters.send(mode) do |filter|
-        @logger.debug { "selecting by \e[33m#{mode}\e[0m with filter \e[33m#{filter}\e[0m on #{File.basename(file)}" }
+      @filters.send(@mode) do |filter|
+        @logger.debug { "filtering by \e[33m#{@mode}\e[0m with \e[33m#{filter}\e[0m on #{File.basename(file)}" }
         filter.call(file)
       end
     end

metadata

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