drillbit 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d3a3b24d1a55b56e25bef531ba272d232b88866
-  data.tar.gz: 03c5a523c82bd9dcaad960229d6dc10797299a8f
+  metadata.gz: 1b0722486e3348f08a8bdc4738993706215910d5
+  data.tar.gz: b978c35838ba619d4bf4ad1dc808b4f4b99dcd98
 SHA512:
-  metadata.gz: fe8345734ccb77aa79440b4a24df55f97488a13bcdad277856337b6759499581ac5597923ec9aac7534baac6fd649973b03796c05df0c66a002a2100f52a05f1
-  data.tar.gz: 64d7f04e658f77b83cbc12cad4a6fb6f2d81f227ce65bffcce4a2c346defafa7d3e5fff208ac0c498e86153c45a094c13cef0951dfb81b202b277eeed31825b1
+  metadata.gz: 37e73c70b11476d9e98cb25e3eee61703b00caba5c37fcd2e30e6de3f4c471c80782905578ee57b5a65fef98898d6e0a9adfd7806768b14b1a80e80fb6c0ce7d
+  data.tar.gz: 4512cbf49593cf627be82c63b7d8a594a20bcf375be78e679051d5e701cf51d7f5d67355b34498ba68ae6463a3c75155a90c7f533264fbaffc97ce175318b867

data/lib/drillbit/authorizable_resource.rb

@@ -83,11 +83,10 @@ module  AuthorizableResource
     @authorized_scope ||= self.
                           class.
                           authorizer_scope_class.
-                          new(token:          token,
-                              user:           authorized_user,
-                              scoped_user_id: scoped_user_id,
-                              params:         authorized_params,
-                              scope_root:     authorized_scope_root).
+                          new(token:      token,
+                              user:       authorized_user,
+                              params:     authorized_params,
+                              scope_root: authorized_scope_root).
                           call
   end
 
@@ -133,33 +132,10 @@ module  AuthorizableResource
                                constantize
   end
 
-  def scoped_user_id
-    @scoped_user_id ||= if requested_user_id.blank?
-                          nil
-                        else
-                          requested_user_id
-                        end
-  end
-
-  def requested_user_id
-    @requested_user_id ||= params.
-                           fetch(:filter, {}).
-                           fetch(authorized_user_underscored_class_name,
-                                 authorized_user.id)
-  end
-
   def authorized_user
     current_user
   end
 
-  def authorized_user_underscored_class_name
-    @authorized_user_underscored_class_name ||= authorized_user.
-                                                class.
-                                                name[/([^:]+)\z/, 1].
-                                                underscore.
-                                                downcase
-  end
-
   def authorization_query
     @authorization_query ||= "able_to_#{action_name}?"
   end

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

@@ -45,6 +45,23 @@ class   Filtering < Authorizers::Parameters
       add_filterable_parameter(name)
     end
   end
+
+  # :reek:ControlParameter
+  # :reek:BooleanParameter
+  # :reek:DuplicateMethodCall
+  def filter_by_authenticated_owner(owner_id_name:,
+                                    owner_id_value:,
+                                    even_if_not_passed_in: true,
+                                    override_if_admin:     false)
+
+    return true if !override_if_admin && token.admin?
+
+    params[:filter] ||= {}
+
+    if params[:filter][owner_id_name] || even_if_not_passed_in
+      params[:filter][owner_id_name] = owner_id_value
+    end
+  end
 end
 end
 end

data/lib/drillbit/authorizers/scope.rb

@@ -1,30 +1,56 @@
 # frozen_string_literal: true
+require 'drillbit/utilities/string'
+
 module  Drillbit
 module  Authorizers
 class   Scope
   attr_accessor :token,
                 :user,
-                :scoped_user_id,
                 :params,
                 :scope_root
 
-  # rubocop:disable Metrics/ParameterLists
-  def initialize(token:, user:, params:, scoped_user_id:, scope_root:, **other)
-    self.token          = token
-    self.user           = user
-    self.params         = params
-    self.scoped_user_id = scoped_user_id
-    self.scope_root     = scope_root
+  def initialize(token:, user:, params:, scope_root:, **other)
+    self.token      = token
+    self.user       = user
+    self.params     = params
+    self.scope_root = scope_root
 
     other.each do |name, value|
       public_send("#{name}=", value)
     end
   end
-  # rubocop:enable Metrics/ParameterLists
 
-  def call
+  def user_scope
+    scope_root.public_send("for_#{user_underscored_class_name}", scope_user_id)
+  end
+
+  def public_scope
     scope_root.none
   end
+
+  def call
+    if scope_user_id
+      user_scope
+    else
+      public_scope
+    end
+  end
+
+  private
+
+  def scope_user_id
+    @scope_user_id ||= params.
+                       fetch(:filter, {}).
+                       fetch(user_underscored_class_name, nil)
+  end
+
+  def user_underscored_class_name
+    @user_underscored_class_name ||= begin
+      base_user_class_name = user.class.name[/([^:]+)\z/, 1]
+
+      Utilities::String.underscore(base_user_class_name).downcase
+    end
+  end
 end
 end
 end

data/lib/drillbit/utilities/string.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+module  Drillbit
+module  Utilities
+class   String
+  def self.underscore(other)
+    word = other.to_s.gsub('::', '/')
+    word.gsub!(/(?:([A-Za-z\d])|^)(?=\b|[^a-z])/) do
+      "#{Regexp.last_match(1)}#{Regexp.last_match(1) && ''}"
+    end
+    word.gsub!(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2')
+    word.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
+    word.tr!('-', '_')
+    word.downcase!
+    word
+  end
+end
+end
+end

data/lib/drillbit/version.rb

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

data/spec/drillbit/authorizers/scope_spec.rb

@@ -7,11 +7,10 @@ module    Drillbit
 module    Authorizers
 describe  Scope do
   it 'defaults to nothing' do
-    scope = Scope.new(token:          '123',
-                      user:           'my_user',
-                      scoped_user_id: '456',
-                      params:         {},
-                      scope_root:     OpenStruct.new(none: []))
+    scope = Scope.new(token:      '123',
+                      user:       Object.new,
+                      params:     {},
+                      scope_root: OpenStruct.new(none: []))
 
     expect(scope.call).to be_empty
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drillbit
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - thegranddesign
@@ -31,7 +31,7 @@ cert_chain:
   zRIv8lqQM8QFT76rzP5SBCERwN+ltKAFbQ5/FwmZNGWYnmCP3RZMQiRnbh+9H9lh
   mlbwaYZTjgsXq6cy8N38EecewgBbZYS1IYJraE/M
   -----END CERTIFICATE-----
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erratum
@@ -174,6 +174,7 @@ files:
 - lib/drillbit/tokens/json_web_tokens/null.rb
 - lib/drillbit/tokens/json_web_tokens/password_reset.rb
 - lib/drillbit/tokens/null.rb
+- lib/drillbit/utilities/string.rb
 - lib/drillbit/version.rb
 - spec/drillbit/accept_header_spec.rb
 - spec/drillbit/authorizers/parameters/filtering_spec.rb
@@ -208,10 +209,11 @@ files:
 - spec/fixtures/test_rsa_key.pub
 - spec/spec_helper.rb
 - spec/support/private_keys.rb
-homepage: 
+homepage: ''
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths: