wordpress-xmlrpc 0.0.2 → 0.0.3

data/Gemfile

@@ -4,6 +4,7 @@ gem "mysql",			"2.8.1"
 gem "rspec",			"1.3.0"
 gem "cucumber",			"0.8.3"
 gem "capybara",			"0.3.9"
-gem "selenium-webdriver", 	"0.0.27"
 gem "jeweler",			"1.4.0"
 gem "log4r",			"1.1.8"
+gem "mimemagic", 		"0.1.5"
+gem "nokogiri", 		"1.4.3.1"

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/features/publish.feature

@@ -6,12 +6,13 @@ Feature: Publish post
   Given I have a blog control
   And all posts and comments cleaned out
 
+  @wip
   Scenario: Load wordpress home page
     When I go to wordpress "home" page
     Then I should see "wordpress"
     When make following post:
-    | title  | content               | publish_date |
-    | hey ho | this is my first post |   01.08.2010 |
+    | title  | content               | creation_date |
+    | hey ho | this is my first post |    01.08.2010 |
     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

@@ -16,12 +16,12 @@ Then /^I should see "([^\"]*)"$/ do |expected_content|
 end
 
 Given /^I have a blog control$/ do
-  @blog = Wordpress::Blog.new(:host => "http://localhost", :user => "admin", :password => "wordpress-xmlrpc")
+  @blog = Wordpress::Blog.new(:blog_uri => "http://localhost", :user => "admin", :password => "wordpress-xmlrpc")
 end
 
 When /^make following post:$/ do |table|
   table.hashes.each do |hash|
-    hash['publish_date'] = Date.parse(hash.delete('publish_date')) if hash['publish_date']
+    hash['creation_date'] = Date.parse(hash.delete('creation_date')) if hash['creation_date']
     post = Wordpress::Post.new(hash)
     @blog.publish(post)
   end

data/lib/blog.rb

@@ -1,5 +1,8 @@
 require 'xmlrpc/client'
 require 'params_check'
+require 'base64'
+require 'mimemagic'
+require 'nokogiri'
 
 module Wordpress
   class Blog
@@ -31,6 +34,19 @@ 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
+
       post.id = blog_api_call("metaWeblog.newPost", post.to_struct, true).to_i
       post.published = true
     end #publish
@@ -39,6 +55,16 @@ module Wordpress
       return api_call("metaWeblog.editPost", post.id, @user, @password, post.to_struct, post.published)
     end #update_post
 
+    def upload_file(file)
+      struct = {
+        :name => File.basename(file.path),
+        :type => MimeMagic.by_magic(file).type,
+        :bits => Base64.encode64(file.read),
+        :overwrite => true
+      }
+      return blog_api_call("wp.uploadFile", struct)
+    end
+
     private
     def api_call(method_name, *args)
       begin

data/lib/post.rb

@@ -14,7 +14,8 @@ module Wordpress
                   :content,
                   :excerpt,
                   :creation_date,
-                  :published
+                  :published,
+                  :images
                   )
 
     def initialize(attributes = {})

data/spec/blog_spec.rb

@@ -58,14 +58,44 @@ 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")
+                  }
+                 ]
         post = Wordpress::Post.new(
                                    :title => "Hey ho",
-                                   :content => "Content",
+                                   :content => "Content <img src=\"http://otherhost/post_picture.jpg\">",
                                    :excerpt => "Excerpt",
+                                   :images => images,
                                    :publish_date => Date.parse("01.08.2010"))
 
-        @client_mock.should_receive(:call).with("metaWeblog.newPost", 0, "admin", "wordpress-xmlrpc", post.to_struct, true).and_return("123")
+
+        required_post_struct = {
+          :title=>"Hey ho",
+          :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",
+                                                {
+                                                  :type => "image/jpeg",
+                                                  :bits => "encoded file content",
+                                                  :overwrite => true,
+                                                  :name => "post_picture.jpg"
+                                                }).and_return({
+                                                               :file => "post_picture.jpg",
+                                                               :url => "http://localhost/post_picture.jpg",
+                                                               :type => "image/jpeg"
+                                                             })
+
+        Base64.should_receive(:encode64).and_return("encoded file content")
 
         @blog.publish(post).should be_true
         post.id.should == 123
@@ -108,6 +138,7 @@ describe Wordpress::Blog do
         @blog.update_post(post).should be_true
       end
     end
+
   end
 end
 

data/wordpress-xmlrpc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wordpress-xmlrpc}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Naumenko"]
-  s.date = %q{2010-09-15}
+  s.date = %q{2010-09-20}
   s.description = %q{Please do not fork it before directly contacint}
   s.email = %q{alecnmk@gmail.com}
   s.extra_rdoc_files = [
@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
      "spec/post_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
+     "spec/support/files/post_picture.jpg",
      "wordpress-xmlrpc.gemspec"
   ]
   s.homepage = %q{http://github.com/alecnmk/wordpress-xmlrpc}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wordpress-xmlrpc
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Alexander Naumenko
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-15 00:00:00 +03:00
+date: 2010-09-20 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,6 +81,7 @@ files:
 - spec/post_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/support/files/post_picture.jpg
 - wordpress-xmlrpc.gemspec
 has_rdoc: true
 homepage: http://github.com/alecnmk/wordpress-xmlrpc