file_renamer 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abfc8171a09153f98a5e713ef7a70a91882c9db60434101921714cf4dc1c467b
-  data.tar.gz: 4c04c4eec580a8460db6d9f2197c8c25cab8443cebd75e890229baef4a17c4e1
+  metadata.gz: bbe42ce58e960a5b36e8d2678a1dece3e4345d51e67a39e500d38f996ea9a26a
+  data.tar.gz: f3f4073710903db45c0f0383a8cf149141692a8eacd3d49fec6eb20c9ab603a9
 SHA512:
-  metadata.gz: c67b670abd019667dcdb11530240f76b3429005018049b6295d7f683529e248827edf4820495b7d11e5d1f42af44a4308fd96388188f4e737aba47d9f2d748cd
-  data.tar.gz: bff076f6cdaf1c2896e2a6e6ae8f6f95330679511973a916ac33de1cbd85de8ef7b3e4dcf708019b9c53aea5011654b63e35fbaf76b960da768bfd5af71f0401
+  metadata.gz: d339a3d688abc335a716b0d0fc0480dc1547fdb1832237d27873403c7b864874e12452690eeb770196317c5a294c9a65419e664b38f761136fd62673b7ae7692
+  data.tar.gz: 60083ade211097fd833689426f15a374a119cd07f6cd76980504a3a4a7ffdfcb90f110b46fd300323220d839dfc8122d34b62f7ac33a52d0ff9fff929e32e6a9

data/lib/name_alterer.rb

@@ -13,18 +13,15 @@ module FileRenamer
     end
 
     def renamed_filename(args)
-      init_params(args)
-      name_with_extension
-    end
-
-    private
-
-    def init_params(args)
       @filename = args[:filename]
       @number   = args[:number]
       @name     = args[:new_name]
+
+      name_with_extension
     end
 
+    private
+
     def name_with_extension
       filename.gsub(/^\w+./, "#{numbered_name}.")
     end

data/lib/path_processor.rb

@@ -12,21 +12,23 @@ module FileRenamer
                   :name,
                   :prefix,
                   :directory,
-                  :paths,
-                  :params
+                  :paths
 
     def self.run!(args = {})
       self.new(args).rename_files!
     end
 
     def initialize(args)
-      @params       = args[:corrected_params] || ParamsCorrector.new.corrected_params(args[:params])
-      @name_alterer = args.fetch(:name_alterer, NameAlterer.new)
+      params       = args[:corrected_params] || ParamsCorrector.new.corrected_params(args[:params])
 
-      init_corrected_params
+      @extension    = params[:ext]
+      @name         = params[:name]
+      @directory    = params[:dir]
+      @prefix       = params[:prefix]
 
-      @paths   = paths
-      @counter = 0
+      @name_alterer = args.fetch(:name_alterer, NameAlterer.new)
+      @paths        = paths
+      @counter      = 0
     end
 
     def rename_files!
@@ -37,18 +39,11 @@ module FileRenamer
 
     private
 
-    def init_corrected_params
-      @extension = params[:ext]
-      @name      = params[:name]
-      @directory = params[:dir]
-      @prefix    = params[:prefix]
-    end
-
     def process_path(path)
-      old_filename = slice_filename(path)
+      old_filename = sliced_filename(path)
       renamed_filename = name_alterer.renamed_filename({ filename: old_filename,
-                                                             number: counter,
-                                                             new_name: name })
+                                                         number: counter,
+                                                         new_name: name })
 
       renamed_path = renamed_path(path, old_filename, renamed_filename)
 
@@ -73,14 +68,14 @@ module FileRenamer
     end
 
     def matches_pattern?(path)
-      slice_filename(path).match?(Regexp.new("^#{prefix}.*#{extension}$"))
+      sliced_filename(path).match?(Regexp.new("^#{prefix}.*#{extension}$"))
     end
 
     def is_file?(path)
       !File.directory?(path)
     end
 
-    def slice_filename(path)
+    def sliced_filename(path)
       path.slice(%r{([^/|\\]+$)})
     end
   end

data/spec/params_corrector_spec.rb

@@ -14,12 +14,6 @@ describe 'ParamsCorrector#corrected_params' do
       expect(corrected_params[:ext]).to eq '.jpg'
     end
 
-    let(:params1) { { ext: '.jpg', dir: './spec/fixtures/dir/', prefix: nil, name: 'new_name' } }
-    it 'return ext string with dot if ext not nil' do
-      corrected_params = @corrector.corrected_params(params1)
-      expect(corrected_params[:ext]).to eq '.jpg'
-    end
-
     let(:params2) { { ext: 'jpganyany', dir: './spec/fixtures/dir/', prefix: nil, name: 'new_name' } }
     it 'return nil if ext not matches regexp' do
       corrected_params = @corrector.corrected_params(params2)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: file_renamer
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Tee Zed