writer 0.2.0 → 0.3.0

data/lib/writer/file_namer.rb

@@ -27,11 +27,12 @@ module Writer
       end
 
       def prevent_overwrite(name, base = nil, ext = nil)
+        separator = separator_for(name, base)
         to_fix = base || name
         count = 1
 
         while File.exists?(name)
-          name = append_count(to_fix, count += 1)
+          name = append_count(to_fix, separator, count += 1)
           name << ".#{ext}" if base
         end
 
@@ -39,9 +40,19 @@ module Writer
       end
 
       private
-      def append_count(name, count)
-        name = name.gsub(/--\d*$/, '')
-        [name, "--", count].join
+      def append_count(name, separator, count)
+        basename = name.gsub(/(--|\.)\d*$/, '')
+        zero_pad = count < 10 ? 0 : nil
+
+        [basename, separator, zero_pad, count].join
+      end
+
+      def separator_for(name, base = nil)
+        if base || name.include?('.')
+          "."
+        else
+          "--"
+        end
       end
     end
   end

data/lib/writer/version.rb

@@ -1,3 +1,3 @@
 module Writer
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/writer_spec.rb

@@ -21,12 +21,21 @@ describe Writer do
     file.read.should == "\n"
   end
 
+  it "prevents overwriting" do
+    50.times do
+      Writer.write!
+    end
+
+    File.open('2012-01Jan-03.02.md')
+    File.open('2012-01Jan-03.52.md')
+  end
+
   it "plays well with no dots" do
     file = Writer.write!('nodots')
     File.basename(file).should == 'nodots'
 
     file = Writer.write!('nodots')
-    File.basename(file).should == 'nodots--2'
+    File.basename(file).should == 'nodots--02'
   end
 
   it "plays well with a dot at the end" do
@@ -34,7 +43,7 @@ describe Writer do
     File.basename(file).should == 'dot.'
 
     file = Writer.write!('dot.')
-    File.basename(file).should == 'dot--2.'
+    File.basename(file).should == 'dot.02.'
   end
 
   it "plays well with a dot at the beginning" do
@@ -42,21 +51,13 @@ describe Writer do
     File.basename(file).should == '.dot'
 
     file = Writer.write!('.dot')
-    File.basename(file).should == '.dot--2'
+    File.basename(file).should == '.dot.02'
   end
 
   it "plays well with multiple dots" do
     Writer.write!('some.jquery.file')
     file = Writer.write!('some.jquery.file')
-    File.basename(file).should == 'some.jquery--2.file'
-  end
-
-  it "prevents overwriting" do
-    Writer.write!
-    Writer.write!
-
-    File.open('2012-01Jan-03--2.md')
-    File.open('2012-01Jan-03--3.md')
+    File.basename(file).should == 'some.jquery.02.file'
   end
 
   it "creates the file with your custom name" do
@@ -80,18 +81,17 @@ end
 
 def cleanup_files
   File.delete('2012-01Jan-03.md')
-  File.delete('2012-01Jan-03--2.md')
-  File.delete('2012-01Jan-03--3.md')
-  File.delete('2012-01Jan-03--4.md')
-  File.delete('2012-01Jan-03--5.md')
+  52.times do |n|
+    File.delete("2012-01Jan-03.#{'0' if n < 8}#{n + 2}.md")
+  end
   File.delete('nodots')
-  File.delete('nodots--2')
   File.delete('dot.')
-  File.delete('dot--2.')
+  File.delete('dot.02.')
   File.delete('some.jquery.file')
-  File.delete('some.jquery--2.file')
+  File.delete('some.jquery.02.file')
   File.delete('.template')
   File.delete('My custom filename.txt')
   File.delete('.dot')
-  File.delete('.dot--2')
+  File.delete('.dot.02')
+  File.delete('nodots--2')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: writer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70238314665740 !ruby/object:Gem::Requirement
+  requirement: &70124302849860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70238314665740
+  version_requirements: *70124302849860
 description: Easily start a new file to write in.
 email:
 - joe@joesak.com