restrict 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40ecfe0fc4a56dfb106d72c936831d92ce4331d0082ead530c5eeaa47762dfcc
-  data.tar.gz: 6ae9d487ae24a4c36fb7a8483e04acb1b0ec249cd5d86039638d4279e5d79dd3
+  metadata.gz: 64c201583341d1cfab486ba72a9a35562a2e453b15586f25a5403177e8e6af48
+  data.tar.gz: c73bcd768f66647315925df95a003e236fd31b1a22384a6670cb94ac5ab8cc96
 SHA512:
-  metadata.gz: 5c7acadb64232f1b850265207d9288ab4c49bf7481cdf04a033dab7658983a8abfd463cb7c4a15a0d956b6d601dbf279930a0c137908431383d4c75c7a1f97ba
-  data.tar.gz: 3e518e19c2fa5a9eaf3ba0239baa0288b6904cc6082077cba046e36b5953ee8631586e58cdbd33cd2779a40c45fbfc8ab9c9c91a60b7d08b98ee9eff2d507c25
+  metadata.gz: 7ff470658e364c155179b26ca04c6ba98c342ebc7c6a8bf3d1019f811c08c6ef9e726d06da5e8baa09f75dbbdba74c74553c4f664274f6db04741dbb7728a734
+  data.tar.gz: 66baa2c8609ba7cc6e2a47fc013e77db2dbb161c7329f6d0b41488d0ac718048ff8ba1a492b74a05363d26a371cf0feb28ffb700030e5356500d8e08b60e77f8

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+[0.1.1] - 2019-11-26
+  * Bug fix release to actually work in rails ¯\_(ツ)_/¯
+
 [0.1.0] - 2019-11-25
   * Support controller inheritance
 

data/lib/restrict/rails/controller.rb

@@ -3,16 +3,12 @@ module Restrict
     module Controller
       extend ActiveSupport::Concern
 
-      def restrictions
-        inherited_restrictions + self.class.__send__(:restrict_restrictions)
+      def inherited(subclass)
+        subclass.extend Restrict::Rails::Controller
       end
 
-      def inherited_restrictions
-        self.class.ancestors.map do |ancestor|
-          if ancestor.instance_variable_get(:@restrict_gatekeeper_installed)
-            ancestor.__send__(:restrict_restrictions)
-          end
-        end.compact.flatten
+      def restrictions
+        inherited_restrictions + self.class.__send__(:restrict_restrictions)
       end
 
       module ClassMethods
@@ -29,10 +25,6 @@ module Restrict
           @restrictions ||= []
         end
 
-        def inherited(subclass)
-          subclass.include Restrict::Rails::Controller
-        end
-
         # This could happen in included block as well, but often you need
         # other before filters to happen before you actually check the
         # restrictions, so lets set it where it is used in the code as well.
@@ -45,6 +37,14 @@ module Restrict
 
       private
 
+      def inherited_restrictions
+        self.class.ancestors.map do |ancestor|
+          if ancestor.instance_variable_get(:@restrict_gatekeeper_installed)
+            ancestor.__send__(:restrict_restrictions)
+          end
+        end.compact.flatten
+      end
+
       def invoke_gatekeeper
         Restrict::Gatekeeper.new.eye(self)
       end

data/lib/restrict/version.rb

@@ -1,3 +1,3 @@
 module Restrict
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/lib/restrict/rails/controller_spec.rb

@@ -58,4 +58,22 @@ describe Restrict::Rails::Controller do
       expect(child).to have_restriction_on(:show).unless(:level3?)
     end
   end
+
+  describe 'applies inherited general restrictions additionally to explizit restrictions' do
+    let(:base)       { ExampleController.new }
+    let(:controller) { InheritingController.new }
+
+    before do
+      base.class.restrict              unless: :level1?
+      controller.class.restrict :show, unless: :level2?
+    end
+
+    it 'does not leak restrictions into superclass' do
+      expect(base).to have_restriction_on(:show).unless(:level1?)
+      expect(base).not_to have_restriction_on(:show).unless(:level2?)
+
+      expect(controller).to have_restriction_on(:show).unless(:level1?)
+      expect(controller).to have_restriction_on(:show).unless(:level2?)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restrict
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Johannes Opper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-27 00:00:00.000000000 Z
+date: 2019-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails