discretion 2.0.0.pre.alpha → 3.0.0.pre.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 356b1ea298c592e14cc0bee26238faf978a325da
-  data.tar.gz: 68ea3e321eb97c0c718c7ce28e11d6f92cf6f3e2
+SHA256:
+  metadata.gz: 151384ffe6eb47722c2bba83128a44f7a724e41e105413999ef835da6078c2c6
+  data.tar.gz: 238b0b1f5824c7d854b354c6dbea5f193fda306586fa1acec26e329271d6723b
 SHA512:
-  metadata.gz: ea101402106c86b157f4741bdba29563b33d8d07620bc88b5e4031972dd92cb426134be70e14b40ddf7ecb274f015697ee71ee7cf8c1098e3f1dad882d729705
-  data.tar.gz: '058fa5ae16167fab16beb478f630d3a7c7e0a9d8a9fd6d22cf81da1c5a1218e86c3863dae2196360c775f4ca5755311dd65da545deb5569cdbb48e30461c50f4'
+  metadata.gz: 15261a63c3ecf0d9b9b1ca501d09a09ac81d9c9a2e12e7ffdcbe65011c49007af6711c3feb8d0d8dafb1c49c1da96022e47ed226f0f69abbd57a4c06b6175ea6
+  data.tar.gz: 9f9a15eeaaac9e9c7f108d33016dbf559b46c6bb730f7ef7d19d3b6d261ad61f19c99d738d32cd8a2d2652bfcaf6440f840ce221b4ab9ce0f5ec13392c7ee6d4

data/discretion.gemspec

@@ -14,9 +14,9 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/abeland/discretion'
   spec.license       = 'MIT'
 
-  spec.add_dependency 'activesupport'
+  spec.add_dependency 'activesupport', '~> 5.1', '>= 5.1.4'
   spec.add_dependency 'rails', '~>5'
-  spec.add_dependency 'request_store', '~>1.3'
+  spec.add_dependency 'request_store', '~>1.4', '>= 1.4.1'
   spec.required_ruby_version = '>= 2.2.2'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
@@ -26,11 +26,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'activerecord'
-  spec.add_development_dependency 'bundler', '~> 1.15'
-  spec.add_development_dependency 'factory_bot_rails'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rspec-rails'
-  spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'activerecord', '~> 5.1', '>= 5.1.4'
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'factory_bot_rails', '~> 4.8', '>= 4.8.2'
+  spec.add_development_dependency 'rake', '~> 10.5'
+  spec.add_development_dependency 'rspec', '~> 3.7'
+  spec.add_development_dependency 'rspec-rails', '~> 3.7', '>= 3.7.2'
+  spec.add_development_dependency 'sqlite3', '~> 1.3', '>= 1.3.13'
 end

data/lib/discretion/can.rb

@@ -2,7 +2,8 @@ module Discretion
   class << self
     def can_see_record?(viewer, record)
       return true unless record.is_a?(Discretion::DiscreetModel)
-      return true if Discretion::OMNISCIENT_VIEWER == viewer || Discretion::OMNIPOTENT_VIEWER == viewer
+      return true if Discretion.currently_acting_as?(Discretion::OMNISCIENT_VIEWER) ||
+                     Discretion.currently_acting_as?(Discretion::OMNIPOTENT_VIEWER)
 
       record.send(:can_see?, viewer)
     end
@@ -13,7 +14,7 @@ module Discretion
 
     def can_write_record?(viewer, record, changes, new_record)
       return true unless record.is_a?(Discretion::DiscreetModel)
-      return true if Discretion::OMNIPOTENT_VIEWER == viewer
+      return true if Discretion.currently_acting_as?(Discretion::OMNIPOTENT_VIEWER)
 
       record.respond_to?(:can_write?, true) ?
         record.send(:can_write?, viewer, changes, new_record) :
@@ -23,5 +24,17 @@ module Discretion
     def current_viewer_can_write_record?(record, changes, new_record)
       can_write_record?(Discretion.current_viewer, record, changes, new_record)
     end
+
+    def can_destroy_record?(viewer, record)
+      return true unless record.is_a?(Discretion::DiscreetModel)
+      return true if Discretion.currently_acting_as?(Discretion::OMNIPOTENT_VIEWER)
+
+      record.respond_to?(:can_destroy?, true) ?
+        record.send(:can_destroy?, viewer) : can_write_record?(viewer, record, {}, false)
+    end
+
+    def current_viewer_can_destroy_record?(record)
+      can_destroy_record?(Discretion.current_viewer, record)
+    end
   end
 end

data/lib/discretion/current_viewer.rb

@@ -4,6 +4,7 @@ module Discretion
 
   class << self
     CURRENT_VIEWER_KEY = :__discretion_current_viewer
+    CURRENTLY_ACTING_AS_KEY = :__discretion_currently_acting_as
 
     def current_viewer
       RequestStore[CURRENT_VIEWER_KEY]
@@ -12,5 +13,17 @@ module Discretion
     def set_current_viewer(current_viewer)
       RequestStore[CURRENT_VIEWER_KEY] = current_viewer
     end
+
+    def currently_acting_as
+      RequestStore[CURRENTLY_ACTING_AS_KEY]
+    end
+
+    def currently_acting_as?(as)
+      currently_acting_as == as
+    end
+
+    def set_currently_acting_as(as)
+      RequestStore[CURRENTLY_ACTING_AS_KEY] = as
+    end
   end
 end

data/lib/discretion/discreet_model.rb

@@ -14,6 +14,12 @@ module Discretion
           raise Discretion::CannotWriteError
         end
       end
+
+      before_destroy ->(record) {
+        unless Discretion.current_viewer_can_destroy_record?(record)
+          raise Discretion::CannotDestroyError
+        end
+      }, prepend: true
     end
   end
 end

data/lib/discretion/errors.rb

@@ -1,4 +1,5 @@
 module Discretion
   class CannotSeeError < StandardError; end
   class CannotWriteError < StandardError; end
+  class CannotDestroyError < StandardError; end
 end

data/lib/discretion/helpers.rb

@@ -23,24 +23,24 @@ module Discretion
       # Calling Proc.new will create a Proc from the implicitly given block to
       # the current method.
       # cf. http://ruby-doc.org/core-2.5.0/Proc.html#method-c-new
-      with_viewer(Discretion::OMNISCIENT_VIEWER, &Proc.new)
+      acting_as(Discretion::OMNISCIENT_VIEWER, &Proc.new)
     end
 
     def omnipotently
       # Calling Proc.new will create a Proc from the implicitly given block to
       # the current method.
       # cf. http://ruby-doc.org/core-2.5.0/Proc.html#method-c-new
-      with_viewer(Discretion::OMNIPOTENT_VIEWER, &Proc.new)
+      acting_as(Discretion::OMNIPOTENT_VIEWER, &Proc.new)
     end
 
     private
 
-    def with_viewer(viewer)
-      orig_viewer = Discretion.current_viewer
-      Discretion.set_current_viewer(viewer)
+    def acting_as(as)
+      orig_as = Discretion.currently_acting_as
+      Discretion.set_currently_acting_as(as)
       yield
     ensure
-      Discretion.set_current_viewer(orig_viewer)
+      Discretion.set_currently_acting_as(orig_as)
     end
   end
 end

data/lib/discretion/middleware.rb

@@ -6,9 +6,15 @@ module Discretion
 
     def call(env)
       # From Clearance
-      if env[:clearance]&.signed_in?
-        Discretion.set_current_viewer(env[:clearance].current_user)
+
+      # Have to do this omnisciently so that when Clearance loads the signed in User, we
+      # can gurarantee can_see?() will return true.
+      Discretion.omnisciently do
+        if env[:clearance]&.signed_in?
+          Discretion.set_current_viewer(env[:clearance].current_user)
+        end
       end
+
       @app.call(env)
     end
   end

data/lib/discretion/version.rb

@@ -1,3 +1,3 @@
 module Discretion
-  VERSION = '2.0.0.pre.alpha'.freeze
+  VERSION = '3.0.0.pre.alpha'.freeze
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: discretion
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha
+  version: 3.0.0.pre.alpha
 platform: ruby
 authors:
 - Abe Land
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-11 00:00:00.000000000 Z
+date: 2018-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.1.4
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -44,112 +50,142 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.1.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.8.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.8.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.7.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.7.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.13
 description: A simple privacy/authorization framework for Rails projects.
 email:
 - codeclimbcoffee@gmail.com
@@ -197,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A simple privacy/authorization framework for Rails projects.