Blux 0.0.4 → 0.0.5

data/lib/publishing/wp_options.rb

@@ -0,0 +1,76 @@
+#
+# Copyright 2010 Louis-Philippe Salin de l'Etoile, aka Louis Salin
+# Copyright (c) 2007 John Mettraux
+#
+# email: louis.phil@gmail.com
+#
+# This file is part of Blux.
+#
+# Blux is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Blux is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Blux.  If not, see <http://www.gnu.org/licenses/>.
+require 'optparse'
+require 'ostruct'
+
+class WPOptionParser
+	def self.parse(args)
+		options = OpenStruct.new
+		options.tags = []
+		options.title = nil
+		options.type = 'html'
+		options.bluxrc = nil
+		options.command = :post
+		options.entry_id = nil
+
+		opts = OptionParser.new
+		opts.banner = "Usage: post.rb [options]"
+		opts.separator ""
+		opts.separator "options :"
+
+		opts.on("-c", "--categories {list}", "comma separated list of tags/categories") do |v|
+			options.tags = v.split ","
+		end
+
+		opts.on("-t", "--title {title}", "title for the post") do |v|
+			options.title = v
+		end
+
+		opts.on("-T", "--type {html|xhtml|text}", 
+				"type of the content. ('html' is the default).") do |v|
+			options.type = v
+			end
+
+		opts.on("--config {config_file}", "blux config file path") do |f|
+			options.bluxrc = f
+		end
+
+		opts.on("--update {entry_id}", "update an existing post") do |id|
+			options.command = :put
+			options.entry_id = id
+		end
+
+		opts.on("--delete {entry_id}", "delete an existing post") do |id|
+			options.command = :delete
+			options.entry_id = id
+		end
+
+		opts.on("-h", "--help",	"displays this help") do
+			puts
+			puts opts.to_s
+			puts
+			exit 0
+		end
+
+		opts.parse!(args)
+		yield options
+	end
+end

data/lib/publishing/wp_publish.rb

@@ -0,0 +1,136 @@
+#!/usr/bin/env ruby
+## Copyright (c) 2007 John Mettraux
+## Copyright 2010 Louis-Philippe Salin de l'Etoile, aka Louis Salin
+##
+## Released under the MIT license
+## http://www.opensource.org/licenses/mit-license.php
+##
+## This file is part of Blux.
+##
+## Modifications by Louis Salin, October 2010
+## => reading blog information from the configuration file
+## => splitting out option parsing and refactoring functionnality into methods
+## => added delete and put REST commands
+
+require 'net/http'
+require 'atom/entry' # sudo gem install atom-tools
+require 'atom/collection'
+require File.join(File.expand_path(File.dirname(__FILE__)), "..", "blux_config_reader")
+require File.join(File.expand_path(File.dirname(__FILE__)), "wp_options")
+
+# a great thanks to the devs of all the libs used here
+# some info about you and your blog
+
+def delete(options, base, username, password)
+	entry = Atom::Entry.new
+	entry.updated!
+	entry.edit_url = options.entry_id
+
+	h = Atom::HTTP.new
+	h.user = username
+	h.pass = password
+	h.always_auth = :basic
+
+	c = Atom::Collection.new(base + "/posts", h)
+	res = c.delete! entry
+
+	return entry, res
+end
+
+def get_content
+	content = ""
+	loop do
+		line = STDIN.gets
+		break unless line
+		content += line
+	end
+
+	content
+end
+
+def publish_or_update(command, options, username, password, base, bloguri, authorname)
+	raise "please specify a title for the post with the -t option" unless options.title
+	content = get_content
+
+	entry = Atom::Entry.new
+	entry.title = options.title
+	entry.updated!
+
+	author = Atom::Author.new
+	author.name = authorname
+	author.uri = bloguri
+	entry.authors << author
+
+	options.tags.each do |t|
+		c = Atom::Category.new
+		c["scheme"] = bloguri
+		c["term"] = t.strip
+		entry.categories << c
+	end
+
+	entry.content = content
+	entry.content["type"] = options.type if options.type
+
+	h = Atom::HTTP.new
+	h.user = username
+	h.pass = password
+	h.always_auth = :basic
+
+	c = Atom::Collection.new(base + "/posts", h)
+
+	if command == :post
+		res = c.post! entry
+	elsif command == :put
+		entry.edit_url = options.entry_id
+		res = c.put! entry
+	end
+
+	return entry, res
+end
+
+begin
+	WPOptionParser.parse(ARGV) do |options|
+		config = BluxConfigurationReader.new
+		config.load_config options.bluxrc
+
+		blog = config.blog
+		authorname = config.author_name
+		username = config.user_name
+		password = config.password
+
+		bloguri = "http://#{blog}"
+		base = "https://#{blog}/wp-app.php"
+
+		case(options.command)
+		when :post
+			entry, res = publish_or_update(:post, options, username, password, 
+										   base, bloguri, authorname)
+			puts "--entry--"
+			puts entry
+
+			puts "--response--"
+			puts res 
+
+			puts "--url--"
+			puts Atom::Entry.parse(res.read_body).edit_url
+		when :put
+			entry, res = publish_or_update(:put, options, username, password, 
+										   base, bloguri, authorname)
+			puts "--entry--"
+			puts entry
+
+			puts "--response--"
+			puts res 
+		when :delete
+			entry, res = delete(options, base, username, password)
+
+			puts "--entry--"
+			puts entry
+
+			puts "--response--"
+			puts res 
+		end
+	end
+rescue
+	STDERR << "publishing error: #{$!}\n"
+end

data/spec/blog_manager_spec.rb

@@ -63,24 +63,6 @@ describe BlogManager do
 		it "should create a draft folder in the .blux dir if it doesn't exist" do
 			File.exists?("#{@blux}/draft").should == true
 		end
-
-		it "should create a published post file in the .blux dir if it doesn't exist" do
-			File.exists?("#{@blux}/.published").should == true
-		end
-	end
-
-	context "when using the blog manager" do
-		before :each do
-			File.open("#{@blux}/.published", 'w') do |f|
-				f.write('{"draft1.23":{}}')
-			end
-
-			@manager.start
-		end
-
-		it "should load the published post file" do
-			@manager.index.key?("draft1.23").should == true
-		end
 	end
 
 	context "loading the config and setting up the draft manager" do
@@ -100,12 +82,6 @@ describe BlogManager do
 		before :each do
 			create_config
 
-			File.open(@manager.index_file, 'w') do |f|
-				f.write('{"draft5.67":{"a":1,"b":2}}')
-			end
-
-			@draft_mgr.stub!(:get_attribute).and_return("title")
-
 			@manager.load_config
 			@manager.start
 
@@ -115,33 +91,68 @@ describe BlogManager do
 		end
 
 		it "should send the proper command" do
-			@manager.should_receive(:system).with("blux --convert -f draft5.67 | ruby #{File.dirname(__FILE__)[0..-6]}/lib/wp_publish.rb -t title --config #{@blux_rc} | blux --set_edit_url -f draft5.67")
+			@draft_mgr.stub!(:get_attribute).and_return("title")
+			@draft_mgr.stub!(:get_attribute).with("draft5.67", "published_time").and_return(nil)
+			@draft_mgr.stub!(:set_attribute)
+
+			@manager.should_receive(:system).with("blux --convert -f draft5.67 | ruby #{File.dirname(__FILE__)[0..-6]}/lib/publishing/wp_publish.rb -t \"title\" --config #{@blux_rc} -c \"title\" | blux --set_edit_url -f draft5.67")
+			@manager.publish 'draft5.67'
+		end
+
+		it "should send the proper command with categories if there are any" do
+			@draft_mgr.stub!(:get_attribute).with("draft5.67", "title").and_return("title")
+			@draft_mgr.stub!(:get_attribute).with("draft5.67", "categories").and_return("tag1,tag2")
+			@draft_mgr.stub!(:get_attribute).with("draft5.67", "published_time").and_return(nil)
+			@draft_mgr.stub!(:set_attribute)
+
+			@manager.should_receive(:system).with("blux --convert -f draft5.67 | ruby #{File.dirname(__FILE__)[0..-6]}/lib/publishing/wp_publish.rb -t \"title\" --config #{@blux_rc} -c \"tag1,tag2\" | blux --set_edit_url -f draft5.67")
 			@manager.publish 'draft5.67'
 		end
 
 		it "should send the command with the title included if it exists" do
 			@draft_mgr.stub!(:get_attribute).and_return('bla')
+			@draft_mgr.stub!(:get_attribute).with("draft5.67", "published_time").and_return(nil)
+			@draft_mgr.stub!(:set_attribute)
 
-			@manager.should_receive(:system).with("blux --convert -f draft5.67 | ruby #{File.dirname(__FILE__)[0..-6]}/lib/wp_publish.rb -t bla --config #{@blux_rc} | blux --set_edit_url -f draft5.67")
+			@manager.should_receive(:system).with("blux --convert -f draft5.67 | ruby #{File.dirname(__FILE__)[0..-6]}/lib/publishing/wp_publish.rb -t \"bla\" --config #{@blux_rc} -c \"bla\" | blux --set_edit_url -f draft5.67")
 			@manager.publish 'draft5.67'
 		end
 
 		it "should save the record of published drafts to disk" do
+			@draft_mgr.stub!(:get_attribute).and_return("title")
+			@draft_mgr.stub!(:get_attribute).and_return(nil)
+			Time.stub!(:now).and_return('000')
+			@draft_mgr.should_receive(:set_attribute).with('draft5.67', "published_time", '000')
+
 			@manager.publish 'draft5.67'
+		end
 
-			lines = ''
-			File.open(@manager.index_file, 'r') do |f| 
-				f.each_line {|l| lines += l}
-			end
+		it "should not allow to publish a draft twice" do
+			@draft_mgr.stub!(:get_attribute).and_return('bla')
+			@draft_mgr.stub!(:get_attribute).with("draft5.67", "published_time").and_return('123')
+			@draft_mgr.stub!(:set_attribute)
 
-			JSON.parse(lines).key?('draft5.67').should == true
+			lambda {@manager.publish 'draft5.67'}.should raise_error("this draft has already been published")
 		end
+	end
 
-		it "should add the published time to the attributes of that post" do
-			time = Time.now.to_s
+	context "when deleting" do
+		before :each do
+			create_config
 
-			@manager.publish 'draft5.67'
-			@manager.index["draft5.67"]["published_time"].to_s.should == time
+			@manager.load_config
+			@manager.start
+
+			system "touch #{@manager.draft_dir}/draft5.67"
+
+			@manager.stub!(:system).and_return(true)
+			@draft_mgr.stub!(:delete_draft)
+			@draft_mgr.stub!(:get_attribute).and_return('http://blablabla.com/asf/1')
+		end
+
+		it "should send the proper command" do
+			@manager.should_receive(:system).with("ruby #{File.dirname(__FILE__)[0..-6]}/lib/publishing/wp_publish.rb --delete http://blablabla.com/asf/1 --config #{@blux_rc} | blux --post-cmd")
+			@manager.delete 'draft5.67'
 		end
 	end
 

data/spec/draft_manager_spec.rb

@@ -22,10 +22,13 @@ describe DraftManager do
 
 	context "when using a new manager" do
 		it "should have an empty draft index" do
-			@manager.index.keys.length.should == 0
+			index = @manager.load_index
+			index.keys.length.should == 0
 		end
 
 		it "should load the draft index from disk" do
+			File.stub!(:exists?).and_return(true)
+
 			File.open("#{@draft_dir}/.draft_index", 'w') do |f|
 				f.write('{"test.sh":{"a":1,"b":2}}')
 			end
@@ -33,9 +36,8 @@ describe DraftManager do
 			manager = DraftManager.new
 			manager.setup('gedit', @temp_dir, @draft_dir)
 
-			manager.index.key?("test.sh").should == true
-			manager.index["test.sh"].key?("a").should == true
-			manager.index["test.sh"].key?("b").should == true
+			@manager.get_attribute('test.sh', "a").should == 1
+			@manager.get_attribute('test.sh', "b").should == 2
 		end
 	end
 
@@ -78,6 +80,8 @@ describe DraftManager do
 		end
 
 		it "should copy the temp file in the draft folder if it has data" do
+			File.stub!(:exists?).and_return(true)
+
 			class Tempfile
 				def size() 123 end
 				def path() 'test/test.sh' end
@@ -92,6 +96,7 @@ describe DraftManager do
 	context "when saving a new draft" do
 		before :each do
 			@manager.stub!(:system).and_return(true)
+			File.stub!(:exists?).and_return(true)
 
 			class Tempfile
 				def size() 123 end
@@ -111,7 +116,7 @@ describe DraftManager do
 		it "should add the creation time to the attributes of that draft" do
 			time = Time.now.to_s
 			@manager.create_draft
-			@manager.index["test.sh"][:creation_time].to_s.should == time
+			@manager.get_attribute('test.sh', "creation_time").to_s.should == time
 		end
 	end
 
@@ -142,19 +147,19 @@ describe DraftManager do
 			time = Time.now.to_s
 
 			@manager.edit_draft('test.sh')
-			@manager.index["test.sh"]["edited_time"].to_s.should == time
+			@manager.get_attribute('test.sh', "edited_time").to_s.should == time
 		end
 	end
 
 	context "when listing drafts" do
 		before :each do
-			system "touch #{@draft_dir}/1"
-			system "touch #{@draft_dir}/2"
-			system "touch #{@draft_dir}/3"
+			File.open("#{@draft_dir}/.draft_index", 'w') do |f|
+				f.write('{"1":{},"2":{},"3":{}}')
+			end
 		end
 
 		it "should list all the draft filenames, one per line" do
-			@manager.list.should == ["1", "2", "3"]
+			@manager.list.entries.should == ["1", "2", "3"]
 		end
 	end
 
@@ -210,7 +215,9 @@ describe DraftManager do
 	context "when outputing a draft" do
 		before :each do
 			File.open("#{@draft_dir}/.draft_index", 'w') do |f|
-				f.write('{"file1":{"a":1,"b":2},"file2":{"a":1,"b":2}, "file3":{}}')
+				f.write('{"file1":{"a":1,"b":2},
+						  "file2":{"a":1,"deleted":"2010-10-15 00:00:00"}, 
+						  "file3":{}}')
 			end
 
 			system "echo this is blog with lots of letters intended to go beyond the 76 chars that will be displayed by the preview functionnality of the draft manager > #{@draft_dir}/file1"
@@ -228,6 +235,10 @@ describe DraftManager do
 		it "should display an empty string for an empty draft" do
 			@manager.output('file3').should == ''
 		end
+
+		it "should raise an exception if the draft has been deleted" do
+			lambda {@manager.output('file2')}.should raise_error("draft filename file2 has been deleted")
+		end
 	end
 
 	context "when adding an attribute" do
@@ -243,13 +254,13 @@ describe DraftManager do
 
 		it "should add the attribute to the draft index" do
 			@manager.set_attribute('draft.1', "attr", "123")
-			@manager.index['draft.1']["attr"].should == "123"
+			@manager.get_attribute('draft.1', "attr").should == "123"
 		end
 
 		it "should overwrite the value if the attribute already exists" do
 			@manager.set_attribute('draft.1', "attr", "123")
 			@manager.set_attribute('draft.1', "attr", "456")
-			@manager.index['draft.1']["attr"].should == "456"
+			@manager.get_attribute('draft.1', "attr").should == "456"
 		end
 
 		it "should output an error message if the file does not exist" do
@@ -257,6 +268,7 @@ describe DraftManager do
 		end
 
 		it "should save the draft index to disk" do
+			File.should_receive(:open).with("#{@draft_dir}/.draft_index", 'r')
 			File.should_receive(:open).with("#{@draft_dir}/.draft_index", 'w')
 			@manager.set_attribute('draft.1', "attr", "123")
 		end
@@ -277,16 +289,77 @@ describe DraftManager do
 		it "should output an warning message if the title is not unique" do
 			@manager.set_attribute('draft.1', "title", 'title')
 
+			STDERR.stub!(:<<)
 			STDERR.should_receive(:<<).with("warning: title 'title' is not unique\n")
 			@manager.set_attribute('draft.2', "title", 'title')
 		end
 
 		it "should still change the value of the previous title" do
+			STDERR.stub!(:<<)
 			@manager.set_attribute('draft.1', 'title', 'title')
 			@manager.set_attribute('draft.2', 'title', 'title2')
 			@manager.set_attribute('draft.2', 'title', 'title')
 
-			@manager.index['draft.2']["title"].should == 'title'
+			@manager.get_attribute('draft.2', "title").should == "title"
+		end
+	end
+
+	context "when adding a tag" do
+		before :each do
+			File.open("#{@draft_dir}/.draft_index", 'w') do |f|
+				f.write('{"draft.1":{}}')
+			end
+
+			system "touch #{@draft_dir}/draft.1"
+			@manager = DraftManager.new
+			@manager.setup('gedit', @temp_dir, @draft_dir)
+		end
+
+		it "should add a new tags attribute" do
+			@manager.set_attribute('draft.1', 'categories', "a tag")
+			@manager.get_attribute('draft.1', "categories").should == "a tag"
+		end
+
+		it "should add to an existing tag attribute if it already exists" do
+			@manager.set_attribute('draft.1', 'categories', "a tag")
+			@manager.set_attribute('draft.1', 'categories', "another tag")
+			@manager.get_attribute('draft.1', "categories").should == "a tag,another tag"
+		end
+	end
+
+	context "when deleting a tag" do
+		before :each do
+			File.open("#{@draft_dir}/.draft_index", 'w') do |f|
+				f.write('{"draft.1":{"categories":"tag1,tag2,tag3"}}')
+			end
+
+			system "touch #{@draft_dir}/draft.1"
+			@manager = DraftManager.new
+			@manager.setup('gedit', @temp_dir, @draft_dir)
+		end
+
+		it "should remove the attribute from the draft index" do
+			@manager.delete_attribute('draft.1', "categories") do
+				'tag2'
+			end
+			
+			@manager.get_attribute('draft.1', "categories").should == "tag1,tag3"
+		end
+
+		it "should not do anything if the tag does not exist" do
+			@manager.delete_attribute('draft.1', "categories") do
+				'tag5'
+			end
+			
+			@manager.get_attribute('draft.1', "categories").should == "tag1,tag2,tag3"
+		end
+
+		it "should remove the attribute if there are no tags left" do
+			@manager.delete_attribute('draft.1', "categories") do
+				'tag1,tag2,tag3'
+			end
+			
+			@manager.get_attribute('draft.1', "categories").should == nil
 		end
 	end
 
@@ -303,7 +376,7 @@ describe DraftManager do
 
 		it "should remove the attribute from the draft index" do
 			@manager.delete_attribute('draft.1', :a)
-			@manager.index['draft.1']["a"].should == nil 
+			@manager.get_attribute('draft.1', "a").should == nil
 		end
 
 		it "should output an error message if the file does not exist" do
@@ -333,6 +406,20 @@ describe DraftManager do
 		it "should output an error message if there are no drafts saved" do
 			lambda {@manager.get_latest_created_draft}.should raise_error("there is currently no saved index")
 		end
+
+		it "should not take deleted drafts into account" do
+			File.open("#{@draft_dir}/.draft_index", 'w') do |f|
+				f.write({"draft.1" => {"creation_time" => "2010-10-11 15:30:12",
+									   "deleted" => "2010-10-15 00:00:00"},
+						 "draft.2" => {"creation_time" => "2010-10-10 15:30:12"},
+						 "draft.3" => {"creation_time" => "2010-10-09 15:30:12"}}.to_json)
+			end
+
+			@manager = DraftManager.new
+			@manager.setup('gedit', @temp_dir, @draft_dir)
+
+			@manager.get_latest_created_draft().should == "draft.2"
+		end
 	end
 
 	context "when requesting a draft by title" do