writer 0.1.1 → 0.2.0

data/lib/writer/file_creator.rb

@@ -1,10 +1,10 @@
-require "writer/overwrite_prevention"
+require "writer/file_namer"
 
 module Writer
   class FileCreator
     class << self
       def create!(filename, content)
-        name = OverwritePrevention.adjust(filename)
+        name = FileNamer.name_for(filename)
         content = content
 
         create_file(name, content)

data/lib/writer/{overwrite_prevention.rb → file_namer.rb}

@@ -1,11 +1,10 @@
 module Writer
-  class OverwritePrevention
+  class FileNamer
     class << self
-      def adjust(filename)
+      def name_for(filename)
         name = fix_standard(filename)
-        name ||= fix_no_extension(filename)
-        name ||= fix_no_base(filename)
-        name ||= fix_no_dots(filename)
+        name ||= fix_no_ext(filename)
+        name ||= prevent_overwrite(filename)
         name
       end
 
@@ -15,32 +14,19 @@ module Writer
           basename = parts[0..-2].join('.')
           extension = parts.last
 
-          fix_name(name, basename, extension)
+          prevent_overwrite(name, basename, extension)
         end
       end
 
-      def fix_no_extension(name)
+      def fix_no_ext(name)
         if /\.$/ =~ name
           basename = name.gsub('.', '')
 
-          fix_name(name, basename)
+          prevent_overwrite(name, basename)
         end
       end
 
-      def fix_no_base(name)
-        if /^\./ =~ name
-          fix_name(name)
-        end
-      end
-
-      def fix_no_dots(name)
-        unless name.include?('.')
-          fix_name(name)
-        end
-      end
-
-      private
-      def fix_name(name, base = nil, ext = nil)
+      def prevent_overwrite(name, base = nil, ext = nil)
         to_fix = base || name
         count = 1
 
@@ -52,6 +38,7 @@ module Writer
         name
       end
 
+      private
       def append_count(name, count)
         name = name.gsub(/--\d*$/, '')
         [name, "--", count].join

data/lib/writer/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: writer
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.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: &70289521172480 !ruby/object:Gem::Requirement
+  requirement: &70238314665740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70289521172480
+  version_requirements: *70238314665740
 description: Easily start a new file to write in.
 email:
 - joe@joesak.com
@@ -41,7 +41,7 @@ files:
 - lib/writer.rb
 - lib/writer/configuration.rb
 - lib/writer/file_creator.rb
-- lib/writer/overwrite_prevention.rb
+- lib/writer/file_namer.rb
 - lib/writer/version.rb
 - spec/.gitkeep
 - spec/writer_spec.rb