jekyll-compose 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 284c0224140f97b3f80f0041330f7e20790c24d6
-  data.tar.gz: 5c736a3ec82eef5328aa097d4351b6c81f1a9807
+  metadata.gz: d24fea17086602339c5733e9f7ff462f7873d688
+  data.tar.gz: 760ec8a158fc02edc26483568b38e55bce6fda0e
 SHA512:
-  metadata.gz: 38ece0d02394f8b0d5d5937cc629664d70b2b0684cd98ec4b5bab44f79fa3130b9b928c0b50efc3fd4d51dd2c368b700f1ca2678eaf3dcf88d829f309065c8cd
-  data.tar.gz: 91bac058225f3c0811684567805db2db4c45d6d161f98cd0913a013153b192b7e74fd0687c3611574a2880273bc7e48ea2740d2d254d3e6cc7d96bab19677cbf
+  metadata.gz: c0c1164e65ae1eb4838a9acbe8cf03f95a95e754f28c7f8f088b8d8d5d449992f257e2bc881f32a30e6cd262ddbf37559ec310e16622f5e36854fce020388a94
+  data.tar.gz: 0da8db0f0c55356953d8446abd27aa4f2aa1c47eefd4a3fa61ca2857f1b52fdaac5ea8068d6f24b079958ef6362cc394dcce623c25b285dbc4fba7749ececdb1

data/lib/jekyll-compose.rb

@@ -1,12 +1,18 @@
 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
   module Compose
     DEFAULT_TYPE = "md"
     DEFAULT_LAYOUT = "post"
+    DEFAULT_LAYOUT_PAGE = "page"
   end
 end
 
-%w{draft post publish}.each do |file|
+%w{draft post publish unpublish page}.each do |file|
   require File.expand_path("jekyll/commands/#{file}.rb", File.dirname(__FILE__))
 end

data/lib/jekyll-compose/arg_parser.rb

@@ -0,0 +1,27 @@
+class Jekyll::Compose::ArgParser
+  attr_reader :args, :options
+  def initialize(args, options)
+    @args = args
+    @options = options
+  end
+
+  def validate!
+    raise ArgumentError.new('You must specify a name.') if args.empty?
+  end
+
+  def type
+    type = options["extension"] || Jekyll::Compose::DEFAULT_TYPE
+  end
+
+  def layout
+    layout = options["layout"] || Jekyll::Compose::DEFAULT_LAYOUT
+  end
+
+  def title
+    args.join ' '
+  end
+
+  def force?
+    !!options["force"]
+  end
+end

data/lib/jekyll-compose/file_creator.rb

@@ -0,0 +1,36 @@
+module Jekyll
+  module Compose
+    class FileCreator
+      attr_reader :file, :force
+      def initialize(fileInfo, force = false)
+        @file = fileInfo
+        @force = force
+      end
+
+      def create!
+        validate_should_write!
+        ensure_directory_exists
+        write_file
+      end
+
+      private
+
+      def validate_should_write!
+        raise ArgumentError.new("A #{file.resource_type} already exists at #{file.path}") if File.exist?(file.path) and !force
+      end
+
+      def ensure_directory_exists
+        dir = File.dirname file.path
+        Dir.mkdir(dir) unless Dir.exist?(dir)
+      end
+
+      def write_file
+        File.open(file.path, "w") do |f|
+          f.puts(file.content)
+        end
+
+        puts "New #{file.resource_type} created at #{file.path}."
+      end
+    end
+  end
+end

data/lib/jekyll-compose/file_info.rb

@@ -0,0 +1,20 @@
+class Jekyll::Compose::FileInfo
+  attr_reader :params
+  def initialize(params)
+    @params = params
+  end
+
+  def file_name
+    name = Jekyll::Utils.slugify params.title
+    "#{name}.#{params.type}"
+  end
+
+  def content
+    <<-CONTENT.gsub /^\s+/, ''
+      ---
+      layout: #{params.layout}
+      title: #{params.title}
+      ---
+    CONTENT
+  end
+end

data/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

data/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

data/lib/jekyll-compose/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Compose
-    VERSION = "0.2.1"
+    VERSION = "0.3.0"
   end
 end

data/lib/jekyll/commands/draft.rb

@@ -6,48 +6,38 @@ module Jekyll
           c.syntax 'draft NAME'
           c.description 'Creates a new draft post with the given NAME'
 
-          c.option 'type', '-t TYPE', '--type TYPE', 'Specify the content type'
-          c.option 'layout', '-l LAYOUT', '--layout LAYOUT', 'Specify the post layout'
-          c.option 'force', '-f', '--force', 'Overwrite a draft if it already exists'
+          options.each {|opt| c.option *opt }
 
-          c.action do |args, options|
-            Jekyll::Commands::Draft.process(args, options)
-          end
+          c.action { |args, options| process args, options }
         end
       end
 
-      def self.process(args = [], options = {})
-        raise ArgumentError.new('You must specify a name.') if args.empty?
+      def self.options
+        [
+          ['extension', '-x EXTENSION', '--extension EXTENSION', 'Specify the file extension'],
+          ['layout', '-l LAYOUT', '--layout LAYOUT', "Specify the draft layout"],
+          ['force', '-f', '--force', 'Overwrite a draft if it already exists']
+        ]
+      end
 
-        type = options["type"] || Jekyll::Compose::DEFAULT_TYPE
-        layout = options["layout"] || Jekyll::Compose::DEFAULT_LAYOUT
 
-        title = args.shift
-        name = title.gsub(' ', '-').downcase
+      def self.process(args = [], options = {})
+        params = Compose::ArgParser.new args, options
+        params.validate!
 
-        draft_path = draft_name(name, type)
+        draft = DraftFileInfo.new params
 
-        raise ArgumentError.new("A draft already exists at ./#{draft_path}") if File.exist?(draft_path) and !options["force"]
+        Compose::FileCreator.new(draft, params.force?).create!
+      end
 
-        Dir.mkdir("_drafts") unless Dir.exist?("_drafts")
-        File.open(draft_path, "w") do |f|
-          f.puts(front_matter(layout, title))
+      class DraftFileInfo < Compose::FileInfo
+        def resource_type
+          'draft'
         end
 
-        puts "New draft created at ./#{draft_path}.\n"
-      end
-      # Internal: Gets the filename of the draft to be created
-      #
-      # Returns the filename of the draft, as a String
-      def self.draft_name(name, ext=Jekyll::Compose::DEFAULT_TYPE)
-        "_drafts/#{name}.#{ext}"
-      end
-
-      def self.front_matter(layout, title)
-        {
-          "layout" => layout,
-          "title"  => title,
-        }.to_yaml + "\n---\n"
+        def path
+          "_drafts/#{file_name}"
+        end
       end
     end
   end

data/lib/jekyll/commands/page.rb

@@ -0,0 +1,48 @@
+module Jekyll
+  module Commands
+    class Page < Command
+      def self.init_with_program(prog)
+        prog.command(:page) do |c|
+          c.syntax 'page NAME'
+          c.description 'Creates a new page with the given NAME'
+
+          options.each {|opt| c.option *opt }
+
+          c.action { |args, options| process args, options }
+        end
+      end
+
+      def self.options
+        [
+          ['extension', '-x EXTENSION', '--extension EXTENSION', 'Specify the file extension'],
+          ['layout', '-l LAYOUT', '--layout LAYOUT', "Specify the page layout"],
+          ['force', '-f', '--force', 'Overwrite a page if it already exists']
+        ]
+      end
+
+      def self.process(args = [], options = {})
+        params = PageArgParser.new args, options
+        params.validate!
+
+        page = PageFileInfo.new params
+
+        Compose::FileCreator.new(page, params.force?).create!
+      end
+
+      class PageArgParser < Compose::ArgParser
+        def layout
+          layout = options["layout"] || Jekyll::Compose::DEFAULT_LAYOUT_PAGE
+        end
+      end
+
+      class PageFileInfo < Compose::FileInfo
+        def resource_type
+          'page'
+        end
+
+        alias_method :path, :file_name
+
+      end
+    end
+  end
+end

data/lib/jekyll/commands/post.rb

@@ -6,50 +6,53 @@ module Jekyll
           c.syntax 'post NAME'
           c.description 'Creates a new post with the given NAME'
 
-          c.option 'type', '-t TYPE', '--type TYPE', 'Specify the content type'
-          c.option 'layout', '-t LAYOUT', '--layout LAYOUT', 'Specify the post layout'
-          c.option 'date', '-d DATE', '--date DATE', 'Specify the post date'
-          c.option 'force', '-f', '--force', 'Overwrite a post if it already exists'
-
-          c.action do |args, options|
-            Jekyll::Commands::Post.process(args, options)
-          end
+          options.each {|opt| c.option *opt }
+
+          c.action { |args, options| process args, options }
         end
       end
 
+      def self.options
+        [
+          ['extension', '-x EXTENSION', '--extension EXTENSION', 'Specify the file extension'],
+          ['layout', '-l LAYOUT', '--layout LAYOUT', "Specify the post layout"],
+          ['force', '-f', '--force', 'Overwrite a post if it already exists'],
+          ['date', '-d DATE', '--date DATE', 'Specify the post date']
+        ]
+      end
+
       def self.process(args = [], options = {})
-        raise ArgumentError.new('You must specify a name.') if args.empty?
+        params = PostArgParser.new args, options
+        params.validate!
 
-        type = options["type"] || Jekyll::Compose::DEFAULT_TYPE
-        layout = options["layout"] || Jekyll::Compose::DEFAULT_LAYOUT
+        post = PostFileInfo.new params
 
-        date = options["date"].nil? ? Time.now : DateTime.parse(options["date"])
+        Compose::FileCreator.new(post, params.force?).create!
+      end
 
-        title = args.shift
-        name = title.gsub(' ', '-').downcase
 
-        post_path = file_name(name, type, date)
+      class PostArgParser < Compose::ArgParser
+        def date
+          options["date"].nil? ? Time.now : DateTime.parse(options["date"])
+        end
+      end
 
-        raise ArgumentError.new("A post already exists at ./#{post_path}") if File.exist?(post_path) and !options["force"]
+      class PostFileInfo < Compose::FileInfo
+        def resource_type
+          'post'
+        end
 
-        File.open(post_path, "w") do |f|
-          f.puts(front_matter(layout, title))
+        def path
+          "_posts/#{file_name}"
         end
 
-        puts "New post created at ./#{post_path}.\n"
-      end
-      # Internal: Gets the filename of the draft to be created
-      #
-      # Returns the filename of the draft, as a String
-      def self.file_name(name, ext, date)
-        "_posts/#{date.strftime('%Y-%m-%d')}-#{name}.#{ext}"
-      end
+        def file_name
+          "#{_date_stamp}-#{super}"
+        end
 
-      def self.front_matter(layout, title)
-        "---
-layout: #{layout}
-title: #{title}
----"
+        def _date_stamp
+          @params.date.strftime '%Y-%m-%d'
+        end
       end
     end
   end

data/lib/jekyll/commands/publish.rb

@@ -15,30 +15,51 @@ module Jekyll
       end
 
       def self.process(args = [], options = {})
-        raise ArgumentError.new('You must specify a draft path.') if args.empty?
+        params = PublishArgParser.new args, options
+        params.validate!
 
-        date = options["date"].nil? ? Date.today : Date.parse(options["date"])
-        draft_path = args.shift
+        movement = DraftMovementInfo.new params
 
-        raise ArgumentError.new("There was no draft found at '#{draft_path}'.") unless File.exist? draft_path
+        mover = DraftMover.new movement
+        mover.move
+      end
+
+    end
 
-        post_path = post_name(date, draft_name(draft_path))
-        FileUtils.mv(draft_path, post_path)
+    class PublishArgParser < Compose::MovementArgParser
+      def resource_type
+        "draft"
+      end
 
-        puts "Draft #{draft_path} was published to ./#{post_path}"
+      def date
+        options["date"].nil? ? Date.today : Date.parse(options["date"])
       end
 
-      # Internal: Gets the filename of the post to be created
-      #
-      # Returns the filename of the post, as a String
-      def self.post_name(date, name)
-        "_posts/#{date.strftime('%Y-%m-%d')}-#{name}"
+      def name
+        File.basename path
       end
+    end
 
-      def self.draft_name(path)
-        File.basename(path)
+    class DraftMovementInfo
+      attr_reader :params
+      def initialize(params)
+        @params = params
       end
 
+      def from
+        params.path
+      end
+
+      def to
+        date_stamp = params.date.strftime '%Y-%m-%d'
+        "_posts/#{date_stamp}-#{params.name}"
+      end
+    end
+
+    class DraftMover < Compose::FileMover
+      def resource_type
+        'draft'
+      end
     end
   end
 end

data/lib/jekyll/commands/unpublish.rb

@@ -0,0 +1,58 @@
+module Jekyll
+  module Commands
+    class Unpublish < Command
+      def self.init_with_program(prog)
+        prog.command(:unpublish) do |c|
+          c.syntax 'unpublish POST_PATH'
+          c.description 'Moves a post back into the _drafts directory'
+
+          c.action do |args, options|
+            process(args, options)
+          end
+        end
+      end
+
+      def self.process(args = [], options = {})
+        params = UnpublishArgParser.new args, options
+        params.validate!
+
+        movement = PostMovementInfo.new params
+
+        mover = PostMover.new movement
+        mover.move
+      end
+
+    end
+
+    class UnpublishArgParser < Compose::MovementArgParser
+      def resource_type
+        'post'
+      end
+
+      def name
+        File.basename(path).sub /\d{4}-\d{2}-\d{2}-/, ''
+      end
+    end
+
+    class PostMovementInfo
+      attr_reader :params
+      def initialize(params)
+        @params = params
+      end
+
+      def from
+        params.path
+      end
+
+      def to
+        "_drafts/#{params.name}"
+      end
+    end
+
+    class PostMover < Compose::FileMover
+      def resource_type
+        'post'
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-compose
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Parker Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-17 00:00:00.000000000 Z
+date: 2015-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,10 +74,17 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/jekyll-compose.rb
+- lib/jekyll-compose/arg_parser.rb
+- lib/jekyll-compose/file_creator.rb
+- lib/jekyll-compose/file_info.rb
+- lib/jekyll-compose/file_mover.rb
+- lib/jekyll-compose/movement_arg_parser.rb
 - lib/jekyll-compose/version.rb
 - lib/jekyll/commands/draft.rb
+- lib/jekyll/commands/page.rb
 - lib/jekyll/commands/post.rb
 - lib/jekyll/commands/publish.rb
+- lib/jekyll/commands/unpublish.rb
 homepage: https://github.com/jekyll/jekyll-compose
 licenses:
 - MIT
@@ -98,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Streamline your writing in Jekyll with these commands.