drillbit 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04148bb5142b9ebae181f0df4b525fe3e8f3b10d
-  data.tar.gz: b6d1b458eac0fbee1f82e4d97126e8508cd87611
+  metadata.gz: fec9e9fdc03cb3d4b5ec5977ba97e7732979d35e
+  data.tar.gz: 1eb9aeaa0634e5d47e6a6c80e95fbc2124e08900
 SHA512:
-  metadata.gz: 27c3ce833d7b7a4e1702fbef09fa934fc41436dcb98fae84b585c64fbe06a2a9b36423436a50b10a702bfb1066d289515ec02884913c18f3bc5dcc79f22e70fc
-  data.tar.gz: 00ff0dc854ec766993494a467c32700f459afdd64a4a8c8a11613c51a1d21ebc4753dc47e191fbbb8f6c813b8d669f70ae638ae9aea57890bb0290cef2f3d471
+  metadata.gz: 86d163daf5b5523fa2d156f093a8ea257591e15ae155138a6c6b147fb9e34eb8c11d3cfb136481f8cc0f40c932a456c7514caae7ad5c64e6effe92191e733eb0
+  data.tar.gz: 00471ebf723e9042d801d66e2dfa27847bb7a11b3314a57c391d99402cfdc3b0486652555b466ea55fa80ad8803765f642cbdc1fc702a7fe7984028c64a9cba1

data/lib/drillbit/authorizable_resource.rb

@@ -101,7 +101,7 @@ module  AuthorizableResource
                            call
   end
 
-  # rubocop:disable Metrics/AbcSize
+  # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
   def authorized_attributes
     @authorized_attributes ||= begin
       attributes    = authorized_params.
@@ -114,11 +114,20 @@ module  AuthorizableResource
       fetch(:data,          {}).
       fetch(:relationships, authorized_params.class.new).
       each_pair do |name, relationship|
-
         if relationship[:data].is_a?(Array)
-          attribute = "#{Drillbit::Utilities::String.singularize(name)}_ids".to_sym
+          if (relationship[:data][0] || {})[:attributes]
+            relationships["#{name}_attributes"] = relationship[:data].map do |datum|
+              attrs = datum[:attributes].dup
+
+              attrs.delete(:__id__)
+
+              attrs
+            end
+          else
+            attribute = "#{Drillbit::Utilities::String.singularize(name)}_ids".to_sym
 
-          relationships[attribute] = relationship[:data].map { |datum| datum[:id] }
+            relationships[attribute] = relationship[:data].map { |datum| datum[:id] }
+          end
         elsif relationship[:data].nil? || relationship[:data].is_a?(Hash)
           attribute = name.to_sym
 
@@ -131,7 +140,7 @@ module  AuthorizableResource
       end
     end
   end
-  # rubocop:enable Style/EmptyLinesAroundBlockBody, Metrics/AbcSize
+  # rubocop:enable Metrics/AbcSize, Metrics/PerceivedComplexity
 
   def authorized_resource
     return nil if RESOURCE_COLLECTION_ACTIONS.include?(action_name)

data/lib/drillbit/authorizers/parameters/resource.rb

@@ -51,19 +51,37 @@ class   Resource < Authorizers::Parameters
     end
   end
 
-  def add_authorized_relationship(name)
-    param = params.
-            fetch(:data,          {}).
-            fetch(:relationships, {}).
-            fetch(name,           {}).
-            fetch(:data,          nil)
+  # rubocop:disable Metrics/AbcSize
+  def add_authorized_relationship(name, embedded_attributes: {})
+    param    = params.
+               fetch(:data,          {}).
+               fetch(:relationships, {}).
+               fetch(name,           {}).
+               fetch(:data,          nil)
+    first    = params.
+               fetch(:data,          {}).
+               fetch(:relationships, {}).
+               fetch(name,           {}).
+               fetch(:data,          []).
+               first || {}
+    embedded = first.fetch(:attributes, nil)
 
     if param.nil?
       authorized_params[6][:data][2][:relationships][name] = [:data]
+    elsif embedded
+      authorized_params[6][:data][2][:relationships][name] = {
+        data: [
+                :type,
+                {
+                  attributes: %i{__id__} + embedded_attributes,
+                },
+              ],
+      }
     else
       authorized_params[6][:data][2][:relationships][name] = { data: %i{type id} }
     end
   end
+  # rubocop:enable Metrics/AbcSize
 
   def add_authorized_relationships(*names)
     names.each do |name|

data/lib/drillbit/middleware/parameter_parser.rb

@@ -59,7 +59,16 @@ class   ParameterParser
     return parameters unless parameters.is_a? Hash
 
     parameters.each_with_object({}) do |(key, value), hash|
-      value = underscore_parameters(value) if value.is_a? Hash
+      value = case value
+              when Hash
+                underscore_parameters(value)
+              when Array
+                value.map do |item|
+                  underscore_parameters(item)
+                end
+              else
+                value
+              end
 
       hash[Drillbit::Utilities::String.underscore(key)] = value
     end

data/lib/drillbit/utilities/string.rb

@@ -19,6 +19,7 @@ class   String
                             [/^(m|l)ice$/i, '\1ouse'],
                             [/(x|ch|ss|sh)es$/i, '\1'],
                             [/(m)ovies$/i, '\1ovie'],
+                            [/(child)ren$/i, '\1'],
                             [/(s)eries$/i, '\1eries'],
                             [/([^aeiouy]|qu)ies$/i, '\1y'],
                             [/([lr])ves$/i, '\1f'],

data/lib/drillbit/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Drillbit
-  VERSION = '2.7.0'
+  VERSION = '2.8.0'
 end

data/spec/drillbit/middleware/parameter_parser_spec.rb

@@ -96,7 +96,15 @@ describe  ParameterParser do
                            "quad":             {
                              "another-level":    "whoa inception"
                            }
-                         }
+                         },
+          "quint":       [
+                           {
+                             "quint-it-quit": "mc-dipple"
+                           },
+                           {
+                             "quint-it-quit": "big-maccle"
+                           }
+                         ]
         }
       HEREDOC
     }
@@ -112,6 +120,14 @@ describe  ParameterParser do
           'another_level' => 'whoa inception',
         },
       },
+      'quint'       => [
+                         {
+                           'quint_it_quit' => 'mc-dipple',
+                         },
+                         {
+                           'quint_it_quit' => 'big-maccle',
+                         },
+                       ],
     )
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drillbit
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - thegranddesign
@@ -31,7 +31,7 @@ cert_chain:
   zRIv8lqQM8QFT76rzP5SBCERwN+ltKAFbQ5/FwmZNGWYnmCP3RZMQiRnbh+9H9lh
   mlbwaYZTjgsXq6cy8N38EecewgBbZYS1IYJraE/M
   -----END CERTIFICATE-----
-date: 2016-10-23 00:00:00.000000000 Z
+date: 2016-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erratum