wordpress-client 0.1.5 → 0.2.0

data/README.md

@@ -4,9 +4,19 @@
 
 wordpress-client is a [Wordpress Rest API Wrapper](http://developer.wordpress.com/docs/api/).
 
-## Getting started
+## Requirements
 
-Add wordpress-client to your `Gemfile` and `bundle install`:
+I test with ruby 1.9.3 and 2.1. Other versions/VMs are untested but might work fine.
+
+## Installation
+
+To your system
+
+```ruby
+gem install wordpress-client
+```
+
+Or add wordpress-client to your `Gemfile` and `bundle install`:
 
 ```ruby
 gem 'wordpress-client'
@@ -14,25 +24,28 @@ gem 'wordpress-client'
 
 ## Usage
 
+Create new client
+
 ```ruby
 require 'wordpress-client'
 
-# Get user by access token
+# Shared client
 client = Wordpress.client
-client.access_token = 'YOUR_ACCESS_TOKEN' # if you have any
-user = client.me
-site = user.site
-posts = site.posts
 
-# Get posts of a specific domain without access token
+# New client
 client = Wordpress::Client.new
+```
+
+Call API without access token
+
+```ruby
+# Get posts of a specific domain without access token
 posts = client.get_posts('wordpress-site-domain')
 posts.each do |post|
   # Do something
 end
 
 # Get all the posts of a specific domain without access token
-client = Wordpress::Client.new
 page = 1
 loop do
   posts = client.get_posts('wordpress-site-domain', :page => page)
@@ -44,6 +57,16 @@ loop do
 end
 ```
 
+Call API with access token
+
+```ruby
+# Get user by access token
+client.access_token = 'YOUR_ACCESS_TOKEN' # if you have any
+user = client.me
+site = user.site
+posts = site.posts
+```
+
 ## TODO
 - Complete spec test
 - Support all the apis

data/lib/wordpress/api.rb

@@ -1,18 +1,67 @@
-require 'wordpress/api/me'
-require 'wordpress/api/sites'
-require 'wordpress/api/posts'
-require 'wordpress/api/comments'
-require 'wordpress/api/tests'
+require 'wordpress/errors'
+require 'wordpress/request'
 
 module Wordpress
   module API
     def self.included(base)
+      base.send(:include, InstanceMethods)
+      base.extend(ClassMethods)
       base.class_eval do
-        include Wordpress::API::Me
-        include Wordpress::API::Sites
-        include Wordpress::API::Posts
-        include Wordpress::API::Comments
-        include Wordpress::API::Tests
+        Dir.glob(File.expand_path('../api/*.rb', __FILE__)) do |path|
+          eval(File.open(path).read)
+        end
+      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 : {}
+
+          params.keys.each do |key|
+            raise Wordpress::ArgumentError, "#{key} is not valid for this method." unless valid_keys.include?(key)
+          end
+
+          path = path.dup
+          arg_names.each do |key|
+            path.gsub!(/\$#{key}/, args.shift.to_s)
+          end
+          data = args.shift || {}
+
+          json = call_api(Wordpress::Request.new(method, path, params, data))
+
+          instance_exec(json, &response)
+        end
+      end
+  
+      def default_keys
+        [:http_envelope, :pretty, :meta, :callback].freeze
+      end
+  
+      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

data/lib/wordpress/api/comments.rb

@@ -1,39 +1,26 @@
-require 'wordpress/api/utils'
+require "wordpress/object/comments"
+require "wordpress/object/comment"
 
-module Wordpress
-  module API
-    module Comments
-      include Wordpress::API::Utils
+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) }
 
-      def get_comments(site, params = {})
-        validate_params! params, [:context, :type, :status] + default_keys + search_keys
-        object_from_response Wordpress::Object::Comments.new(self), Wordpress::Request.new(:get, "/rest/v1/sites/#{site}/comments", params)
-      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_params! params, [:context] + default_keys
-        object_from_response Wordpress::Object::Comments.new(self), Wordpress::Request.new(:get, "/rest/v1/sites/#{site}/posts/#{post_id}/replies", params)
-      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_params! params, [:context] + default_keys
-        object_from_response Wordpress::Object::Comment.new(self), Wordpress::Request.new(:get, "/rest/v1/sites/#{site}/comments/#{comment_id}", params)
-      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_params! params, [:context] + default_keys
-        object_from_response Wordpress::Object::Comment.new(self), Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/comments/#{comment_id}", params, data)
-      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_params! params, [:context] + default_keys
-        object_from_response Wordpress::Object::Comment.new(self), Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/posts/#{post_id}/replies/new", params, data)
-      end
-
-      def delete_comment(site, comment_id, params = {})
-        validate_params! params, [:context] + default_keys
-        object_from_response Wordpress::Object::Comment.new(self), Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/comments/#{comment_id}/delete", params)
-      end
-    end
-  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) }

data/lib/wordpress/api/follow.rb

@@ -0,0 +1,19 @@
+require "wordpress/ostruct"
+
+register_api :create_follow, :post, "/rest/v1/sites/$site/follows/new",
+  [:context] + default_keys,
+  lambda{ |json|
+    Wordpress::OpenStruct.new(json)
+  }
+
+register_api :delete_follow, :post, "/rest/v1/sites/$site/follows/mine/delete",
+  [:context] + default_keys,
+  lambda{ |json|
+    Wordpress::OpenStruct.new(json)
+  }
+
+register_api :get_follow, :get, "/rest/v1/sites/$site/follows/mine",
+  [:context] + default_keys,
+  lambda{ |json|
+    Wordpress::OpenStruct.new(json)
+  }

data/lib/wordpress/api/freshly_pressed.rb

@@ -0,0 +1,7 @@
+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)
+  }

data/lib/wordpress/api/me.rb

@@ -1,19 +1,10 @@
-require 'wordpress/api/utils'
+require "wordpress/ostruct"
+require "wordpress/object/user"
 
-module Wordpress
-  module API
-    module Me
-      include Wordpress::API::Utils
+register_api :me, :get, "/rest/v1/me",
+  default_keys,
+  lambda{ |json| Wordpress::Object::User.new(self, json) }
 
-      def me(params = {})
-        validate_params! params, default_keys
-        object_from_response Wordpress::Object::User.new(self), Wordpress::Request.new(:get, "/rest/v1/me", params)
-      end
-
-      def get_my_likes(params = {})
-        validate_params! params, default_keys
-        object_from_response Wordpress::OpenStruct.new, Wordpress::Request.new(:get, "/rest/v1/me/likes", params)
-      end
-    end
-  end
-end
+register_api :get_my_likes, :get, "/rest/v1/me/likes",
+  default_keys,
+  lambda{ |json| Wordpress::OpenStruct.new(json) }

data/lib/wordpress/api/notifications.rb

@@ -0,0 +1,26 @@
+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)
+  }
+
+register_api :get_notification, :get, "/rest/v1/notifications/$note_id",
+  [:context, :fields, :num_note_items] + default_keys,
+  lambda{ |json|
+    Wordpress::OpenStruct.new(json)
+  }
+
+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)
+  }
+

data/lib/wordpress/api/posts.rb

@@ -1,69 +1,51 @@
-require 'wordpress/api/utils'
+require "wordpress/ostruct"
+require "wordpress/object/posts"
+require "wordpress/object/post"
 
-module Wordpress
-  module API
-    module Posts
-      include Wordpress::API::Utils
+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) }
 
-      def get_posts(site, params = {})
-        validate_params! params, [:context, :tag, :category, :type, :status, :sticky, :author, :search, :meta_key, :meta_value] + default_keys + search_keys
-        object_from_response Wordpress::Object::Posts.new(self), Wordpress::Request.new(:get, "/rest/v1/sites/#{site}/posts", params)
-      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_params! params, [:context] + default_keys
-        object_from_response Wordpress::Object::Post.new(self), Wordpress::Request.new(:get, "/rest/v1/sites/#{site}/posts/#{post_id}", params)
-      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_params! params, [:context] + default_keys
-        object_from_response Wordpress::Object::Post.new(self), Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/posts/#{post_id}", params, data)
-      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, post_slug, params = {})
-        validate_params! params, [:context] + default_keys
-        object_from_response Wordpress::Object::Post.new(self), Wordpress::Request.new(:get, "/rest/v1/sites/#{site}/posts/slug:#{post_slug}", params)
-      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, post_id, data, params = {})
-        validate_params! params, [:context], default_keys
-        object_from_response Wordpress::Object::Post.new(self), Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/posts/new", params, data)
-      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, params = {})
-        validate_params! params, [:context], default_keys
-        object_from_response Wordpress::Object::Post.new(self), Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/posts/#{post_id}/delete", params)
-      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_params! params, default_keys
-        object_from_response Wordpress::OpenStruct.new, 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, params = {})
-        validate_params! params, default_keys
-        object_from_response Wordpress::OpenStruct.new, Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/posts/#{post_id}/likes/new", params)
-      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, params = {})
-        validate_params! params, default_keys
-        object_from_response Wordpress::OpenStruct.new, Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/posts/#{post_id}/likes/mine/delete", params)
-      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_params! params, default_keys
-        object_from_response Wordpress::OpenStruct.new, 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_params! params, default_keys
-        object_from_response Wordpress::OpenStruct.new, Wordpress::Request.new(:get, "/rest/v1/sites/#{site}/posts/#{post_id}/reblogs/mine", params)
-      end
-
-      def create_reblog(site, post_id, data, params = {})
-        validate_params! params, default_keys
-        object_from_response Wordpress::OpenStruct.new, Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/posts/#{post_id}/reblogs/new", params, data)
-      end
-    end
-  end
-end
+register_api :create_reblog, :post, "/rest/v1/sites/$site/posts/$post_id/reblogs/new",
+  default_keys,
+  lambda{ |json| Wordpress::OpenStruct.new(json) }

data/lib/wordpress/api/sites.rb

@@ -1,14 +1,5 @@
-require 'wordpress/api/utils'
+require "wordpress/object/site"
 
-module Wordpress
-  module API
-    module Sites
-      include Wordpress::API::Utils
-
-      def get_site(site, params = {})
-        validate_params! params, default_keys
-        object_from_response Wordpress::Object::Site.new(self), Wordpress::Request.new(:get, "/rest/v1/sites/#{site}", params)
-      end
-    end
-  end
-end
+register_api :get_site, :get, "/rest/v1/sites/$site",
+  default_keys,
+  lambda{ |json| Wordpress::Object::Site.new(self, json) }

data/lib/wordpress/api/taxonomy.rb

@@ -0,0 +1,50 @@
+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)
+  }
+

data/lib/wordpress/api/tests.rb

@@ -1,25 +1,11 @@
-require 'wordpress/api/utils'
+require "wordpress/object/test"
 
-module Wordpress
-  module API
-    module Tests
-      include Wordpress::API::Utils
+test_keys = [:id, :default_string, :default_int, :boolean_whitelist_defaults_to_false, :boolean_whitelist_defaults_to_true, :string_whitelist_defaults_to_foo, :url, :datetime]
 
-      def get_test(id, params = {})
-        validate_params! params, test_keys
-        object_from_response Wordpress::Object::Test.new(self), Wordpress::Request.new(:get, "/rest/v1/test/#{id}", params)
-      end
+register_api :get_test, :get, "/rest/v1/test/$id",
+  test_keys,
+  lambda{ |json| Wordpress::Object::Test.new(self, json) }
 
-      def post_test(id, params = {})
-        validate_params! params, test_keys
-        object_from_response Wordpress::Object::Test.new(self), Wordpress::Request.new(:post, "/rest/v1/test/#{id}",  params)
-      end
-
-      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]
-      end
-    end
-  end
-end
+register_api :post_test, :post, "/rest/v1/test/$id",
+  test_keys,
+  lambda{ |json| Wordpress::Object::Test.new(self, json) }

data/lib/wordpress/client.rb

@@ -1,8 +1,10 @@
+require 'multi_json'
 require 'faraday'
 require 'faraday_middleware/gzip'
 require 'wordpress/base'
 require 'wordpress/request'
 require 'wordpress/api'
+require 'wordpress/errors'
 
 module Wordpress
   class Client < Base
@@ -35,9 +37,18 @@ module Wordpress
         req.options[:open_timeout] = 5
       end
 
-      debug "Response: #{response.body}"
+      begin
+        json = MultiJson.load(response.body)
+        if json.nil? || json == ''
+          raise Wordpress::ResponseError
+        end
+      rescue MultiJson::LoadError => e
+        raise Wordpress::ResponseError, {'error' => e, 'message' => "Can not parse the response: #{response.body.inspect}"}
+      end
+
+      debug "Response: #{json}"
 
-      response.body
+      json
     end
 
     private

data/lib/wordpress/object/meta_object.rb

@@ -24,7 +24,8 @@ module Wordpress::Object
     def reload
       if meta && meta.links && meta.links.self
         request = Wordpress::Request.new(:get, meta.links.self)
-        client.object_from_response(self, request)
+        json = client.call(request)
+        self.assign(json)
       end
     end
 
@@ -52,7 +53,8 @@ module Wordpress::Object
       if associated_object?(name)
         @cached_objects[name] ||= begin
           request = Wordpress::Request.new(:get, meta.links.send(name))
-          client.object_from_response(Wordpress::Object.const_get(meta_objects[name]).new(client), request)
+          json = client.call(request)
+          Wordpress::Object.const_get(meta_objects[name]).new(client, json)
         end
       else
         super

data/lib/wordpress/version.rb

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

data/spec/wordpress/api_spec.rb

@@ -21,11 +21,17 @@ describe Wordpress::API do
     '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},
     'get_test' => {:args => [1], :method => :get, :url => '/rest/v1/test/1', :response => Wordpress::Object::Test},
+    'get_category' => {:args => ['sitename', 'cat_name'], :method => :get, :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},
+    'get_follow' => {:args => ['sitename'], :method => :get, :url => '/rest/v1/sites/sitename/follows/mine', :response => Wordpress::OpenStruct},
+    'freshly_pressed' => {:method => :get, :url => '/rest/v1/freshly-pressed', :response => Wordpress::OpenStruct},
+    '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},
   }.each do |method, params|
     describe "\##{method}" do
       it "should return #{params[:response].name}" do
         request = Wordpress::Request.new(params[:method], params[:url])
-        client.stub(:call).and_return('{}')
+        client.stub(:call).and_return({})
         client.should_receive(:call).with do |*args|
           req = args.shift
           req.method.should == request.method

data/spec/wordpress/client_spec.rb

@@ -16,6 +16,7 @@ describe Wordpress::Client do
       req.should_receive(:url).with(anything)
       req.should_receive(:params=).with(anything)
       Faraday::Connection.any_instance.should_receive(:get).and_yield(req).and_return(Faraday::Response.new)
+      Faraday::Response.any_instance.stub(:body).and_return('{}')
 
       request = Wordpress::Request.new(:get, 'url', {})
       client.call(request)
@@ -29,6 +30,7 @@ describe Wordpress::Client do
       req.should_receive(:params=).with(anything)
       req.should_receive(:body=).with(anything)
       Faraday::Connection.any_instance.should_receive(:post).and_yield(req).and_return(Faraday::Response.new)
+      Faraday::Response.any_instance.stub(:body).and_return('{}')
 
       request = Wordpress::Request.new(:post, 'url', {}, {})
       client.call(request)
@@ -45,6 +47,7 @@ describe Wordpress::Client do
       req.should_receive(:url).with(anything)
       req.should_receive(:params=).with(anything)
       Faraday::Connection.any_instance.should_receive(:get).and_yield(req).and_return(Faraday::Response.new)
+      Faraday::Response.any_instance.stub(:body).and_return('{}')
 
       request = Wordpress::Request.new(:get, 'url', {})
       client.access_token = 'something'
@@ -59,6 +62,7 @@ describe Wordpress::Client do
       req.should_receive(:url).with(anything)
       req.should_receive(:params=).with(anything)
       Faraday::Connection.any_instance.should_receive(:get).and_yield(req).and_return(Faraday::Response.new)
+      Faraday::Response.any_instance.stub(:body).and_return('{}')
 
       request = Wordpress::Request.new(:get, 'url', {})
       client.call(request, :bearer_token_request => true)

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: wordpress-client
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Daisuke Taniwaki
@@ -13,6 +14,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -112,11 +125,14 @@ files:
 - lib/wordpress-client.rb
 - lib/wordpress/api.rb
 - lib/wordpress/api/comments.rb
+- lib/wordpress/api/follow.rb
+- lib/wordpress/api/freshly_pressed.rb
 - lib/wordpress/api/me.rb
+- lib/wordpress/api/notifications.rb
 - lib/wordpress/api/posts.rb
 - lib/wordpress/api/sites.rb
+- lib/wordpress/api/taxonomy.rb
 - lib/wordpress/api/tests.rb
-- lib/wordpress/api/utils.rb
 - lib/wordpress/base.rb
 - lib/wordpress/client.rb
 - lib/wordpress/configuration.rb
@@ -146,26 +162,27 @@ files:
 homepage: https://github.com/dtaniwaki/wordpress-client
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Wordpress API Wrapper.
 test_files:
 - spec/spec_helper.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZWRmZjc5ZWZiYzZmOGI2MzllZWFkYzEzN2E5OGY4ZDBiMzcxZTZlYw==
-  data.tar.gz: !binary |-
-    YWZiYTdlN2ViZjk1NWE2N2Q5Y2Y4NzkzZjFlZWRhZTg0YzQyMjEwYg==
-SHA512:
-  metadata.gz: !binary |-
-    ZmZkZDc2NGE0NDQ0OWE4MWNiMjVlNWFhZWRiZjFiNGVlMmJlOTE0OGJmM2Ji
-    Nzk3NjZkZjJjMWJhNTI3MjI0OTA5YTk3Y2NmYTdhMDU1NmJiOWIxOWQ0MWM0
-    Njk5ODdiNzBlMDNjZjRlZTgxNDg2Y2IzNTBhMWI4ZGEzZDY2ZDQ=
-  data.tar.gz: !binary |-
-    YmU4Y2I1MjUzZmE1ZjlhMTkyMTNjNzA1ZTE0NWFmY2U1NWU1NTgwZTFlOThm
-    NjA1ZDI0Mjg2OGJlYjBmNWM4YTZiOTg1OWE0ZWI1ZGNiNWNjOTQ5ZWVkZmI0
-    ZDgzNTYzM2UzOGM5YmQ0YTJkZDg0OWQyNjZmY2FiOGMwNWU0Zjk=

data/lib/wordpress/api/utils.rb

@@ -1,44 +0,0 @@
-require 'multi_json'
-require 'wordpress/errors'
-require 'wordpress/ostruct'
-Dir.glob(File.expand_path('../../object/*.rb', __FILE__)) do |path|
- require path
-end
-
-module Wordpress
-  module API
-    module Utils
-      def object_from_response(obj, request)
-        res = call(request, :bearer_token_request => true)
-        begin
-          json = MultiJson.load(res)
-          if json.nil? || json == ''
-            raise Wordpress::ResponseError
-          end
-          if !json['error'].nil?
-            raise Wordpress::ResponseError, json
-          end
-          obj.assign(json)
-        rescue MultiJson::LoadError => e
-          raise Wordpress::ResponseError, {'error' => e, 'message' => "Can not parse the response: #{res.inspect}"}
-        end
-      end
-
-      private
-
-      def default_keys
-        [:http_envelope, :pretty, :callback]
-      end
-
-      def search_keys
-        [:number, :offset, :page, :order, :order_by, :after, :before]
-      end
-
-      def validate_params!(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
-    end
-  end
-end