wp-api-client 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c79a386294cc7fb4cba0a13895836546f44d6bd
-  data.tar.gz: 95f7761c08ea70c9d00d7a93f5581cc1428f2393
+  metadata.gz: e6daac342406211d577fc07b8948ab96358589a8
+  data.tar.gz: 3df23ccd037feb4eef033e416a50942babf49672
 SHA512:
-  metadata.gz: ee69105e832eb279cf28c6b8d29ecb38a83e5ceb3d086b8b56297bf62285f6087f85dfa91d62c26d99bf601b5e07b98edf153de79023f7ff3d5cece72097cb5d
-  data.tar.gz: 48bc17fffdde6b9a2f7badf75d4864ea2809646451a35f4f55abc99b6f9e808eb8eb954e117dd3f2cb0d73e93c10c8ae89007234d3baf169b389d8758b4d4a96
+  metadata.gz: 6f02a6f121e4cb8be779c49e4457fc9029f483955017a2e077e0a448bf1754646bb28fb31261a9b52f7ec0deed31d1eb001f7938b28da274937780cea001dca6
+  data.tar.gz: 70289be078d5a64ac1db18376cc79c22fea58f24d4a8acf400a7adf61da962c3ca535859e1a76d34c434705ac6527c6cbb5cd532b52db36dbdc2f924703d2d5b

data/lib/wp_api_client.rb

@@ -1,3 +1,5 @@
+require "ostruct"
+
 require "wp_api_client/version"
 require "wp_api_client/configuration"
 
@@ -8,6 +10,7 @@ require "wp_api_client/entities/meta"
 require "wp_api_client/entities/taxonomy"
 require "wp_api_client/entities/term"
 require "wp_api_client/entities/image"
+require "wp_api_client/entities/error"
 require "wp_api_client/entities/types"
 
 require "wp_api_client/client"
@@ -17,6 +20,7 @@ require "wp_api_client/collection"
 require "wp_api_client/relationship"
 
 module WpApiClient
+
   def self.get_client
     @client ||= Client.new(Connection.new(configuration))
   end
@@ -27,4 +31,14 @@ module WpApiClient
   end
 
   class RelationNotDefined < StandardError; end
+  class ErrorResponse < StandardError
+
+    attr_reader :error
+    attr_reader :status
+
+    def initialize(json)
+      @error = OpenStruct.new(json)
+      @status = @error.data["status"]
+    end
+  end
 end

data/lib/wp_api_client/collection.rb

@@ -24,7 +24,11 @@ module WpApiClient
     def previous_page
       @links[:prev] && @links[:prev]
     end
-    
+
+    def method_missing(method, *args)
+      @resources.send(method, *args)
+    end
+
 private
 
     # https://www.snip2code.com/Snippet/71914/Parse-link-headers-from-Github-API-in-Ru

data/lib/wp_api_client/configuration.rb

@@ -23,6 +23,7 @@ module WpApiClient
     attr_accessor :debug
     attr_accessor :cache
     attr_accessor :basic_auth
+    attr_accessor :proxy
 
     def initialize
       @endpoint = 'http://localhost:8080/wp-json/wp/v2'

data/lib/wp_api_client/connection.rb

@@ -32,6 +32,10 @@ module WpApiClient
           faraday.use :http_cache, store: configuration.cache, shared_cache: false
         end
 
+        if configuration.proxy
+          faraday.proxy configuration.proxy
+        end
+
         faraday.use Faraday::Response::RaiseError
         faraday.response :json, :content_type => /\bjson$/
         faraday.adapter  :typhoeus

data/lib/wp_api_client/entities/base.rb

@@ -1,4 +1,5 @@
 require 'open-uri'
+require 'ostruct'
 
 module WpApiClient
   module Entities
@@ -12,10 +13,10 @@ module WpApiClient
       end
 
       def initialize(resource)
-        unless resource.is_a? Hash
+        unless resource.is_a? Hash or resource.is_a? OpenStruct
           raise ArgumentError.new('Tried to initialize a WP-API resource with something other than a Hash')
         end
-        @resource = resource
+        @resource = OpenStruct.new(resource)
       end
 
       def links
@@ -31,6 +32,10 @@ module WpApiClient
           relations
         end
       end
+
+      def method_missing(method, *args)
+        @resource.send(method, *args)
+      end
     end
   end
 end

data/lib/wp_api_client/entities/error.rb

@@ -0,0 +1,14 @@
+module WpApiClient
+  module Entities
+    class Error
+
+      def self.represents?(json)
+        json.key?("code") and json.key?("message")
+      end
+
+      def initialize(json)
+        raise WpApiClient::ErrorResponse.new(json)
+      end
+    end
+  end
+end

data/lib/wp_api_client/entities/meta.rb

@@ -7,13 +7,6 @@ module WpApiClient
         json["key"] and json["value"]
       end
 
-      def key
-        meta["key"]
-      end
-
-      def value
-        meta["value"]
-      end
     end
   end
 end

data/lib/wp_api_client/entities/post.rb

@@ -11,10 +11,6 @@ module WpApiClient
         post["title"]["rendered"]
       end
 
-      def slug
-        post["slug"]
-      end
-
       def date
         Time.parse(post["date_gmt"]) if post["date_gmt"]
       end
@@ -27,10 +23,6 @@ module WpApiClient
         post["excerpt"]["rendered"]
       end
 
-      def id
-        post["id"]
-      end
-
       def terms(taxonomy = nil)
         relations("https://api.w.org/term", taxonomy)
       end

data/lib/wp_api_client/entities/taxonomy.rb

@@ -7,10 +7,6 @@ module WpApiClient
         !json.dig("hierarchical").nil?
       end
 
-      def name
-        taxonomy["name"]
-      end
-
       def terms
         relations("https://api.w.org/items")
       end

data/lib/wp_api_client/entities/term.rb

@@ -15,18 +15,6 @@ module WpApiClient
         relations("http://api.w.org/v2/post_type", post_type)
       end
 
-      def name
-        term["name"]
-      end
-
-      def slug
-        term["slug"]
-      end
-
-      def id
-        term["id"]
-      end
-
     end
   end
 end

data/lib/wp_api_client/entities/types.rb

@@ -5,7 +5,8 @@ module WpApiClient
       Post,
       Meta,
       Term,
-      Taxonomy
+      Taxonomy,
+      Error
     ]
   end
 end

data/lib/wp_api_client/relationship.rb

@@ -20,7 +20,12 @@ module WpApiClient
           "https://api.w.org/items" => :terms,
           "http://api.w.org/v2/post_type" => :post_type,
           "https://api.w.org/meta" => :meta,
-          "https://api.w.org/featuredmedia" => :post
+          "https://api.w.org/featuredmedia" => :post,
+          "wp:term" => :term,
+          "wp:items" => :terms,
+          "wp:post_type" => :post_type,
+          "wp:meta" => :meta,
+          "wp:featuredmedia" => :post
         }
       end
 
@@ -64,6 +69,9 @@ module WpApiClient
     attr_reader :relation
 
     def initialize(resource, relation)
+      if resource["_links"].keys.include? 'curies'
+        relation = convert_uri_to_curie(relation)
+      end
       @resource = resource
       @relation = relation
     end
@@ -96,22 +104,40 @@ Available mappings are :post, :term, and :meta.}
     def load_relation(relationship, position = nil)
       if objects = @resource.dig("_embedded", relationship)
         location = position ? objects[position] : objects
-        WpApiClient::Collection.new(location)
+        begin
+          WpApiClient::Collection.new(location)
+        rescue WpApiClient::ErrorResponse
+          load_from_links(relationship, position)
+        end
+      else
+        load_from_links(relationship, position)
+      end
+    end
+
+    def load_from_links(relationship, position = nil)
+      unless position.nil?
+        location = @resource["_links"].dig(relationship, position.to_i, "href")
       else
-        unless position.nil?
-          location = @resource["_links"].dig(relationship, position.to_i, "href")
+        if @resource["_links"][relationship].is_a? Array
+          # If the resources are linked severally, crank through and
+          # retrieve them one by one as an array
+          return @resource["_links"][relationship].map { |link| WpApiClient.get_client.get(link["href"]) }
         else
-          if @resource["_links"][relationship].is_a? Array
-            # If the resources are linked severally, crank through and
-            # retrieve them one by one as an array
-            return @resource["_links"][relationship].map { |link| WpApiClient.get_client.get(link["href"]) }
-          else
-            # Otherwise, get the single link to the lot
-            location = @resource["_links"][relationship]["href"]
-          end
+          # Otherwise, get the single link to the lot
+          location = @resource["_links"][relationship]["href"]
         end
-        WpApiClient.get_client.get(location) if location
       end
+      WpApiClient.get_client.get(location) if location
+    end
+
+    def convert_uri_to_curie(uri)
+      uri_curie_mappings = {
+        "https://api.w.org/term" => "wp:term",
+        "https://api.w.org/items" => "wp:items",
+        "https://api.w.org/meta" => "wp:meta",
+        "https://api.w.org/featuredmedia" => "wp:featuredmedia"
+      }
+      uri_curie_mappings.dig(uri) || uri
     end
   end
 end

data/lib/wp_api_client/version.rb

@@ -1,3 +1,3 @@
 module WpApiClient
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wp-api-client
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Duncan Brown
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -160,6 +160,7 @@ files:
 - lib/wp_api_client/configuration.rb
 - lib/wp_api_client/connection.rb
 - lib/wp_api_client/entities/base.rb
+- lib/wp_api_client/entities/error.rb
 - lib/wp_api_client/entities/image.rb
 - lib/wp_api_client/entities/meta.rb
 - lib/wp_api_client/entities/post.rb