serif 0.4 → 0.5

data/test/site_spec.rb

@@ -4,6 +4,69 @@ describe Serif::Site do
   subject do
     Serif::Site.new(testing_dir)
   end
+
+  describe "#conflicts" do
+    context "with no arguments" do
+      it "is nil if there are no conflicts" do
+        subject.conflicts.should be_nil
+      end
+
+      it "is a map of url => conflicts_array if there are conflicts" do
+        d = Serif::Draft.new(subject)
+        conflicting_post = subject.posts.first
+        d.slug = conflicting_post.slug
+        d.title = "Anything you like"
+        d.save("# Some content")
+
+        # need this to be true
+        d.url.should == conflicting_post.url
+
+        begin
+          conflicts = subject.conflicts
+          conflicts.should_not be_nil
+          conflicts.class.should == Hash
+          conflicts.size.should == 1
+          conflicts.keys.should == [conflicting_post.url]
+          conflicts[conflicting_post.url].size.should == 2
+        ensure
+          FileUtils.rm(d.path)
+        end
+      end
+    end
+
+    context "with an argument given" do
+      it "is nil if there are no conflicts" do
+        subject.conflicts(subject.drafts.sample).should be_nil
+        subject.conflicts(subject.posts.sample).should be_nil
+
+        d = Serif::Draft.new(subject)
+        subject.conflicts(d).should be_nil
+      end
+
+      it "is an array of conflicting content if there are conflicts" do
+        d = Serif::Draft.new(subject)
+        conflicting_post = subject.posts.first
+        d.slug = conflicting_post.slug
+        d.title = "Anything you like"
+        d.save("# Some content")
+
+        # need this to be true
+        d.url.should == conflicting_post.url
+
+        begin
+          conflicts = subject.conflicts(d)
+          conflicts.should_not be_nil
+          conflicts.class.should == Array
+          conflicts.size.should == 2
+          conflicts.each do |e|
+            e.url.should == conflicting_post.url
+          end
+        ensure
+          FileUtils.rm(d.path)
+        end
+      end
+    end
+  end
   
   describe "#source_directory" do
     it "should be sane" do

data/test/test_helper.rb

@@ -1,4 +1,12 @@
 require "simplecov"
+
+# if we're running on Travis, use Coveralls, otherwise
+# let us generate SimpleCov output as normal.
+if ENV["CI"]
+  require "coveralls"
+  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+end
+
 SimpleCov.start do
   add_filter "/test/"
 end
@@ -27,6 +35,7 @@ describe "curly quote patch" do
 end
 
 require "serif"
+require "serif/commands"
 require "fileutils"
 require "pathname"
 require "time"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serif
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -219,8 +219,40 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.1
-description: Serif is a blogging system powered by markdown files and an optional
-  admin interface complete with drag-and-drop image uploading.
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Serif is a static site generator and blogging system powered by markdown
+  files and an optional admin interface complete with drag-and-drop image uploading.
 email:
 - adam@aprescott.com
 executables:
@@ -232,9 +264,11 @@ files:
 - lib/serif/server.rb
 - lib/serif/markup_renderer.rb
 - lib/serif/post.rb
+- lib/serif/errors.rb
 - lib/serif/config.rb
 - lib/serif/admin_server.rb
 - lib/serif/draft.rb
+- lib/serif/commands.rb
 - lib/serif/site.rb
 - lib/serif.rb
 - statics/templates/admin/new_draft.liquid
@@ -280,8 +314,8 @@ files:
 - test/site_dir/_site/test-archive/2012/11.html
 - test/site_dir/_site/test-archive/2400/01.html
 - test/site_dir/_site/test-archive/2399/01.html
-- test/site_dir/_site/drafts/another-sample-draft/481da12b79709bfa0547fa9b5754c9506fbed29afd0334e07a8c95e76850.html
-- test/site_dir/_site/drafts/sample-draft/a986a62ad5f6edd1fcac3d08f5b461b92bcb667a2af69505230c291d405c.html
+- test/site_dir/_site/drafts/another-sample-draft/add25848a94509103cb492c47e3a04b7b2a56299de207155fbffec42dc4b.html
+- test/site_dir/_site/drafts/sample-draft/0b6fc164b8534d5d5a9fcfc5c709265d33f1577cd0fe2f4e23042e92f0c1.html
 - test/site_dir/_site/index.html
 - test/site_dir/_site/file-digest-test.html
 - test/site_dir/_site/page-alt-layout.html
@@ -295,8 +329,8 @@ files:
 - test/site_dir/_site/test-blog/penultimate-post.html
 - test/site_dir/_site/test-smarty-filter.html
 - test/site_dir/_site/archive.html
-- test/site_dir/_trash/1363633154-autopublish-draft
-- test/site_dir/_trash/1363633154-test-draft
+- test/site_dir/_trash/1364747613-autopublish-draft
+- test/site_dir/_trash/1364747613-test-draft
 - test/site_dir/_posts/2013-03-07-post-with-custom-layout
 - test/site_dir/_posts/2012-01-05-sample-post
 - test/site_dir/_posts/2400-01-01-final-post
@@ -309,6 +343,7 @@ files:
 - test/file_digest_tag_spec.rb
 - test/site_generation_spec.rb
 - test/post_spec.rb
+- test/commands_spec.rb
 - serif.gemspec
 - rakefile
 - LICENSE
@@ -338,8 +373,8 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Markdown-powered blogging with an optional admin interface with drag-and-drop
-  image uploading.
+summary: Static site generator and markdown-based blogging with an optional admin
+  interface complete with drag-and-drop image uploading.
 test_files:
 - test/test_helper.rb
 - test/filters_spec.rb
@@ -352,3 +387,4 @@ test_files:
 - test/file_digest_tag_spec.rb
 - test/site_generation_spec.rb
 - test/post_spec.rb
+- test/commands_spec.rb

data/test/site_dir/_trash/1363633154-autopublish-draft

@@ -1,5 +0,0 @@
-title: Some draft title
-Updated: 2013-03-18T18:59:14+00:00
-Created: 2013-03-18T18:59:14+00:00
-
-some content