fixnames 0.4.1 → 0.5.0

data/bin/fixdirs

@@ -29,76 +29,107 @@ optparse = OptionParser.new do |opts|
   opts.separator 'DIRECTORIES:'
 
   opts.on('-g', '--glob=GLOB_STRING',
-          "Filename glob to use inside each directory for when
+       "Filename glob to use inside each directory for when
 #{desc_pad}we are left to ourself. Default: #{options.dir_glob}"
           ) { |val| options.dir_glob = val }
 
   opts.on('-R', '--[no-]recursive',
-          'Recursively descend into directories'
+       'Recursively descend into directories'
           ) { |val| options.recursive = val }
 
   opts.separator ''
   opts.separator 'FILTERS:'
 
-  opts.on('-A', '--[no-]hack_and',
-          'Replace "&" with "_and_"'
+  opts.on('-H', '--[no-]hack-and',
+       'Replace "&" with "_and_"'
+          ) { |val| options.hack_and = val }
+
+  opts.on('-A', '--[no-]and-to-dash',
+       'Replace "_and_" with "-"'
           ) { |val| options.hack_and = val }
 
   opts.on('-C', '--[no-]semicolon',
-          'Replace ";" with "-"'
+       'Replace ";" with "-"'
           ) { |val| options.semicolon = val }
 
   opts.on('-B', '--[no-]banners',
-          'Trims [FOO] style advert prefixs from the beginning'
+       'Trims [FOO] style advert prefixs from the beginning'
           ) { |val| options.banners = val }
 
-  opts.on('-b', '--[no-]brackets',
-         'Trims (round) or [square] bracket regions'
-          ) { |val| options.brackets = val }
-
   opts.on('-k', '--[no-]checksums',
-         "Trims [0A1B2C3D] CRC32 bracket-wrapped checksums
+       "Trims [0A1B2C3D] CRC32 bracket-wrapped checksums
 #{desc_pad}from names, when wrapped with square brackes []
 #{desc_pad}or round parens ()"
           ) { |val| options.checksums = val }
 
   opts.on('-d', '--[no-]dots',
-         'Trims excessive dots from files
+       'Trims excessive dots from files
  (before the .extention)'
           ) { |val| options.fix_dots = val }
 
   opts.on('-D', '--[no-]dashes',
-         'Trims redundant dashes, and leading/trailing dashes'
+       'Trims redundant dashes, and leading/trailing dashes'
           ) { |val| options.fix_dashes = val }
 
+  opts.on('-N', '--[no-]numsep',
+       'Fixes the separator afterinitial numbers. That is,
+#{desc_pad}it replaces ^(\d+)_ with ^(\d+)-"'
+          ) { |val| options.fix_numsep = val }
+
   opts.on('-c', '--[no-]camelcase',
-          'Undo camelCase with underscores. "aB" becomes "a_b"'
+       'Undo camelCase with underscores. "aB" becomes "a_b"'
           ) { |val| options.camelcase = val }
 
   opts.on('-l', '--[no-]lowercase',
-          'Forces all letters to lowercase'
+       'Forces all letters to lowercase'
           ) { |val| options.lowercase = val }
 
   opts.separator ''
   opts.separator 'CHARACTERS:'
 
+  opts.on('-b', '--[no-]brackets',
+       "Trims matching bracket, replacing with a \"-\" or
+#{desc_pad}nothing if at the beginning of end of the name;
+#{desc_pad}characters that count as a bracket defined with
+#{desc_pad}the options --bracken-open and --br-close"
+        ) { |val| options.brackets = val }
+
+  opts.on('-O', '--br-open=CHARS',
+       "Characters that count as the 'opening' half of a
+#{desc_pad}bracket pair. Much be the same number of chars
+#{desc_pad}as --br-close. The order in BOTH of these
+#{desc_pad}options determines the pairing between open and
+#{desc_pad}close, in a manner very similar tr(1).
+#{desc_pad}Default: #{options.bracket_characters_close}"
+        ) { |val| options.bracket_characters_open = val }
+
+  opts.on('-L', '--br-close=CHARS',
+       "Characters that count as the 'opening' half of a
+#{desc_pad}bracket pair. Much be the same number of chars
+#{desc_pad}as --br-close. The order in BOTH of these
+#{desc_pad}options determines the pairing between open and
+#{desc_pad}close, in a manner very similar tr(1).
+#{desc_pad}Default: #{options.bracket_characters_close}"
+        ) { |val| options.bracket_characters_close = val }
+
   opts.on('-w', '--whitespace=CHARS',
-          "Characters to treat as whitespace, to be
+       "Characters to treat as whitespace, to be
 #{desc_pad}replaced with underscores."
           ) { |val| options.whitespace = val }
 
   opts.on('-W', '--no-whitespace',
-          'Do not parse any character as whitespace'
+       'Do not parse any character as whitespace'
           ) {       options.whitespace = nil }
 
-  opts.on('-s', '--strip=CHARLIST',
-          "Individual characters to strip from names.
+  opts.on('-s', '--[no-]strip=CHARLIST',
+       "Individual characters to strip from names.
 #{desc_pad}Default: #{options.charstrip}"
           ) { |val| options.charstrip = val }
 
-  opts.on('-S', '--no-strip',
-          'Do not strip any specific characters'
-          ) {       options.charstrip = nil }
+  opts.on('-j', '--[no-]junkwords=WORDLIST',
+       "Words to always strip, separated by commas.
+#{desc_pad}Default: #{options.junkwords.join(',')}"
+          ) {       options.junkwords = nil }
 
   opts.separator ''
   opts.separator 'REGEX-REPLACE:'

data/bin/fixnames

@@ -29,76 +29,107 @@ optparse = OptionParser.new do |opts|
   opts.separator 'DIRECTORIES:'
 
   opts.on('-g', '--glob=GLOB_STRING',
-          "Filename glob to use inside each directory for when
+       "Filename glob to use inside each directory for when
 #{desc_pad}we are left to ourself. Default: #{options.dir_glob}"
           ) { |val| options.dir_glob = val }
 
   opts.on('-R', '--[no-]recursive',
-          'Recursively descend into directories'
+       'Recursively descend into directories'
           ) { |val| options.recursive = val }
 
   opts.separator ''
   opts.separator 'FILTERS:'
 
-  opts.on('-A', '--[no-]hack_and',
-          'Replace "&" with "_and_"'
+  opts.on('-H', '--[no-]hack-and',
+       'Replace "&" with "_and_"'
+          ) { |val| options.hack_and = val }
+
+  opts.on('-A', '--[no-]and-to-dash',
+       'Replace "_and_" with "-"'
           ) { |val| options.hack_and = val }
 
   opts.on('-C', '--[no-]semicolon',
-          'Replace ";" with "-"'
+       'Replace ";" with "-"'
           ) { |val| options.semicolon = val }
 
   opts.on('-B', '--[no-]banners',
-          'Trims [FOO] style advert prefixs from the beginning'
+       'Trims [FOO] style advert prefixs from the beginning'
           ) { |val| options.banners = val }
 
-  opts.on('-b', '--[no-]brackets',
-         'Trims (round) or [square] bracket regions'
-          ) { |val| options.brackets = val }
-
   opts.on('-k', '--[no-]checksums',
-         "Trims [0A1B2C3D] CRC32 bracket-wrapped checksums
+       "Trims [0A1B2C3D] CRC32 bracket-wrapped checksums
 #{desc_pad}from names, when wrapped with square brackes []
 #{desc_pad}or round parens ()"
           ) { |val| options.checksums = val }
 
   opts.on('-d', '--[no-]dots',
-         'Trims excessive dots from files
+       'Trims excessive dots from files
  (before the .extention)'
           ) { |val| options.fix_dots = val }
 
   opts.on('-D', '--[no-]dashes',
-         'Trims redundant dashes, and leading/trailing dashes'
+       'Trims redundant dashes, and leading/trailing dashes'
           ) { |val| options.fix_dashes = val }
 
+  opts.on('-N', '--[no-]numsep',
+       'Fixes the separator afterinitial numbers. That is,
+#{desc_pad}it replaces ^(\d+)_ with ^(\d+)-"'
+          ) { |val| options.fix_numsep = val }
+
   opts.on('-c', '--[no-]camelcase',
-          'Undo camelCase with underscores. "aB" becomes "a_b"'
+       'Undo camelCase with underscores. "aB" becomes "a_b"'
           ) { |val| options.camelcase = val }
 
   opts.on('-l', '--[no-]lowercase',
-          'Forces all letters to lowercase'
+       'Forces all letters to lowercase'
           ) { |val| options.lowercase = val }
 
   opts.separator ''
   opts.separator 'CHARACTERS:'
 
+  opts.on('-b', '--[no-]brackets',
+       "Trims matching bracket, replacing with a \"-\" or
+#{desc_pad}nothing if at the beginning of end of the name;
+#{desc_pad}characters that count as a bracket defined with
+#{desc_pad}the options --bracken-open and --br-close"
+        ) { |val| options.brackets = val }
+
+  opts.on('-O', '--br-open=CHARS',
+       "Characters that count as the 'opening' half of a
+#{desc_pad}bracket pair. Much be the same number of chars
+#{desc_pad}as --br-close. The order in BOTH of these
+#{desc_pad}options determines the pairing between open and
+#{desc_pad}close, in a manner very similar tr(1).
+#{desc_pad}Default: #{options.bracket_characters_close}"
+        ) { |val| options.bracket_characters_open = val }
+
+  opts.on('-L', '--br-close=CHARS',
+       "Characters that count as the 'opening' half of a
+#{desc_pad}bracket pair. Much be the same number of chars
+#{desc_pad}as --br-close. The order in BOTH of these
+#{desc_pad}options determines the pairing between open and
+#{desc_pad}close, in a manner very similar tr(1).
+#{desc_pad}Default: #{options.bracket_characters_close}"
+        ) { |val| options.bracket_characters_close = val }
+
   opts.on('-w', '--whitespace=CHARS',
-          "Characters to treat as whitespace, to be
+       "Characters to treat as whitespace, to be
 #{desc_pad}replaced with underscores."
           ) { |val| options.whitespace = val }
 
   opts.on('-W', '--no-whitespace',
-          'Do not parse any character as whitespace'
+       'Do not parse any character as whitespace'
           ) {       options.whitespace = nil }
 
-  opts.on('-s', '--strip=CHARLIST',
-          "Individual characters to strip from names.
+  opts.on('-s', '--[no-]strip=CHARLIST',
+       "Individual characters to strip from names.
 #{desc_pad}Default: #{options.charstrip}"
           ) { |val| options.charstrip = val }
 
-  opts.on('-S', '--no-strip',
-          'Do not strip any specific characters'
-          ) {       options.charstrip = nil }
+  opts.on('-j', '--[no-]junkwords=WORDLIST',
+       "Words to always strip, separated by commas.
+#{desc_pad}Default: #{options.junkwords.join(',')}"
+          ) {       options.junkwords = nil }
 
   opts.separator ''
   opts.separator 'REGEX-REPLACE:'

data/fixnames.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fixnames"
-  s.version = "0.4.1"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brent Sanders"]
-  s.date = "2012-02-26"
+  s.date = "2012-11-29"
   s.description = "Cleans up filenames so they can easily be used\nin scripts, without annoyances such as spaces or other bad characters"
   s.email = "git@thoughtnoise.net"
   s.executables = ["fixnames", "fixdirs"]
@@ -36,17 +36,23 @@ Gem::Specification.new do |s|
     "lib/fixnames/interface.rb",
     "lib/fixnames/option.rb",
     "lib/fixnames/version.rb",
+    "spec/fixnames/and_to_dash_spec.rb",
+    "spec/fixnames/badopt_spec.rb",
     "spec/fixnames/banners_spec.rb",
     "spec/fixnames/brackets_spec.rb",
     "spec/fixnames/camelcase_spec.rb",
     "spec/fixnames/charstrip_spec.rb",
     "spec/fixnames/checksums_spec.rb",
+    "spec/fixnames/dashes_spec.rb",
+    "spec/fixnames/expunge_spec.rb",
     "spec/fixnames/fixdots_spec.rb",
     "spec/fixnames/hack_and_spec.rb",
     "spec/fixnames/lowercase_spec.rb",
+    "spec/fixnames/numsep_spec.rb",
     "spec/fixnames/semicolon_spec.rb",
     "spec/fixnames/whitespace_spec.rb",
     "spec/spec_helper.rb",
+    "spec/support/option_setting_helpers.rb",
     "spec/support/should_fix_helpers.rb",
     "test/helper.rb",
     "test/test_charstrip.rb",
@@ -58,7 +64,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/pdkl95/fixnames"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.23"
   s.summary = "Filename cleanup for script compatability"
 
   if s.respond_to? :specification_version then

data/lib/fixnames/filters.rb

@@ -8,6 +8,10 @@ module Fixnames
       replace '&', '_and_'
     end
 
+    def and_to_dash
+      replace '[-_ ]+and[-_ ]+', '-'
+    end
+
     def semicolon
       translate ';', '-'
       fixed.squeeze! '-'
@@ -20,7 +24,13 @@ module Fixnames
     end
 
     def brackets
-      remove wrap_brackets('.+?')
+      bop = option.bracket_characters_open.dup
+      bcl = option.bracket_characters_close.dup
+      while bop.length > 0
+        op = "%03o" % bop.slice!(0,1).bytes.first
+        cl = "%03o" % bcl.slice!(0,1).bytes.first
+        replace "\\#{op}(.+?)\\#{cl}", '-\\1-'
+      end
     end
 
     def checksums
@@ -40,8 +50,17 @@ module Fixnames
 
     def fix_dashes
       fixed.squeeze! '-'
-      remove  '^-' while fixed =~ /^-/
-      remove  '-$' while fixed =~ /-$/
+      replace_all '--', '-'
+
+      remove_all  '^-'
+      remove_all  '-$'
+
+      replace_all '-\.', '.'
+      replace_all '\.-', '.'
+    end
+
+    def fix_numsep
+      replace '^(\d+)_', '\1-'
     end
 
     def camelcase
@@ -59,11 +78,15 @@ module Fixnames
 
     def whitespace(chrlist)
       replace "[#{Regexp.escape chrlist}]", '_'
-      replace '[_-]\.', '.' while fixed =~ /[_-]\./
-      replace '_-',     '-' while fixed =~ /_-/
-      replace '-_',     '-' while fixed =~ /-_/
-      remove  '^_'          while fixed =~ /^_/
-      remove  '_$'          while fixed =~ /_$/
+
+      remove_all '^_'
+      remove_all '_$'
+
+      replace_all  '_-', '-'
+      replace_all  '-_', '-'
+      replace_all '_\.', '.'
+      replace_all '\._', '.'
+
       fixed.squeeze! '_'
     end
 

data/lib/fixnames/helpers.rb

@@ -1,5 +1,12 @@
 module Fixnames
   module Helpers
+    def safeloop(condition, max_tries = option.max_filter_loops, &block)
+      max_tries.times do
+        return fixed unless fixed =~ Regexp.new(condition)
+        block.call
+      end
+    end
+
     def replace(re, replacement)
       re_str = bold "/#{re}/"
       replacement_str = bold "\"#{replacement}\""
@@ -13,6 +20,14 @@ module Fixnames
       fixed.gsub! Regexp.new(re), ''
     end
 
+    def replace_all(condition, replacement)
+      safeloop(condition) { replace(condition, replacement) }
+    end
+
+    def remove_all(condition)
+      safeloop(condition) { remove(condition) }
+    end
+
     def translate(src, dst)
       debug "\t<translate>  #{bold src.inspect}  ->  #{bold dst.inspect}"
       fixed.tr! src, dst

data/lib/fixnames/option.rb

@@ -2,30 +2,56 @@ require 'abbrev'
 
 module Fixnames
   class Option
+    # the maximum number of times we will allow a filter
+    # to be applied before giving up and moving on to the next
+    MAX_FILTER_LOOPS = 6
+
     # filters that MUST run early
-    SETUP_FILTERS = [ :expunge ]
+    SETUP_FILTERS = [
+      :expunge,
+      :brackets
+    ]
 
     # filters that only accept a simple boolean on/off
-    FLAG_FILTERS = [ :hack_and, :checksums, :banners,
-                     :brackets, :semicolon,
-                     :camelcase, :lowercase,
-                     :fix_dots, :fix_dashes ]
+    FLAG_FILTERS = [
+      :hack_and,
+      :and_to_dash,
+      :checksums,
+      :banners,
+      :semicolon,
+      :camelcase,
+      :lowercase,
+      :fix_dots,
+      :fix_dashes,
+      :fix_numsep
+    ]
 
     # filters that accept character ranges
-    CHAR_FILTERS = [ :junkwords, :charstrip, :whitespace]
+    CHAR_FILTERS = [
+      :junkwords,
+      :charstrip,
+      :whitespace
+    ]
+
+    # filters that MUST run after everything else
+    LATE_FILTERS = [
+      :fix_numsep
+    ]
 
     # standard order to apply the filters
-    DEFAULT_FILTER_ORDER = [ SETUP_FILTERS,
-                             FLAG_FILTERS,
-                             CHAR_FILTERS
-                           ].flatten
+    DEFAULT_FILTER_ORDER = [
+      SETUP_FILTERS,
+      FLAG_FILTERS,
+      CHAR_FILTERS,
+      LATE_FILTERS
+    ].flatten
 
     DEFAULT_DIR_GLOB   = '*'
     DEFAULT_MENDSTR    = ''
     DEFAULT_WHITESPACE = " \t_"
     DEFAULT_BRACKET_CHARACTERS_OPEN  = '[({<'
     DEFAULT_BRACKET_CHARACTERS_CLOSE = '])}>'
-    DEFAULT_CHARSTRIP = "[]{}'\",()+!~@#/\\"
+    DEFAULT_CHARSTRIP = "[]{}'\",()+!~@#/\\<>"
     DEFAULT_JUNKWORDS = [ 'x264', 'hdtv', '2hd', '720p', 'dvdrip']
     DEFAULT_BANNER_TYPES = [ 'xxx', 'dvdrip', 'dual_audio',
                              'xvid', 'h264', 'divx' ]
@@ -40,6 +66,9 @@ module Fixnames
       var = "@#{name}"
 
       define_method "valid_for_#{name}?" do |value|
+        value = nil if value == false
+        return true if value.nil?
+        return true if value == ''
         types.map do |type|
           value.is_a?(type)
         end.reduce(false) do |t,x|
@@ -53,7 +82,7 @@ module Fixnames
         end
         if args.length == 1
           unless send("valid_for_#{name}?", args[0])
-            raise "bad type for option"
+            raise ArgumentError, "bad type for option"
           end
           instance_variable_set(var, args[0])
         end
@@ -62,7 +91,7 @@ module Fixnames
 
       define_method "#{name}=" do |value|
         unless send("valid_for_#{name}?", value)
-          raise "bad type for option"
+          raise ArgumentError, "bad type for option"
         end
         instance_variable_set(var, value)
       end
@@ -87,6 +116,9 @@ module Fixnames
     # * `verbose=3` ; all *filters* are output as they run for debugging. Very noisy.
     mkopt :verbose, Integer, 0
 
+    # @note The maximum number of times a {Fixname::Filters} will be applied before giving and proceeding with the next filter (infinite-loop protextion)
+    mkopt :max_filter_loops, Integer, MAX_FILTER_LOOPS
+
     # When {#recursive} is set, use this pattern to glob each
     # directory for files.
     mkopt :dir_glob, String, DEFAULT_DIR_GLOB
@@ -104,6 +136,9 @@ module Fixnames
     # @note Enables {Fixnames::Filters#hack_and}
     mkopt :hack_and,  [TrueClass, FalseClass], false
 
+    # @note Enables {Fixnames::Filters#hack_and}
+    mkopt :and_to_dash,  [TrueClass, FalseClass], false
+
     # @note Enables {Fixnames::Filters#checksums}
     mkopt :checksums, [TrueClass, FalseClass], false
 
@@ -122,6 +157,9 @@ module Fixnames
     # @note Enables {Fixnames::Filters#fix_dashes}
     mkopt :fix_dashes, [TrueClass, FalseClass], false
 
+    # @note Enables {Fixnames::Filters#fix_dashes}
+    mkopt :fix_numsep, [TrueClass, FalseClass], false
+
     # @note Enables {Fixnames::Filters#camelcase}
     mkopt :camelcase, [TrueClass, FalseClass], false
 

data/lib/fixnames/version.rb

@@ -1,8 +1,8 @@
 class Fixnames
   module Version
     MAJOR = 0
-    MINOR = 4
-    PATCH = 1
+    MINOR = 5
+    PATCH = 0
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/spec/fixnames/and_to_dash_spec.rb

@@ -0,0 +1,34 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Fixnames do
+  context "when option[:and_to_dash] is TRUE" do
+    before do
+      @testopt.and_to_dash = true
+    end
+
+    describe "should replace \"_and_\" with \"-\"" do
+      subject { 'a-b' }
+      it_should_fix 'a_and_b', 'a and b', 'a-and-b'
+      it_should_fix 'a-and_b', 'a_and-b'
+      it_should_fix 'a-and b', 'a and-b'
+      it_should_fix 'a and_b', 'a_and b'
+
+      it_should_fix 'a    and    b'
+      it_should_fix 'a- -and- -b'
+      it_should_fix 'a- _and_ -b'
+      it_should_fix 'a__and__b'
+      it_should_fix 'a_-_and_-_b'
+      it_should_fix 'a - and - b'
+    end
+  end
+
+  context "when option[:and_to_dash] is FALSE" do
+    before do
+      @testopt.and_to_dash = false
+    end
+
+    describe "should replace ALLOW \"&\"" do
+      it_should_not_change 'a_and_b'
+    end
+  end
+end

data/spec/fixnames/badopt_spec.rb

@@ -0,0 +1,91 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Fixnames::Option do
+  context "when setting new options" do
+    describe "should allow bool types" do
+      it_should_allow_bool_option 'recursive'
+      it_should_allow_bool_option 'hack_and'
+      it_should_allow_bool_option 'and_to_dash'
+      it_should_allow_bool_option 'checksums'
+      it_should_allow_bool_option 'banners'
+      it_should_allow_bool_option 'brackets'
+      it_should_allow_bool_option 'semicolon'
+      it_should_allow_bool_option 'fix_dots'
+      it_should_allow_bool_option 'fix_dashes'
+      it_should_allow_bool_option 'fix_numsep'
+      it_should_allow_bool_option 'camelcase'
+      it_should_allow_bool_option 'lowercase'
+      it_should_allow_bool_option 'charstrip_allow_brackets'
+      it_should_allow_bool_option 'pretend'
+    end
+
+    describe "should allow integer types" do
+      it_should_allow_option 'max_filter_loops', 10
+    end
+
+    describe "should allow string types" do
+      it_should_allow_option 'dir_glob', '*foo*'
+      it_should_allow_option 'expunge', '^(\d\d+)'
+      it_should_allow_option 'mendstr', '\1-'
+      it_should_allow_option 'charstrip', '!@#$%^&()_+-='
+      it_should_allow_option 'whitespace', " \t\n"
+      it_should_allow_option 'bracket_characters_open',  "`\\"
+      it_should_allow_option 'bracket_characters_close', "'/"
+    end
+
+    describe "should allow array types" do
+      it_should_allow_option 'junkwords',    ['foo','bar','baz']
+      it_should_allow_option 'banner_types', ['foo','bar','baz']
+      it_should_allow_option 'filter_order', Fixnames::Option::DEFAULT_FILTER_ORDER.sort
+    end
+
+    describe "should reject invalid non-bool types for bool options" do
+      [ 'recursive',
+        'hack_and',
+        'and_to_dash',
+        'checksums',
+        'banners',
+        'brackets',
+        'semicolon',
+        'fix_dots',
+        'fix_dashes',
+        'fix_numsep',
+        'camelcase',
+        'lowercase',
+        'charstrip_allow_brackets',
+        'pretend'
+      ].each do |opt_name|
+        it_should_reject_nonbool_option(opt_name)
+      end
+    end
+
+    describe "should reject invalid non-integer types for integer options" do
+      [ 'max_filter_loops'
+      ].each do |opt_name|
+        it_should_reject_noninteger_option(opt_name)
+      end
+    end
+
+    describe "should reject invalid non-string types for string options" do
+      [ 'dir_glob',
+        'expunge',
+        'mendstr',
+        'charstrip',
+        'whitespace',
+        'bracket_characters_open',
+        'bracket_characters_close'
+      ].each do |opt_name|
+        it_should_reject_nonstring_option(opt_name)
+      end
+    end
+
+    describe "should reject invalid non-array types for array options" do
+      [ 'junkwords',
+        'banner_types',
+        'filter_order'
+      ].each do |opt_name|
+        it_should_reject_nonarray_option(opt_name)
+      end
+    end
+  end
+end

data/spec/fixnames/brackets_spec.rb

@@ -1,26 +1,102 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Fixnames do
+
+  ##########################################################################
   context "when option[:brackets] is TRUE" do
     before do
       @testopt.brackets = true
+      @testopt.fix_dashes = true
+    end
+
+    describe "should replace bracket pairs with a dash" do
+      subject { 'foo-x-bar' }
+      it_should_fix 'foo[x]bar'
+      it_should_fix 'foo[ x ]bar'
+      it_should_fix 'foo[-x-]bar'
+      it_should_fix 'foo[_x_]bar'
+      it_should_fix 'foo [x] bar'
+      it_should_fix 'foo-[x]-bar'
+      it_should_fix 'foo_[x]_bar'
+    end
+
+    describe "should replace multiple bracket pairs" do
+      subject { 'foo-bar-baz-quux' }
+      it_should_fix 'foo(bar)baz<quux>'
+      it_should_fix 'foo(bar)[baz]quux'
+      it_should_fix 'foo(-bar-)baz<_quux_>'
+      it_should_fix 'foo-(bar)-baz-<quux>'
+      it_should_fix 'foo (bar) baz <quux>'
+      it_should_fix '{ foo }-( bar )-[ baz ]-< quux >'
+      it_should_fix '[ foo ]<->[ bar ]<->[ baz ]<->[ quux ]'
+    end
+  end
+
+  ##########################################################################
+  context "when option[:brackets] is FALSE and option[:charstrip] strips brackets" do
+    before do
+      @testopt.brackets = false
+      @testopt.charstrip_allow_brackets = false
+    end
+
+    describe "should strip a single bracket pair" do
+      subject { 'fooxbar' }
+      it_should_fix 'foo[x]bar'
+      it_should_fix 'foo(x)bar'
+      it_should_fix 'foo<x>bar'
+      it_should_fix '[foo]xbar'
+      it_should_fix 'fooxba[r]'
+      it_should_fix '[fooxbar]'
+    end
+
+    describe "should strip a single bracket pair near dashes" do
+      subject { 'foo-x-bar' }
+      it_should_fix 'foo[-x-]bar'
+      it_should_fix 'foo-[x]-bar'
+      it_should_fix '[foo]-x-bar'
+      it_should_fix '[foo-x-]bar'
+      it_should_fix 'foo-x[-bar]'
+    end
+
+    describe "should strip a single bracket pair near undebars" do
+      subject { 'foo_x_bar' }
+      it_should_fix 'foo[_x_]bar'
+      it_should_fix 'foo_[x]_bar'
+      it_should_fix '[foo_]x_bar'
+      it_should_fix 'foo[_x_bar]'
+    end
+
+    describe "should strip multiple bracket pairs" do
+      subject { 'foobarbazquux' }
+      it_should_fix 'foo(bar)baz[quux]'
+      it_should_fix '{foo}(bar)<baz>[quux]'
     end
 
-    describe "should remove bracket expressions" do
-      subject { 'foobar' }
-      it_should_fix 'foo[x]bar', 'fo(foo)ob<bar>ar'
-      it_should_fix 'foo[ x ]bar', 'fo(-foo-)ob<_bar_>ar'
+    describe "should strip multiple brack pairs with dashes" do
+      subject { 'foo-bar-baz-quux' }
+      it_should_fix 'foo-bar-baz-quux'
+      it_should_fix 'foo-(b)ar-[baz-]quux'
+      it_should_fix 'foo<->bar[-]baz(-)quux'
+      it_should_fix '[foo]-[bar]-[baz]-[quux]'
     end
   end
 
-  context "when option[:brackets] is FALSE" do
+  ##########################################################################
+  context "when option[:brackets] is FALSE and option[:charstrip] sllows brackets" do
     before do
       @testopt.brackets = false
       @testopt.charstrip_allow_brackets = true
     end
 
     describe "should replace ALLOW bracket expressions" do
-      it_should_not_change 'foo[x]bar', 'fo(foo)ob<bar>ar'
+      it_should_not_change 'foo[x]bar'
+      it_should_not_change 'foo[-x-]bar'
+      it_should_not_change 'foo[_x_]bar'
+      it_should_not_change 'foo-[x]-bar'
+      it_should_not_change 'foo_[x]_bar'
+      it_should_not_change 'fo(foo)ob<bar>ar'
+      it_should_not_change 'fo(-foo-)ob<_bar_>ar'
+      it_should_not_change 'fo-(foo)-ob-<bar>-ar'
     end
   end
 end

data/spec/fixnames/dashes_spec.rb

@@ -0,0 +1,33 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Fixnames do
+  context "when only option[:dashes] is non-nil" do
+    before do
+      @testopt.fix_dashes = true
+      @testopt.whitespace = nil
+    end
+
+    describe "should preserve single dashes between letters" do
+      it_should_not_change 'a-b'
+    end
+
+    describe "should pass single underscores unchanged" do
+      it_should_not_change 'a_b'
+    end
+
+    describe "should not duplicate the :whitesapce filter and collapse dashe-underscores pairs to a dash" do
+      it_should_not_change 'a-_b', 'a_-b', 'a_-_b'
+    end
+
+    describe "should collapse multiple dashes to a single character" do
+      subject { 'a-b' }
+      it_should_fix 'a--b', 'a---b', 'a----b'
+    end
+
+    describe "should remove dashes near a dot" do
+      subject { 'a.b' }
+      it_should_fix  'a-.b', 'a.-b',   'a-.-b'
+      it_should_fix 'a--.b', 'a.--b', 'a--.--b'
+    end
+  end
+end

data/spec/fixnames/expunge_spec.rb

@@ -0,0 +1,59 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Fixnames do
+  context "when option[:expunge] is Regexp-formatted string and option[:replace is nil" do
+    before do
+      @testopt.mendstr = Fixnames::Option::DEFAULT_MENDSTR
+     end
+
+    describe "should erase matched fragments" do
+       subject { 'foo-242-bar-baz.quux' }
+      it_should_expunge_and_match      '-', 'foo242barbaz.quux'
+      it_should_expunge_and_match      'b', 'foo-242-ar-az.quux'
+      it_should_expunge_and_match    '\d+', 'foo--bar-baz.quux'
+      it_should_expunge_and_match '[0-9]+', 'foo--bar-baz.quux'
+      it_should_expunge_and_match   '-.*-', 'foobaz.quux'
+    end
+  end
+
+  context "when options[:expunge] is a Regexp and ootions[:replace] is a string" do
+    before do
+      @testopt.mendstr = 'X'
+    end
+
+    describe "should replace matched fragments" do
+      subject { 'foo-242-bar-baz.quux' }
+      it_should_expunge_and_match       '-', 'fooX242XbarXbaz.quux'
+      it_should_expunge_and_match       'b', 'foo-242-Xar-Xaz.quux'
+      it_should_expunge_and_match     '\d+', 'foo-X-bar-baz.quux'
+      it_should_expunge_and_match  '[0-9]+', 'foo-X-bar-baz.quux'
+      it_should_expunge_and_match    '-.*-', 'fooXbaz.quux'
+    end
+  end
+
+  context "when options[:expunge] is a Regexp and ootions[:replace] is a string with a backreference" do
+    before do
+      @testopt.mendstr = '\1-PLUGH'
+    end
+
+    describe "should replace matched fragments (including backreferences)" do
+      subject { 'foo-242-bar-baz.quux' }
+      it_should_expunge_and_match 'foo-(\d+)', '242-PLUGH-bar-baz.quux'
+      it_should_expunge_and_match    '(b\w*)', 'foo-242-bar-PLUGH-baz-PLUGH.quux'
+    end
+  end
+
+  context "when options[:expunge] is a Regexp and ootions[:replace] is a string with multiple backreferences" do
+    before do
+      @testopt.mendstr = '_\1\2\1_'
+    end
+
+    describe "should replace matched fragments (including backreferences)" do
+      subject { 'foo-242-bar-baz.quux' }
+      it_should_expunge_and_match   '(\d+)-(b\w*)', 'foo-242bar242-baz.quux'
+      it_should_expunge_and_match '-(\d+)-(b\w*)-', 'foo_242bar242_baz.quux'
+      it_should_expunge_and_match      '(b)(\w\w)', 'foo-242-barb-bazb.quux'
+      it_should_expunge_and_match    '-(b)(\w\w)-', 'foo-242_barb_baz.quux'
+    end
+  end
+end

data/spec/fixnames/numsep_spec.rb

@@ -0,0 +1,26 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Fixnames do
+  context "when option[:fix_numsep] is TRUE" do
+    before do
+      @testopt.fix_numsep = true
+    end
+
+    describe "should replace \"_\" with \"-\" after leading digits" do
+      subject { '42-foo_bar-3_quux.baz' }
+      it_should_fix '42_foo_bar-3_quux.baz'
+      it_should_not_change 'prefix-42_foo_bar-3_quux.baz'
+      it_should_not_change 'prefix_42_foo_bar-3_quux.baz'
+    end
+  end
+
+  context "when option[:fix_numsep] is FALSE" do
+    before do
+      @testopt.fix_numsep = false
+    end
+
+    describe "should not replace \"_\" with \"-\" after leading digits" do
+      it_should_not_change '42_foo_bar-3_quux.baz'
+    end
+  end
+end

data/spec/fixnames/whitespace_spec.rb

@@ -1,7 +1,12 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Fixnames do
-  context "when option[:whitespace] is non-nil" do
+  context "when only option[:whitespace] is non-nil" do
+    before do
+      @testopt.fix_dashes = false
+      @testopt.whitespace = Fixnames::Option::DEFAULT_WHITESPACE
+    end
+
     describe "should preserve simple names" do
       it_should_not_change 'abc', 'a-b', 'a.b'
     end
@@ -25,6 +30,11 @@ describe Fixnames do
       it_should_fix 'a  b', 'a   b', 'a    b'
     end
 
+    describe "should collapse dash-underscore pairs to a dash" do
+      subject { 'a-b' }
+      it_should_fix 'a-_b', 'a_-b', 'a_-_b'
+    end
+
     describe "should collapse multiple underscores to a single character" do
       subject { 'a_b' }
       it_should_fix 'a__b', 'a___b', 'a____b'
@@ -51,9 +61,9 @@ describe Fixnames do
 
     describe "should remove whitespace preceding a dot" do
       subject { 'a.b' }
-      it_should_fix  'a .b',   'a_.b',   'a-.b'
-      it_should_fix 'a  .b',  'a _.b',  'a_ .b'
-      it_should_fix 'a__.b', 'a _ .b', 'a- _.b'
+      it_should_fix  'a .b',   'a_.b'
+      it_should_fix 'a  .b',  'a _.b'
+      it_should_fix 'a__.b', 'a _ .b'
     end
 
     describe "should remove whitespace around a single dash" do

data/spec/support/option_setting_helpers.rb

@@ -0,0 +1,50 @@
+def it_should_allow_option(opt_name, value)
+  specify "new value allowd: option.#{opt_name}(#{value.inspect})" do
+    expect do
+      @testopt.send(opt_name, value)
+    end.not_to raise_error(ArgumentError)
+  end
+  specify "new value allowd: option.#{opt_name} = #{value.inspect}" do
+    expect do
+      @testopt.send("#{opt_name}=", value)
+    end.not_to raise_error(ArgumentError)
+  end
+end
+
+def it_should_allow_bool_option(opt_name)
+  it_should_allow_option(opt_name, true)
+  it_should_allow_option(opt_name, false)
+end
+
+def it_should_reject_option(opt_name, *values)
+  values.each do |value|
+    specify "new value rejected: option.#{opt_name}(#{value.inspect})" do
+      expect do
+        @testopt.send(opt_name, value)
+      end.to raise_error(ArgumentError)
+    end
+    specify "new value rejected: option.#{opt_name} = #{value.inspect}" do
+      expect do
+        @testopt.send("#{opt_name}=", value)
+      end.to raise_error(ArgumentError)
+    end
+  end
+end
+
+
+def it_should_reject_nonbool_option(opt_name)
+  it_should_reject_option opt_name, 123, 'foo', ['foo','bar','baz']
+end
+
+def it_should_reject_noninteger_option(opt_name)
+  it_should_reject_option opt_name, true, 'foo', ['foo','bar','baz']
+end
+
+def it_should_reject_nonstring_option(opt_name)
+  it_should_reject_option opt_name, true, 123, ['foo','bar','baz']
+end
+
+def it_should_reject_nonarray_option(opt_name)
+  it_should_reject_option opt_name, true, 123, 'foo'
+end
+

data/spec/support/should_fix_helpers.rb

@@ -17,3 +17,11 @@ def it_should_fix(*args)
     end
   end
 end
+
+def it_should_expunge_and_match(re, result)
+  specify "expunges /#{re}/ from #{subject.call.inspect} to produce #{result.inspect}" do
+    @testopt.expunge = re
+    fixed_for(subject).should eq(result)
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fixnames
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,63 +9,88 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-26 00:00:00.000000000 Z
+date: 2012-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  type: :runtime
   name: term-ansicolor
-  requirement: &10551560 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.6
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.6
-  type: :runtime
-  prerelease: false
-  version_requirements: *10551560
 - !ruby/object:Gem::Dependency
+  type: :development
   name: yard
-  requirement: &10550940 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.6.0
-  type: :development
-  prerelease: false
-  version_requirements: *10550940
 - !ruby/object:Gem::Dependency
+  type: :development
   name: rspec
-  requirement: &10532580 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.0
-  type: :development
-  prerelease: false
-  version_requirements: *10532580
 - !ruby/object:Gem::Dependency
+  type: :development
   name: jeweler
-  requirement: &10531940 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.4
-  type: :development
-  prerelease: false
-  version_requirements: *10531940
 - !ruby/object:Gem::Dependency
+  type: :development
   name: simplecov
-  requirement: &10531260 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *10531260
 description: ! 'Cleans up filenames so they can easily be used
 
   in scripts, without annoyances such as spaces or other bad characters'
@@ -96,17 +121,23 @@ files:
 - lib/fixnames/interface.rb
 - lib/fixnames/option.rb
 - lib/fixnames/version.rb
+- spec/fixnames/and_to_dash_spec.rb
+- spec/fixnames/badopt_spec.rb
 - spec/fixnames/banners_spec.rb
 - spec/fixnames/brackets_spec.rb
 - spec/fixnames/camelcase_spec.rb
 - spec/fixnames/charstrip_spec.rb
 - spec/fixnames/checksums_spec.rb
+- spec/fixnames/dashes_spec.rb
+- spec/fixnames/expunge_spec.rb
 - spec/fixnames/fixdots_spec.rb
 - spec/fixnames/hack_and_spec.rb
 - spec/fixnames/lowercase_spec.rb
+- spec/fixnames/numsep_spec.rb
 - spec/fixnames/semicolon_spec.rb
 - spec/fixnames/whitespace_spec.rb
 - spec/spec_helper.rb
+- spec/support/option_setting_helpers.rb
 - spec/support/should_fix_helpers.rb
 - test/helper.rb
 - test/test_charstrip.rb
@@ -135,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Filename cleanup for script compatability