jordandobson-wordpress 0.1.6 → 0.1.7

data/README.txt

@@ -44,21 +44,19 @@ Posting images with posts, posting only images and pulling down your posts will
     
         account.blog_url
 
-3. Setup your post
+3. Send your post to your Wordpress Blog
 
-    * You must at least include the title or body. Tags must be an array.
+    * Set to a variable to work with the response
     
-        account.title = "My Title"
-        account.body  = "My Body Text"
-        account.tags  = ["Glue", "Wordpress", "Ruby", "Made By Squad"]
+        response = account.post("My title", "Body Text", ["Glue", "Wordpress"])
+        
+        response = account.post("", "Body Text", ["Glue", "Wordpress"])
+        
+        response = account.post("My title", "")
 
-4. Send your post to your Wordpress Blog
+        response = account.post("", "Body Text")
 
-    * Set this to a variable to work with the response
-    
-        response = account.post
-
-5. You get a success or error hash back
+4. You get a success or error hash back
 
     * Your response should look something like this if successful
     

data/lib/wordpress.rb

@@ -1,71 +1,67 @@
 require 'rubygems'
 require 'mechanize'
- 
+
 module Wordpress
- 
-  VERSION = '0.1.6'
- 
+
+  VERSION = '0.1.7'
+
   class AuthError < StandardError; end
   class PostError < StandardError; end
   class HostError < StandardError; end
   class TagsError < StandardError; end
- 
+
   class Client
- 
+
     DEFAULT_URL = 'http://wordpress.com/wp-login.php'
     LOGIN_FORM  = 'loginform'
     POST_FORM   = 'post'
     IS_ADMIN    = 'body.wp-admin'
     IS_LOGIN    = 'body.login'
- 
-    attr_accessor :title, :body
-    attr_reader   :login_url, :username, :password, :tags, :post_url, :agent
- 
+
+    attr_reader   :login_url, :username, :password, :agent
+
     def initialize usr, pwd, login_url = DEFAULT_URL
-      raise   AuthError, "Blank Username or Password or not a string." \
-        unless  usr.is_a?(String) && pwd.is_a?(String) && !usr.empty? && !pwd.empty?
- 
-      raise   AuthError, "Url should end with wp-login.php" \
+    
+      # should I 
+      raise   AuthError, "You must provide a username and password" \
+        if      usr.empty? || pwd.empty?
+
+      raise   AuthError, "Login Url should end with wp-login.php" \
         unless  login_url =~ /\/wp-login[.]php$/
- 
+
       @username  = usr
       @password  = pwd
       @login_url = login_url
       @agent     = WWW::Mechanize.new
-      @post_url  = @tags = @title = @body = nil
     end
- 
-    def tags= ary
-      raise TagsError, 'Tags must added using an array' unless ary.is_a?(Array)
-      @tags = ary.join(", ")
-    end
- 
+
     def valid_login_page?
       !login_page.search("form[name=#{LOGIN_FORM}]").empty?
     end
- 
+
     def valid_user?
       logged_into? dashboard_page
     end
- 
+
     def blog_url
-      dashboard_page.search("#{IS_ADMIN} #wphead h1 a").first['href'] rescue nil
+      dashboard_page.at("#{IS_ADMIN} #wphead h1 a")['href'] rescue nil
     end
- 
-    def post
-      raise PostError, "A post requires a title or body."                       unless @title || @body
+
+    def post title, body, tags=nil
+      raise PostError, "A post requires a title or body."                       if  title.empty? && body.empty?
       post_form      = dashboard_page.form(POST_FORM)
-      raise HostError, "Missing QuickPress on dashboard page or bad account."   unless post_form
-      post_form      = build_post(post_form)
-      post_response    @agent.submit(post_form, post_form.buttons.last)
+      raise HostError, "Missing QuickPress on dashboard page or bad account."   unless  post_form
+      tags           = tags.join(", ") if tags
+      post_form      = build_post(post_form, title, body, tags)
+      post_response    @agent.submit(post_form, post_form.buttons.last), title
     end
- 
+
   private
- 
+
     def login_page
       @agent.get @login_url
     end
- 
+
     def dashboard_page
       page             = login_page
       login_form       = page.form(LOGIN_FORM)
@@ -76,28 +72,28 @@ module Wordpress
       end
       page
     end
- 
+
     def logged_into? page
       !page.search(IS_ADMIN).empty?
     end
- 
-    def build_post form
-      form.post_title = @title
-      form.content    = @body
-      form.tags_input = @tags
+
+    def build_post form, title, body, tags
+      form.post_title = title
+      form.content    = body
+      form.tags_input = tags
       form
     end
- 
-    def post_response page
+
+    def post_response page, title
       links = page.search("div.message p a")
       if links.first && links.last
         url = links.first['href'] ? links.first['href'].gsub("?preview=1", "")  : nil
         pid = links.last['href']  ? links.last['href'].sub(/.*post=(\d*)/,'\1') : nil
         if pid && url
-          return { "rsp" => { "post" => { "title" => "#{@title}", "url" => "#{url}", "id" => "#{pid}" }, "stat" => "ok" }}
+          return {"rsp" => {"post" => {"title" => "#{title}", "url" => "#{url}", "id" => "#{pid}"}, "stat" => "ok" }}
         end
       end
-      { "rsp" => { "err" => { "msg" => "Post was unsuccessful.", "title" => "#{@title}" }, "stat" => "fail" } }
+      {"rsp" => {"err" => {"msg" => "Post was unsuccessful.", "title" => "#{title}"}, "stat" => "fail"}}
     end
   end
 end

data/test/test_wordpress.rb

@@ -1,205 +1,171 @@
 require "test/unit"
 require "wordpress"
 require "mocha"
- 
+
 class Wordpress::Client
   public :login_page, :dashboard_page, :logged_into?, :build_post, :post_response
 end
- 
-# Need to test these methods
+
+# Should Test The Following
 # * build_post
 # * dashboard_page
 # * Post Response failure
- 
+# * Tags error without being an array
+# * Body and tags are returned in response
+# * Testing that username, password & login url respond to empty
+
 class TestWordpress < Test::Unit::TestCase
- 
+
   def setup
     @u = 'jordandobson'
     @p = 'password'
- 
+
     @account                    = Wordpress::Client.new @u, @p
     @account_bad                = Wordpress::Client.new @u, 'x'
     @account_invalid_login_page = Wordpress::Client.new @u, @p, 'http://notapage.gd/wp-login.php'
     @account_hosted_account     = Wordpress::Client.new @u, @p, 'http://blog.getglue.net/wp-login.php'
- 
+
     login_html   = '<html><body class="login"><form name="loginform"></form></body></html>'
     admin_html   = '<html><body class="wp-admin"><div id="wphead"><h1><a href="http://getglue.wordpress.com/" title="Visit Site">Get Glue</a></h1></div><form name="post"><input type="text" name="post_title"/><textarea name="content"></textarea><input type="text" name="tags_input"/><input type="submit" name="publish" /></form></body></html>'
     success_html = '<div class="message"><p><a href="http://success.com/2009/?preview=1">preview</a><a href="http://success.com/wp-admin/post.php?post=99">edit</a></p></div>'
     fail_html    = '<div class="message"><p></p></div>'
- 
+
     @login_pg   = setup_mock_mechanize_pg login_html
     @admin_pg   = setup_mock_mechanize_pg admin_html
     @success_pg = setup_mock_mechanize_pg success_html
     @fail_pg    = setup_mock_mechanize_pg fail_html
   end
- 
+
   def setup_mock_mechanize_pg html
     WWW::Mechanize::Page.new(nil, {'content-type' => 'text/html'}, html, 200)
   end
- 
+
   def test_sets_account_info_on_initialize
-    actual       = Wordpress::Client.new @u, @p 
+    actual       = Wordpress::Client.new @u, @p
     assert_equal   [@u, @p], [actual.username, actual.password]
   end
- 
+
   def test_raises_if_username_is_blank
     assert_raise Wordpress::AuthError do
-      Wordpress::Client.new "", @p 
+      Wordpress::Client.new "", @p
     end
   end
- 
+
   def test_raises_if_password_is_blank
     assert_raise Wordpress::AuthError do
       Wordpress::Client.new @u, ""
     end
   end
- 
-  def test_raises_if_password_is_not_srting
-    assert_raise Wordpress::AuthError do
-      Wordpress::Client.new @u, 00
-    end
-  end
- 
-  def test_raises_if_username_is_not_srting
-    assert_raise Wordpress::AuthError do
-      Wordpress::Client.new 00, @p
-    end
-  end
- 
+
   def test_login_url_uses_default_if_witheld
     assert_equal Wordpress::Client::DEFAULT_URL, @account.login_url
   end
- 
+  
   def test_users_url_does_not_raise
     assert_equal 'http://notapage.gd/wp-login.php', @account_invalid_login_page.login_url
   end
- 
+
   def test_raises_on_bad_login_url
     assert_raise Wordpress::AuthError do
       Wordpress::Client.new @u, @p, 'http://bad.login/url.php'
     end
   end
- 
+
   def test_login_page_is_valid
     actual = Wordpress::Client.new @u, @p
     actual.stubs(:login_page).returns(@login_pg)
     assert_equal true, actual.valid_login_page?
   end
- 
+
   def test_login_page_is_invalid
     @account_invalid_login_page.stubs(:login_page).returns(@fail_pg)
     assert_equal false, @account_invalid_login_page.valid_login_page?
   end
- 
+
   def test_is_a_valid_user
     @account.stubs(:dashboard_page).returns(@admin_pg)
     assert_equal true, @account.valid_user?
   end
- 
+
   def test_is_an_invalid_user
     @account_bad.stubs(:dashboard_page).returns(@login_pg)
     assert_equal false, @account_bad.valid_user?
   end
- 
+
   def test_is_a_valid_hosted_user
     @account_hosted_account.stubs(:dashboard_page).returns(@admin_pg)
     assert_equal true, @account_hosted_account.valid_user?
   end
- 
+
   def test_private_logged_in_is_true
     assert_equal  true,  @account.logged_into?(@admin_pg)
   end
- 
+
   def test_private_logged_in_is_false
     assert_equal  false, @account.logged_into?(@login_pg)
   end
- 
+
   def test_returns_blog_url
     @account_hosted_account.stubs(:dashboard_page).returns(@admin_pg)
     assert_equal 'http://getglue.wordpress.com/', @account_hosted_account.blog_url
   end
- 
+
   def test_returns_blog_url_bad
     @account_invalid_login_page.stubs(:dashboard_page).raises(SocketError)
     assert_nil @account_invalid_login_page.blog_url
   end
- 
-  def test_update_raises_without_title_or_body
+
+  def test_post_raises_without_title_or_body
     assert_raise Wordpress::PostError do
-      @account.post
+      @account.post("", "")
     end
   end
- 
-  def test_update_raises_without_post_form
+
+  def test_post_raises_without_post_form
     @account_bad.stubs(:dashboard_page).returns(@fail_pg)
-    @account_bad.title = "Fail"
     assert_raise Wordpress::HostError do
-      @account_bad.post
-    end
-  end
- 
-  def test_tags_are_added_correctly
-    @account.tags = []
-    assert_equal @account.tags, ""
-  end
- 
-  def test_tags_single_is_correctly
-    @account.tags = ["Glue"]
-    assert_equal @account.tags, "Glue"
-  end
- 
-  def test_tags_multiple_is_correctly_joined
-    @account.tags = ["Glue", "Wordpress", "Ruby on Rails"]
-    assert_equal @account.tags, "Glue, Wordpress, Ruby on Rails"
-  end
- 
-  def test_raises_if_tags_not_set_as_array
-    assert_raise Wordpress::TagsError do
-      @account.tags = "hello, "
+      @account_bad.post("My Title", "")
     end
   end
- 
+
   def test_post_response_returns_good_response
-    assert_equal "ok", @account.post_response(@success_pg)["rsp"]["stat"]
+    assert_equal "ok", @account.post_response(@success_pg, "")["rsp"]["stat"]
   end
- 
+
   def test_post_returns_fail
     title          = "My Title"
-    @account.title = title
-    res            = @account.post_response(@fail_pg)
-    assert_equal     "fail",                    res["rsp"]["stat"]
-    assert_equal     "Post was unsuccessful.",  res["rsp"]["err"]["msg"]
-    assert_equal     title,                     res["rsp"]["err"]["title"]
+    res            = @account.post_response(@fail_pg, title)
+    assert_equal     "fail",                      res["rsp"]["stat"]
+    assert_equal     "Post was unsuccessful.",    res["rsp"]["err"]["msg"]
+    assert_equal     title,                       res["rsp"]["err"]["title"]
   end
- 
+
   def test_post_returns_ok
     @account.stubs(:dashboard_page).returns(@admin_pg)
     @account.agent.stubs(:submit).returns(@success_pg)
     title          = "My Title"
-    @account.title = title
-    @account.body  = "Body Text ..."
-    actual         = @account.post
+    body           = "Body Text"
+    actual         = @account.post(title, body)
     assert_equal     "ok",                        actual["rsp"]["stat"]
     assert_equal     title,                       actual["rsp"]["post"]["title"]
     assert_equal     "99",                        actual["rsp"]["post"]["id"]
     assert_equal     "http://success.com/2009/",  actual["rsp"]["post"]["url"]
   end
- 
+
   def test_post_returns_ok_with_only_title
     @account.stubs(:dashboard_page).returns(@admin_pg)
     @account.agent.stubs(:submit).returns(@success_pg)
     title          = "My Title"
-    @account.title = "My Title"
-    actual         = @account.post
+    actual         = @account.post(title, "")
     assert_equal     "ok",                        actual["rsp"]["stat"]
     assert_equal     title,                       actual["rsp"]["post"]["title"]
   end
- 
+
   def test_post_returns_ok_with_only_body
     @account.stubs(:dashboard_page).returns(@admin_pg)
     @account.agent.stubs(:submit).returns(@success_pg)
-    @account.body  = "Body Text ..."
-    actual         = @account.post
+    body           = "Body Text"
+    actual         = @account.post("", body)
     assert_equal     "ok",                        actual["rsp"]["stat"]
     assert_equal     "",                          actual["rsp"]["post"]["title"]
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jordandobson-wordpress
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Jordan Dobson