shaf_client 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de51f879d8fd9a032434411bbe29df1b1dd6629c39277c1373384ae10615e2ff
-  data.tar.gz: fa37f60def169a85f3910d6c4dd36faa3155b299f42725606682500e722c504e
+  metadata.gz: c4eda6aea2ca9040216f1dee7732b7123e98edfbbec2d3b53dd567f50940d145
+  data.tar.gz: a1d43989ce6bff97ac6801ef4fcb67f77e01933cbdf796694e6339d57606d9d0
 SHA512:
-  metadata.gz: 6e11dd7e17aa9052606440cbb16c06e8bec99933b0d1033c803116e14c18591795eb26304277288f249c8812a3991d8a2a3bca6deedd1e0c59ea0a1a529abd85
-  data.tar.gz: 4db2d441198e463dc8f590638d2017baab472d4d00a205b0694c6b9aef74f6952d5fb715e408f81da70959bbf9d7aeb02970ecc78a1853859dbcb595c0c43432
+  metadata.gz: d0ca1c6347bf9fb9d15eab004cf7cc83c5f9d571f32cb0fa65c8aaec179c03f9a6f6cd1762951d9904c2eecd537ea0d2b0d04ff347c171099541c7ef1628f9f3
+  data.tar.gz: 976c5ce8cd4e7868c957c7b4c74696298cb7b262ddb314a359efd28e52b6aa4c1925fe698718eed75472acf646737b12cddedaefb7bb9311026e9599fc934ef3

data/lib/shaf_client.rb

@@ -15,6 +15,7 @@ require 'shaf_client/resource'
 require 'shaf_client/shaf_form'
 require 'shaf_client/hal_form'
 require 'shaf_client/api_error'
+require 'shaf_client/problem_json'
 require 'shaf_client/empty_resource'
 require 'shaf_client/unknown_resource'
 require 'shaf_client/hypertext_cache_strategy'

data/lib/shaf_client/base_resource.rb

@@ -39,20 +39,24 @@ class ShafClient
       to_s
     end
 
-    def attribute(key)
-      _attribute(key) or raise Error, "No attribute for key: #{key}"
+    def attribute(key, &block)
+      block ||= proc { raise Error, "No attribute for key: #{key}" }
+      _attribute(key, &block)
     end
 
-    def link(rel)
-      _link(rel) or raise Error, "No link with rel: #{rel}"
+    def link(rel, &block)
+      block ||= proc { raise Error, "No link with rel: #{rel}" }
+      _link(rel, &block)
     end
 
-    def curie(rel)
-      _curie(rel) or raise Error, "No curie with rel: #{rel}"
+    def curie(rel, &block)
+      block ||= proc { raise Error, "No curie with rel: #{rel}" }
+      _curie(rel, &block)
     end
 
-    def embedded(rel)
-      _embedded(rel) or raise Error, "No embedded resources with rel: #{rel}"
+    def embedded(rel, &block)
+      block ||= proc { raise Error, "No embedded resources with rel: #{rel}" }
+      _embedded(rel, &block)
     end
 
     def rel?(rel)
@@ -75,22 +79,38 @@ class ShafClient
       @payload ||= {}
     end
 
-    def _attribute(key)
-      attributes[key.to_sym]
+    def _attribute(key, &block)
+      if block
+        attributes.fetch(key.to_sym, &block)
+      else
+        attributes[key.to_sym]
+      end
     end
 
-    def _link(rel)
+    def _link(rel, &block)
       rewritten_rel = best_match(links.keys, rel)
-      links[rewritten_rel]
+      if block
+        links.fetch(rewritten_rel, &block)
+      else
+        links[rewritten_rel]
+      end
     end
 
-    def _curie(rel)
-      curies[rel.to_sym]
+    def _curie(rel, &block)
+      if block
+        curies.fetch(rel.to_sym, &block)
+      else
+        curies[rel.to_sym]
+      end
     end
 
-    def _embedded(rel)
+    def _embedded(rel, &block)
       rewritten_rel = best_match(embedded_resources.keys, rel)
-      embedded_resources[rewritten_rel]
+      if block
+        embedded_resources.fetch(rewritten_rel, &block)
+      else
+        embedded_resources[rewritten_rel]
+      end
     end
 
     def <<(other)

data/lib/shaf_client/mime_types.rb

@@ -2,6 +2,5 @@ class ShafClient
   module MimeTypes
     MIME_TYPE_JSON = 'application/json'
     MIME_TYPE_HAL  = 'application/hal+json'
-    DEFAULT_ADAPTER = :net_http
   end
 end

data/lib/shaf_client/problem_json.rb

@@ -0,0 +1,38 @@
+require 'shaf_client/form'
+require 'shaf_client/status_codes'
+
+class ShafClient
+  class ProblemJson < Resource
+    include StatusCodes
+
+    content_type 'application/problem+json'
+
+    def type
+      attribute(:type) { 'about:blank' }
+    end
+
+    def title
+      attribute(:title) do
+        next unless type == 'about:blank'
+
+        StatusCode[status] if (400..599).include? status.to_i
+      end
+    end
+
+    def status
+      attribute(:status) { http_status }
+    end
+
+    def detail
+      attribute(:detail)
+    end
+
+    def instance
+      attribute(:instance)
+    end
+
+    def to_h
+      attributes
+    end
+  end
+end

data/lib/shaf_client/resource.rb

@@ -89,6 +89,10 @@ class ShafClient
       delete(:delete)
     end
 
+    def content_type
+      headers['content-type']
+    end
+
     protected
 
     def <<(other)

data/lib/shaf_client/status_codes.rb

@@ -0,0 +1,70 @@
+class ShafClient
+  module StatusCodes
+    StatusCode = {
+      100 => 'Continue',
+      101 => 'Switching Protocols',
+      102 => 'Processing',
+      103 => 'Early Hints',
+      200 => 'OK',
+      201 => 'Created',
+      202 => 'Accepted',
+      203 => 'Non-Authoritative Information',
+      204 => 'No Content',
+      205 => 'Reset Content',
+      206 => 'Partial Content',
+      207 => 'Multi-Status',
+      208 => 'Already Reported',
+      226 => 'IM Used',
+      300 => 'Multiple Choices',
+      301 => 'Moved Permanently',
+      302 => 'Found',
+      303 => 'See Other',
+      304 => 'Not Modified',
+      305 => 'Use Proxy',
+      306 => '(Unused)',
+      307 => 'Temporary Redirect',
+      308 => 'Permanent Redirect',
+      400 => 'Bad Request',
+      401 => 'Unauthorized',
+      402 => 'Payment Required',
+      403 => 'Forbidden',
+      404 => 'Not Found',
+      405 => 'Method Not Allowed',
+      406 => 'Not Acceptable',
+      407 => 'Proxy Authentication Required',
+      408 => 'Request Timeout',
+      409 => 'Conflict',
+      410 => 'Gone',
+      411 => 'Length Required',
+      412 => 'Precondition Failed',
+      413 => 'Payload Too Large',
+      414 => 'URI Too Long',
+      415 => 'Unsupported Media Type',
+      416 => 'Range Not Satisfiable',
+      417 => 'Expectation Failed',
+      421 => 'Misdirected Request',
+      422 => 'Unprocessable Entity',
+      423 => 'Locked',
+      424 => 'Failed Dependency',
+      425 => 'Too Early',
+      426 => 'Upgrade Required',
+      428 => 'Precondition Required',
+      429 => 'Too Many Requests',
+      431 => 'Request Header Fields Too Large',
+      451 => 'Unavailable For Legal Reasons',
+      500 => 'Internal Server Error',
+      501 => 'Not Implemented',
+      502 => 'Bad Gateway',
+      503 => 'Service Unavailable',
+      504 => 'Gateway Timeout',
+      505 => 'HTTP Version Not Supported',
+      506 => 'Variant Also Negotiates',
+      507 => 'Insufficient Storage',
+      508 => 'Loop Detected',
+      510 => 'Not Extended',
+      511 => 'Network Authentication Required',
+    }
+    StatusCode.default = 'Unassigned'
+    StatusCode.freeze
+  end
+end

data/lib/shaf_client/version.rb

@@ -1,3 +1,3 @@
 class ShafClient
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shaf_client
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Sammy Henningsson
@@ -30,7 +30,7 @@ cert_chain:
   ZMhjYR7sRczGJx+GxGU2EaR0bjRsPVlC4ywtFxoOfRG3WaJcpWGEoAoMJX6Z0bRv
   M40=
   -----END CERTIFICATE-----
-date: 2019-11-01 00:00:00.000000000 Z
+date: 2020-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -38,14 +38,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: faraday-http-cache
   requirement: !ruby/object:Gem::Requirement
@@ -66,14 +66,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ dependencies:
         version: '5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '5.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -93,7 +93,7 @@ dependencies:
         version: '5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '5.14'
 description: A HAL client customized for Shaf APIs
 email: sammy.henningsson@gmail.com
 executables: []
@@ -114,9 +114,11 @@ files:
 - lib/shaf_client/link.rb
 - lib/shaf_client/middleware/redirect.rb
 - lib/shaf_client/mime_types.rb
+- lib/shaf_client/problem_json.rb
 - lib/shaf_client/resource.rb
 - lib/shaf_client/resource_mapper.rb
 - lib/shaf_client/shaf_form.rb
+- lib/shaf_client/status_codes.rb
 - lib/shaf_client/unknown_resource.rb
 - lib/shaf_client/version.rb
 homepage: https://github.com/sammyhenningsson/shaf_client
@@ -138,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: HAL client for Shaf