wp2middleman 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b67863aef362146f51783f4a7ced9cdeb3c0c2f
-  data.tar.gz: 19c5c8e3928ca0105aeb94401d16cb7dc04793e9
+  metadata.gz: 6bf5c2076748c910b3515e473912c17758f0be58
+  data.tar.gz: 45ca770a54f40a300656253b68c0db60ad48e880
 SHA512:
-  metadata.gz: 35557bbabfae2b1a3a018e42e2697ae94fa2212399a22ec8ecfa58af9948fec267de57c18b260709f18ede882bc692e71eff582ce9be304af32db6777fe36307
-  data.tar.gz: f5fa2d3f54cd1814e86f9336e378635a143c5b112d221d6fe0695cc5c42505b137dfbed2915559ccd0259bcedd592454ac07cf8e6efaf87f2879439c7845de4d
+  metadata.gz: 1c4f3e75ba32a0912cbc858b426d87fe580c2a83cf6721acb64913b0aba589819e2fe9d3267f958930794ff8b9325fe68883e087681a564fb0b0a8a97f2cbb14
+  data.tar.gz: 34571e5da1978978e4e8d04b8aec6f262744d06f7b145b271e89232c987ee7ab2b90f93acab6e2af7e42a27a8c712254b22e910ae73770f028265b54a215be05

data/.rspec

@@ -1 +1,2 @@
 --color
+--format documentation

data/README.md

@@ -1,16 +1,16 @@
 [![Build Status](https://travis-ci.org/mdb/wp2middleman.png?branch=master)](https://travis-ci.org/mdb/wp2middleman)
+[![Code Climate](https://codeclimate.com/github/mdb/wp2middleman/badges/gpa.svg)](https://codeclimate.com/github/mdb/wp2middleman)
 
 # wp2middleman
 
-Migrate the posts contained in a Wordpress XML export file to Middleman-style markdown files.
+A command line tool to help move a Wordpress blog to [Middleman](http://middlemanapp.com).
+
+wp2middleman migrates the posts contained in a Wordpress XML export file to Middleman-style markdown files.
 
 ## Installation
 
 ```
-git clone http://github.com/mdb/wp2middleman
-cd wp2middleman
-bundle install
-rake install
+gem install wp2middleman
 ```
 
 ## Commandline Usage
@@ -35,7 +35,14 @@ tags: foo, bar
 </ul>
 ```
 
-### Optional parameters
+## Optional Parameters
+
+```
+--body_to_markdown                         converts to markdown
+--include_fields=FIELD_ONE FIELD_TWO ETC   includes specific fields in frontmatter
+```
+
+### Convert to Markdown
 
 ```
 wp2mm some_wordpress_export.xml --body_to_markdown true
@@ -55,3 +62,28 @@ The post content in markdown or text, depending on how it was saved to Wordpress
 * list item
 * another list item
 ```
+
+### Include specific post fields
+
+```
+wp2mm some_wordpress_export.xml --include_fields wp:post_id link
+```
+
+Pulls the specified key/values out of the post xml and includes it in frontmatter:
+
+```
+---
+title: 'Some Title'
+date: YYYY-MM-DD
+tags: foo, bar
+wp:post_id: '280'
+link: http://somewebsite.com/2012/10/some-title
+---
+
+<p>The post content in HTML or text, depending on how it was saved to Wordpress.</p>
+<ul>
+<li>list item</li>
+<li>another list item</li>
+</ul>
+```
+

data/lib/wp2middleman/cli.rb

@@ -5,7 +5,9 @@ module WP2Middleman
     default_task :wp2mm
 
     desc "WORDPRESS XML EXPORT FILE", "Migrate Wordpress posts to Middleman-style markdown files"
-    option :body_to_markdown
+    option :body_to_markdown, :type => :boolean
+    option :include_fields, :type => :array
+
     def wp2mm(wp_xml_export = nil)
       return usage unless wp_xml_export
 
@@ -14,7 +16,8 @@ module WP2Middleman
         exit 1
       end
 
-      WP2Middleman.migrate(wp_xml_export, options[:body_to_markdown])
+      include_fields = options[:include_fields] || []
+      WP2Middleman.migrate(wp_xml_export, options[:body_to_markdown], include_fields)
 
       say "Successfully migrated #{wp_xml_export}", "\033[32m"
     end

data/lib/wp2middleman/frontmatter.rb

@@ -0,0 +1,34 @@
+require 'yaml'
+
+module WP2Middleman
+  class Frontmatter
+    def initialize(post, include_fields: [])
+      @post = post
+      @include_fields = include_fields
+    end
+
+    def post_data
+      data = {
+        'title' => post.title,
+        'date' => post.date_published,
+        'tags' => post.tags
+      }
+
+      data['published'] = false if !post.published?
+
+      include_fields.each do |field|
+        data[field] = post.field(field)
+      end
+
+      data
+    end
+
+    def to_yaml
+      post_data.to_yaml.strip
+    end
+
+    private
+
+    attr_reader :post, :include_fields
+  end
+end

data/lib/wp2middleman/middleman_post.rb

@@ -0,0 +1,71 @@
+module WP2Middleman
+  class MiddlemanPost
+    def initialize(wp_post, body_to_markdown: false, include_fields: [])
+      @wp_post = wp_post
+      @body_to_markdown = body_to_markdown
+      @include_fields = include_fields
+    end
+
+    def title
+      wp_post.title
+    end
+
+    def title_for_filename
+      title.gsub(/[^\w\s_-]+/, '')
+        .gsub(/(^|\b\s)\s+($|\s?\b)/, '\\1\\2')
+        .gsub(/\s+/, '-')
+    end
+
+    def filename
+      "#{date_published}-#{title_for_filename}"
+    end
+
+    def date_published
+      wp_post.date_published
+    end
+
+    def full_filename output_path
+      "#{output_path}#{filename}.html.markdown"
+    end
+
+    def file_content
+      <<-EOS.gsub(/^ {8}/, '')
+        #{frontmatter.to_yaml}
+        ---
+
+        #{formatted_post_content}
+      EOS
+    end
+
+    def formatted_post_content
+      if body_to_markdown
+        markdown_content
+      else
+        content
+      end
+    end
+
+    def content
+      wp_post.content
+    end
+
+    def markdown_content
+      html = HTMLPage.new :contents => content
+      html.comment do |node,_|
+        "#{node}"
+      end
+      html.iframe do |node,_|
+        "#{node}"
+      end
+      html.markdown
+    end
+
+    private
+
+    attr_reader :wp_post, :body_to_markdown, :include_fields
+
+    def frontmatter
+      @frontmatter ||= Frontmatter.new(wp_post, include_fields: include_fields)
+    end
+  end
+end

data/lib/wp2middleman/migrator.rb

@@ -2,69 +2,23 @@ require 'yaml'
 
 module WP2Middleman
   class Migrator
-
     attr_reader :posts
 
-    def initialize(wp_xml_export_file, body_to_markdown: false)
-      @body_to_markdown = body_to_markdown
-      @posts = WP2Middleman::PostCollection.new(wp_xml_export_file).posts
+    def initialize(wp_xml_export_file, body_to_markdown: false, include_fields: [])
+      @posts = WP2Middleman::PostCollection.from_file(wp_xml_export_file)
+        .without_attachments
+        .only_valid
+        .to_middleman(body_to_markdown: body_to_markdown, include_fields: include_fields)
     end
 
     def migrate
       ensure_export_directory
 
-      @posts.each do |post|
-        write_file(post)
+      posts.each do |post|
+        File.write(post.full_filename(output_path), post.file_content)
       end
     end
 
-    def write_file(post)
-      if valid_post_data(post)
-        File.open(full_filename(post), "w") do |file|
-          file.write(file_content(post))
-        end
-      end
-    end
-
-    def file_content(post)
-      yaml = frontmatter(post).to_yaml.strip
-
-      <<-EOS.gsub(/^ {8}/, '')
-        #{yaml}
-        ---
-
-        #{formatted_post_content(post)}
-      EOS
-    end
-
-    def frontmatter(post)
-      data = {
-        'title' => post.title,
-        'date' => post.date_published,
-        'tags' => post.tags
-      }
-
-      data['published'] = false if !post.published?
-
-      data
-    end
-
-    def formatted_post_content(post)
-      if @body_to_markdown
-        post.markdown_content
-      else
-        post.content
-      end
-    end
-
-    def full_filename(post)
-      "#{output_path}#{post.filename}.html.markdown"
-    end
-
-    def valid_post_data(post)
-      !(post.post_date.nil? || post.title.nil? || post.date_published.nil? || post.content.nil?)
-    end
-
     def output_path
       "#{Dir.pwd}/export/"
     end

data/lib/wp2middleman/post.rb

@@ -12,14 +12,16 @@ module WP2Middleman
       post.css('title').text
     end
 
-    def title_for_filename
-      title.gsub(/[^\w\s_-]+/, '')
-      .gsub(/(^|\b\s)\s+($|\s?\b)/, '\\1\\2')
-      .gsub(/\s+/, '-')
+    def valid?
+      !(post_date.nil? || title.nil? || date_published.nil? || content.nil?)
     end
 
-    def filename
-      "#{date_published}-#{title_for_filename}"
+    def attachment?
+      type == 'attachment'
+    end
+
+    def field(field)
+      post.xpath(field).first.inner_text
     end
 
     def post_date
@@ -46,17 +48,6 @@ module WP2Middleman
       post.at_xpath(".//content:encoded").inner_text
     end
 
-    def markdown_content
-      html = HTMLPage.new :contents => content
-      html.comment do |node,_|
-        "#{node}"
-      end
-      html.iframe do |node,_|
-        "#{node}"
-      end
-      html.markdown
-    end
-
     def tags
       tags = []
       categories = post.xpath("category")

data/lib/wp2middleman/post_collection.rb

@@ -2,14 +2,44 @@ require 'nokogiri'
 
 module WP2Middleman
   class PostCollection
-    def initialize(wp_xml_export_file)
-      @xml = Nokogiri::XML(File.open("#{Dir.pwd}/#{wp_xml_export_file}"))
+    include Enumerable
+
+    def self.from_file(wp_xml_export_file)
+      xml = Nokogiri::XML(File.open("#{Dir.pwd}/#{wp_xml_export_file}"))
+      new xml.css('item').collect { |raw_wp_post| WP2Middleman::Post.new(raw_wp_post) }
+    end
+
+    def initialize(posts=[])
+      @posts = posts
+    end
+
+    def each(&block)
+      posts.each &block
+    end
+
+    def [] key
+      posts[key]
     end
 
-    def posts
-      @xml.css('item')
-        .map { |post| WP2Middleman::Post.new(post) }
-        .reject { |post| post.type == 'attachment' }
+    def empty?
+      posts.empty?
     end
+
+    def without_attachments
+      self.class.new(reject(&:attachment?))
+    end
+
+    def only_valid
+      self.class.new(select(&:valid?))
+    end
+
+    def to_middleman(body_to_markdown: false, include_fields: [])
+      middleman_posts = collect { |p| WP2Middleman::MiddlemanPost.new(p, body_to_markdown: body_to_markdown, include_fields: include_fields) }
+      self.class.new(middleman_posts)
+    end
+
+    private
+
+    attr_reader :posts
   end
 end

data/lib/wp2middleman/version.rb

@@ -1,3 +1,3 @@
 module WP2Middleman
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/wp2middleman.rb

@@ -1,12 +1,16 @@
 require 'wp2middleman/version'
 require 'wp2middleman/post'
+require 'wp2middleman/middleman_post'
 require 'wp2middleman/post_collection'
+require 'wp2middleman/frontmatter'
 require 'wp2middleman/migrator'
 require 'wp2middleman/cli'
 
 module WP2Middleman
-  def self.migrate(wp_xml_export_file, body_to_markdown = false)
-    migrator = WP2Middleman::Migrator.new wp_xml_export_file, body_to_markdown: body_to_markdown
+  def self.migrate(wp_xml_export_file, body_to_markdown = false, include_fields = [])
+    migrator = WP2Middleman::Migrator.new wp_xml_export_file,
+      body_to_markdown: body_to_markdown,
+      include_fields: include_fields
     migrator.migrate
   end
 end

data/spec/lib/wp2middleman/cli_spec.rb

@@ -7,51 +7,71 @@ describe WP2Middleman::CLI do
 
   describe "#wp2mm" do
     before do
-      cli.stub :say
+      allow(cli).to receive(:say)
     end
 
     context "it's not passed any arguments" do
       it "returns usage details" do
-        cli.should_receive(:usage).exactly(1).times
+        expect(cli).to receive(:usage).exactly(1).times
         cli.wp2mm
       end
     end
 
     context "it's passed a Wordpress XML export file that does not exist" do
       it "reports that it was passed an invalid directory and exits with an exit code of 1" do
-        Kernel.stub(:exit).and_return true
-        File.stub(:file?).and_return false
-        cli.should_receive(:error).with("foo is not a valid file")
-        lambda { cli.wp2mm 'foo' }.should exit_with_code(1)
+        allow(Kernel).to receive(:exit) { true }
+        allow(File).to receive(:file?) { false }
+        expect(cli).to receive(:error).with("foo is not a valid file")
+
+        begin
+          cli.wp2mm('foo')
+        rescue SystemExit => e
+          expect(e.status).to eq(1)
+        end
       end
     end
 
     context "it's passed a valid Wordpress XML export file" do
       before :each do
-        WP2Middleman.stub(:migrate).and_return false
-        File.stub(:file?).and_return true
+        allow(WP2Middleman).to receive(:migrate) { false }
+        allow(File).to receive(:file?) { true }
       end
 
       it "migrates the posts listed in the XML file" do
-        WP2Middleman.should_receive(:migrate).with "foo", nil
+        expect(WP2Middleman).to receive(:migrate).with "foo", nil, []
         cli.wp2mm "foo"
       end
 
       it "reports that the directory has been successfully uploaded" do
-        cli.should_receive(:say).with("Successfully migrated foo", "\e[32m")
+        expect(cli).to receive(:say).with("Successfully migrated foo", "\e[32m")
         cli.wp2mm "foo"
       end
     end
+
+    context "sets include_fields" do
+      before :each do
+        allow(WP2Middleman).to receive(:migrate) { false }
+        allow(File).to receive(:file?) { true }
+      end
+
+      it "deserializes the values into an array" do
+        expect(WP2Middleman).to receive(:migrate).with "foo", nil, ['wp:post_id', 'guid']
+
+        capture :stdout do
+          WP2Middleman::CLI.start %w[wp2mm foo --include_fields=wp:post_id guid]
+        end
+      end
+    end
   end
 
   describe "#usage" do
     subject(:usage) { cli.usage }
 
     it "displays version info, GitHub info, and help" do
-      cli.should_receive(:say).with('wp2middleman 0.0.1')
-      cli.should_receive(:say).with('https://github.com/mdb/wp2middleman')
-      cli.should_receive(:say).with("\n")
-      cli.should_receive(:help)
+      expect(cli).to receive(:say).with('wp2middleman 0.0.1')
+      expect(cli).to receive(:say).with('https://github.com/mdb/wp2middleman')
+      expect(cli).to receive(:say).with("\n")
+      expect(cli).to receive(:help)
 
       usage
     end

data/spec/lib/wp2middleman/frontmatter_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe WP2Middleman::Migrator do
+  def post(attributes = {})
+    defaults = {title: "mytitle", date_published: "mydate", tags: "mytags", published?: false}
+    @post ||= double(defaults.merge attributes)
+  end
+
+  it "includes the title, date, and tags from the post" do
+    frontmatter = WP2Middleman::Frontmatter.new(post).post_data
+
+    expect(frontmatter["title"]).to eq("mytitle")
+    expect(frontmatter["date"]).to eq("mydate")
+    expect(frontmatter["tags"]).to eq("mytags")
+  end
+
+  it "sets published to false for unpublished posts" do
+    frontmatter = WP2Middleman::Frontmatter.new(post).post_data
+
+    expect(frontmatter["published"]).to be_falsey
+  end
+
+  it "sets published to nil for published posts" do
+    frontmatter = WP2Middleman::Frontmatter.new(post published?: true).post_data
+
+    expect(frontmatter["published"]).to be_nil
+  end
+
+  it "includes fields specified in include_fields" do
+    allow(post).to receive(:field).with("field1") { "value1" }
+    allow(post).to receive(:field).with("field2") { "value2" }
+
+    frontmatter = WP2Middleman::Frontmatter.new(post, include_fields: ["field1", "field2"]).post_data
+
+    expect(frontmatter["field1"]).to eq("value1")
+    expect(frontmatter["field2"]).to eq("value2")
+  end
+end

data/spec/lib/wp2middleman/middleman_post_spec.rb

@@ -0,0 +1,121 @@
+require 'spec_helper'
+
+describe WP2Middleman::MiddlemanPost do
+  let(:post_one) { double :post,
+    title: "A Title",
+    date_published: Date.new(2012,6,8).to_s,
+    content: "Paragraph one.\n\n      Paragraph two.\n    ",
+    tags: [],
+    published?: true
+  }
+
+  let(:post_two) { double :post,
+    title: "A second title",
+    date_published: Date.new(2011,7,25).to_s,
+    content: " <strong>Foo</strong>",
+    tags: ["some_tag", "another tag", "tag"],
+    published?: true
+  }
+
+  let(:post_three) { double :post,
+    title: "A third title: With colon",
+    date_published: Date.new(2011,7,26).to_s,
+    content: "Foo",
+    tags: ["some_tag", "another tag", "tag"],
+    published?: false
+  }
+
+  let(:post_with_iframe) { double :post,
+    title: "A fourth item with iframe and comment",
+    date_published: Date.new(2011,7,26).to_s,
+    content: "Here's a post with an iframe and a comment.\n\n<!--more-->\n\n<iframe width=\"400\" height=\"100\" style=\"position: relative; display: block; width: 400px; height: 100px;\" src=\"http://bandcamp.com/EmbeddedPlayer/v=2/track=833121761/size=venti/bgcol=FFFFFF/linkcol=4285BB/\" allowtransparency=\"true\" frameborder=\"0\"><a href=\"http://dihannmoore.bandcamp.com/track/you-do-it-for-me\">&quot;YOU DO IT FOR ME&quot; by DIHANN MOORE</a></iframe>",
+    tags: ["some_tag", "another tag", "tag"],
+    published?: false
+  }
+
+  it "has a title formatted for a filename" do
+    wp_post = double :post, title: "A Title"
+    post = WP2Middleman::MiddlemanPost.new(wp_post)
+
+    expect(post.title_for_filename).to eq "A-Title"
+  end
+
+  it "removes odd characters (like colons) from title for filename" do
+    wp_post = double :post, title: "A third title: With colon"
+    post = WP2Middleman::MiddlemanPost.new(wp_post)
+
+    expect(post.title_for_filename).to eq "A-third-title-With-colon"
+  end
+
+  it "prepends the date published onto the title for the filename" do
+    wp_post = double :post, title: "A Title", date_published: Date.new(2012,6,8)
+    post = WP2Middleman::MiddlemanPost.new(wp_post)
+
+    expect(post.filename).to eq "2012-06-08-A-Title"
+  end
+
+  it "returns the full filename for a Middleman-style markdown post" do
+    wp_post = double :post, title: "A Title", date_published: Date.new(2012,6,8)
+    post = WP2Middleman::MiddlemanPost.new(wp_post)
+
+    expect(post.full_filename('/some/path/')).to eq("/some/path/2012-06-08-A-Title.html.markdown")
+  end
+
+  it "converts the content to markdown" do
+    wp_post = double :post, content: "<strong>Foo</strong>"
+    post = WP2Middleman::MiddlemanPost.new(wp_post)
+
+    expect(post.markdown_content).to eq "**Foo**"
+  end
+
+  it "has no formatting change to post body by default" do
+    post = WP2Middleman::MiddlemanPost.new post_one
+
+    expect(post.file_content).to eq(
+      "---\ntitle: A Title\ndate: '2012-06-08'\ntags: []\n---\n\nParagraph one.\n\n      Paragraph two.\n    \n"
+    )
+  end
+
+  it "formats the post body as markdown" do
+    post = WP2Middleman::MiddlemanPost.new post_two, body_to_markdown: true
+
+    expect( post.file_content ).to eq(
+      "---\ntitle: A second title\ndate: '2011-07-25'\ntags:\n- some_tag\n- another tag\n- tag\n---\n\n**Foo**\n"
+    )
+  end
+
+  it "ignores iframe and comment tags when converting to markdown" do
+    post = WP2Middleman::MiddlemanPost.new post_with_iframe, body_to_markdown: true
+
+    expect(post.file_content).to eq("---\ntitle: A fourth item with iframe and comment\ndate: '2011-07-26'\ntags:\n- some_tag\n- another tag\n- tag\npublished: false\n---\n\nHere's a post with an iframe and a comment.\n\n\n<!--more-->\n\n\n<iframe width=\"400\" height=\"100\" style=\"position: relative; display: block; width: 400px; height: 100px;\" src=\"http://bandcamp.com/EmbeddedPlayer/v=2/track=833121761/size=venti/bgcol=FFFFFF/linkcol=4285BB/\" allowtransparency=\"true\" frameborder=\"0\"><a href=\"http://dihannmoore.bandcamp.com/track/you-do-it-for-me\">\"YOU DO IT FOR ME\" by DIHANN MOORE</a></iframe>\n")
+  end
+
+  it "appends included fields in with frontmatter" do
+    expect(post_two).to receive(:field).with('wp:post_id').and_return('209')
+    post = WP2Middleman::MiddlemanPost.new post_two, include_fields: ['wp:post_id']
+
+    expect( post.file_content ).to eq(
+      "---\ntitle: A second title\ndate: '2011-07-25'\ntags:\n- some_tag\n- another tag\n- tag\nwp:post_id: '209'\n---\n\n <strong>Foo</strong>\n"
+    )
+  end
+
+  it "reports 'published: false' in the post's frontmatter when post is not published" do
+    post = WP2Middleman::MiddlemanPost.new post_three
+
+    expect( post.file_content ).to eq(
+      "---\ntitle: 'A third title: With colon'\ndate: '2011-07-26'\ntags:\n- some_tag\n- another tag\n- tag\npublished: false\n---\n\nFoo\n"
+    )
+  end
+
+  it "does no formatting by default" do
+    post = WP2Middleman::MiddlemanPost.new post_two
+
+    expect( post.formatted_post_content ).to eq(" <strong>Foo</strong>")
+  end
+
+  it "does markdown formatting" do
+    post = WP2Middleman::MiddlemanPost.new post_two, body_to_markdown: true
+
+    expect( post.formatted_post_content ).to eq("**Foo**")
+  end
+end

data/spec/lib/wp2middleman/migrator_spec.rb

@@ -5,148 +5,67 @@ describe WP2Middleman::Migrator do
   let(:migrator) { WP2Middleman::Migrator.new(file) }
 
   it "exists as a class within the WP2Middleman module" do
-    WP2Middleman::Migrator.class.should eq Class
+    expect(WP2Middleman::Migrator.class).to eq Class
   end
 
   describe "#migrate" do
-
     before :each do
-      FileUtils.stub :mkdir_p
-      File.stub :write
+      allow(FileUtils).to receive(:mkdir_p)
+      allow(File).to receive(:write)
     end
 
     it "ensures there is an export directory" do
-      File.stub :open
-      migrator.should_receive :ensure_export_directory
-      migrator.migrate
-    end
+      allow(File).to receive(:open)
+
+      expect(migrator).to receive :ensure_export_directory
 
-    it "writes a middleman markdown file for each post" do
-      migrator.should_receive(:write_file).exactly(4).times
       migrator.migrate
     end
-  end
 
-  describe "#write_file" do
-    before :each do
-      @post = migrator.posts[0]
-    end
+    it "writes a middleman markdown file for each post" do
+      expect(File).to receive(:write).exactly(4).times
 
-    it "ensures that the post it's passed contains valid data" do
-      migrator.should_receive(:valid_post_data).with(@post)
-      migrator.write_file(@post)
+      migrator.migrate
     end
 
     it "writes the proper markdown file" do
-      File.should_receive(:open).with( "#{Dir.pwd}/export/2012-06-08-A-Title.html.markdown", "w")
-      migrator.write_file(@post)
-    end
+      post = migrator.posts.first
 
-    # pending
-    xit "writes the proper markdown file" do
-      File.should_receive(:write).with(migrator.file_content(@post))
-      migrator.write_file(@post)
-    end
-  end
-
-  describe "#file_content" do
-    it "properly formats a post as a Middleman-style post" do
-      expect(migrator.file_content(migrator.posts[1])).to eq("---\ntitle: A second title\ndate: '2011-07-25'\ntags:\n- some_tag\n- another tag\n- tag\n---\n\n <strong>Foo</strong>\n")
-    end
-
-    context "its behavior if @body_to_markdown is true" do
-      let(:migrator) { WP2Middleman::Migrator.new(file, body_to_markdown: true) }
+      allow(post).to receive(:file_content) { "content" }
+      allow(migrator).to receive(:valid_posts) { [post] }
 
-      it "formats the post body as markdown" do
-        expect(migrator.file_content(migrator.posts[1])).to eq("---\ntitle: A second title\ndate: '2011-07-25'\ntags:\n- some_tag\n- another tag\n- tag\n---\n\n**Foo**\n")
-      end
+      expect(File).to receive(:write).with("#{Dir.pwd}/export/2012-06-08-A-Title.html.markdown", "content")
 
-      it "includes iframe and comment" do
-        expect(migrator.file_content(migrator.posts[3])).to eq("---\ntitle: A fourth item with iframe and comment\ndate: '2011-07-26'\ntags:\n- some_tag\n- another tag\n- tag\npublished: false\n---\n\nHere's a post with an iframe and a comment.\n\n\n<!--more-->\n\n\n<iframe width=\"400\" height=\"100\" style=\"position: relative; display: block; width: 400px; height: 100px;\" src=\"http://bandcamp.com/EmbeddedPlayer/v=2/track=833121761/size=venti/bgcol=FFFFFF/linkcol=4285BB/\" allowtransparency=\"true\" frameborder=\"0\"><a href=\"http://dihannmoore.bandcamp.com/track/you-do-it-for-me\">\"YOU DO IT FOR ME\" by DIHANN MOORE</a></iframe>\n")
-      end
-    end
-
-    context "the post is not published" do
-      it "reports 'published: false' in the post's frontmatter" do
-        expect(migrator.file_content(migrator.posts[2])).to eq("---\ntitle: 'A third title: With colon'\ndate: '2011-07-26'\ntags:\n- some_tag\n- another tag\n- tag\npublished: false\n---\n\nFoo\n")
-      end
-    end
-  end
-
-  describe "#formatted_post_content" do
-    it "returns the content of the post it's passed" do
-      expect(migrator.formatted_post_content(migrator.posts[1])).to eq(" <strong>Foo</strong>")
-    end
-
-    context "its behavior if @body_to_markdown is true" do
-      let(:migrator) { WP2Middleman::Migrator.new(file, body_to_markdown: true) }
-
-      it "returns the content of the post it's passed as markdown" do
-        expect(migrator.formatted_post_content(migrator.posts[1])).to eq("**Foo**")
-      end
-    end
-  end
-
-  describe "#full_filename" do
-    it "returns the full filename for a Middleman-style markdown post" do
-      expect(migrator.full_filename(migrator.posts[0])).to eq("#{Dir.pwd}/export/2012-06-08-A-Title.html.markdown")
-    end
-  end
-
-  describe "#valid_post_data" do
-    context "the post's #post_date, #title, #date_published, and #content are not nil" do
-      let(:post) {
-        double('Post',
-          :post_date => 'post_date',
-          :title => 'title',
-          :date_published => 'date_published',
-          :content => 'content'
-        )
-      }
-
-      it "returns true" do
-        expect(migrator.valid_post_data(post)).to eq(true)
-      end
-    end
-
-    context "the post's #post_date, #title, #date_published, or #content is nil" do
-      let(:post) {
-        double('Post',
-          :post_date => nil,
-          :title => 'title',
-          :date_published => 'date_published',
-          :content => 'content'
-        )
-      }
-
-      it "returns false" do
-        expect(migrator.valid_post_data(post)).to eq(false)
-      end
+      migrator.migrate
     end
   end
 
   describe "#output_path" do
     subject { migrator.output_path }
 
-    it { should eq("#{Dir.pwd}/export/") }
+    let(:export_path) { migrator.output_path }
+
+    it "reports the proper path to the export directory" do
+      expect(export_path).to eq "#{Dir.pwd}/export/"
+    end
   end
 
   describe "#ensure_export_directory" do
     it "makes the export directory if it's not already there" do
-      File.stub(:directory?).and_return false
+      allow(File).to receive(:directory?) { false }
 
-      FileUtils.should receive(:mkdir_p).with("#{Dir.pwd}/export/")
+      expect(FileUtils).to receive(:mkdir_p).with("#{Dir.pwd}/export/")
 
       migrator.ensure_export_directory
     end
 
     context "the export directory is already there" do
       it "does not create it" do
-        File.stub(:directory?).and_return true
+        allow(File).to receive(:directory?) { true }
 
         migrator.ensure_export_directory
 
-        FileUtils.should_not receive(:mkdir_p).with("#{Dir.pwd}/export/")
+        expect(FileUtils).not_to receive(:mkdir_p).with("#{Dir.pwd}/export/")
       end
     end
   end

data/spec/lib/wp2middleman/post_collection_spec.rb

@@ -2,15 +2,27 @@ require 'spec_helper'
 
 describe WP2Middleman::PostCollection do
   let(:file) { 'spec/fixtures/fixture.xml' }
-  let(:posts) { WP2Middleman::PostCollection.new(file).posts }
 
   it "exists as a class within the WP2Middleman module" do
-    WP2Middleman::PostCollection.class.should eq Class
+    expect(WP2Middleman::PostCollection.class).to eq Class
   end
 
-  describe "#title" do
-    it "returns an array of posts" do
-      posts.class.should eq Array
+  it "contains a Post object for every word press item" do
+    posts = WP2Middleman::PostCollection.from_file(file)
+
+    expect(posts).to_not be_empty
+
+    posts.each do |post|
+      expect(post).to be_a WP2Middleman::Post
     end
   end
+
+  it "can reject attachments" do
+    post = double :post, attachment?: false
+    attachment = double :post, attachment?: true
+
+    post_collection = WP2Middleman::PostCollection.new([post, attachment]).without_attachments
+
+    expect(post_collection.to_a).to eq([post])
+  end
 end

data/spec/lib/wp2middleman/post_spec.rb

@@ -7,60 +7,48 @@ describe WP2Middleman::Post do
   let(:post_three) { WP2Middleman::Post.new(file.css('item')[2]) }
 
   it "exists as a class within the WP2Middleman module" do
-    WP2Middleman::Post.class.should eq Class
+    expect(WP2Middleman::Post.class).to eq Class
   end
 
   describe "#title" do
     subject { post_one.title }
 
-    it { should eq "A Title" }
-  end
-
-  describe "#title_for_filename" do
-    subject { post_one.title_for_filename }
-
-    it { should eq "A-Title" }
-  end
-
-  describe "#filename" do
-    subject { post_one.filename }
-
-    it { should eq "2012-06-08-A-Title" }
-
-    context "post titles with odd characters such as colons" do
-      subject { post_three.filename }
-
-      it { should eq "2011-07-26-A-third-title-With-colon" }
-    end
+    it { is_expected.to eq "A Title" }
   end
 
   describe "#post_date" do
     subject { post_one.post_date }
 
-    it { should eq "2012-06-08 03:21:41" }
+    it { is_expected.to eq "2012-06-08 03:21:41" }
   end
 
   describe "#date_published" do
     subject { post_one.date_published }
 
-    it { should eq "2012-06-08" }
+    it { is_expected.to eq "2012-06-08" }
   end
 
   describe "#status" do
     subject { post_three.status }
 
-    it { should eq "private" }
+    it { is_expected.to eq "private" }
+  end
+
+  describe "#field" do
+    subject { post_one.field('wp:post_id') }
+
+    it { is_expected.to eq "84" }
   end
 
   describe "#published?" do
     subject { post_one.published? }
 
-    it { should eq true }
+    it { is_expected.to eq true }
 
     context "#status is not 'publish'" do
       subject { post_three.published? }
 
-      it { should eq false }
+      it { is_expected.to eq false }
 
     end
   end
@@ -68,24 +56,51 @@ describe WP2Middleman::Post do
   describe "#content" do
     subject { post_one.content }
 
-    it { should eq "Paragraph one.\n\n      Paragraph two.\n    " }
-  end
-
-  describe "#markdown_content" do
-    subject { post_two.markdown_content }
-
-    it { should eq "**Foo**" }
+    it { is_expected.to eq "Paragraph one.\n\n      Paragraph two.\n    " }
   end
 
   describe "#tags" do
     subject { post_two.tags }
 
-    it { should eq ["some_tag", "another tag", "tag"] }
+    it { is_expected.to eq ["some_tag", "another tag", "tag"] }
 
     context "the post only has an 'Uncategorized' tag" do
       subject { post_one.tags }
 
-      it { should eq [] }
+      it { is_expected.to eq [] }
+    end
+  end
+
+  describe "#valid?" do
+    def post(post_date: Date.new(2014,2,19), title: "Title", date_published: Date.new(2014,2,19), content: "content")
+      post = WP2Middleman::Post.new(double)
+
+      allow(post).to receive(:post_date) { post_date }
+      allow(post).to receive(:title) { title }
+      allow(post).to receive(:date_published) { date_published }
+      allow(post).to receive(:content) { content }
+
+      post
+    end
+
+    it "is valid with post_date, title, date_published, and content" do
+      expect(post).to be_valid
+    end
+
+    it "is not valid without post_date" do
+      expect(post(post_date: nil)).to_not be_valid
+    end
+
+    it "is not valid without a title" do
+      expect(post(title: nil)).to_not be_valid
+    end
+
+    it "is not valid without a date_published" do
+      expect(post(date_published: nil)).to_not be_valid
+    end
+
+    it "is not valid without content" do
+      expect(post(content: nil)).to_not be_valid
     end
   end
 end

data/spec/lib/wp2middleman_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe WP2Middleman do
   it "exists as a module" do
-    WP2Middleman.class.should eq Module
+    expect(WP2Middleman.class).to eq Module
   end
 
   describe ".migrate" do
@@ -11,8 +11,8 @@ describe WP2Middleman do
     end
 
     it "migrates the posts in the wordpress XML export file it's passed" do
-      WP2Middleman::Migrator.should_receive(:new).with('foo', body_to_markdown: false).and_return(@migrator_double)
-      @migrator_double.should_receive(:migrate)
+      expect(WP2Middleman::Migrator).to receive(:new).with('foo', body_to_markdown: false, include_fields: []).and_return(@migrator_double)
+      expect(@migrator_double).to receive(:migrate)
 
       WP2Middleman.migrate 'foo'
     end

data/spec/spec_helper.rb

@@ -10,5 +10,5 @@ SimpleCov.start
 require 'wp2middleman'
 
 RSpec.configure do |config|
-  # some (optional) config here
+  config.include CLIHelpers
 end

data/spec/support/cli_helpers.rb

@@ -0,0 +1,17 @@
+$0 = "wp2mm"
+ARGV.clear
+
+module CLIHelpers
+  def capture(stream)
+    begin
+      stream = stream.to_s
+      eval "$#{stream} = StringIO.new"
+      yield
+      result = eval("$#{stream}").string
+    ensure
+      eval("$#{stream} = #{stream.upcase}")
+    end
+
+    result
+  end
+end

data/spec/support/matchers/exit_with_code.rb

@@ -10,12 +10,12 @@ RSpec::Matchers.define :exit_with_code do |exp_code|
     actual and actual == exp_code
   end
 
-  failure_message_for_should do |block|
+  failure_message do |block|
     "expected block to call exit(#{exp_code}) but exit" +
       (actual.nil? ? " not called" : "(#{actual}) was called")
   end
 
-  failure_message_for_should_not do |block|
+  failure_message_when_negated do |block|
     "expected block not to call exit(#{exp_code})"
   end
 

data/wp2middleman.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = WP2Middleman::VERSION
   spec.authors       = ["Mike Ball"]
   spec.email         = ["mikedball@gmail.com"]
-  spec.description   = %q{Migrate a Wordpress export XML file to middleman}
-  spec.summary       = %q{Migrate your Wordpress blog posts to middleman}
+  spec.description   = %q{Migrate a Wordpress export XML file to Middleman-style markdown files}
+  spec.summary       = %q{Migrate Wordpress blog posts to Middleman-style markdown files}
   spec.homepage      = "http://github.com/mdb/wp2middleman"
   spec.license       = "MIT"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wp2middleman
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Mike Ball
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -108,7 +108,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Migrate a Wordpress export XML file to middleman
+description: Migrate a Wordpress export XML file to Middleman-style markdown files
 email:
 - mikedball@gmail.com
 executables:
@@ -127,17 +127,22 @@ files:
 - bin/wp2mm
 - lib/wp2middleman.rb
 - lib/wp2middleman/cli.rb
+- lib/wp2middleman/frontmatter.rb
+- lib/wp2middleman/middleman_post.rb
 - lib/wp2middleman/migrator.rb
 - lib/wp2middleman/post.rb
 - lib/wp2middleman/post_collection.rb
 - lib/wp2middleman/version.rb
 - spec/fixtures/fixture.xml
 - spec/lib/wp2middleman/cli_spec.rb
+- spec/lib/wp2middleman/frontmatter_spec.rb
+- spec/lib/wp2middleman/middleman_post_spec.rb
 - spec/lib/wp2middleman/migrator_spec.rb
 - spec/lib/wp2middleman/post_collection_spec.rb
 - spec/lib/wp2middleman/post_spec.rb
 - spec/lib/wp2middleman_spec.rb
 - spec/spec_helper.rb
+- spec/support/cli_helpers.rb
 - spec/support/matchers/exit_with_code.rb
 - wp2middleman.gemspec
 homepage: http://github.com/mdb/wp2middleman
@@ -160,17 +165,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Migrate your Wordpress blog posts to middleman
+summary: Migrate Wordpress blog posts to Middleman-style markdown files
 test_files:
 - spec/fixtures/fixture.xml
 - spec/lib/wp2middleman/cli_spec.rb
+- spec/lib/wp2middleman/frontmatter_spec.rb
+- spec/lib/wp2middleman/middleman_post_spec.rb
 - spec/lib/wp2middleman/migrator_spec.rb
 - spec/lib/wp2middleman/post_collection_spec.rb
 - spec/lib/wp2middleman/post_spec.rb
 - spec/lib/wp2middleman_spec.rb
 - spec/spec_helper.rb
+- spec/support/cli_helpers.rb
 - spec/support/matchers/exit_with_code.rb
-has_rdoc: