wordpress-client 0.0.6 → 0.1.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MjczN2E1ZjNkODBlN2NjYjBiYWMyZmI0OWY0MmU3N2IxZWY1OGUzNQ==
+  data.tar.gz: !binary |-
+    YWI2YzI2YzBhZTJmNDNhZjc1MTQ1YzU4OTE5NGNhZmUyODE2ZmFiNA==
+SHA512:
+  metadata.gz: !binary |-
+    NDQ5Y2YzYjAzMWZlMDNlYzJiZDgwMWJjODcyM2VmZjdmMGMxZmI1OTdmOWZk
+    YmNmZjBlMzEwODM3ZmMxNjJiYTZjZDcyOGJmMTkwMjEyYjgxM2E5YmQxNzU0
+    YTk0ODc5NjY2MzAyOGI4ZDQ0NTI4MmMyNzc5ZTUxMDM3NmVmMTQ=
+  data.tar.gz: !binary |-
+    MWYzNmQ4YTI4OTZiYmRiNTE2NTc5Y2ExNGY0ZDBhZTZkNzUzYjZkNTllMmRk
+    M2IzYmFhZGMxMGIwOGY4MDc0OTlkMDFlMjRiNDM0YzNkOTQyOTljNzM0NDU5
+    YTk0ODZkNDc2YzlkYzdkNDdmZmExY2VjNTc5ZDIxODEwZTllNDU=

data/Rakefile

@@ -3,3 +3,11 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+
+namespace :spec do
+  desc "Execute rspec coverage"
+  task :coverage do
+    ENV['COVERAGE'] = 'true'
+    Rake::Task["spec"].execute
+  end
+end

data/lib/faraday_middleware/gzip.rb

@@ -0,0 +1,22 @@
+require 'faraday'
+require 'zlib'
+ 
+module FaradayMiddleware
+  class Gzip < Faraday::Response::Middleware
+ 
+    def on_complete(env)
+      encoding = env[:response_headers]['content-encoding'].to_s.downcase
+      case encoding
+      when 'gzip'
+        env[:body] = Zlib::GzipReader.new(StringIO.new(env[:body]), encoding: 'ASCII-8BIT').read
+        env[:response_headers].delete('content-encoding')
+      when 'deflate'
+        env[:body] = Zlib::Inflate.inflate(env[:body])
+        env[:response_headers].delete('content-encoding')
+      end
+    end
+ 
+  end
+end
+ 
+Faraday::Response.register_middleware :gzip => FaradayMiddleware::Gzip

data/lib/wordpress-client.rb

@@ -3,14 +3,12 @@ require 'wordpress/client'
 
 module Wordpress
   class << self
+    attr_writer :logger
+
     def client
       @client ||= Wordpress::Client.new
     end
 
-    def client?
-      !!@client
-    end
-
     def logger
       @logger ||= Logger.new(STDOUT)
     end

data/lib/wordpress/api/comments.rb

@@ -7,32 +7,32 @@ module Wordpress
 
       def get_comments(site, params = {})
         validate_params! params, [:context, :type, :status], :search
-        object_from_response Wordpress::CommentArray, "/sites/#{site}/comments", :get, :query => params
+        object_from_response Wordpress::Object::Comments.new(self), Wordpress::Request.new(:get, "/rest/v1/sites/#{site}/comments", params)
       end
 
       def get_post_comments(site, post_id, params = {})
         validate_params! params, [:context]
-        object_from_response Wordpress::CommentArray, "/sites/#{site}/posts/#{post_id}/replies", :get, :query => params
+        object_from_response Wordpress::Object::Comments.new(self), Wordpress::Request.new(:get, "/rest/v1/sites/#{site}/posts/#{post_id}/replies", params)
       end
 
       def get_comment(site, comment_id, params = {})
         validate_params! params, [:context]
-        object_from_response Wordpress::Comment, "/sites/#{site}/comments/#{comment_id}", :get, :query => params
+        object_from_response Wordpress::Object::Comment.new(self), Wordpress::Request.new(:get, "/rest/v1/sites/#{site}/comments/#{comment_id}", params)
       end
 
       def update_comment(site, comment_id, data, params = {})
         validate_params! params, [:context]
-        object_from_response Wordpress::Comment, "/sites/#{site}/comments/#{comment_id}", :post, :request => data, :query => params
+        object_from_response Wordpress::Object::Comment.new(self), Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/comments/#{comment_id}", params, data)
       end
 
       def create_comment(site, post_id, data, params = {})
         validate_params! params, [:context]
-        object_from_response Wordpress::Comment, "/sites/#{site}/posts/#{post_id}/replies/new", :post, :request => data, :query => params
+        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]
-        object_from_response Wordpress::Comment, "/sites/#{site}/comments/#{comment_id}/delete", :post, :query => params
+        object_from_response Wordpress::Object::Comment.new(self), Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/comments/#{comment_id}/delete", params)
       end
     end
   end

data/lib/wordpress/api/me.rb

@@ -7,12 +7,12 @@ module Wordpress
 
       def me(params = {})
         validate_params! params
-        object_from_response Wordpress::User, "/me", :get, :query => params
+        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
-        object_from_response Wordpress::LikeArray, "/me/likes", :get, :query => params
+        object_from_response Wordpress::Ostruct.new, Wordpress::Request.new(:get, "/rest/v1/me/likes", params)
       end
     end
   end

data/lib/wordpress/api/posts.rb

@@ -7,62 +7,62 @@ module Wordpress
 
       def get_posts(site, params = {})
         validate_params! params, [:context, :tag, :category, :type, :status, :sticky, :author, :search, :meta_key, :meta_value], :search
-        object_from_response Wordpress::PostArray, "/sites/#{site}/posts", :get, :query => params
+        object_from_response Wordpress::Object::Posts.new(self), Wordpress::Request.new(:get, "/rest/v1/sites/#{site}/posts", params)
       end
 
       def get_post(site, post_id, params = {})
         validate_params! params, [:context]
-        object_from_response Wordpress::Post, "/sites/#{site}/posts/#{post_id}", :get, :query => params
+        object_from_response Wordpress::Object::Post.new(self), Wordpress::Request.new(:get, "/rest/v1/sites/#{site}/posts/#{post_id}", params)
       end
 
       def update_post(site, post_id, data, params = {})
         validate_params! params, [:context]
-        object_from_response Wordpress::Post, "/sites/#{site}/posts/#{post_id}", :post, :request => data, :query => params
+        object_from_response Wordpress::Object::Post.new(self), Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/posts/#{post_id}", params, data)
       end
 
       def get_post_by_slug(site, post_slug, params = {})
         validate_params! params, [:context]
-        object_from_response Wordpress::Post, "/sites/#{site}/posts/slug:#{post_slug}", :get, :query => params
+        object_from_response Wordpress::Object::Post.new(self), Wordpress::Request.new(:get, "/rest/v1/sites/#{site}/posts/slug:#{post_slug}", params)
       end
 
       def create_post(site, post_id, data, params = {})
         validate_params! params, [:context]
-        object_from_response Wordpress::Post, "/sites/#{site}/posts/new", :post, :request => data, :query => params
+        object_from_response Wordpress::Object::Post.new(self), Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/posts/new", params, data)
       end
 
       def delete_post(site, post_id, params = {})
         validate_params! params, [:context]
-        object_from_response Wordpress::Post, "/sites/#{site}/posts/#{post_id}/delete", :post, :query => params
+        object_from_response Wordpress::Object::Post.new(self), Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/posts/#{post_id}/delete", params)
       end
 
       def get_likes(site, post_id, params = {})
         validate_params! params
-        object_from_response Wordpress::LikeArray, "/sites/#{site}/posts/#{post_id}/likes", :get, :query => params
+        object_from_response Wordpress::Ostruct.new, Wordpress::Request.new(:get, "/rest/v1/sites/#{site}/posts/#{post_id}/likes", params)
       end
 
       def create_like(site, post_id, params = {})
         validate_params! params
-        object_from_response Wordpress::OpenStruct, "/sites/#{site}/posts/#{post_id}/likes/new", :post, :query => params
+        object_from_response Wordpress::Ostruct.new, Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/posts/#{post_id}/likes/new", params)
       end
 
       def delete_like(site, post_id, params = {})
         validate_params! params
-        object_from_response Wordpress::OpenStruct, "/sites/#{site}/posts/#{post_id}/likes/mine/delete", :post, :query => params
+        object_from_response Wordpress::Ostruct.new, Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/posts/#{post_id}/likes/mine/delete", params)
       end
 
       def get_like_status(site, post_id, params = {})
         validate_params! params
-        object_from_response Wordpress::OpenStruct, "/sites/#{site}/posts/#{post_id}/likes/mine", :get, :query => params
+        object_from_response Wordpress::Ostruct.new, Wordpress::Request.new(:get, "/rest/v1/sites/#{site}/posts/#{post_id}/likes/mine", params)
       end
 
       def get_reblog_status(site, post_id, params = {})
         validate_params! params
-        object_from_response Wordpress::OpenStruct, "/sites/#{site}/posts/#{post_id}/reblogs/mine", :get, :query => params
+        object_from_response Wordpress::Ostruct.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
-        object_from_response Wordpress::OpenStruct, "/sites/#{site}/posts/#{post_id}/reblogs/new", :post, :request => data, :query => params
+        object_from_response Wordpress::Ostruct.new, Wordpress::Request.new(:post, "/rest/v1/sites/#{site}/posts/#{post_id}/reblogs/new", params, data)
       end
     end
   end

data/lib/wordpress/api/sites.rb

@@ -7,7 +7,7 @@ module Wordpress
 
       def get_site(site, params = {})
         validate_params! params
-        object_from_response Wordpress::Site, "/sites/#{site}", :get, :query => params
+        object_from_response Wordpress::Object::Site.new(self), Wordpress::Request.new(:get, "/rest/v1/sites/#{site}", params)
       end
     end
   end

data/lib/wordpress/api/tests.rb

@@ -5,14 +5,14 @@ module Wordpress
     module Tests
       include Wordpress::API::Utils
 
-      def get_test(id, options = {})
-        validate_options! options, [:id, :default_string, :default_int, :boolean_whitelist_defaults_to_false, :boolean_whitelist_defaults_to_true, :string_whitelist_defaults_to_foo, :url, :datetime], :test
-        object_from_response Wordpress::Test, "/test/#{id}", :get, options
+      def get_test(id, params = {})
+        validate_params! params, [:id, :default_string, :default_int, :boolean_whitelist_defaults_to_false, :boolean_whitelist_defaults_to_true, :string_whitelist_defaults_to_foo, :url, :datetime], :test
+        object_from_response Wordpress::Object::Test.new(self), Wordpress::Request.new(:get, "/rest/v1/test/#{id}", params)
       end
 
-      def post_test(id, options = {})
-        validate_options! options, [:id, :default_string, :default_int, :boolean_whitelist_defaults_to_false, :boolean_whitelist_defaults_to_true, :string_whitelist_defaults_to_foo, :url, :datetime], :test
-        object_from_response Wordpress::Test, "/test/#{id}", :post, options
+      def post_test(id, params = {})
+        validate_params! params, [:id, :default_string, :default_int, :boolean_whitelist_defaults_to_false, :boolean_whitelist_defaults_to_true, :string_whitelist_defaults_to_foo, :url, :datetime], :test
+        object_from_response Wordpress::Object::Test.new(self), Wordpress::Request.new(:post, "/rest/v1/test/#{id}",  params)
       end
     end
   end

data/lib/wordpress/api/utils.rb

@@ -1,33 +1,31 @@
 require 'json'
 require 'wordpress/errors'
 require 'wordpress/ostruct'
-require 'wordpress/user'
-require 'wordpress/site'
-require 'wordpress/post'
-require 'wordpress/post_array'
-require 'wordpress/like_array'
-require 'wordpress/comment'
-require 'wordpress/test'
+Dir.glob(File.expand_path('../../object/*.rb', __FILE__)) do |path|
+ require path
+end
 
 module Wordpress
   module API
     module Utils
-      private
-
-      def object_from_response(klass, path, method, params = {})
-        res = request(method, "/rest/v1#{path}", params, :bearer_token_request => true)
-        if res
+      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['message']
+            raise Wordpress::ResponseError, json
           end
-          klass.new(json)
+          obj.assign(json)
+        rescue MultiJson::LoadError => e
+          raise Wordpress::ResponseError, {'error' => e, 'message' => "Can not parse the response: #{res.inspect}"}
         end
       end
 
+      private
+
       def validate_params!(params, valid_keys = [], type = nil)
         valid_keys += [:http_envelope, :pretty, :callback] if type != :test
         valid_keys += [:number, :offset, :page, :order, :order_by, :after, :before] if type == :search

data/lib/wordpress/base.rb

@@ -2,9 +2,12 @@ module Wordpress
   class Base
     extend Forwardable
 
-    def_delegators 'Wordpress.logger', :debug, :info, :warn, :error, :fatal
+    def_delegators 'Wordpress', :logger
+    def_delegators 'logger', :debug, :info, :warn, :error, :fatal
 
     class << self
+      private
+
       def attr_accessor(*args)
         if args.size == 1 && args.first.is_a?(Hash)
           args.first.each do |key, default|
@@ -19,6 +22,26 @@ module Wordpress
           super
         end
       end
+
+      def class_attribute(*args)
+        args.each do |arg|
+          class_eval <<-EOS
+            class << self
+              def #{arg}
+                @#{arg}
+              end
+
+              def #{arg}=(v)
+                @#{arg} = v
+              end
+            end
+
+            def #{arg}
+              self.class.#{arg}
+            end
+          EOS
+        end
+      end
     end
 
     def metaclass

data/lib/wordpress/client.rb

@@ -1,50 +1,48 @@
 require 'wordpress/base'
+require 'wordpress/request'
 require 'wordpress/api'
-require 'curb'
+require 'faraday'
+require 'faraday_middleware/gzip'
+require 'multi_json'
 
 module Wordpress
-  class Client < Wordpress::Base
+  class Client < Base
     include Wordpress::API
 
     attr_accessor :access_token
-    attr_accessor :end_point => "https://public-api.wordpress.com/"
 
-    private
-
-    def request(method, path, params = {}, options = {})
-      query_params = params[:query] || {}
-      request_params = params[:request] || {}
-      uri = end_point + (end_point[-1] == '/' ? '' : '/') + path.sub(/^[\/]+/, '')
-      uri += "?#{query_params.map{ |k, v| "#{k}=#{v}" }.join('&')}" if !query_params.empty?
+    def initialize
+      @conn = Faraday.new do |faraday|
+        faraday.use Faraday::Response::Logger, logger
+        faraday.request :url_encoded
+        faraday.response :gzip
+        faraday.adapter Faraday.default_adapter
+      end
+    end
 
-      debug <<-EOS
-Request Dump
-  Method     : #{method}
-  Path       : #{uri}
-  Parameters : #{request_params.inspect}
-      EOS
+    def call(request, options = {})
+      debug "Request: #{request}"
 
-      http = Curl.send(method, uri, request_params) do |http|
+      response = @conn.send(request.method) do |req|
+        req.url request.url
+        req.params = request.params
+        req.body = request.body.to_s
         if options.delete(:bearer_token_request) && !access_token.nil?
-          http.headers['Authorization'] = bearer_auth_header
+          req.headers['Authorization'] = bearer_auth_header
         end
-        http.headers['Accept-Encoding'] = 'gzip,deflate'
-        http.timeout = 10
+        req.headers['Accept-Encoding'] = 'gzip,deflate'
+        req.headers['Content-Type'] = 'application/json'
+        req.options[:timeout] = 10
+        req.options[:open_timeout] = 5
       end
-      begin
-        res = Zlib::GzipReader.new(StringIO.new(http.body_str)).read
-      rescue Zlib::GzipFile::Error
-        res = http.body_str
-      end
-      
-      debug <<-EOS
-Response Dump
-  Content     : #{res}
-      EOS
 
-      res
+      debug "Response: #{response.body}"
+
+      response.body
     end
 
+    private
+
     def bearer_auth_header
       "Bearer #{access_token}"
     end

data/lib/wordpress/configuration.rb

@@ -1,5 +1,4 @@
 module Wordpress
-  class Configuration < Hash
-
+  class Configuration
   end
 end

data/lib/wordpress/errors.rb

@@ -1,4 +1,14 @@
 module Wordpress
   class ResponseError < StandardError
+    attr_reader :error, :message
+
+    def initialize(json = {})
+      @error = json['error'] || 'unknown'
+      @message = json['message']
+    end
+
+    def to_s
+      @message
+    end
   end
 end

data/lib/wordpress/object/array.rb

@@ -0,0 +1,29 @@
+require_relative 'base'
+
+module Wordpress::Object
+  class Array < Base
+    class_attribute :array_name
+
+    class << self
+      private
+
+      def attr_array(name, klass)
+        name = name.to_s
+        @array_name = name
+        attr_parameter name, :as => lambda{ |client, array|
+          (array || []).map{ |v|
+            Wordpress::Object.const_get(klass).new(client, v)
+          }
+        }
+      end
+    end
+
+    def [](k)
+      if k.is_a?(Fixnum) && array_name.to_s != ''
+        send(array_name)[k]
+      else
+        send(k)
+      end
+    end
+  end
+end