wordpress-xmlrpc 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/features/publish.feature

@@ -7,12 +7,12 @@ Feature: Publish post
   And all posts and comments cleaned out
 
   @wip
-  Scenario: Load wordpress home page
+  Scenario: Publish post
     When I go to wordpress "home" page
     Then I should see "wordpress"
     When make following post:
-    | title  | content               | creation_date |
-    | hey ho | this is my first post |    01.08.2010 |
+    | title  | content                                                   | creation_date | image                               |
+    | hey ho | this is my first post <br/> <img src="post_picture.jpg"/> |    01.08.2010 | spec/support/files/post_picture.jpg |
     And I go to wordpress "home" page
     Then I should see "hey ho"
     And I should see "this is my first post"

data/features/step_definitions/basic_steps.rb

@@ -22,6 +22,7 @@ end
 When /^make following post:$/ do |table|
   table.hashes.each do |hash|
     hash['creation_date'] = Date.parse(hash.delete('creation_date')) if hash['creation_date']
+    hash.merge!({:images => [{:file_path => File.expand_path(hash.delete('image'))}]}) if hash['image']
     post = Wordpress::Post.new(hash)
     @blog.publish(post)
   end

data/lib/blog.rb

@@ -1,6 +1,5 @@
 require 'xmlrpc/client'
 require 'params_check'
-require 'base64'
 require 'mimemagic'
 require 'nokogiri'
 
@@ -34,24 +33,13 @@ module Wordpress
     end #recent_posts
 
     def publish(post)
-      doc = Nokogiri::HTML::DocumentFragment.parse(post.content)
-      post.images.each do |image|
-        image_file = File.open(image[:file_path], "rb")
-        file_name = File.basename(image_file.path)
-
-        uploaded_image = upload_file(File.open(image[:file_path], "rb"))
-
-        doc.xpath("img[contains(@src, '#{file_name}')]").each do |img|
-          img['src'] = uploaded_image[:url]
-        end
-      end
-      post.content = doc.to_html
-
+      process_post_images(post)
       post.id = blog_api_call("metaWeblog.newPost", post.to_struct, true).to_i
       post.published = true
     end #publish
 
     def update_post(post)
+      process_post_images(post)
       return api_call("metaWeblog.editPost", post.id, @user, @password, post.to_struct, post.published)
     end #update_post
 
@@ -59,13 +47,32 @@ module Wordpress
       struct = {
         :name => File.basename(file.path),
         :type => MimeMagic.by_magic(file).type,
-        :bits => Base64.encode64(file.read),
+        :bits => XMLRPC::Base64.new(File.open(file.path, "r").read),
         :overwrite => true
       }
       return blog_api_call("wp.uploadFile", struct)
     end
 
     private
+    def process_post_images(post)
+      doc = Nokogiri::HTML::DocumentFragment.parse(post.content)
+      post.images.each do |image|
+
+        raise ArgumentError, "Image not found (path: #{image[:file_path]})" unless File.exist?(image[:file_path])
+
+        image_file = File.open(image[:file_path], "rb")
+        file_name = File.basename(image_file.path)
+
+        uploaded_image = upload_file(File.open(image[:file_path], "rb"))
+        raise "Image upload failed" if uploaded_image.nil?
+
+        doc.xpath("img[contains(@src, '#{file_name}')]").each do |img|
+          img['src'] = uploaded_image['url']
+        end
+      end
+      post.content = doc.to_html
+    end #process_post_images
+
     def api_call(method_name, *args)
       begin
         return @client.call(method_name, *args)

data/lib/post.rb

@@ -19,6 +19,7 @@ module Wordpress
                   )
 
     def initialize(attributes = {})
+      self.images = []
       attributes.each do |attribute, value|
         accessor_name = "#{attribute}="
         send(accessor_name, value) if respond_to?(accessor_name)

data/spec/blog_spec.rb

@@ -58,11 +58,7 @@ describe Wordpress::Blog do
 
     describe "publish" do
       it "should make appropriate call to xmlrpc api" do
-        images = [
-                  {
-                    :file_path => File.expand_path("./spec/support/files/post_picture.jpg")
-                  }
-                 ]
+        images = [{:file_path => File.expand_path("./spec/support/files/post_picture.jpg")}]
         post = Wordpress::Post.new(
                                    :title => "Hey ho",
                                    :content => "Content <img src=\"http://otherhost/post_picture.jpg\">",
@@ -76,26 +72,27 @@ describe Wordpress::Blog do
           :description=>"Content <img src=\"http://localhost/post_picture.jpg\">",
           :mt_excerpt=>"Excerpt"
         }
-        @client_mock.should_receive(:call).with(
-                                                "metaWeblog.newPost",
-                                                0, "admin", "wordpress-xmlrpc",
-                                                required_post_struct, true).and_return("123")
 
         @client_mock.should_receive(:call).with(
                                                 "wp.uploadFile",
                                                 0, "admin", "wordpress-xmlrpc",
                                                 {
+                                                  :name => "post_picture.jpg",
                                                   :type => "image/jpeg",
                                                   :bits => "encoded file content",
-                                                  :overwrite => true,
-                                                  :name => "post_picture.jpg"
+                                                  :overwrite => true
                                                 }).and_return({
-                                                               :file => "post_picture.jpg",
-                                                               :url => "http://localhost/post_picture.jpg",
-                                                               :type => "image/jpeg"
+                                                               'file' => "post_picture.jpg",
+                                                               'url' => "http://localhost/post_picture.jpg",
+                                                               'type' => "image/jpeg"
                                                              })
 
-        Base64.should_receive(:encode64).and_return("encoded file content")
+        @client_mock.should_receive(:call).with(
+                                                "metaWeblog.newPost",
+                                                0, "admin", "wordpress-xmlrpc",
+                                                required_post_struct, true).and_return("123")
+
+        XMLRPC::Base64.should_receive(:new).and_return("encoded file content")
 
         @blog.publish(post).should be_true
         post.id.should == 123
@@ -133,8 +130,32 @@ describe Wordpress::Blog do
 
     describe "update_post" do
       it "should submit post update" do
-        post = Wordpress::Post.new(:id => 54, :title => "Updated post", :published => true)
-        @client_mock.should_receive(:call).with("metaWeblog.editPost", 54, "admin", "wordpress-xmlrpc", post.to_struct, true).and_return(true)
+        images = [{:file_path => File.expand_path("./spec/support/files/post_picture.jpg")}]
+        post = Wordpress::Post.new(:id => 54, :title => "Updated post", :content => "Content <img src=\"http://otherhost/post_picture.jpg\">",  :published => true, :images => images)
+
+        required_post_struct = {
+          :title=>"Updated post",
+          :description=>"Content <img src=\"http://localhost/post_picture.jpg\">",
+          :postid => 54
+        }
+        @client_mock.should_receive(:call).with("metaWeblog.editPost",
+                                                54, "admin", "wordpress-xmlrpc",
+                                                required_post_struct, true).and_return(true)
+
+        @client_mock.should_receive(:call).with("wp.uploadFile",
+                                                0, "admin", "wordpress-xmlrpc",
+                                                {
+                                                  :name => "post_picture.jpg",
+                                                  :type => "image/jpeg",
+                                                  :bits => "encoded file content",
+                                                  :overwrite => true
+                                                }).and_return({
+                                                               'file' => "post_picture.jpg",
+                                                               'url' => "http://localhost/post_picture.jpg",
+                                                               'type' => "image/jpeg"
+                                                             })
+        XMLRPC::Base64.should_receive(:new).and_return("encoded file content")
+
         @blog.update_post(post).should be_true
       end
     end

data/wordpress-xmlrpc.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wordpress-xmlrpc}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Naumenko"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wordpress-xmlrpc
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Alexander Naumenko