wordpress-json-api 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24188f2c4b40c0c7efbe73fe75a26ac862a5324e15d1dfca1e3f4c7dfcc59d3a
-  data.tar.gz: b8a5740cb11a5954087836dd3f420131db2084af64b31c7cb458b37bc55c7b62
+  metadata.gz: b16ed9bae362513e88acab5b6def2a44d6e24f4671762d1f3b6714ebe63bcb1e
+  data.tar.gz: 5b6288b9f0c8b0595429b4f395267989de933f91ca0515abcffe6f51035d8b7d
 SHA512:
-  metadata.gz: f0b3c0d1e9b312654fcec8664ef2a63e7881c267d059c3fcc8baa47adb8d44879b34f561fc5a62f2870a8474261956d599d194fb7e35cd08d572a09b7a06bb6c
-  data.tar.gz: df859d2f8e9141c4924d69d5565cb8705077050d469eb2a73d182861b7fd928584a144e8463d70a41152cb5b89dce4243a64c2a172d577b1586007924b55f79b
+  metadata.gz: e4f0a38a8ecb5e334ccd88a03d72d02452f41c8d3031496be691b7153fc5b8df168458c443f14d2d7ad74541b6baffb2ee2e04194e625b18148c2212ae75ffe5
+  data.tar.gz: d09dc0344f3b1a4a7c0088d5e2f9039f961ca1405613d5988d5c44714bc41056a8289811b0f539d95021a507c6619570082d773830880cb0247a130894124831

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wordpress-json-api (0.1.0)
+    wordpress-json-api (0.1.1)
       faraday (>= 1.1.0)
       faraday_middleware (>= 1.0.0)
 

data/lib/wordpress/json/api/client.rb

@@ -3,72 +3,123 @@
 module Wordpress
   module Json
     module Api
-
       class Client
         attr_accessor :url, :configuration, :connection, :headers
   
         def initialize(url, configuration: ::Wordpress::Json::Api.configuration, options: {})
           self.configuration = configuration
           set_url(url)
+          set_headers
           set_connection
         end
 
         def set_url(url)
           self.url = url.include?("/wp-json/wp/v#{self.configuration.version}/") ? url : "#{url.gsub(/\/$/i, '')}/wp-json/wp/v#{self.configuration.version}/"
         end
+
+        def set_headers
+          self.headers                      ||=   {}
+          set_user_agent
+        end
+
+        def set_user_agent
+          user_agent                          =   self.configuration.faraday.fetch(:user_agent, nil)
+          
+          if user_agent
+            if user_agent.is_a?(String)
+              self.headers["User-Agent"]      =   user_agent
+            elsif user_agent.is_a?(Array)
+              self.headers["User-Agent"]      =   user_agent.sample
+            elsif user_agent.is_a?(Proc)
+              self.headers["User-Agent"]      =   user_agent.call
+            end
+          end
+        end
   
         def set_connection
           self.connection = ::Faraday.new(url) do |builder|
-            if configuration.faraday.fetch(:timeout, nil)
-              builder.options[:timeout]         =   configuration.faraday.fetch(:timeout, nil)
-            end
-            if configuration.faraday.fetch(:open_timeout, nil)
-              builder.options[:open_timeout]    =   configuration.faraday.fetch(:open_timeout, nil)
-            end
-  
-            builder.headers = headers if headers && !headers.empty?
+            builder.options[:timeout]         =   configuration.faraday.fetch(:timeout, nil) if configuration.faraday.fetch(:timeout, nil)
+            builder.options[:open_timeout]    =   configuration.faraday.fetch(:open_timeout, nil) if configuration.faraday.fetch(:open_timeout, nil)
   
+            builder.headers = self.headers if self.headers && !self.headers.empty?
             builder.request :json
-  
-            if configuration.verbose
-              builder.response :logger, ::Logger.new(STDOUT), bodies: true
-            end
+            builder.response :logger, ::Logger.new(STDOUT), bodies: true if configuration.verbose
             builder.response :json, content_type: /\bjson$/
-  
-            builder.use ::FaradayMiddleware::FollowRedirects, limit: 10
+            builder.use ::FaradayMiddleware::FollowRedirects, limit: 3
   
             builder.adapter configuration.faraday.fetch(:adapter, ::Faraday.default_adapter)
           end
         end
   
-        def get(path, params: {})
-          resp = connection.get(path) do |request|
-            if headers && !headers.empty?
-              request.headers = connection.headers.merge(headers)
+        def get(path, params: {}, headers: {})
+          request(path, params: params, headers: headers)&.fetch(:body, nil)
+        end
+
+        def request(path, params: {}, headers: {}, retries: 3)
+          resp    =   nil
+
+          begin
+            resp  =   self.connection.get(path) do |request|
+              request.headers = connection.headers.merge(headers) if headers && !headers.empty?
+              request.params  = params if params && !params.empty?
             end
-            request.params = params if params && !params.empty?
+  
+            resp  =   response(resp)
+          rescue => exception
+            retries       -= 1
+            retry if retries > 0
           end
 
-          response(resp)
+          return resp
+        end
+
+        def all(path, params: {}, headers: {})
+          page              =   1
+          params.merge!(per_page: 100)
+          responses         =   []
+          continue          =   false
+
+          begin
+            params.merge!(page: page)
+
+            begin
+              resp          =   request(path, params: params, headers: headers)
+              body          =   resp&.fetch(:body, nil)
+              resp_headers  =   resp&.fetch(:headers, {})
+              total_pages   =   resp_headers&.fetch('x-wp-totalpages', 0)&.to_i
+
+              if body && body.is_a?(Array) && body.any?
+                responses   =   responses | body
+                page       +=   1
+              end
+
+              continue      =   (!total_pages.nil? && page <= total_pages)
+            rescue ::Wordpress::Json::Api::Error => exception
+              continue      =   false
+            end
+          end while continue
+
+          return responses
         end
 
         def response(resp)
           if resp.success?
-            resp  = resp&.body
+            body  = resp&.body
   
-            error_code = (resp && resp.is_a?(Hash) && !resp.fetch('code', nil).to_s.empty?) ? resp.fetch('code', nil).to_s : nil
+            error_code = (body && body.is_a?(Hash) && !body.fetch('code', nil).to_s.empty?) ? body.fetch('code', nil).to_s : nil
             unless error_code.to_s.empty?
               raise ::Wordpress::Json::Api::Error, error_code
             end
+
+            headers = resp&.env&.response_headers
   
-            resp
+            return {body: body, headers: headers}
           else
             raise ::Wordpress::Json::Api::Error, "Failed to send request to #{self.url}"
           end
         end
         
       end
-
     end
   end
 end

data/lib/wordpress/json/api/configuration.rb

@@ -12,8 +12,9 @@ module Wordpress
 
           self.faraday = {
             adapter: :net_http,
-            timeout: 120,
-            open_timeout: 60
+            timeout: 60,
+            open_timeout: 30,
+            #user_agent: 'ENTER_A_CUSTOM_USER_AGENT_HERE'
           }
   
           self.verbose = false

data/lib/wordpress/json/api/version.rb

@@ -1,7 +1,7 @@
 module Wordpress
   module Json
     module Api
-      VERSION = "0.1.1"
+      VERSION = "0.1.2"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wordpress-json-api
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Sebastian Johnsson