0
@@ -58,21 +58,12 @@ class MetaWeblogApi < ActionWebService::API::Base
0
   api_method :newMediaObject,
0
     :expects => [ {:blogid => :string}, {:username => :string}, {:password => :string}, {:data => MetaWeblogStructs::MediaObject} ],
0
     :returns => [MetaWeblogStructs::Url]
0
-    
0
 end
0
 
0
-class MetaWeblogService < ActionWebService::Base
0
+class MetaWeblogService < XmlRpcService
0
   web_service_api MetaWeblogApi
0
   before_invocation :authenticate
0
 
0
-  attr_accessor :controller
0
-
0
-  delegate :site, :to => :controller
0
-
0
-  def initialize(controller)
0
-    @controller = controller
0
-  end
0
-
0
   def getCategories(blogid, username, password)
0
     site.sections.find(:all).collect &:name
0
   end
0
@@ -135,34 +126,13 @@ class MetaWeblogService < ActionWebService::Base
0
       article.published? && article.full_permalink
0
     end
0
     
0
-    def server_url
0
-      controller.url_for(:only_path => false, :controller => "/")
0
-    end
0
-    
0
-    def pub_date(time)
0
-      time.strftime "%a, %e %b %Y %H:%M:%S %Z"
0
-    end
0
-    
0
-    def authenticate(name, args)
0
-      method = self.class.web_service_api.api_methods[name]
0
-    
0
-      # Coping with backwards incompatibility change in AWS releases post 0.6.2
0
-      begin
0
-        h = method.expects_to_hash(args)
0
-        raise "Invalid login" unless @user = User.authenticate(h[:username], h[:password])
0
-      rescue NoMethodError
0
-        username, password = method[:expects].index(:username=>String), method[:expects].index(:password=>String)
0
-        raise "Invalid login" unless @user = User.authenticate(args[username], args[password])
0
-      end
0
-    end
0
-    
0
     def post_it(article, user, password, struct, publish)
0
       article.attributes = {:updater => @user, :section_ids => Section.find(:all, :conditions => ['name IN (?)', struct['sections']]).collect(&:id),
0
         :body => struct['description'].to_s, :title => struct['title'].to_s, :excerpt => struct['mt_excerpt'].to_s}
0
 
0
       utc_date = Time.utc(struct['dateCreated'].year, struct['dateCreated'].month, struct['dateCreated'].day, struct['dateCreated'].hour, struct['dateCreated'].sec, struct['dateCreated'].min)
0
 
0
-      article.published_at = publish ? utc_date : nil
0
+      article.published_at = publish == 1 ? utc_date : nil
0
       article.save!
0
       article.id
0
     end

0
@@ -1,9 +1,11 @@
0
 require 'meta_weblog_api'
0
+require 'movable_type_api'
0
 class BackendController < ApplicationController
0
   session :off
0
 
0
   web_service_dispatching_mode :layered
0
-  web_service(:metaWeblog)  { MetaWeblogService.new(self) }
0
+  web_service(:metaWeblog)  { MetaWeblogService.new(self)  }
0
+  web_service(:mt)          { MovableTypeService.new(self) }
0
 
0
   alias xmlrpc api
0
 end

0
@@ -13,6 +13,8 @@ ActionController::Routing::Routes.draw do |map|
0
   map.resources :assets, :path_prefix => '/admin', :controller => 'admin/assets', :member => { :add_bucket => :post },
0
     :collection => { :latest => :post, :search => :post, :upload => :post, :clear_bucket => :post }
0
   
0
+  map.connect 'xmlrpc', :controller => 'backend', :action => 'xmlrpc' 
0
+  
0
   map.connect ':controller/:action/:id/:version', :version => nil, :controller => /routing_navigator|account|(admin\/\w+)/
0
   
0
   map.comment ':year/:month/:day/:permalink/comment', :controller => 'comments', :action => 'create',

0
@@ -1,5 +1,6 @@
0
 require File.dirname(__FILE__) + '/../test_helper'
0
 require 'meta_weblog_api'
0
+require 'movable_type_api'
0
 require 'backend_controller'
0
 
0
 # Re-raise errors caught by the controller.
0
@@ -99,6 +100,12 @@ class BackendControllerTest < Test::Unit::TestCase
0
   #   assert File.unlink(File.expand_path(RAILS_ROOT) + "/public/images/#{media_object['name']}")
0
   # end
0
 
0
+  def test_should_show_filters
0
+    result  = invoke_layered :mt, :supportedTextFilters
0
+    filters = %w(textile_filter markdown_filter smartypants_filter)
0
+    result.each { |f| filters.include? f[:key] }
0
+  end
0
+
0
   def test_meta_weblog_fail_authentication
0
     args = [ 1, 'quentin', 'using a wrong password', 2 ]
0
     # This will be a little more useful with the upstream changes in [1093]