bullet_train-roles 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f41c9b86402531e17f5853d967530968368985d44a5130f011c8d6d0844691a7
-  data.tar.gz: 102b0571926e9a698b2654b8d54128b226e8c67ffdd10f626a18baf23b35c754
+  metadata.gz: f03a796a2c17954ad4c25e313caea68ba0b60b7e8901e7c1acf83d869e100592
+  data.tar.gz: 131e6518cefb00c6ea280d4ac4bf492961cb6f45b6d0ef3d695b66de9366d906
 SHA512:
-  metadata.gz: 92706fc57f271f24cdcc2a6c204bbfeb21fe79e0a0b2cedd480c8ea51c62157e93f4665fe7de98f0ad0ff8b96fc04cd6448d408415faced1936e4d68a0521583
-  data.tar.gz: 50c64184545ecfcdab68be3163148ae0d1ee3727f23fb415cfa741418d66b1aed71946f4e3902413d118bd22abe2e6715840d2548835f72d3d4f019412297807
+  metadata.gz: 7df53d71fb2d393e84a30a5efb1fa9f351781653b40e1cc31e5cf565d4432228b3a78b6924d021908c5d463695dfdeb0dff834a0f1c63a26438774e8159f4438
+  data.tar.gz: 56a0c8b76f5105959d828db3f619c863cc917fd3caf1e8dc838151268da68da1bce455ebd3378f68dfa7bf78d804d673df311f6351cfd0a47a2b4f43a6c68c07

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    bullet_train-roles (0.1.2)
+    bullet_train-roles (0.1.4)
       active_hash
       activesupport
       cancancan

data/README.md

@@ -1,12 +1,12 @@
 # Bullet Train Roles
 
-Bullet Train Roles provides a Yaml-based configuration layer on top of [CanCanCan](https://github.com/CanCanCommunity/cancancan). You can use this configuration file to simplify the definition of many common permissions, while still implementing more complicated permissions in CanCanCan's traditional `app/model/ability.rb`. 
+Bullet Train Roles provides a Yaml-based configuration layer on top of [CanCanCan](https://github.com/CanCanCommunity/cancancan). You can use this configuration file to simplify the definition of many common permissions, while still implementing more complicated permissions in CanCanCan's traditional `app/model/ability.rb`.
 
 Additionally, Bullet Train Roles makes it trivial to assign the same roles and associated permissions at different levels in your application. For example, you can assign someone administrative privileges at a team level, or only at a project level.
 
 Bullet Train Roles was created by [Andrew Culver](http://twitter.com/andrewculver) and [Adam Pallozzi](https://twitter.com/adampallozzi).
 
-## Example Domain Model 
+## Example Domain Model
 
 For the sake of this document, we're going to assume the following example modeling around users and teams:
 
@@ -15,7 +15,7 @@ For the sake of this document, we're going to assume the following example model
 - A `Membership` can have zero, one, or many `Role`s assigned.
 - A `Membership` without a `Role` is just a default team member.
 
-You don't have to name your models the same thing in order to use this Ruby Gem, but it does depend on having a similar structure. 
+You don't have to name your models the same thing in order to use this Ruby Gem, but it does depend on having a similar structure.
 
 > If you're interested in reading more about how and why Bullet Train implements this structure, you can [read about it on our blog](https://blog.bullettrain.co/teams-should-be-an-mvp-feature/).
 
@@ -52,10 +52,6 @@ The installer will:
  - add a basic `permit` call in `app/models/ability.rb`.
 
 
-### Limitations
-
-The generators currently assume you're using PostgreSQL and `jsonb` will be available when generating a `role_ids` column. If you're using MySQL, the generator will use `json` instead, although you won't be able to set a default value and you'll need to take care of this in the model.
-
 ## Usage
 
 The provided `Role` model is backed by a Yaml configuration in `config/models/roles.yml`.

data/bin/setup

@@ -8,7 +8,7 @@ bundle install
 # We need to cd into the dummy app because it uses a different Rakefile
 cd test/dummy
 bundle install
-rake db:test:prepare
+rake db:reset
 cd ../..
 
 # Do any other automated setup that you need to do here

data/lib/bullet_train/roles/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Roles
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/generators/bullet_train/roles/install/install_generator.rb

@@ -58,11 +58,6 @@ module BulletTrain
         adapter_name
       end
 
-      def db_adapter_supports_defaults?
-        supported_db_adapters = %w[postgresql]
-        supported_db_adapters.include?(db_adapter)
-      end
-
       def find_json_data_type_identifier
         adapter_name = db_adapter
 
@@ -95,14 +90,6 @@ module BulletTrain
         File.write(file_location, update_file_content.join)
       end
 
-      def add_default_value_to_migration(file_name, table_name)
-        file_location = Dir["db/migrate/*_#{file_name}.rb"].last
-        line_to_match = "add_column :#{table_name.downcase}, :role_ids"
-        content_to_add = ", default: []\n"
-
-        add_in_file(file_location, line_to_match, content_to_add)
-      end
-
       def migration_file_exists?(file_name)
         file_location = Dir["db/migrate/*_#{file_name}.rb"].last
 
@@ -124,8 +111,6 @@ module BulletTrain
 
         generate "migration", "#{migration_file_name} role_ids:#{json_data_type_identifier}"
 
-        add_default_value_to_migration(migration_file_name, top_level_model_table_name) if db_adapter_supports_defaults?
-
         puts("Success 🎉🎉\n\n")
       end
 

data/lib/models/role.rb

@@ -109,23 +109,21 @@ class Role < ActiveYaml::Base
   class Collection < Array
     def initialize(model, ary)
       @model = model
-
       super(ary)
     end
 
     def <<(role)
       return true if include?(role)
-
-      role_ids = @model.role_ids
-
+      role_ids = @model.role_ids || []
       role_ids << role.id
-
       @model.update(role_ids: role_ids)
     end
 
     def delete(role)
-      @model.role_ids -= [role.key]
-
+      return @model.save unless include?(role)
+      current_role_ids = @model.role_ids || []
+      new_role_ids = current_role_ids - [role.key]
+      @model.role_ids = new_role_ids
       @model.save
     end
   end

data/lib/roles/support.rb

@@ -44,7 +44,7 @@ module Roles
       after_destroy :invalidate_cache
 
       def validate_roles
-        self.role_ids = role_ids.select(&:present?)
+        self.role_ids = role_ids&.select(&:present?) || []
 
         return if @allowed_roles.nil?
 
@@ -66,7 +66,7 @@ module Roles
       end
 
       def roles_without_defaults
-        role_ids.map { |role_id| Role.find(role_id) }
+        role_ids&.map { |role_id| Role.find(role_id) } || []
       end
 
       def manageable_roles

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-roles
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Prabin Poudel