drillbit 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc9fd8dac14b792d3bf485777b8e8623aa418d77
-  data.tar.gz: 1f3fc94e276177ffd648a49b96f16ecc8f7a502b
+  metadata.gz: d29c3be0431dc83e7edb1c1cf2d0844b93ea086a
+  data.tar.gz: c5e5a28648fc56cd51731f5b698da2756bed6b86
 SHA512:
-  metadata.gz: 9a68c37c4649c12bc286758b2c8e9c3f4ab389fab3224c5fafd0d3fd05fd5b5b92d414068c8eb80b29c61ed061ce6c463f0af3db9ca2c62a818464bb85515d7d
-  data.tar.gz: 19dc7ef9360ea973b5fb53791a57cafe250bb2deb93b4a351acbd747690d8a64ab4598b6def32dbf5f1f65c8e07994b811e31e0d210358fbcec4c39b7c902ce8
+  metadata.gz: 2b471ef7bf9d5854779359cbe78a23c024fd2410abdc7a141c93796a084ebeec30c9fe05c3d9a0d05e8ef39b364d02d3ba4bf66253c7bee8009573f594246bcb
+  data.tar.gz: 81300a8c464efc2c6323319b2da243870f17b2f3acc17490c3bfe9b33d60d14c54c15d421f16d51ad7ab89ca0f61541dff161a69d6a032b4056ada9cc8d8b97c

data/lib/drillbit/authorizable_resource.rb

@@ -98,11 +98,37 @@ module  AuthorizableResource
                            call
   end
 
+  # rubocop:disable Style/EmptyLinesAroundBlockBody, Metrics/AbcSize
   def authorized_attributes
-    @authorized_attributes ||= authorized_params.
-                               fetch(:data,       {}).
-                               fetch(:attributes, {})
+    @authorized_attributes ||= begin
+      attributes    = authorized_params.
+                      fetch(:data,       {}).
+                      fetch(:attributes, authorized_params.class.new)
+
+      relationships = authorized_params.class.new
+
+      authorized_params.
+      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
+
+          relationships[attribute] = relationship[:data].map { |datum| datum[:id] }
+        elsif relationship[:data].nil? || relationship[:data].is_a?(Hash)
+          attribute = name.to_sym
+
+          relationships[attribute] = relationship[:data][:id]
+        end
+      end
+
+      ActiveSupport::Deprecation.silence do
+        attributes.merge(relationships)
+      end
+    end
   end
+  # rubocop:enable Style/EmptyLinesAroundBlockBody, Metrics/AbcSize
 
   def authorized_resource
     return nil if RESOURCE_COLLECTION_ACTIONS.include?(action_name)

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

@@ -21,9 +21,7 @@ class   Resource < Authorizers::Parameters
                                        attributes:    [
                                                         {},
                                                       ],
-                                       relationships: [
-                                                        {},
-                                                      ],
+                                       relationships: {},
                                      },
                                    ],
                            ]
@@ -52,12 +50,13 @@ class   Resource < Authorizers::Parameters
     param = params.
             fetch(:data,          {}).
             fetch(:relationships, {}).
-            fetch(name,           nil)
+            fetch(name,           {}).
+            fetch(:data,          nil)
 
-    if param.class == Array
-      authorized_params[1][:data][2][:relationships][0][name] = []
+    if param.nil?
+      authorized_params[1][:data][2][:relationships][name] = [:data]
     else
-      authorized_params[1][:data][2][:relationships] << name
+      authorized_params[1][:data][2][:relationships][name] = { data: %i{type id} }
     end
   end
 

data/lib/drillbit/middleware/parameter_parser.rb

@@ -2,6 +2,7 @@
 require 'json'
 require 'stringio'
 require 'drillbit/responses/invalid_request_body'
+require 'drillbit/utilities/string'
 
 module  Drillbit
 module  Middleware
@@ -15,9 +16,12 @@ class   ParameterParser
 
     if env['CONTENT_LENGTH'].to_i > 0 && env['CONTENT_TYPE'] =~ /json/
       if env['rack.input']
-        env['rack.input'] = StringIO.new(underscore_request_parameters(env['rack.input']))
+        underscored_input     = underscore_request_parameters(env['rack.input'])
+        env['rack.input']     = StringIO.new(underscored_input)
+        env['CONTENT_LENGTH'] = underscored_input.bytesize
       elsif env['RACK_INPUT']
-        env['RACK_INPUT'] = underscore_request_parameters(env['RACK_INPUT'])
+        env['RACK_INPUT']     = underscore_request_parameters(env['RACK_INPUT'])
+        env['CONTENT_LENGTH'] = env['RACK_INPUT'].bytesize
       end
     end
 
@@ -39,7 +43,10 @@ class   ParameterParser
     return query_string unless query_string.respond_to? :gsub
 
     query_string.gsub(/(?<=\A|&|\?)[^=&]+/) do |match|
-      match.tr('-', '_')
+      unescaped   = CGI.unescape(match)
+      underscored = Drillbit::Utilities::String.underscore(unescaped)
+
+      CGI.escape(underscored)
     end
   end
 
@@ -49,7 +56,7 @@ class   ParameterParser
     parameters.each_with_object({}) do |(key, value), hash|
       value = underscore_parameters(value) if value.is_a? Hash
 
-      hash[key.tr('-', '_')] = value
+      hash[Drillbit::Utilities::String.underscore(key)] = value
     end
   end
 end

data/lib/drillbit/utilities/string.rb

@@ -2,6 +2,38 @@
 module  Drillbit
 module  Utilities
 class   String
+  # rubocop:disable Metrics/LineLength
+  SINGULARIZATION_RULES = [
+                            [/(database)s$/i, '\1'],
+                            [/(quiz)zes$/i, '\1'],
+                            [/(matr)ices$/i, '\1ix'],
+                            [/(vert|ind)ices$/i, '\1ex'],
+                            [/^(ox)en/i, '\1'],
+                            [/(alias|status)(es)?$/i, '\1'],
+                            [/(octop|vir)(us|i)$/i, '\1us'],
+                            [/^(a)x[ie]s$/i, '\1xis'],
+                            [/(cris|test)(is|es)$/i, '\1is'],
+                            [/(shoe)s$/i, '\1'],
+                            [/(o)es$/i, '\1'],
+                            [/(bus)(es)?$/i, '\1'],
+                            [/^(m|l)ice$/i, '\1ouse'],
+                            [/(x|ch|ss|sh)es$/i, '\1'],
+                            [/(m)ovies$/i, '\1ovie'],
+                            [/(s)eries$/i, '\1eries'],
+                            [/([^aeiouy]|qu)ies$/i, '\1y'],
+                            [/([lr])ves$/i, '\1f'],
+                            [/(tive)s$/i, '\1'],
+                            [/(hive)s$/i, '\1'],
+                            [/([^f])ves$/i, '\1fe'],
+                            [/(^analy)(sis|ses)$/i, '\1sis'],
+                            [/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)(sis|ses)$/i, '\1sis'],
+                            [/([ti])a$/i, '\1um'],
+                            [/(n)ews$/i, '\1ews'],
+                            [/(ss)$/i, '\1'],
+                            [/s$/i, ''],
+                          ].freeze
+  # rubocop:enable Metrics/LineLength
+
   def self.underscore(other)
     word = other.to_s.gsub('::', '/')
     word.gsub!(/(?:([A-Za-z\d])|^)(?=\b|[^a-z])/) do
@@ -13,6 +45,16 @@ class   String
     word.downcase!
     word
   end
+
+  def self.singularize(word)
+    result = word.to_s.dup
+
+    SINGULARIZATION_RULES.each do |(rule, replacement)|
+      break if result.sub!(rule, replacement)
+    end
+
+    result
+  end
 end
 end
 end

data/lib/drillbit/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drillbit
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - thegranddesign
@@ -31,7 +31,7 @@ cert_chain:
   zRIv8lqQM8QFT76rzP5SBCERwN+ltKAFbQ5/FwmZNGWYnmCP3RZMQiRnbh+9H9lh
   mlbwaYZTjgsXq6cy8N38EecewgBbZYS1IYJraE/M
   -----END CERTIFICATE-----
-date: 2016-08-14 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erratum