cancancan-system 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b37daed7b5d3b0c495de6e7bc587dba3d6142f2c7f3eb661b5f18c7af50312f8
-  data.tar.gz: dd5d14a8eef306541a19793abddff2a275b6105a60bf0293ab4cde8f91ed7b77
+  metadata.gz: 253f1db910ec70b137aae617ae0687b1a68d530867f2633a85c9af878b60d2f6
+  data.tar.gz: 60420111c58708ddc8ba58c3062db44f5421e8592475566e925d81259d50d54e
 SHA512:
-  metadata.gz: 8e584e80ec587a3eb539e61154a55a7c07ff0106e1a883208517c1cd16676820186c34ecfa49be91ae85faedea0a4ccdcf979ef56050c480e3672b690350df36
-  data.tar.gz: 6a9c6657c00a41538b757f7bebccbe30bb768298a6f02a23ea10524f9354c42608876b14ba9800bee7d124ea21a4515f9afddebb285f705e38fddda3a36dde58
+  metadata.gz: b0dc138a86917f2dfcc348372a0968dedb459a56ef01ece0fba04e962f717973fd8cf5dbcd2bcc3ba05b5b56b8c5f8926616dd9d0525bf15647172d1272a3dca
+  data.tar.gz: 7e6873d00dd8618f48bbbcf2b1c6324e18316cc3031ccf9264a744417f8485366384597fa582cceac0d56580145385ab6b928ac29d2224aa5705acdecfe56e3f

data/CHANGELOG.md

@@ -4,6 +4,11 @@
 
 * nothing yet
 
+### 1.1.0 - 2018/01/21
+
+* enhancements
+    * allow `column` option to be set to `nil` to use the `id` attribute
+    
 ### 1.0.1 - 2018/01/21
 
 * bugfixes

data/README.md

@@ -126,6 +126,8 @@ def initialize user
 end
 ```
 
+**Note:** Set `column` to `nil` or `''` to use the `id` attribute.
+
 This is equivalent to:
 
 ```ruby

data/app/models/concerns/can_can_can/system/ability.rb

@@ -33,9 +33,9 @@ module CanCanCan
                 public_abilities record_class if options[:public_abilities]
                 if user
                     if options[:polymorphic]
-                        can :manage, record_class, "#{options[:column]}_id": user.id, "#{options[:column]}_type": user.class.name
+                        can :manage, record_class, "#{get_column(options[:column])}": user.id, "#{get_column(options[:column], 'type')}": user.class.name
                     else
-                        can :manage, record_class, "#{options[:column]}_id": user.id
+                        can :manage, record_class, "#{get_column(options[:column])}": user.id
                     end
                     yield if block_given?
                 end
@@ -57,9 +57,9 @@ module CanCanCan
                             can ability, record_class, "#{options[:column] || class_name.pluralize}": { id: belonging.belonger_id }
                         else
                             if options[:polymorphic]
-                                can ability, record_class, "#{options[:column] || class_name}_id": belonging.belonger_id, "#{options[:column] || class_name}_type": belonging.belonger_type
+                                can ability, record_class, "#{get_column(options[:column] || class_name)}": belonging.belonger_id, "#{get_column(options[:column] || class_name, 'type')}": belonging.belonger_type
                             else
-                                can ability, record_class, "#{options[:column] || class_name}_id": belonging.belonger_id
+                                can ability, record_class, "#{get_column(options[:column] || class_name)}": belonging.belonger_id
                             end
                         end
                     end
@@ -69,9 +69,9 @@ module CanCanCan
                         can :manage, record_class, "#{options[:column] || class_name.pluralize}": { id: object.id }
                     else
                         if options[:polymorphic]
-                            can :manage, record_class, "#{options[:column] || class_name}_id": object.id, "#{options[:column] || class_name}_type": object.class.name
+                            can :manage, record_class, "#{get_column(options[:column] || class_name)}": object.id, "#{get_column(options[:column] || class_name, 'type')}": object.class.name
                         else
-                            can :manage, record_class, "#{options[:column] || class_name}_id": object.id
+                            can :manage, record_class, "#{get_column(options[:column] || class_name)}": object.id
                         end
                     end
                 end
@@ -142,6 +142,15 @@ module CanCanCan
                 end
             end
 
+
+            def get_column column, name = 'id'
+                if column.nil? || column == ''
+                    name
+                else
+                    "#{column}_#{name}"
+                end
+            end
+
         end
     end
 end

data/lib/cancancan-system/version.rb

@@ -1,7 +1,7 @@
 module CanCanCan
     module System
 
-        VERSION = '1.0.1'
+        VERSION = '1.1.0'
 
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cancancan-system
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Jonas Hübotter