ebook_renamer 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e424aaf924da59dd5d6b1d753190e5ca6620c843
-  data.tar.gz: 493c6f7a8516d592b5eff936949d8275d0483e52
+  metadata.gz: f616cb073cb5cba2a5aa1e2d9e5e16342563d179
+  data.tar.gz: 2d01a060dee06089c5b058ade6304d51b4210d3b
 SHA512:
-  metadata.gz: 598d4d1a58f1b5ba9e4e9d7bf7bd6d9d13a08fe715ec1a9eddfe5949b60423dc022ad81a6550300ea2456f2db80eef5edf92ec9e0d64dd1d35864a7addd88462
-  data.tar.gz: 6adfee3ab04652a9f403424c7030fc63ff89f023325484816a610cd51e02677a088901949ad198b59d32a11fb6cb00aef1854e20c3a9d842b623753933d26d1e
+  metadata.gz: 30e22b60a59a775e446a29431f713579fc4824602447700df2307effd0c1fc4773c5f4e6bcfb795c2cdd01508357b1448080c8b730ad3d92c307ff39bd0ff1ae
+  data.tar.gz: bb48fe0ef334828a29c36e0f2701f49dfe17e4988529ca07ecc0c24a29e210ded2e222384255f4c5a3911053d56e6160a0f5539ebd31b455e7e33c40447200d1

data/README.md

@@ -154,28 +154,41 @@ Rename multiple ebook files (pdf,epub,mobi)
 
 ### Changelog
 
+#### 0.1.3
+
+- Make sanitize_filename work properly with `--sep-string` option
+- Use symbolize_keys from [agile_utils][] gem
+- Fix the Guardfile and misc cleanup
+
 #### 0.1.2
+
 - Make use of [agile_utils] gem
 - Add TODOs.md
 
 #### 0.1.1
+
 - Make use of the [code_lister][] gem
 
 #### 0.1.0
+
 - Add link to the version badge to link to latest gem.
 - Implicitly set the default value for extension to `pdf,epub,mobi` if
   not explicitly set by the user at the command line.
 
 #### 0.0.9
+
 - Make sure the gemspec include the proper dependencies.
 
 #### 0.0.8
+
 - Use Thor instead of OptionParser for parsing of options
 
 #### 0.0.2 - 0.0.7
+
 - Improvement of code and fix a few bugs a long the way
 
 #### 0.0.1
+
 - Initial release
 
 ### Contributing

data/ebook_renamer.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
   spec.add_runtime_dependency 'thor', '~> 0.18'
+  spec.add_runtime_dependency 'agile_utils', '~> 0.0.7'
   spec.add_runtime_dependency 'code_lister', '~> 0.0.7'
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'

data/lib/ebook_renamer.rb

@@ -1,8 +1,7 @@
 require 'thor'
 require 'code_lister'
 require 'agile_utils'
-require_relative 'ebook_renamer/core_ext/hash'
 require_relative 'ebook_renamer/version'
 require_relative 'ebook_renamer/logger'
-require_relative 'ebook_renamer/helper'
+require_relative 'ebook_renamer/utils'
 require_relative 'ebook_renamer/cli'

data/lib/ebook_renamer/cli.rb

@@ -1,3 +1,4 @@
+require 'agile_utils'
 require 'code_lister'
 require_relative '../ebook_renamer'
 

data/lib/ebook_renamer/logger.rb

@@ -2,9 +2,9 @@ require 'logger'
 module EbookRenamer
   class << self
     attr_writer :logger
-      # @return [Logger] the Logger for the project
-      def logger
-        @logger ||= Logger.new STDOUT
-      end
+    # @return [Logger] the Logger for the project
+    def logger
+      @logger ||= Logger.new STDOUT
+    end
   end
 end

data/lib/ebook_renamer/{helper.rb → utils.rb}

@@ -58,10 +58,8 @@ module EbookRenamer
   # @return [String] the new file name with special characters replaced or removed.
   def sanitize_filename(filename, sep_char = nil)
     dot = "."
-
     # Note exclude the '.' (dot)
     filename.gsub!(/[^0-9A-Za-z\-_ ]/, dot)
-
     # replace multiple occurrences of a given char with a dot
     ['-', '_', ' '].each do |c|
       filename.gsub!(/#{Regexp.quote(c)}+/, dot)
@@ -69,16 +67,7 @@ module EbookRenamer
 
     # replace multiple occurrence of dot with one dot
     filename.gsub!(/#{Regexp.quote(dot)}+/, dot)
-
-    if sep_char
-      # File.basename("demo.txt", ".*") #=> "demo"
-      name_only = File.basename(filename, ".*")
-      # File.extname("demo.txt")        #=> ".txt"
-      ext_only = File.extname(filename)
-      name_only.gsub!(/#{Regexp.quote(dot)}+/, sep_char)
-      return "#{name_only}#{ext_only}"
-    end
-
+    return filename.gsub!(/#{Regexp.quote(dot)}+/, sep_char) if sep_char
     filename.strip
   end
 

data/lib/ebook_renamer/version.rb

@@ -1,3 +1,3 @@
 module EbookRenamer
-  VERSION = "0.1.2"
+  VERSION = '0.1.3'
 end

data/test/lib/ebook_renamer/{helper_test.rb → test_utils.rb}

@@ -66,15 +66,22 @@ describe EbookRenamer do
     end
 
     it "replaces multiple valid chars with one" do
-      sanitize_filename('Valid-    -fil3_name......___   .txt').must_equal('Valid.fil3.name.txt')
+      sanitize_filename('Valid-    -fil3_name......___   ').must_equal('Valid.fil3.name.')
     end
 
     it "replaces multiple valid chars with one" do
-      sanitize_filename('valid filename_.txt').must_equal('valid.filename.txt')
+      sanitize_filename('valid!!___filename').must_equal('valid.filename')
     end
 
-    it "uses sepc_char correctly" do
-      sanitize_filename('valid.file name.txt','_').must_equal('valid_file_name.txt')
+    it "uses specify separator char correctly" do
+      sanitize_filename('valid.file name','_').must_equal('valid_file_name')
+    end
+
+    it "replaces mutliple separator char with one" do
+      sanitize_filename('input&!:.file name$only','-').must_equal('input-file-name-only')
+    end
+    it "handles the end char properly" do
+      sanitize_filename('input&!:.file name$only!!&$','-').must_equal('input-file-name-only-')
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ebook_renamer
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Burin Choomnuan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
+- !ruby/object:Gem::Dependency
+  name: agile_utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: code_lister
   requirement: !ruby/object:Gem::Requirement
@@ -200,15 +214,14 @@ files:
 - ebook_renamer.gemspec
 - lib/ebook_renamer.rb
 - lib/ebook_renamer/cli.rb
-- lib/ebook_renamer/core_ext/hash.rb
-- lib/ebook_renamer/helper.rb
 - lib/ebook_renamer/logger.rb
+- lib/ebook_renamer/utils.rb
 - lib/ebook_renamer/version.rb
 - test/fixtures/ebooks/demo1.pdf
 - test/fixtures/ebooks/demo2.epub
 - test/fixtures/ebooks/subdir/demo1.pdf
 - test/fixtures/ebooks/subdir/demo2.epub
-- test/lib/ebook_renamer/helper_test.rb
+- test/lib/ebook_renamer/test_utils.rb
 - test/test_helper.rb
 homepage: https://github.com/agilecreativity/ebook_renamer
 licenses:
@@ -240,6 +253,6 @@ test_files:
 - test/fixtures/ebooks/demo2.epub
 - test/fixtures/ebooks/subdir/demo1.pdf
 - test/fixtures/ebooks/subdir/demo2.epub
-- test/lib/ebook_renamer/helper_test.rb
+- test/lib/ebook_renamer/test_utils.rb
 - test/test_helper.rb
 has_rdoc: 

data/lib/ebook_renamer/core_ext/hash.rb

@@ -1,56 +0,0 @@
-class Hash
-
-  # File activesupport/lib/active_support/core_ext/hash/keys.rb
-  #
-  # hash = { name: 'Rob', age: '28' }
-  # hash.transform_keys{ |key| key.to_s.upcase }
-  # => { "NAME" => "Rob", "AGE" => "28" }
-  def transform_keys
-    result = {}
-    each_key do |key|
-      result[yield(key)] = self[key]
-    end
-    result
-  end
-
-  def transform_keys!(&block)
-    keys.each do |key|
-      value = delete(key)
-      self[yield(key)] = value.is_a?(Hash) ? value.transform_keys!(&block) : value
-    end
-    self
-  end
-
-  # hash = { 'name' => 'Rob', 'age' => '28' }
-  # hash.symbolize_keys
-  # => { name: "Rob", age: "28" }
-  def symbolize_keys
-    transform_keys{ |key| key.to_sym rescue key }
-  end
-
-  # File activesupport/lib/active_support/core_ext/hash/keys.rb, line 135
-  def symbolize_keys!
-    transform_keys!{ |key| key.to_sym rescue key }
-  end
-
-  # Merges the caller into +other_hash+. For example,
-  #
-  #   options = options.reverse_merge(size: 25, velocity: 10)
-  #
-  # is equivalent to
-  #
-  #   options = { size: 25, velocity: 10 }.merge(options)
-  #
-  # This is particularly useful for initializing an options hash
-  # with default values.
-  def reverse_merge(other_hash)
-    other_hash.merge(self)
-  end
-
-  # Destructive +reverse_merge+.
-  def reverse_merge!(other_hash)
-    # right wins if there is no left
-    merge!(other_hash) { |key,left,right| left }
-  end
-
-end