simon_says 0.3.0.alpha.4 → 0.3.0.alpha.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ebffb1d29f995636c2c9997b8e86a795b4a7ec08cc9dfcd6fd1bca31463203c
-  data.tar.gz: 0fb849d27ded008910437acd78b9470975b436702f917a52ae101f7ef6a0e2f9
+  metadata.gz: 3abfdc67fe4a00391a5a167d425db7cda7e855c316b00a724d1f452114af6c68
+  data.tar.gz: c14a9de36943db2c6059b8ea6a41063ad99a704a0964c38600a99ebb3687a170
 SHA512:
-  metadata.gz: cdb55a962f39d5d0df49579a37cf997e4acba5fc41e375429ff38b2ffcaadd6b9377861e661ab573833f4fe8fe58eb9981ae9b8ab5c9ed5d5f7655290c9e022c
-  data.tar.gz: ea2a382c7226db07795804807280ee24e4c834bb9d7316a3122c62c718cea195a61a45504668150f208ed420f8b0f34a5613f5facc3bfe11a94397eeb244ff5e
+  metadata.gz: ac1930289951138e3bee481d6f09a44b3f5b3878e4b19685167614add7ceff33e1ebb409ec67f382dd3985ba9970373ff3ddac316b97b82443c383d16bc3a7b6
+  data.tar.gz: 9be3fd968195386735821c2ab17b02ce59de685788ad54cc5ded492368e6c2bc2e92f36f77a4b61c1924a78d052ca7b1d0283770957ed8702651f89968839108

data/lib/simon_says/authorizer.rb

@@ -6,7 +6,9 @@ module SimonSays
       # @private
       def initialize(as, required, actual)
         # TODO i18n for err message (as should be singluarized with 1 flag)
-        super "Access denied; #{required * ', '} role is required. Current access is #{actual * ', '}"
+        current_access = actual.empty? ? 'empty' : actual.join(', ')
+
+        super "Access denied; #{required * ', '} #{as} is required. Current access is #{current_access}"
       end
     end
 
@@ -145,7 +147,8 @@ module SimonSays
       scope, query = resource_scope_and_query(resource, options)
       through = options[:through] ? options[:through].to_s : nil
 
-      assoc = through || (options[:from] ? resource.pluralize : nil)
+      assoc_name = through || (options[:from] ? resource.pluralize : nil)
+      assoc = Authorizer.association_method(assoc_name)
       scope = scope.send(assoc) if assoc && scope.respond_to?(assoc)
 
       record = scope.where(query).first!
@@ -195,6 +198,13 @@ module SimonSays
       end
     end
 
+    def self.association_method(assoc)
+      return if assoc.nil?
+      return :"#{assoc}_dataset" if defined? Sequel
+
+      assoc.to_sym
+    end
+
     private
 
     # @private

data/lib/simon_says/version.rb

@@ -1,3 +1,3 @@
 module SimonSays
-  VERSION = '0.3.0.alpha.4'
+  VERSION = '0.3.0.alpha.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simon_says
 version: !ruby/object:Gem::Version
-  version: 0.3.0.alpha.4
+  version: 0.3.0.alpha.5
 platform: ruby
 authors:
 - Michael Coyne
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-12 00:00:00.000000000 Z
+date: 2019-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport