cancancan-system 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94f86f5710ad3064cb2fbd31f4894fda9bc079b26701f7ed351c5a52ad59821f
-  data.tar.gz: e81ae0727b09aa9e0a137962c46927c0ca313bdc2480aa964c661fa11e09d882
+  metadata.gz: b37daed7b5d3b0c495de6e7bc587dba3d6142f2c7f3eb661b5f18c7af50312f8
+  data.tar.gz: dd5d14a8eef306541a19793abddff2a275b6105a60bf0293ab4cde8f91ed7b77
 SHA512:
-  metadata.gz: a35d4aac231b628f6b3223b46308719f5916d030f5b5f07d48a502db0ba4cc5c8f717d372b92059c7f556bccae684646ab21b11918608890f1f0b02389c28ecc
-  data.tar.gz: c88efd88664474247b41b0b2b91672f594140d55f5f3c0d7eed44ba8127d0d541ad926a82f5357aa1f04aafadeaaff4654cc0f351eea0c5be71235f7ec35e080
+  metadata.gz: 8e584e80ec587a3eb539e61154a55a7c07ff0106e1a883208517c1cd16676820186c34ecfa49be91ae85faedea0a4ccdcf979ef56050c480e3672b690350df36
+  data.tar.gz: 6a9c6657c00a41538b757f7bebccbe30bb768298a6f02a23ea10524f9354c42608876b14ba9800bee7d124ea21a4515f9afddebb285f705e38fddda3a36dde58

data/CHANGELOG.md

@@ -4,6 +4,11 @@
 
 * nothing yet
 
+### 1.0.1 - 2018/01/21
+
+* bugfixes
+    * fixed variable naming issues
+
 ### 1.0.0 - 2018/01/20
 
 * initial release

data/README.md

@@ -87,6 +87,18 @@ end
 
 **Note:** The aliases (`:create, :read, :update, :destroy`) can be custom.
 
+You should add the `ability` attribute to ActiveRecord models you want to [define abilities](#defining-abilities) for:
+
+```ruby
+add_column :users, :ability, :string, default: 'guest'
+```
+
+And you should add a `visiblity` attribute to ActiveRecord models you want to define [public abilities](#public-abilities) for:
+
+```ruby
+add_column :users, :visiblity, :string, default: 'public'
+```
+
 ### Defining Abilities
 
 CanCanCan System makes an `abilities` method available which simplifies setting up common abilities:

data/app/models/concerns/{cancancan → can_can_can}/system/ability.rb

@@ -6,7 +6,7 @@ module CanCanCan
 
             def method_missing m, *args
                 if m.to_s[/(.+)_abilities/]
-                    membership_abilities $1, args
+                    membership_abilities $1, *args
                 else
                     super
                 end
@@ -19,7 +19,7 @@ module CanCanCan
             private
 
             def modify aliases
-                alias_action aliases, to: :modify
+                alias_action *aliases, to: :modify
             end
 
             def abilities record_class, user, options = {}
@@ -37,7 +37,7 @@ module CanCanCan
                     else
                         can :manage, record_class, "#{options[:column]}_id": user.id
                     end
-                    yield
+                    yield if block_given?
                 end
             end
 
@@ -54,24 +54,24 @@ module CanCanCan
                     if belonging.belonger_type == class_name.camelize
                         ability = ability belonging
                         if options[:acts_as_belongable]
-                            can ability, record_class, "#{column || class_name.pluralize}": { id: belonging.belonger_id }
+                            can ability, record_class, "#{options[:column] || class_name.pluralize}": { id: belonging.belonger_id }
                         else
                             if options[:polymorphic]
-                                can ability, record_class, "#{column || class_name}_id": belonging.belonger_id, "#{column || class_name}_type": belonging.belonger_type
+                                can ability, record_class, "#{options[:column] || class_name}_id": belonging.belonger_id, "#{options[:column] || class_name}_type": belonging.belonger_type
                             else
-                                can ability, record_class, "#{column || class_name}_id": belonging.belonger_id
+                                can ability, record_class, "#{options[:column] || class_name}_id": belonging.belonger_id
                             end
                         end
                     end
                 end
                 user.send("#{class_name.pluralize}").each do |object|
                     if options[:acts_as_belongable]
-                        can :manage, record_class, "#{column || class_name.pluralize}": { id: object.id }
+                        can :manage, record_class, "#{options[:column] || class_name.pluralize}": { id: object.id }
                     else
                         if options[:polymorphic]
-                            can :manage, record_class, "#{column || class_name}_id": object.id, "#{column || class_name}_type": object.class.name
+                            can :manage, record_class, "#{options[:column] || class_name}_id": object.id, "#{options[:column] || class_name}_type": object.class.name
                         else
-                            can :manage, record_class, "#{column || class_name}_id": object.id
+                            can :manage, record_class, "#{options[:column] || class_name}_id": object.id
                         end
                     end
                 end
@@ -83,12 +83,12 @@ module CanCanCan
                 }
                 options = defaults.merge options
 
-                if scope.nil?
+                if options[:scope].nil?
                     user.belongable_belongings.each do |belonging|
                         belongable_belonging belonging
                     end
                 else
-                    user.belongable_belongings.where(scope: scope.to_s).each do |belonging|
+                    user.belongable_belongings.where(scope: options[:scope].to_s).each do |belonging|
                         belongable_belonging belonging
                     end
                 end
@@ -106,12 +106,12 @@ module CanCanCan
                 }
                 options = defaults.merge options
 
-                if scope.nil?
+                if options[:scope].nil?
                     user.belonger_belongings.each do |belonging|
                         belonger_belonging belonging
                     end
                 else
-                    user.belonger_belongings.where(scope: scope.to_s).each do |belonging|
+                    user.belonger_belongings.where(scope: options[:scope].to_s).each do |belonging|
                         belonger_belonging belonging
                     end
                 end
@@ -137,10 +137,8 @@ module CanCanCan
                     :modify
                 when 'guest'
                     :read
-                when nil
-                    nil
                 else
-                    object.ability.to_sym
+                    object.ability&.to_sym
                 end
             end
 

data/lib/cancancan-system/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cancancan-system
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jonas Hübotter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-20 00:00:00.000000000 Z
+date: 2018-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -104,7 +104,7 @@ files:
 - CHANGELOG.md
 - LICENSE
 - README.md
-- app/models/concerns/cancancan/system/ability.rb
+- app/models/concerns/can_can_can/system/ability.rb
 - lib/cancancan-system.rb
 - lib/cancancan-system/engine.rb
 - lib/cancancan-system/version.rb