cancancan-system 1.1.2 → 1.1.3

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

@@ -1,156 +1,155 @@
-module CanCanCan
-    module System
-        module Ability
-
-            extend ActiveSupport::Concern
-
-            def method_missing m, *args
-                if m.to_s[/(.+)_abilities/]
-                    membership_abilities $1, *args
-                else
-                    super
-                end
-            end
-
-            def respond_to? m, include_private = false
-                super || m.to_s[/(.+)_abilities/]
-            end
-
-            private
-
-            def modify aliases
-                alias_action *aliases, to: :modify
-            end
-
-            def abilities record_class, user, options = {}
-                defaults = {
-                    column: 'user',
-                    polymorphic: false,
-                    public_abilities: true
-                }
-                options = defaults.merge options
-
-                public_abilities record_class if options[:public_abilities]
-                if user
-                    if options[:polymorphic]
-                        can :manage, record_class, "#{get_column(options[:column])}": user.id, "#{get_column(options[:column], 'type')}": user.class.name
-                    else
-                        can :manage, record_class, "#{get_column(options[:column])}": user.id
-                    end
-                    yield if block_given?
-                end
-            end
-
-            def membership_abilities class_name, record_class, user, options = {}
-                defaults = {
-                    scope: :membership,
-                    column: nil,
-                    polymorphic: false,
-                    acts_as_belongable: false
-                }
-                options = defaults.merge options
-
-                user.belongable_belongings.where(scope: options[:scope].to_s).each do |belonging|
-                    if belonging.belonger_type == class_name.camelize
-                        ability = ability belonging
-                        if options[:acts_as_belongable]
-                            can ability, record_class, "#{options[:column] || class_name.pluralize}": { id: belonging.belonger_id }
-                        else
-                            if options[:polymorphic]
-                                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, "#{get_column(options[:column] || class_name)}": belonging.belonger_id
-                            end
-                        end
-                    end
-                end
-                user.send("#{class_name.pluralize}").each do |object|
-                    if options[:acts_as_belongable]
-                        can :manage, record_class, "#{options[:column] || class_name.pluralize}": { id: object.id }
-                    else
-                        if options[:polymorphic]
-                            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, "#{get_column(options[:column] || class_name)}": object.id
-                        end
-                    end
-                end
-            end
-
-            def belongable_abilities record_class, user, options = {}
-                defaults = {
-                    scope: nil
-                }
-                options = defaults.merge options
-
-                if options[:scope].nil?
-                    user.belongable_belongings.each do |belonging|
-                        belongable_belonging belonging
-                    end
-                else
-                    user.belongable_belongings.where(scope: options[:scope].to_s).each do |belonging|
-                        belongable_belonging belonging
-                    end
-                end
-            end
-            def belongable_belonging belonging
-                if belonging.belonger_type == record_class.name
-                    ability = ability belonging
-                    can ability, record_class, id: belonging.belonger_id if ability
-                end
-            end
-
-            def belonger_abilities record_class, user, options = {}
-                defaults = {
-                    scope: nil
-                }
-                options = defaults.merge options
-
-                if options[:scope].nil?
-                    user.belonger_belongings.each do |belonging|
-                        belonger_belonging belonging
-                    end
-                else
-                    user.belonger_belongings.where(scope: options[:scope].to_s).each do |belonging|
-                        belonger_belonging belonging
-                    end
-                end
-            end
-            def belonger_belonging belonging
-                if belonging.belongable_type == record_class.name
-                    ability = ability belonging
-                    can ability, record_class, id: belonging.belongable_id if ability
-                end
-            end
-
-            def public_abilities record_class
-                can :manage, record_class, ability: 'admin', visibility: 'public'
-                can :modify, record_class, ability: 'user', visibility: 'public'
-                can :read, record_class, ability: 'guest', visibility: 'public'
-            end
-
-            def ability object
-                case object.ability
-                when 'admin'
-                    :manage
-                when 'user'
-                    :modify
-                when 'guest'
-                    :read
-                else
-                    object.ability&.to_sym
-                end
-            end
-
-
-            def get_column column, name = 'id'
-                if column.nil? || column == ''
-                    name
-                else
-                    "#{column}_#{name}"
-                end
-            end
-
-        end
-    end
-end
+# frozen_string_literal: true
+
+# rubocop:disable Metrics/ModuleLength
+module CanCanCan
+  module System
+    module Ability
+      extend ActiveSupport::Concern
+
+      def method_missing(method, *args)
+        if method.to_s[/(.+)_abilities/]
+          membership_abilities($1, *args)
+        else
+          super
+        end
+      end
+
+      def respond_to_missing?(method, include_private = false)
+        super || method.to_s[/(.+)_abilities/]
+      end
+
+      private
+
+      def modify(aliases)
+        alias_action(*aliases, to: :modify)
+      end
+
+      # rubocop:disable Metrics/MethodLength
+      def abilities(klass, user, column: 'user', polymorphic: false,
+                    public_abilities: true)
+        public_abilities(klass) if public_abilities
+        return unless user
+
+        if polymorphic
+          can(:manage, klass,
+              "#{get_column(column)}": user.id,
+              "#{get_column(column, 'type')}": user.class.name)
+        else
+          can(:manage, klass,
+              "#{get_column(column)}": user.id)
+        end
+        yield if block_given?
+      end
+      # rubocop:enable Metrics/MethodLength
+
+      # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity,
+      # rubocop:disable Metrics/MethodLength, Metrics/ParameterLists,
+      # rubocop:disable Metrics/PerceivedComplexity
+      def membership_abilities(class_name, klass, user, scope: :membership,
+                               column: nil, polymorphic: false,
+                               acts_as_belongable: false)
+        user.belongable_belongings.where(scope: scope).each do |belonging|
+          next unless belonging.belonger_type == class_name.camelize
+
+          ability = ability(belonging)
+          if acts_as_belongable
+            can(ability, klass,
+                "#{column || class_name.pluralize}":
+                  { id: belonging.belonger_id })
+          elsif polymorphic
+            can(ability, klass,
+                "#{get_column(column || class_name)}": belonging.belonger_id,
+                "#{get_column(column || class_name, 'type')}":
+                  belonging.belonger_type)
+          else
+            can(ability, klass,
+                "#{get_column(column || class_name)}": belonging.belonger_id)
+          end
+        end
+        user.send(class_name.pluralize).each do |object|
+          if acts_as_belongable
+            can(:manage, klass,
+                "#{column || class_name.pluralize}": { id: object.id })
+          elsif polymorphic
+            can(:manage, klass,
+                "#{get_column(column || class_name)}": object.id,
+                "#{get_column(column || class_name, 'type')}":
+                  object.class.name)
+          else
+            can(:manage, klass,
+                "#{get_column(column || class_name)}": object.id)
+          end
+        end
+      end
+      # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity,
+      # rubocop:enable Metrics/MethodLength, Metrics/ParameterLists,
+      # rubocop:enable Metrics/PerceivedComplexity
+
+      def belongable_abilities(klass, user, scope: nil)
+        if scope.nil?
+          user.belongable_belongings.each do |belonging|
+            belongable_belonging(klass, belonging)
+          end
+        else
+          user.belongable_belongings
+              .where(scope: scope).each do |belonging|
+            belongable_belonging(klass, belonging)
+          end
+        end
+      end
+
+      def belongable_belonging(klass, belonging)
+        return unless belonging.belonger_type == klass.name
+
+        ability = ability(belonging)
+        can(ability, klass, id: belonging.belonger_id) if ability
+      end
+
+      def belonger_abilities(klass, user, scope: nil)
+        if scope.nil?
+          user.belonger_belongings.each do |belonging|
+            belonger_belonging(klass, belonging)
+          end
+        else
+          user.belonger_belongings
+              .where(scope: scope).each do |belonging|
+            belonger_belonging(klass, belonging)
+          end
+        end
+      end
+
+      def belonger_belonging(klass, belonging)
+        return unless belonging.belongable_type == klass.name
+
+        ability = ability(belonging)
+        can(ability, klass, id: belonging.belongable_id) if ability
+      end
+
+      def public_abilities(klass)
+        can(:manage, klass, ability: 'admin', visibility: 'public')
+        can(:modify, klass, ability: 'user', visibility: 'public')
+        can(:read, klass, ability: 'guest', visibility: 'public')
+      end
+
+      def ability(object)
+        case object.ability
+        when 'admin'
+          :manage
+        when 'user'
+          :modify
+        when 'guest'
+          :read
+        else
+          object.ability&.to_sym
+        end
+      end
+
+      def get_column(column, name = 'id')
+        return name if column.nil? || column == ''
+
+        "#{column}_#{name}"
+      end
+    end
+  end
+end
+# rubocop:enable Metrics/ModuleLength

data/lib/cancancan-system.rb

@@ -1,11 +1,11 @@
+# frozen_string_literal: true
+
 require 'cancancan'
 require 'acts_as_belongable'
 require 'cancancan-system/version'
 
 module CanCanCan
-    module System
-
-        require 'cancancan-system/engine'
-
-    end
+  module System
+    require 'cancancan-system/engine'
+  end
 end

data/lib/cancancan-system/engine.rb

@@ -1,8 +1,10 @@
-require 'rails/railtie'
-
-module CanCanCan
-    module System
-        class Engine < Rails::Engine
-        end
-    end
-end
+# frozen_string_literal: true
+
+require 'rails/railtie'
+
+module CanCanCan
+  module System
+    class Engine < Rails::Engine
+    end
+  end
+end

data/lib/cancancan-system/version.rb

@@ -1,7 +1,7 @@
-module CanCanCan
-    module System
-
-        VERSION = '1.1.2'
-
-    end
-end
+# frozen_string_literal: true
+
+module CanCanCan
+  module System
+    VERSION = '1.1.3'
+  end
+end

data/lib/generators/cancancan_system_generator.rb

@@ -1,35 +1,37 @@
+# frozen_string_literal: true
+
 require 'rails/generators'
 require 'rails/generators/migration'
 
 class CancancanSystemGenerator < Rails::Generators::Base
+  include Rails::Generators::Migration
 
-    include Rails::Generators::Migration
-
-    source_root File.join File.dirname(__FILE__), 'templates'
-    desc 'Install CanCanCan System'
+  source_root File.join File.dirname(__FILE__), 'templates'
+  desc 'Install CanCanCan System'
 
-    def self.next_migration_number dirname
-        if ActiveRecord::Base.timestamped_migrations
-            Time.now.utc.strftime '%Y%m%d%H%M%S'
-        else
-            "%.3d" % ( current_migration_number(dirname) + 1 )
-        end
+  def self.next_migration_number(dirname)
+    if ActiveRecord::Base.timestamped_migrations
+      Time.now.utc.strftime('%Y%m%d%H%M%S')
+    else
+      format('%.3d', current_migration_number(dirname) + 1)
     end
+  end
 
-    def create_migration_file
-        migration_template 'migration.rb.erb', 'db/migrate/cancancan_system_migration.rb', migration_version: migration_version
-    end
+  def create_migration_file
+    migration_template 'migration.rb.erb',
+                       'db/migrate/cancancan_system_migration.rb',
+                       migration_version: migration_version
+  end
 
-    def show_readme
-        readme 'README.md'
-    end
+  def show_readme
+    readme 'README.md'
+  end
 
-    private
+  private
 
-    def migration_version
-        if Rails.version >= '5.0.0'
-            "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
-        end
-    end
+  def migration_version
+    return unless Rails.version >= '5.0.0'
 
+    "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
+  end
 end

data/lib/generators/templates/README.md

@@ -1 +1 @@
-Now run `rails db:migrate` to add CanCanCan System to your database.
+Now run `rails db:migrate` to add CanCanCan System to your database.

data/lib/generators/templates/migration.rb.erb

@@ -1,5 +1,7 @@
-class CancancanSystemMigration < ActiveRecord::Migration<%= migration_version %>
-    def change
-        add_column :belongings, :ability, :string, default: 'guest'
-    end
-end
+# frozen_string_literal: true
+
+class CancancanSystemMigration < ActiveRecord::Migration<%= migration_version %>
+  def change
+    add_column :belongings, :ability, :string, default: 'guest'
+  end
+end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: cancancan-system
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Jonas Hübotter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-24 00:00:00.000000000 Z
+date: 2018-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: acts_as_belongable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -53,47 +53,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: acts_as_belongable
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '0'
 description: Conventions & helpers simplifying the use of CanCanCan in complex Rails
   applications.
 email: me@jonhue.me
@@ -101,7 +115,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
 - LICENSE
 - README.md
 - app/models/concerns/can_can_can/system/ability.rb
@@ -131,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Conventions & helpers simplifying the use of CanCanCan in complex Rails applications