Reduce duplication between publish and unpublish commands

Author: courajs

lib/jekyll-compose.rb

@@ -1,6 +1,8 @@
 require "jekyll-compose/version"
 require "jekyll-compose/arg_parser"
+require "jekyll-compose/movement_arg_parser"
 require "jekyll-compose/file_creator"
+require "jekyll-compose/file_mover"
 require "jekyll-compose/file_info"
 
 module Jekyll

lib/jekyll-compose/file_mover.rb

@@ -0,0 +1,34 @@
+module Jekyll
+  module Compose
+    class FileMover
+      attr_reader :movement
+      def initialize(movement)
+        @movement = movement
+      end
+
+      def resource_type
+        'file'
+      end
+
+      def move
+        validate_source
+        ensure_directory_exists
+        move_file
+      end
+
+      def validate_source
+        raise ArgumentError.new("There was no #{resource_type} found at '#{movement.from}'.") unless File.exist? movement.from
+      end
+
+      def ensure_directory_exists
+        dir = File.dirname movement.to
+        Dir.mkdir(dir) unless Dir.exist?(dir)
+      end
+
+      def move_file
+        FileUtils.mv(movement.from, movement.to)
+        puts "#{resource_type.capitalize} #{movement.from} was moved to #{movement.to}"
+      end
+    end
+  end
+end

lib/jekyll-compose/movement_arg_parser.rb

@@ -0,0 +1,19 @@
+module Jekyll
+  module Compose
+    class MovementArgParser
+      attr_reader :args, :options
+      def initialize(args, options)
+        @args = args
+        @options = options
+      end
+
+      def validate!
+        raise ArgumentError.new("You must specify a #{resource_type} path.") if args.empty?
+      end
+
+      def path
+        args.join ' '
+      end
+    end
+  end
+end

lib/jekyll/commands/publish.rb

@@ -26,27 +26,17 @@ def self.process(args = [], options = {})
 
     end
 
-    class PublishArgParser
-      attr_reader :args, :options
-      def initialize(args, options)
-        @args = args
-        @options = options
-      end
-
-      def validate!
-        raise ArgumentError.new('You must specify a draft path.') if args.empty?
+    class PublishArgParser < Compose::MovementArgParser
+      def resource_type
+        "draft"
       end
 
       def date
         options["date"].nil? ? Date.today : Date.parse(options["date"])
       end
 
-      def draft_path
-        args.join ' '
-      end
-
-      def draft_name
-        File.basename draft_path
+      def name
+        File.basename path
       end
     end
 
@@ -57,41 +47,18 @@ def initialize(params)
       end
 
       def from
-        params.draft_path
+        params.path
       end
 
       def to
-        "_posts/#{_date_stamp}-#{params.draft_name}"
-      end
-
-      def _date_stamp
-        params.date.strftime '%Y-%m-%d'
+        date_stamp = params.date.strftime '%Y-%m-%d'
+        "_posts/#{date_stamp}-#{params.name}"
       end
     end
 
-    class DraftMover
-      attr_reader :movement
-      def initialize(movement)
-        @movement = movement
-      end
-
-      def move
-        validate_source
-        ensure_directory_exists
-        move_file
-      end
-
-      def validate_source
-        raise ArgumentError.new("There was no draft found at '#{movement.from}'.") unless File.exist? movement.from
-      end
-
-      def ensure_directory_exists
-        Dir.mkdir("_posts") unless Dir.exist?("_posts")
-      end
-
-      def move_file
-        FileUtils.mv(movement.from, movement.to)
-        puts "Draft #{movement.from} was published to #{movement.to}"
+    class DraftMover < Compose::FileMover
+      def resource_type
+        'draft'
       end
     end
   end

lib/jekyll/commands/unpublish.rb

@@ -24,23 +24,13 @@ def self.process(args = [], options = {})
 
     end
 
-    class UnpublishArgParser
-      attr_reader :args, :options
-      def initialize(args, options)
-        @args = args
-        @options = options
+    class UnpublishArgParser < Compose::MovementArgParser
+      def resource_type
+        'post'
       end
 
-      def validate!
-        raise ArgumentError.new('You must specify a post path.') if args.empty?
-      end
-
-      def post_path
-        args.join ' '
-      end
-
-      def post_name
-        File.basename(post_path).sub /\d{4}-\d{2}-\d{2}-/, ''
+      def name
+        File.basename(path).sub /\d{4}-\d{2}-\d{2}-/, ''
       end
     end
 
@@ -51,37 +41,17 @@ def initialize(params)
       end
 
       def from
-        params.post_path
+        params.path
       end
 
       def to
-        "_drafts/#{params.post_name}"
+        "_drafts/#{params.name}"
       end
     end
 
-    class PostMover
-      attr_reader :movement
-      def initialize(movement)
-        @movement = movement
-      end
-
-      def move
-        validate_source
-        ensure_directory_exists
-        move_file
-      end
-
-      def validate_source
-        raise ArgumentError.new("There was no post found at '#{movement.from}'.") unless File.exist? movement.from
-      end
-
-      def ensure_directory_exists
-        Dir.mkdir("_drafts") unless Dir.exist?("_drafts")
-      end
-
-      def move_file
-        FileUtils.mv(movement.from, movement.to)
-        puts "Post #{movement.from} was moved to #{movement.to}"
+    class PostMover < Compose::FileMover
+      def resource_type
+        'post'
       end
     end
   end

spec/publish_spec.rb

@@ -44,7 +44,7 @@
   it 'writes a helpful message on success' do
     expect(draft_path).to exist
     output = capture_stdout { described_class.process(args) }
-    expect(output).to eql("Draft _drafts/#{draft_to_publish} was published to _posts/#{post_filename}\n")
+    expect(output).to eql("Draft _drafts/#{draft_to_publish} was moved to _posts/#{post_filename}\n")
   end
 
   it 'publishes a draft on the specified date' do