consul 1.2.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb2a0c2c9a78ba8ad526c9ed666997e3ce7592b1dbbb29e8623d8c21f92265b9
-  data.tar.gz: 8f1f1dc0d6a22f69aba214cbae6f66d564ab338c06ee63dd20ca158a0d1c1f40
+  metadata.gz: 7d56978b19324d537eb1380dd0435e7a9dca4b4c8e7195f0e4e649ad6baa3065
+  data.tar.gz: ebe94441887929eae46422dbc6974e5b71da7e41fba2d0005f9ed650f471b14e
 SHA512:
-  metadata.gz: 90e19bae5eddeadf3d99a8f31922cb928d911c4957b8558cb28624589b7e6697050d68801af5d2790bb1eae8734aec960ff51976fe8a87abf367788404dcc53e
-  data.tar.gz: e3e3f137d384cd4b4248baaedc5a7faa020d889d68bcec5a5aa027cdcf4b6ac3bca4e2acece65a6078adbdc518755c887730f12d65c16f67ed86e47724963ffb
+  metadata.gz: a85d9db39a349fc55768bc54d87c198f41fd9bdbd6f254ed9e9c75c5783c3809e4f08f797407894c5f6cd39bfbb8fb0bd9d2428756dcb0997ab158d3f1fc1af9
+  data.tar.gz: e74d092a626238d63b605db9da653ef63dbf08fabca8d18dfff25602fc25771a32733bb4c22adc749703d8b53c50d6aeff46e88ed9279f5afb4cae23148b728b

data/CHANGELOG.md

@@ -9,6 +9,18 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ### Compatible changes
 
+## 1.3.1 - 2023-02-28
+
+### Compatible changes
+
+- clean release to fix file permissions of files that were broken in 1.3.0
+
+## 1.3.0 - 2023-01-27
+
+### Compatible changes
+
+- When you [map a power to a controller method](https://github.com/makandra/consul#auto-mapping-a-power-scope-to-a-controller-method) you can now override the generated method. The original implementation can be accessed with `super`.
+- When trying to map multiple controller method with the name, an error is now raised. Previously only the last mapping was used.
 
 
 ## 1.2.0 - 2023-01-24

data/Gemfile.5-2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    consul (1.2.0)
+    consul (1.3.1)
       activerecord (>= 3.2)
       activesupport (>= 3.2)
       edge_rider (>= 0.3.0)

data/Gemfile.6-1.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    consul (1.2.0)
+    consul (1.3.1)
       activerecord (>= 3.2)
       activesupport (>= 3.2)
       edge_rider (>= 0.3.0)

data/Gemfile.7-0.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    consul (1.2.0)
+    consul (1.3.1)
       activerecord (>= 3.2)
       activesupport (>= 3.2)
       edge_rider (>= 0.3.0)

data/README.md

@@ -476,7 +476,23 @@ class NotesController < ApplicationController
 end
 ```
 
-This is especially useful when you are using a RESTful controller library like [resource_controller](https://github.com/jamesgolick/resource_controller). The mapped method is aware of the `:map` option.
+The mapped method is aware of the `:map` option.
+
+The mapped method can be overridden and access the original implementation using `super`:
+
+```ruby
+class NotesController < ApplicationController
+
+  power :notes, :as => :note_scope
+
+  # ...
+    
+  def note_scope
+    super.where(trashed: false)
+  end
+
+end
+```
 
 
 ### Multiple power-mappings for nested resources

data/lib/consul/controller.rb

@@ -47,6 +47,7 @@ module Consul
 
       def power(*args)
         guard = Consul::Guard.new(*args)
+        controller = self
 
         # One .power directive will skip the check for all actions, even
         # if that .power directive has :only or :except options.
@@ -60,14 +61,49 @@ module Consul
         end
 
         if guard.direct_access_method
-          define_method guard.direct_access_method do
-            guard.power_value(self, action_name)
+          consul_features_module.module_eval do
+            # It's dangerous to re-define direct access methods like this:
+            #
+            #     power :one, as: :my_power
+            #     power :two, as: :my_power
+            #
+            # The method would always check the last power only.
+            # To prevent this we're raising an error.
+            if method_defined?(guard.direct_access_method)
+              raise DuplicateMethod, "Method #{direct_access_method} is already defined on #{controller.name}"
+            end
+
+            define_method guard.direct_access_method do
+              guard.power_value(self, action_name)
+            end
+
+            private guard.direct_access_method
           end
-          private guard.direct_access_method
         end
 
       end
 
+      # Instead of using define_method on the controller we're enhancing,
+      # we define dynamic method in a module and have the controller include that.
+      # This way the controller can override our generated method and access
+      # the original implenentation with super().
+      #
+      # See https://thepugautomatic.com/2013/07/dsom/ for more examples on this
+      # technique.
+      def consul_features_module
+        name = :ConsulFeatures
+        # Each controller class should get its own FeatureModule, even when
+        # we already inherit one from our parent.
+        if const_defined?(name, (_search_ancestors = false))
+          const_get(name, _search_ancestors = false)
+        else
+          mod = Module.new
+          const_set(name, mod)
+          include(mod)
+          mod
+        end
+      end
+
       # On first access we inherit .consul_power_args from our ancestor classes.
       # We also copy inherited args so we don't change our parent's .consul_power_args
       def consul_power_args

data/lib/consul/errors.rb

@@ -7,4 +7,5 @@ module Consul
   class NoCollection < Error; end
   class MissingContext < Error; end
   class PowerNotSingularizable < Error; end
+  class DuplicateMethod < Error; end
 end

data/lib/consul/version.rb

@@ -1,3 +1,3 @@
 module Consul
-  VERSION = '1.2.0'
+  VERSION = '1.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-24 00:00:00.000000000 Z
+date: 2023-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: memoized