consul 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a1b81fc040672be5ea52bad364ca2b1232f66350
-  data.tar.gz: 396dadb1a2f3d60920c35caedda794a32518508c
+SHA256:
+  metadata.gz: 06155bb23047c53d7674934ff0274db41f0241ed9fc45d13959bbe87b7a68a66
+  data.tar.gz: f28959645bdbbecd5596d764c4993f36d1e7c42c5e12f0b0014f2a57624c0a92
 SHA512:
-  metadata.gz: 2d93efa23a105f53b00fc613e5c44cececa812d6a8f765a609f012ac63222693c0ac13f9eb2b8477cfd9f5048eb54cac0f8a1d9327208649727c2ec74824bd1b
-  data.tar.gz: 4f6724cb723c9aea92b7f10d8604966dabb779923b1ec64351eb3b0dd6fb0e9ba488a3b2dda13daae8f29b93f1cf1af6bbabdbd518f5cbf1aeea073a31d4d92f
+  metadata.gz: 83138414bd69ce544205a1ffe280a1255f0e56217a94c0208bae1d66fb4cccba76e155206a9f032f7cceaae6737d74b1c559fa80fb89904ad57ad4419043aba6
+  data.tar.gz: d861f0003017f975a55688b3971a72ba8d1f9da3ac3023f146d9b392eff824f8fa0123eb27629597d3b2e00d8959f3ef920e9bd51704fcb2ccbbddb34893232b

data/CHANGELOG.md

@@ -0,0 +1,42 @@
+All notable changes to this project will be documented in this file.
+
+This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+
+## Unreleased
+
+### Breaking changes
+
+-
+
+### Compatible changes
+
+-
+
+## 0.13.2 - 2017-10-02
+
+### Compatible changes
+
+- Bang methods should return the scope when successful (e.g. `power.notes!` returns the scope you defined in the power)
+- improve the error message for scoped powers
+
+## 0.13.1 - 2017-09-28
+
+### Compatible changes
+
+- Fix controller integration when using `ActionController::API`.
+
+Thanks to derekprior.
+
+
+## 0.13.0 - 2017-09-05
+
+### Breaking change
+
+- All powers memoize.
+
+
+## Older releases
+
+Please check commits.
+

data/lib/consul/power.rb

@@ -22,6 +22,7 @@ module Consul
     end
 
     def default_include_object?(power_name, *args)
+      check_number_of_arguments_in_include_object(power_name, args.length)
       object = args.pop
       context = args
       power_value = send(power_name, *context)
@@ -63,6 +64,16 @@ module Consul
       self.class.singularize_power_name(name)
     end
 
+    def check_number_of_arguments_in_include_object(power_name, given_arguments)
+      # check unmemoized methods as Memoizer wraps methods and masks the arity.
+      unmemoized_power_name = respond_to?("_unmemoized_#{power_name}") ? "_unmemoized_#{power_name}" : power_name
+      power_arity = method(unmemoized_power_name).arity
+      expected_arity = power_arity + 1 # one additional argument for the context
+      if power_arity >= 0 && expected_arity != given_arguments
+        raise ArgumentError.new("wrong number of arguments (given #{given_arguments}, expected #{expected_arity})")
+      end
+    end
+
     module ClassMethods
       include Consul::Power::DynamicAccess::ClassMethods
 
@@ -103,12 +114,23 @@ module Consul
         with_power(nil, &block)
       end
 
-      def define_query_and_bang_methods(name, &query)
+      def define_query_and_bang_methods(name, options, &query)
+        is_plural = options.fetch(:is_plural)
         query_method = "#{name}?"
         bang_method = "#{name}!"
         define_method(query_method, &query)
         memoize query_method
-        define_method(bang_method) { |*args| send(query_method, *args) or powerless!(name, *args) }
+        define_method(bang_method) do |*args|
+          if is_plural
+            if send(query_method, *args)
+              send(name, *args)
+            else
+              powerless!(name, *args)
+            end
+          else
+            send(query_method, *args) or powerless!(name, *args)
+          end
+        end
         # We don't memoize the bang method since memoizer can't memoize a thrown exception
       end
 
@@ -131,14 +153,14 @@ module Consul
           # The developer is trying to register an optimized query method
           # for singular object queries.
           name_without_suffix = name.chop
-          define_query_and_bang_methods(name_without_suffix, &block)
+          define_query_and_bang_methods(name_without_suffix, :is_plural => false, &block)
         else
           define_main_method(name, &block)
           define_ids_method(name)
-          define_query_and_bang_methods(name) { |*args| default_include_power?(name, *args) }
+          define_query_and_bang_methods(name, :is_plural => true) { |*args| default_include_power?(name, *args) }
           begin
             singular = singularize_power_name(name)
-            define_query_and_bang_methods(singular) { |*args| default_include_object?(name, *args) }
+            define_query_and_bang_methods(singular, :is_plural => false) { |*args| default_include_object?(name, *args) }
           rescue Consul::PowerNotSingularizable
             # We do not define singularized power methods if it would
             # override the collection method

data/lib/consul/version.rb

@@ -1,3 +1,3 @@
 module Consul
-  VERSION = '0.13.1'
+  VERSION = '0.13.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-28 00:00:00.000000000 Z
+date: 2018-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: memoizer
@@ -60,6 +60,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - LICENSE
 - README.md
 - Rakefile
@@ -94,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A scope-based authorization solution for Ruby on Rails.