onsi 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a645bf3aac3bee2b7986c263384f9df5a00f2d3
-  data.tar.gz: b353e411803bf55bc4c7900d55a38c8e24e75b32
+  metadata.gz: 96d2e299515f7829ffc2f93f76dfc26cbe8a25de
+  data.tar.gz: 67855153d40ba6e49e46d0d2e87af9f9ef587987
 SHA512:
-  metadata.gz: 70e86b97c6c267302221286efd56404d3d15c92ca0d700e6a84989e368892cf4510a5069f99e3e8171af9bdce3684a42548b88ac02de16b591fa64e3721dcf80
-  data.tar.gz: 0b1a846fe3ba195801669250768a9a5a2b935c1b3ce3ebb585139b424f39308e69a462eefd379a4ba653d6cc0817dc44f724a182283755585d1e04844ead1ec6
+  metadata.gz: 62ee8543afa30b562aad29d3ed678ab47f930b03761f3cd01c7f6e76cb68aba37f8317df61dfaae4004125aac164813dcf02e74a90788e67ce01780e952d3407
+  data.tar.gz: a8a4a5be644d66942fc3fb362e9692fec191c1fca43e1b1202d1678326e66da44e2d3616bcf0e4c8d582aac65788e37cc45b626b9017ebb4ff7ecba788fb5396

data/lib/onsi/error_responder.rb

@@ -91,6 +91,7 @@ module Onsi
 
     def error_metadata(error)
       return nil unless Rails.configuration.consider_all_requests_local
+
       {
         exception: {
           '_note' => '`exception` will be removed if Rails.configuration.consider_all_requests_local is false',

data/lib/onsi/includes.rb

@@ -19,6 +19,7 @@ module Onsi
         included.each do |name|
           fetcher = fetch_methods[name]
           next if fetcher.nil?
+
           results = fetcher.call
           root[name] = results
         end
@@ -35,6 +36,7 @@ module Onsi
       if block.nil?
         raise ArgumentError, "Must specify a block for fetch_#{name}"
       end
+
       fetch_methods[name.to_sym] = block
     end
 

data/lib/onsi/params.rb

@@ -50,28 +50,52 @@ module Onsi
 
       def permit_attributes(data, attributes)
         return {} if Array(attributes).empty?
+
         data.require(:attributes).permit(*attributes)
       end
 
       def permit_relationships(data, relationships)
         return {} if Array(relationships).empty?
+
         rels = data.require(:relationships)
         {}.tap do |obj|
           relationships.each do |name|
-            next if rels[name].nil?
-            resource = rels.require(name).require(:data)
+            optional, true_name = parse_relationship_name(name)
+            next unless rels.key?(true_name)
+
+            resource = fetch_relationship(rels, optional, true_name)
             case resource
+            when nil
+              obj["#{true_name}_id".to_sym] = nil
             when Array
               ids = resource.map { |r| parse_relationship(r).last }
-              obj["#{name.to_s.singularize}_ids".to_sym] = ids
+              obj["#{true_name.to_s.singularize}_ids".to_sym] = ids
             else
               _type, id = parse_relationship(resource)
-              obj["#{name}_id".to_sym] = id
+              obj["#{true_name}_id".to_sym] = id
             end
           end
         end
       end
 
+      def fetch_relationship(rels, optional, name)
+        if optional
+          payload = rels.require(name).permit!.to_h
+          if payload[:data].is_a?(Array)
+            return []
+          end
+
+          nil
+        else
+          rels.require(name).require(:data)
+        end
+      end
+
+      def parse_relationship_name(name)
+        name = name.to_s
+        [name.start_with?('?'), name.gsub(/\A\?/, '')]
+      end
+
       def parse_relationship(data)
         [
           data.require(:type),
@@ -108,6 +132,7 @@ module Onsi
       if value.nil?
         raise MissingReqiredAttribute.new("Missing attribute #{key}", key)
       end
+
       value
     end
 
@@ -180,6 +205,7 @@ module Onsi
       raw_attrs = attributes.to_h.symbolize_keys
       defaults.each_with_object({}) do |(key, value), object|
         next if raw_attrs.key?(key)
+
         if value.respond_to?(:call)
           object[key] = value.call
         else

data/lib/onsi/resource.rb

@@ -86,18 +86,21 @@ module Onsi
     def append_relationships(root)
       relationships = generate_relationships
       return unless relationships.any?
+
       root[RELATIONSHIPS_KEY] = relationships
     end
 
     def append_meta(root)
       meta = generate_metadata
       return unless meta.any?
+
       root[META_KEY] = meta
     end
 
     def append_includes(root)
       includes = generate_includes
       return unless includes.any?
+
       root[RELATIONSHIPS_KEY] ||= {}
       root[RELATIONSHIPS_KEY].merge!(includes)
     end

data/lib/onsi/version.rb

@@ -1,3 +1,3 @@
 module Onsi
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.8.0'.freeze
 end

data/onsi.gemspec

@@ -5,12 +5,12 @@ require 'onsi/version'
 Gem::Specification.new do |spec|
   spec.name          = 'onsi'
   spec.version       = Onsi::VERSION
-  spec.authors       = ['Skylar Schipper']
-  spec.email         = ['me@skylarsch.com']
+  spec.authors       = ['Maddie Schipper']
+  spec.email         = ['me@maddiesch.com']
 
   spec.summary       = 'Format JSON API Responses'
   spec.description   = 'Format JSON API responses and parse inbound requests.'
-  spec.homepage      = 'https://github.com/skylarsch/onsi'
+  spec.homepage      = 'https://github.com/maddiesch/onsi'
   spec.license       = 'MIT'
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: onsi
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
-- Skylar Schipper
+- Maddie Schipper
 autorequire: 
 bindir: exe
 cert_chain: []
@@ -144,7 +144,7 @@ dependencies:
         version: 1.3.10
 description: Format JSON API responses and parse inbound requests.
 email:
-- me@skylarsch.com
+- me@maddiesch.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -170,7 +170,7 @@ files:
 - lib/onsi/resource.rb
 - lib/onsi/version.rb
 - onsi.gemspec
-homepage: https://github.com/skylarsch/onsi
+homepage: https://github.com/maddiesch/onsi
 licenses:
 - MIT
 metadata: {}