jordandobson-wordpress 0.1.2 → 0.1.3

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.0.3 / 2009-06-05
+
+* 1 major enhancement
+
+  * Stubbed test and refactored code
+
 === 1.0.1 / 2009-06-05
 
 * 1 major enhancement

data/README.txt

@@ -4,7 +4,7 @@
 
 == DESCRIPTION:
 
-The Wordpress gem provides posting to a Wordpress.com blog or a self hosted wordpress by provided your username, password, login url(if you host your blog) and your blog content. With this gem, you have access to add a text entry on Wordpress blug by providing these options: a title, body, and tags. You must include at least a title or body for your post.
+The Wordpress gem provides posting to a Wordpress.com blog or a self hosted wordpress by providing your username, password, login url(if you host your blog) and your blog content. With this gem, you have access to add a text entry on Wordpress blog by providing these options: title text, body text, and a tag array. You must include at least title text or body text for your post.
 
 Posting images with posts, posting only images and pulling down your posts will be available very soon.
 

data/bin/wordpress

@@ -1,3 +1 @@
 #!/usr/bin/env ruby
-
-abort "you need to write me"

data/lib/wordpress.rb

@@ -3,10 +3,11 @@ require 'mechanize'
 
 module Wordpress
 
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 
   class AuthError < StandardError; end
   class PostError < StandardError; end
+  class HostError < StandardError; end
 
   class Client
 
@@ -17,57 +18,57 @@ module Wordpress
     IS_LOGIN    = 'body.login'
 
     attr_accessor :title, :body
-    attr_reader   :login_url, :username, :password, :tags, :post_url
+    attr_reader   :login_url, :username, :password, :tags, :post_url, :agent
 
     def initialize usr, pwd, login_url = DEFAULT_URL
       raise   AuthError, "Blank Username or Password or not a string." \
         if      !usr.is_a?(String) || !pwd.is_a?(String) || usr == '' || pwd == ''
-        
+
       raise   AuthError, "Url should end with wp-login.php" \
         unless  login_url =~ /\/wp-login[.]php$/
-        
+
       @username  = usr
       @password  = pwd
       @login_url = login_url
-      
-      @agent = @post_url = @tags = @title = @body = nil
+      @agent     = WWW::Mechanize.new
+      @post_url  = @tags = @title = @body = nil
     end
-    
+
     def tags= ary
       raise TagError, 'Tags must added using an array' if !ary.is_a?(Array)
       @tags = ary.join(", ")
     end
 
     def valid_login_page?
-      lf = login_page.form(LOGIN_FORM)
-      lf && lf.log ? true : false
+      !login_page.search("form[name=#{LOGIN_FORM}]").empty?
     end
-    
+
     def valid_user?
       logged_into? dashboard_page
     end
-    
+
     def blog_url
-      a = dashboard_page.search("#{IS_ADMIN} #wphead h1 a")
-      return a.first['href'] if a.first && a.first['href']
-      nil
+      begin
+        a = dashboard_page.search("#{IS_ADMIN} #wphead h1 a")
+      rescue SocketError
+      end
+      a && a.first && a.first['href'] ? a.first['href'] : nil
     end
-    
+
     def add_post
+      raise PostError, "A post requires a title or body."                       unless @title || @body
       post_form      = dashboard_page.form(POST_FORM)
-      raise PostError, "Missing QuickPress form on users dashboard page." unless  post_form
-      raise PostError, "A post requires a title or body."                 if      !@title && !@body
+      raise HostError, "Missing QuickPress on dashboard page or bad account."   unless post_form
       post_form      = build_post(post_form)
-      build_response   @agent.submit(post_form, post_form.buttons.last)
+      post_response    @agent.submit(post_form, post_form.buttons.last)
     end
 
   private
-  
+
     def login_page
-      @agent     = WWW::Mechanize.new #if !@agent
-      @agent.get   @login_url
+      @agent.get @login_url
     end
-    
+
     def dashboard_page
       page             = login_page
       login_form       = page.form(LOGIN_FORM)
@@ -76,24 +77,31 @@ module Wordpress
         login_form.pwd = @password
         page           = @agent.submit login_form
       end
+      puts page.inspect
       page
     end
 
     def logged_into? page
       !page.search(IS_ADMIN).empty?
     end
-    
+
     def build_post f
       f.post_title = @title
       f.content    = @body
       f.tags_input = @tags
       f
     end
-    
-    def build_response page
-      return true
-      #get preview url & if it's not there send back error response
-    end
 
+    def post_response page
+      a = page.search("div.message p a")
+      if a && a.first && a.last
+        url = a.first['href'] ? a.first['href'].gsub("?preview=1", "")  : nil
+        pid = a.last['href']  ? a.last['href'].sub(/.*post=(\d*)/,'\1') : nil
+        if pid && url
+          return { "rsp" => { "post" => { "title" => "#{@title}", "url" => "#{url}", "id" => "#{pid}" }, "stat" => "ok" }}
+        end
+      end
+      { "rsp" => { "err" => { "msg" => "Post was unsuccessful.", "title" => "#{@title}" }, "stat" => "fail" }}
+    end
   end
 end

data/test/test_wordpress.rb

@@ -1,19 +1,18 @@
 require "test/unit"
 require "wordpress"
-# 
+require "mocha"
 
 ######
 # USED TO TEST PRIVATE METHODS
 class Class
   def private_methods
     m = self.private_instance_methods
-    self.class_eval { public(*m) }
+    self.class_eval { public( *m ) }
     yield
-    self.class_eval { private(*m) }
+    self.class_eval { private( *m ) }
   end
 end
 
-
 class TestWordpress < Test::Unit::TestCase
 
   def setup
@@ -22,12 +21,25 @@ class TestWordpress < Test::Unit::TestCase
 
     @account                    = Wordpress::Client.new @u, @p
     @account_bad                = Wordpress::Client.new @u, 'x'
-    @account_invalid_login_page = Wordpress::Client.new @u, @p, 'http://is.gd/wp-login.php'
+    @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
 
-    @admin_pg = Nokogiri::HTML( Nokogiri::HTML::Builder.new { html { body( :class => 'wp-admin') } }.to_html )
-    @login_pg = Nokogiri::HTML( Nokogiri::HTML::Builder.new { html { body( :class => 'login'   ) } }.to_html )
+  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 
     assert_equal   [@u, @p], [actual.username, actual.password]
@@ -61,73 +73,124 @@ class TestWordpress < Test::Unit::TestCase
     assert_equal Wordpress::Client::DEFAULT_URL, @account.login_url
   end
 
-  def test_uses_url_does_not_raise
-    assert_equal 'http://is.gd/wp-login.php', @account_invalid_login_page.login_url
+  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
-    assert_equal    true, @account.valid_user?
+    @account.stubs(:dashboard_page).returns(@admin_pg)
+    assert_equal true, @account.valid_user?
   end
-  
+
   def test_is_an_invalid_user
-    assert_equal    false, @account_bad.valid_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       = Wordpress::Client.new('nonbreakablespace', 'Password1', 'http://blog.nonbreakablespace.com/wp-login.php')
-    assert_equal    true, account.valid_user?
-  end
-  def test_returns_blog_url
-    expected      = 'http://blog.nonbreakablespace.com/'
-    account       = Wordpress::Client.new('nonbreakablespace', 'Password1', "#{expected}wp-login.php")
-    assert_equal    expected, account.blog_url
-    # Need to stub dashboard_page
+    @account_hosted_account.stubs(:dashboard_page).returns(@admin_pg)
+    assert_equal true, @account_hosted_account.valid_user?
   end
- 
-  def test_returns_blog_url_bad
-    account       = Wordpress::Client.new(@u, @p, 'http://is.gd/wp-login.php')
-    assert_nil    account.blog_url
-  end
-  
+
   def test_private_logged_in_is_true
-    Wordpress::Client.private_methods { assert_equal true,  @account.logged_into?(@admin_pg) }
+    Wordpress::Client.private_methods {
+      assert_equal  true,  @account.logged_into?(@admin_pg)
+    }
   end
 
   def test_private_logged_in_is_false
-    Wordpress::Client.private_methods { assert_equal false, @account.logged_into?(@login_pg) }
+    Wordpress::Client.private_methods {
+      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_add_post_raises_without_title_or_body
     assert_raise Wordpress::PostError do
       @account.add_post
     end
   end
-  
+
   def test_add_post_raises_without_post_form
-    assert_raise Wordpress::PostError do
+    @account_bad.stubs(:dashboard_page).returns(@fail_pg)
+    @account_bad.title = "Fail"
+    assert_raise Wordpress::HostError do
       @account_bad.add_post
-    end  
+    end
   end
-  
-  def test_add_post_adds_post
-    @account.title = Time.now
-    @account.body  = "updated next"
-    @account.add_post
+
+  def test_post_response_returns_good_response
+    Wordpress::Client.private_methods {
+      assert_equal "ok", @account.post_response(@success_pg)["rsp"]["stat"]
+    }
   end
 
-end
+  def test_add_post_returns_fail
+    Wordpress::Client.private_methods {
+      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"]
+    }
+  end
+
+  def test_add_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.add_post
+    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_add_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.add_post
+    assert_equal     "ok",                        actual["rsp"]["stat"]
+    assert_equal     title,                       actual["rsp"]["post"]["title"]
+  end
+
+  def test_add_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.add_post
+    assert_equal     "ok",                        actual["rsp"]["stat"]
+    assert_equal     "",                          actual["rsp"]["post"]["title"]
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jordandobson-wordpress
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jordan Dobson
@@ -22,7 +22,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.8.3
     version: 
-description: The Wordpress gem provides posting to a Wordpress.com blog or a self hosted wordpress by provided your username, password, login url(if you host your blog) and your blog content.
+description: The Wordpress gem provides posting to a Wordpress.com blog or a self hosted wordpress by providing your username, password, login url(if you host your blog) and your blog content.
 email: 
 - jordan.dobson@madebysquad.com
 executables: []
@@ -67,6 +67,6 @@ rubyforge_project: wordpress
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: "The Wordpress gem provides posting to a Wordpress.com blog or a self hosted wordpress by provided your username, password, login url(if you host your blog) and your blog content. With this gem, you have access to add a text entry on Wordpress blug by providing these options: a title, body, and tags. You must include at least a title or body for your post."
+summary: "The Wordpress gem provides posting to a Wordpress.com blog or a self hosted wordpress by providing your username, password, login url(if you host your blog) and your blog content. With this gem, you have access to add a text entry on Wordpress blog by providing these options: title text, body text, and a tag array. You must include at least title text or body text for your post."
 test_files: 
 - test/test_wordpress.rb