wordpress-client 0.2.0 → 0.2.1

data/lib/wordpress-client.rb

@@ -30,5 +30,14 @@ module Wordpress
     def logger
       @logger ||= Logger.new(STDOUT)
     end
+
+    def configure(&block)
+      block.call(configuration)
+      configuration
+    end
+
+    def configuration
+      @configuration ||= Configuration.new
+    end
   end
 end

data/lib/wordpress/api.rb

@@ -1,5 +1,8 @@
 require 'wordpress/errors'
 require 'wordpress/request'
+Dir.glob(File.expand_path('../api/*.rb', __FILE__)) do |path|
+  require path
+end
 
 module Wordpress
   module API
@@ -7,39 +10,44 @@ module Wordpress
       base.send(:include, InstanceMethods)
       base.extend(ClassMethods)
       base.class_eval do
-        Dir.glob(File.expand_path('../api/*.rb', __FILE__)) do |path|
-          eval(File.open(path).read)
-        end
+        include Posts
+        include Comments
+        include Sites
+        include Me
+        include Tests
+        include Follow
+        include Taxonomy
+        include Notifications
+        include FreshlyPressed
       end
     end
 
     module ClassMethods
-      def register_api(name, method, path, valid_keys, response)
-        arg_names = path.scan(/\$([\w]+)/).map{ |a| a[0] }
-
-        @registered_apis ||= {}
-        @registered_apis[name] = {:method => method, :path => path, :arg_names => arg_names, :valid_keys => valid_keys, :response => response}
-
-        remove_method name if method_defined?(name)
-        define_method name do |*args|
-          params = args[-1].is_a?(Hash) ? args.pop : {}
+    end
 
-          params.keys.each do |key|
-            raise Wordpress::ArgumentError, "#{key} is not valid for this method." unless valid_keys.include?(key)
-          end
+    module InstanceMethods
+      def exec_api(request, &response)
+        json = call(request, :bearer_token_request => true)
 
-          path = path.dup
-          arg_names.each do |key|
-            path.gsub!(/\$#{key}/, args.shift.to_s)
-          end
-          data = args.shift || {}
+        if !json['error'].nil?
+          raise Wordpress::ResponseError, json
+        end
+      
+        if response.nil?
+          Wordpress::OpenStruct.new(json)
+        else
+          instance_exec(json, &response)
+        end
+      end
 
-          json = call_api(Wordpress::Request.new(method, path, params, data))
+      private
 
-          instance_exec(json, &response)
+      def validate_keys!(params, valid_keys)
+        params.keys.each do |key|
+          raise Wordpress::ArgumentError, "#{key} is not valid for this method." unless valid_keys.include?(key)
         end
       end
-  
+
       def default_keys
         [:http_envelope, :pretty, :meta, :callback].freeze
       end
@@ -47,22 +55,6 @@ module Wordpress
       def search_keys
         [:number, :offset, :page, :order, :order_by, :after, :before].freeze
       end
-
-      def registered_apis
-        (@registered_apis || {}).freeze
-      end
-    end
-
-    module InstanceMethods
-      def call_api(request)
-        json = call(request, :bearer_token_request => true)
-
-        if !json['error'].nil?
-          raise Wordpress::ResponseError, json
-        end
-      
-        json
-      end
     end
   end
 end

data/lib/wordpress/api/comments.rb

@@ -1,26 +1,48 @@
 require "wordpress/object/comments"
 require "wordpress/object/comment"
 
-register_api :get_comments, :get, "/rest/v1/sites/$site/comments",
-  [:context, :type, :status] + default_keys + search_keys,
-  lambda{ |json| Wordpress::Object::Comments.new(self, json) }
+module Wordpress::API
+  module Comments
+    def get_comments(site, params = {})
+      validate_keys! params, [:context, :type, :status] + default_keys + search_keys
+      exec_api(Wordpress::Request.new(:get, "/rest/v1/sites/#{site}/comments", params)) do |json|
+        Wordpress::Object::Comments.new(self, json)
+      end
+    end
 
-register_api :get_post_comments, :get, "/rest/v1/sites/$site/posts/$post_id/replies",
-  [:context] + default_keys,
-  lambda{ |json| Wordpress::Object::Comments.new(self, json) }
+    def get_post_comments(site, post_id, params = {})
+      validate_keys! params, [:context] + default_keys
+      exec_api(Wordpress::Request.new(:get, "/rest/v1/sites/#{site}/posts/#{post_id}/replies", params)) do |json|
+        Wordpress::Object::Comments.new(self, json)
+      end
+    end
 
-register_api :get_comment, :get, "/rest/v1/sites/$site/comments/$comment_id",
-  [:context] + default_keys,
-  lambda{ |json| Wordpress::Object::Comment.new(self, json) }
+    def get_comment(site, comment_id, params = {})
+      validate_keys! params, [:context] + default_keys
+      exec_api(Wordpress::Request.new(:get, "/rest/v1/sites/#{site}/comments/#{comment_id}", params)) do |json|
+        Wordpress::Object::Comment.new(self, json)
+      end
+    end
 
-register_api :update_comment, :post, "/rest/v1/sites/$site/comments/$comment_id",
-  [:context] + default_keys,
-  lambda{ |json| Wordpress::Object::Comment.new(self, json) }
+    def update_comment(site, comment_id, data, params = {})
+      validate_keys! params, [:context] + default_keys
+      exec_api(Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/comments/#{comment_id}", params, data)) do |json|
+        Wordpress::Object::Comment.new(self, json)
+      end
+    end
 
-register_api :create_comment, :post, "/rest/v1/sites/$site/comments/$site_id/replies/new",
-  [:context] + default_keys,
-  lambda{ |json| Wordpress::Object::Comment.new(self, json) }
+    def create_comment(site, post_id, data, params = {})
+      validate_keys! params, [:context] + default_keys
+      exec_api(Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/posts/#{post_id}/replies/new", params, data)) do |json|
+        Wordpress::Object::Comment.new(self, json)
+      end
+    end
 
-register_api :delete_comment, :post, "/rest/v1/sites/$site/comments/$comment_id/delete",
-  [:context] + default_keys,
-  lambda{ |json| Wordpress::Object::Comment.new(self, json) }
+    def delete_comment(site, comment_id, data, params = {})
+      validate_keys! params, [:context] + default_keys
+      exec_api(Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/comments/#{comment_id}/delete", params, data)) do |json|
+        Wordpress::Object::Comment.new(self, json)
+      end
+    end
+  end
+end

data/lib/wordpress/api/follow.rb

@@ -1,19 +1,20 @@
 require "wordpress/ostruct"
 
-register_api :create_follow, :post, "/rest/v1/sites/$site/follows/new",
-  [:context] + default_keys,
-  lambda{ |json|
-    Wordpress::OpenStruct.new(json)
-  }
+module Wordpress::API
+  module Follow
+    def create_follow(site, data, params = {})
+      validate_keys! params, [:context] + default_keys
+      exec_api(Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/follows/new", params, data))
+    end
 
-register_api :delete_follow, :post, "/rest/v1/sites/$site/follows/mine/delete",
-  [:context] + default_keys,
-  lambda{ |json|
-    Wordpress::OpenStruct.new(json)
-  }
+    def delete_follow(site, data, params = {})
+      validate_keys! params, [:context] + default_keys
+      exec_api(Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/follows/mine/delete", params, data))
+    end
 
-register_api :get_follow, :get, "/rest/v1/sites/$site/follows/mine",
-  [:context] + default_keys,
-  lambda{ |json|
-    Wordpress::OpenStruct.new(json)
-  }
+    def get_follow(site, params = {})
+      validate_keys! params, [:context] + default_keys
+      exec_api(Wordpress::Request.new(:get, "/rest/v1/sites/#{site}/follows/mine", params))
+    end
+  end
+end

data/lib/wordpress/api/freshly_pressed.rb

@@ -1,7 +1,10 @@
 require "wordpress/ostruct"
 
-register_api :freshly_pressed, :get, "/rest/v1/freshly-pressed",
-  [:number, :after, :before, :content_width, :thumb_width, :thumb_height] + default_keys,
-  lambda{ |json|
-    Wordpress::OpenStruct.new(json)
-  }
+module Wordpress::API
+  module FreshlyPressed
+    def freshly_pressed(params = {})
+      validate_keys! params, [:number, :after, :before, :content_width, :thumb_width, :thumb_height] + default_keys
+      exec_api(Wordpress::Request.new(:get, "/rest/v1/freshly-pressed", params))
+    end
+  end
+end

data/lib/wordpress/api/me.rb

@@ -1,10 +1,18 @@
 require "wordpress/ostruct"
 require "wordpress/object/user"
 
-register_api :me, :get, "/rest/v1/me",
-  default_keys,
-  lambda{ |json| Wordpress::Object::User.new(self, json) }
+module Wordpress::API
+  module Me
+    def me(params = {})
+      validate_keys! params, default_keys
+      exec_api(Wordpress::Request.new(:get, "/rest/v1/me", params)) do |json|
+        Wordpress::Object::User.new(self, json)
+      end
+    end
 
-register_api :get_my_likes, :get, "/rest/v1/me/likes",
-  default_keys,
-  lambda{ |json| Wordpress::OpenStruct.new(json) }
+    def get_my_likes(params = {})
+      validate_keys! params, default_keys
+      exec_api(Wordpress::Request.new(:get, "/rest/v1/me/likes", params))
+    end
+  end
+end

data/lib/wordpress/api/notifications.rb

@@ -1,26 +1,25 @@
 require "wordpress/ostruct"
 
-register_api :get_notifications, :get, "/rest/v1/notifications",
-  [:ids, :fields, :type, :unread, :read, :number, :since, :before, :num_note_items, :trap] + default_keys,
-  lambda{ |json|
-    Wordpress::OpenStruct.new(json)
-  }
+module Wordpress::API
+  module Notifications
+    def get_notifications(params = {})
+      validate_keys! params, [:ids, :fields, :type, :unread, :read, :number, :since, :before, :num_note_items, :trap] + default_keys
+      exec_api(Wordpress::Request.new(:get, "/rest/v1/notifications", params))
+    end
 
-register_api :get_notification, :get, "/rest/v1/notifications/$note_id",
-  [:context, :fields, :num_note_items] + default_keys,
-  lambda{ |json|
-    Wordpress::OpenStruct.new(json)
-  }
+    def get_notification(note_id, params = {})
+      validate_keys! params, [:context, :fields, :num_note_items] + default_keys
+      exec_api(Wordpress::Request.new(:get, "/rest/v1/notifications/#{note_id}", params))
+    end
 
-register_api :seen_notification, :post, "/rest/v1/notifications/seen",
-  [:context] + default_keys,
-  lambda{ |json|
-    Wordpress::OpenStruct.new(json)
-  }
-
-register_api :read_notification, :post, "/rest/v1/notifications/read",
-  [:context] + default_keys,
-  lambda{ |json|
-    Wordpress::OpenStruct.new(json)
-  }
+    def see_notifications(data, params = {})
+      validate_keys! params, [:context] + default_keys
+      exec_api(Wordpress::Request.new(:post, "/rest/v1/notifications/seen", params, data))
+    end
 
+    def read_notifications(data, params = {})
+      validate_keys! params, [:context] + default_keys
+      exec_api(Wordpress::Request.new(:post, "/rest/v1/notifications/read", params, data))
+    end
+  end
+end

data/lib/wordpress/api/posts.rb

@@ -2,50 +2,78 @@ require "wordpress/ostruct"
 require "wordpress/object/posts"
 require "wordpress/object/post"
 
-register_api :get_posts, :get, "/rest/v1/sites/$site/posts",
-  [:context, :tag, :category, :type, :status, :sticky, :author, :search, :meta_key, :meta_value] + default_keys + search_keys,
-  lambda{ |json| Wordpress::Object::Posts.new(self, json) }
+module Wordpress::API
+  module Posts
+    def get_posts(site, params = {})
+      validate_keys! params, [:context, :tag, :category, :type, :status, :sticky, :author, :search, :meta_key, :meta_value] + default_keys + search_keys
+      exec_api(Wordpress::Request.new(:get, "/rest/v1/sites/#{site}/posts", params)) do |json|
+        Wordpress::Object::Posts.new(self, json)
+      end
+    end
 
-register_api :get_post, :get, "/rest/v1/sites/$site/posts/$post_id",
-  [:context] + default_keys,
-  lambda{ |json| Wordpress::Object::Post.new(self, json) }
+    def get_post(site, post_id, params = {})
+      validate_keys! params, [:context] + default_keys
+      exec_api(Wordpress::Request.new(:get, "/rest/v1/sites/#{site}/posts/#{post_id}", params)) do |json|
+        Wordpress::Object::Post.new(self, json)
+      end
+    end
 
-register_api :update_post, :post, "/rest/v1/sites/$site/posts/$post_id",
-  [:context] + default_keys,
-  lambda{ |json| Wordpress::Object::Post.new(self, json) }
+    def update_post(site, post_id, data, params = {})
+      validate_keys! params, [:context] + default_keys
+      exec_api(Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/posts/#{post_id}", params, data)) do |json|
+        Wordpress::Object::Post.new(self, json)
+      end
+    end
 
-register_api :get_post_by_slug, :get, "/rest/v1/sites/$site/posts/slug:$post_slug",
-  [:context] + default_keys,
-  lambda{ |json| Wordpress::Object::Post.new(self, json) }
+    def get_post_by_slug(site, slug, params = {})
+      validate_keys! params, [:context] + default_keys
+      exec_api(Wordpress::Request.new(:get, "/rest/v1/sites/#{site}/posts/slug:#{slug}", params)) do |json|
+        Wordpress::Object::Post.new(self, json)
+      end
+    end
 
-register_api :create_post, :post, "/rest/v1/sites/$site/posts/new",
-  [:context] + default_keys,
-  lambda{ |json| Wordpress::Object::Post.new(self, json) }
+    def create_post(site, data, params = {})
+      validate_keys! params, [:context] + default_keys
+      exec_api(Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/posts/new", params, data)) do |json|
+        Wordpress::Object::Post.new(self, json)
+      end
+    end
 
-register_api :delete_post, :post, "/rest/v1/sites/$site/posts/$post_id/delete",
-  [:context] + default_keys,
-  lambda{ |json| Wordpress::Object::Post.new(self, json) }
+    def delete_post(site, post_id, data, params = {})
+      validate_keys! params, [:context] + default_keys
+      exec_api(Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/posts/#{post_id}/delete", params, data)) do |json|
+        Wordpress::Object::Post.new(self, json)
+      end
+    end
 
-register_api :get_likes, :get, "/rest/v1/sites/$site/posts/$post_id/likes",
-  default_keys,
-  lambda{ |json| Wordpress::OpenStruct.new(json) }
+    def get_likes(site, post_id, params = {})
+      validate_keys! params, default_keys
+      exec_api(Wordpress::Request.new(:get, "/rest/v1/sites/#{site}/posts/#{post_id}/likes", params))
+    end
 
-register_api :create_like, :post, "/rest/v1/sites/$site/posts/$post_id/likes/new",
-  default_keys,
-  lambda{ |json| Wordpress::OpenStruct.new(json) }
+    def create_like(site, post_id, data, params = {})
+      validate_keys! params, default_keys
+      exec_api(Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/posts/#{post_id}/likes/new", params, data))
+    end
 
-register_api :delete_like, :post, "/rest/v1/sites/$site/posts/$post_id/likes/mine/delete",
-  default_keys,
-  lambda{ |json| Wordpress::OpenStruct.new(json) }
+    def delete_like(site, post_id, data, params = {})
+      validate_keys! params, default_keys
+      exec_api(Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/posts/#{post_id}/likes/mine/delete", params, data))
+    end
 
-register_api :get_like_status, :get, "/rest/v1/sites/$site/posts/$post_id/likes/mine",
-  default_keys,
-  lambda{ |json| Wordpress::OpenStruct.new(json) }
+    def get_like_status(site, post_id, params = {})
+      validate_keys! params, default_keys
+      exec_api(Wordpress::Request.new(:get, "/rest/v1/sites/#{site}/posts/#{post_id}/likes/mine", params))
+    end
 
-register_api :get_reblog_status, :get, "/rest/v1/sites/$site/posts/$post_id/reblogs/mine",
-  default_keys,
-  lambda{ |json| Wordpress::OpenStruct.new(json) }
+    def get_reblog_status(site, post_id, params = {})
+      validate_keys! params, default_keys
+      exec_api(Wordpress::Request.new(:get, "/rest/v1/sites/#{site}/posts/#{post_id}/reblogs/mine", params))
+    end
 
-register_api :create_reblog, :post, "/rest/v1/sites/$site/posts/$post_id/reblogs/new",
-  default_keys,
-  lambda{ |json| Wordpress::OpenStruct.new(json) }
+    def create_reblog(site, post_id, data, params = {})
+      validate_keys! params, default_keys
+      exec_api(Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/posts/#{post_id}/reblogs/new", params, data))
+    end
+  end
+end

data/lib/wordpress/api/sites.rb

@@ -1,5 +1,12 @@
 require "wordpress/object/site"
 
-register_api :get_site, :get, "/rest/v1/sites/$site",
-  default_keys,
-  lambda{ |json| Wordpress::Object::Site.new(self, json) }
+module Wordpress::API
+  module Sites
+    def get_site(site, params = {})
+      validate_keys! params, default_keys
+      exec_api(Wordpress::Request.new(:get, "/rest/v1/sites/#{site}", params)) do |json|
+        Wordpress::Object::Site.new(self, json)
+      end
+    end
+  end
+end

data/lib/wordpress/api/taxonomy.rb

@@ -1,50 +1,45 @@
 require "wordpress/ostruct"
 
-register_api :get_category, :get, "/rest/v1/sites/$site/categories/slug:$category",
-  [:context] + default_keys,
-  lambda{ |json|
-    Wordpress::OpenStruct.new(json)
-  }
-
-register_api :update_category, :post, "/rest/v1/sites/$site/categories/slug:$category",
-  [:context] + default_keys,
-  lambda{ |json|
-    Wordpress::OpenStruct.new(json)
-  }
-  
-register_api :get_tag, :get, "/rest/v1/sites/$site/tags/slug:$tag",
-  [:context] + default_keys,
-  lambda{ |json|
-    Wordpress::OpenStruct.new(json)
-  }
-
-register_api :update_tag, :post, "/rest/v1/sites/$site/tags/slug:$tag",
-  [:context] + default_keys,
-  lambda{ |json|
-    Wordpress::OpenStruct.new(json)
-  }
-
-register_api :create_category, :post, "/rest/v1/sites/$site/categories/new",
-  [:context] + default_keys,
-  lambda{ |json|
-    Wordpress::OpenStruct.new(json)
-  }
-
-register_api :create_tag, :post, "/rest/v1/sites/$site/tags/new",
-  [:context] + default_keys,
-  lambda{ |json|
-    Wordpress::OpenStruct.new(json)
-  }
-
-register_api :delete_category, :post, "/rest/v1/sites/$site/categories/slug:$category/delete",
-  [:context] + default_keys,
-  lambda{ |json|
-    Wordpress::OpenStruct.new(json)
-  }
-
-register_api :delete_tag, :post, "/rest/v1/sites/$site/tags/slug:$tag/delete",
-  [:context] + default_keys,
-  lambda{ |json|
-    Wordpress::OpenStruct.new(json)
-  }
-
+module Wordpress::API
+  module Taxonomy
+    def get_category(site, slug, params = {})
+      validate_keys! params, [:context] + default_keys
+      exec_api(Wordpress::Request.new(:get, "/rest/v1/sites/#{site}/categories/slug:#{slug}", params))
+    end
+
+    def update_category(site, slug, data, params = {})
+      validate_keys! params, [:context] + default_keys
+      exec_api(Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/categories/slug:#{slug}", params, data))
+    end
+
+    def get_tag(site, slug, params = {})
+      validate_keys! params, [:context] + default_keys
+      exec_api(Wordpress::Request.new(:get, "/rest/v1/sites/#{site}/tags/slug:#{slug}", params))
+    end
+
+    def update_tag(site, slug, data, params = {})
+      validate_keys! params, [:context] + default_keys
+      exec_api(Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/tags/slug:#{slug}", params, data))
+    end
+
+    def create_category(site, data, params = {})
+      validate_keys! params, [:context] + default_keys
+      exec_api(Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/categories/new", params, data))
+    end
+
+    def create_tag(site, data, params = {})
+      validate_keys! params, [:context] + default_keys
+      exec_api(Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/tags/new", params, data))
+    end
+
+    def delete_category(site, slug, data, params = {})
+      validate_keys! params, [:context] + default_keys
+      exec_api(Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/categories/slug:#{slug}/delete", params, data))
+    end
+
+    def delete_tag(site, slug, data, params = {})
+      validate_keys! params, [:context] + default_keys
+      exec_api(Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/tags/slug:#{slug}/delete", params, data))
+    end
+  end
+end

data/lib/wordpress/api/tests.rb

@@ -1,11 +1,25 @@
 require "wordpress/object/test"
 
-test_keys = [:id, :default_string, :default_int, :boolean_whitelist_defaults_to_false, :boolean_whitelist_defaults_to_true, :string_whitelist_defaults_to_foo, :url, :datetime]
+module Wordpress::API
+  module Tests
+    def get_test(id, params = {})
+      validate_keys! params, test_keys
+      exec_api(Wordpress::Request.new(:get, "/rest/v1/test/#{id}", params)) do |json|
+        Wordpress::Object::Test.new(self, json)
+      end
+    end
 
-register_api :get_test, :get, "/rest/v1/test/$id",
-  test_keys,
-  lambda{ |json| Wordpress::Object::Test.new(self, json) }
+    def post_test(id, data, params = {})
+      validate_keys! params, test_keys
+      exec_api(Wordpress::Request.new(:post, "/rest/v1/test/#{id}", params, data)) do |json|
+        Wordpress::Object::Test.new(self, json)
+      end
+    end
 
-register_api :post_test, :post, "/rest/v1/test/$id",
-  test_keys,
-  lambda{ |json| Wordpress::Object::Test.new(self, json) }
+    private
+
+    def test_keys
+      [:id, :default_string, :default_int, :boolean_whitelist_defaults_to_false, :boolean_whitelist_defaults_to_true, :string_whitelist_defaults_to_foo, :url, :datetime].freeze
+    end
+  end
+end

data/lib/wordpress/client.rb

@@ -1,10 +1,11 @@
 require 'multi_json'
 require 'faraday'
 require 'faraday_middleware/gzip'
-require 'wordpress/base'
-require 'wordpress/request'
-require 'wordpress/api'
-require 'wordpress/errors'
+require_relative 'base'
+require_relative 'request'
+require_relative 'api'
+require_relative 'errors'
+require_relative 'configuration'
 
 module Wordpress
   class Client < Base

data/lib/wordpress/configuration.rb

@@ -1,4 +1,6 @@
+require 'wordpress/ostruct'
+
 module Wordpress
-  class Configuration
+  class Configuration < OpenStruct
   end
 end

data/lib/wordpress/object/meta_object.rb

@@ -24,8 +24,9 @@ module Wordpress::Object
     def reload
       if meta && meta.links && meta.links.self
         request = Wordpress::Request.new(:get, meta.links.self)
-        json = client.call(request)
-        self.assign(json)
+        client.exec_api(request) do |json|
+          self.assign(json)
+        end
       end
     end
 

data/lib/wordpress/version.rb

@@ -2,7 +2,7 @@ module Wordpress
   class Version
     MAJOR = 0 unless defined? Wordpress::Version::MAJOR
     MINOR = 2 unless defined? Wordpress::Version::MINOR
-    PATCH = 0 unless defined? Wordpress::Version::PATCH
+    PATCH = 1 unless defined? Wordpress::Version::PATCH
     PRE = nil unless defined? Wordpress::Version::PRE
 
     class << self

data/spec/wordpress/api_spec.rb

@@ -6,27 +6,64 @@ describe Wordpress::API do
     Wordpress::Client.new
   end
 
-  # Get methods
+  describe "\#exec_api" do
+    it "should raise error for error response" do
+      client.stub(:call).and_return({'error' => 'something wrong!'})
+      expect {
+        client.exec_api(nil)
+      }.to raise_error(Wordpress::ResponseError)
+    end
+  end
+
   {
+    # Me
     'me' => {:args => [], :method => :get, :url => '/rest/v1/me', :response => Wordpress::Object::User},
     'get_my_likes' => {:args => [], :method => :get, :url => '/rest/v1/me/likes', :response => Wordpress::OpenStruct},
+    # Posts
     'get_posts' => {:args => ['sitename'], :method => :get, :url => '/rest/v1/sites/sitename/posts', :response => Wordpress::Object::Posts},
     'get_post' => {:args => ['sitename', 1], :method => :get, :url => '/rest/v1/sites/sitename/posts/1', :response => Wordpress::Object::Post},
+    'update_post' => {:args => ['sitename', 1, {}], :method => :post, :url => '/rest/v1/sites/sitename/posts/1', :response => Wordpress::Object::Post},
     'get_post_by_slug' => {:args => ['sitename', 1], :method => :get, :url => '/rest/v1/sites/sitename/posts/slug:1', :response => Wordpress::Object::Post},
+    'create_post' => {:args => ['sitename', {}], :method => :post, :url => '/rest/v1/sites/sitename/posts/new', :response => Wordpress::Object::Post},
+    'delete_post' => {:args => ['sitename', 1, {}], :method => :post, :url => '/rest/v1/sites/sitename/posts/1/delete', :response => Wordpress::Object::Post},
     'get_likes' => {:args => ['sitename', 1], :method => :get, :url => '/rest/v1/sites/sitename/posts/1/likes', :response => Wordpress::OpenStruct},
+    'create_like' => {:args => ['sitename', 1, {}], :method => :post, :url => '/rest/v1/sites/sitename/posts/1/likes/new', :response => Wordpress::OpenStruct},
+    'delete_like' => {:args => ['sitename', 1, {}], :method => :post, :url => '/rest/v1/sites/sitename/posts/1/likes/mine/delete', :response => Wordpress::OpenStruct},
     'get_like_status' => {:args => ['sitename', 1], :method => :get, :url => '/rest/v1/sites/sitename/posts/1/likes/mine', :response => Wordpress::OpenStruct},
     'get_reblog_status' => {:args => ['sitename', 1], :method => :get, :url => '/rest/v1/sites/sitename/posts/1/reblogs/mine', :response => Wordpress::OpenStruct},
+    'create_reblog' => {:args => ['sitename', 1, {}], :method => :post, :url => '/rest/v1/sites/sitename/posts/1/reblogs/new', :response => Wordpress::OpenStruct},
+    # Sites
     'get_site' => {:args => ['sitename'], :method => :get, :url => '/rest/v1/sites/sitename', :response => Wordpress::Object::Site},
+    # Comments
     'get_comments' => {:args => ['sitename'], :method => :get, :url => '/rest/v1/sites/sitename/comments', :response => Wordpress::Object::Comments},
     'get_post_comments' => {:args => ['sitename', 1], :method => :get, :url => '/rest/v1/sites/sitename/posts/1/replies', :response => Wordpress::Object::Comments},
     'get_comment' => {:args => ['sitename', 1], :method => :get, :url => '/rest/v1/sites/sitename/comments/1', :response => Wordpress::Object::Comment},
+    'update_comment' => {:args => ['sitename', 1, {}], :method => :post, :url => '/rest/v1/sites/sitename/comments/1', :response => Wordpress::Object::Comment},
+    'create_comment' => {:args => ['sitename', 1, {}], :method => :post, :url => '/rest/v1/sites/sitename/posts/1/replies/new', :response => Wordpress::Object::Comment},
+    'delete_comment' => {:args => ['sitename', 1, {}], :method => :post, :url => '/rest/v1/sites/sitename/comments/1/delete', :response => Wordpress::Object::Comment},
+    # Tests
     'get_test' => {:args => [1], :method => :get, :url => '/rest/v1/test/1', :response => Wordpress::Object::Test},
+    'post_test' => {:args => [1, {}], :method => :post, :url => '/rest/v1/test/1', :response => Wordpress::Object::Test},
+    # Taxonomy
     'get_category' => {:args => ['sitename', 'cat_name'], :method => :get, :url => '/rest/v1/sites/sitename/categories/slug:cat_name', :response => Wordpress::OpenStruct},
+    'update_category' => {:args => ['sitename', 'cat_name', {}], :method => :post, :url => '/rest/v1/sites/sitename/categories/slug:cat_name', :response => Wordpress::OpenStruct},
     'get_tag' => {:args => ['sitename', 'tag_name'], :method => :get, :url => '/rest/v1/sites/sitename/tags/slug:tag_name', :response => Wordpress::OpenStruct},
+    'update_tag' => {:args => ['sitename', 'tag_name', {}], :method => :post, :url => '/rest/v1/sites/sitename/tags/slug:tag_name', :response => Wordpress::OpenStruct},
+    'create_category' => {:args => ['sitename', {}], :method => :post, :url => '/rest/v1/sites/sitename/categories/new', :response => Wordpress::OpenStruct},
+    'create_tag' => {:args => ['sitename', {}], :method => :post, :url => '/rest/v1/sites/sitename/tags/new', :response => Wordpress::OpenStruct},
+    'delete_category' => {:args => ['sitename', 'cat_name', {}], :method => :post, :url => '/rest/v1/sites/sitename/categories/slug:cat_name/delete', :response => Wordpress::OpenStruct},
+    'delete_tag' => {:args => ['sitename', 'tag_name', {}], :method => :post, :url => '/rest/v1/sites/sitename/tags/slug:tag_name/delete', :response => Wordpress::OpenStruct},
+    # Follow
+    'create_follow' => {:args => ['sitename', {}], :method => :post, :url => '/rest/v1/sites/sitename/follows/new', :response => Wordpress::OpenStruct},
+    'delete_follow' => {:args => ['sitename', {}], :method => :post, :url => '/rest/v1/sites/sitename/follows/mine/delete', :response => Wordpress::OpenStruct},
     'get_follow' => {:args => ['sitename'], :method => :get, :url => '/rest/v1/sites/sitename/follows/mine', :response => Wordpress::OpenStruct},
+    # FreshlyPressed
     'freshly_pressed' => {:method => :get, :url => '/rest/v1/freshly-pressed', :response => Wordpress::OpenStruct},
+    # Notifications
     'get_notifications' => {:method => :get, :url => '/rest/v1/notifications', :response => Wordpress::OpenStruct},
     'get_notification' => {:args => [1], :method => :get, :url => '/rest/v1/notifications/1', :response => Wordpress::OpenStruct},
+    'see_notifications' => {:args => [{}], :method => :post, :url => '/rest/v1/notifications/seen', :response => Wordpress::OpenStruct},
+    'read_notifications' => {:args => [{}], :method => :post, :url => '/rest/v1/notifications/read', :response => Wordpress::OpenStruct},
   }.each do |method, params|
     describe "\##{method}" do
       it "should return #{params[:response].name}" do

data/spec/wordpress/client_spec.rb

@@ -35,6 +35,26 @@ describe Wordpress::Client do
       request = Wordpress::Request.new(:post, 'url', {}, {})
       client.call(request)
     end
+
+    it "should raise error for null response" do
+      request = Wordpress::Request.new(:get, 'url', {}, {})
+      Faraday::Connection.any_instance.stub(:get).and_return(Faraday::Response.new)
+
+      Faraday::Response.any_instance.stub(:body).and_return('null')
+      expect {
+        client.call(request)
+      }.to raise_error(Wordpress::ResponseError)
+    end
+
+    it "should raise error for invalid response" do
+      request = Wordpress::Request.new(:get, 'url', {}, {})
+      Faraday::Connection.any_instance.stub(:get).and_return(Faraday::Response.new)
+
+      Faraday::Response.any_instance.stub(:body).and_return('/$%@#')
+      expect {
+        client.call(request)
+      }.to raise_error(Wordpress::ResponseError)
+    end
   end
 
   context "with bearer_token_request option" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wordpress-client
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-27 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday