bullet_train-roles 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93fd2729ae287aa0389216798de23663aa3703bed3f5f11e571371c4b55bd30a
-  data.tar.gz: e094e75bec9daf0073e1d658dd0113b4743dfb7a138cf2f2e4eb34851ef85d23
+  metadata.gz: 95cb748cf7f1d4cb6b3ba9a28c6d7b3d7e8bab30cd1d76eb925e52ebc48741a7
+  data.tar.gz: 8d1a5d66b9febbae5985105932f9d4f751f0e806386bb6ec9b98ff73c240e3fc
 SHA512:
-  metadata.gz: 5a905f35fd471b0dfd2e82355f0ede399ac7d212825509ca180732392418d6af9d5821ae46808c85b183e89515f0aacd029142e1d3f9b23ea1e360a0c754fce9
-  data.tar.gz: 2cbcb69b7244c96854ae4841978ded8b7466e04c13a534de8819e35fd28a65b38c03e28f5dbdad9e039bfff5630702196d691f3e1b64490bab464c433d69e982
+  metadata.gz: 9eed70dbba4e17e025885df2d7a1ce920afadfa1da90ad20194916c13d4cfeedd5f979efaf71c1609a4f9474b8b5783c31ef7477cfcd078227726a81252d8e09
+  data.tar.gz: 43c8ed5b1db7d28f49aa171cca36eb675f95eeb37542f7dcb264691c35f55aaf2c18109b35604f8f5add5ae2142f2eba9834bddfb5e38f51aa532a79fa0d20f3

data/.circleci/config.yml

@@ -1,86 +1,124 @@
 version: 2.1
 orbs:
   ruby: circleci/ruby@0.1.2
-
+  browser-tools: circleci/browser-tools@1.1
 aliases:
   - &restore_bundler_cache
-    name: Restore Bundler cache
-    keys:
-      - gem-cache-v1-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
-      - gem-cache-v1-{{ .Branch }}-
-      - gem-cache-v1-
+      name: Restore Bundler cache
+      keys:
+        - gem-cache-v1-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
+        - gem-cache-v1-{{ .Branch }}-
+        - gem-cache-v1-
   - &restore_yarn_cache
-    name: Restore Yarn cache
-    keys:
-      - yarn-packages-v1-{{ .Branch }}-{{ checksum "yarn.lock" }}
-      - yarn-packages-v1-{{ .Branch }}-
-      - yarn-packages-
+      name: Restore Yarn cache
+      keys:
+        - yarn-packages-v1-{{ .Branch }}-{{ checksum "yarn.lock" }}
+        - yarn-packages-v1-{{ .Branch }}-
+        - yarn-packages-
   - &save_bundle_cache
-    name: Save Bundle cache
-    key: gem-cache-v1-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
-    paths:
-      - vendor/bundle
+      name: Save Bundle cache
+      key: gem-cache-v1-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
+      paths:
+        - vendor/bundle
   - &save_yarn_cache
-    name: Save Yarn cache
-    key: yarn-packages-v1-{{ .Branch }}-{{ checksum "yarn.lock" }}
-    paths:
-      - node_modules
-
+      name: Save Yarn cache
+      key: yarn-packages-v1-{{ .Branch }}-{{ checksum "yarn.lock" }}
+      paths:
+        - node_modules
+  - &ruby_node_browsers_docker_image
+      - image: cimg/ruby:3.1.2-browsers
+        environment:
+          PGHOST: localhost
+          PGUSER: untitled_application
+          RAILS_ENV: test
+  - &postgres_docker_image
+      - image: circleci/postgres
+        environment:
+          POSTGRES_HOST_AUTH_METHOD: trust
+          POSTGRES_DB: untitled_application_test
+          POSTGRES_USER: untitled_application
+  - &wait_for_docker
+      # We run this because the DB might not be available for a while due to a race condition.
+      run: dockerize -wait tcp://localhost:5432 -timeout 1m
 jobs:
-  'Standard Ruby':
+  'Local Minitest':
+    docker:
+      - <<: *ruby_node_browsers_docker_image
+      - <<: *postgres_docker_image
+      - image: circleci/redis
+    executor: ruby/default
+    steps:
+      - browser-tools/install-browser-tools
+      - checkout
+
+      # Install dependencies
+      - run: "bundle install"
+      - run: "bundle clean --force"
+      - run: "yarn install"
+      - *wait_for_docker
+      - run:
+          name: Run unit tests
+          command: bundle exec rails test
+
+  'Local Standard Ruby':
     docker:
-      # normal ruby image is also sufficient here but we are using node-browsers so that we can make use of caching and speed up the process since other jobs are also using the same image
-      - image: circleci/ruby:3.0.2-node-browsers
+      - <<: *ruby_node_browsers_docker_image
     steps:
       - checkout
 
-      # Restore dependency caches
-      - restore_cache: *restore_bundler_cache
-      - restore_cache: *restore_yarn_cache
+      # TODO Figure out how to make these work for `tmp/starter`
+      # # Restore dependency caches
+      # - restore_cache: *restore_bundler_cache
+      # - restore_cache: *restore_yarn_cache
 
       # Install dependencies
       - ruby/bundle-install
       - run: bundle clean --force
       - run: yarn install
 
-      # Save dependency caches
-      # We only do this as part of this job, because it's time consuming and we don't want it to slow down test runners.
-      - save_cache: *save_bundle_cache
-      - save_cache: *save_yarn_cache
+      # # Save dependency caches
+      # # We only do this as part of this job, because it's time consuming and we don't want it to slow down test runners.
+      # - save_cache: *save_bundle_cache
+      # - save_cache: *save_yarn_cache
 
       - run:
           name: Check Standard Ruby
           command: bundle exec standardrb
 
-  'Minitest':
+  'Starter Repo Minitest':
     docker:
-      - image: circleci/ruby:3.0.2-node-browsers
-        environment:
-          PGHOST: localhost
-          PGUSER: bullet_train
-          RAILS_ENV: test
-      - image: circleci/postgres
-        environment:
-          POSTGRES_HOST_AUTH_METHOD: trust
-          POSTGRES_DB: bullet_train_test
-          POSTGRES_USER: bullet_train
+      - <<: *ruby_node_browsers_docker_image
+      - <<: *postgres_docker_image
+      - image: circleci/redis
     executor: ruby/default
     parallelism: 16
     steps:
+      - browser-tools/install-browser-tools
       - checkout
-      - restore_cache: *restore_bundler_cache
-      - restore_cache: *restore_yarn_cache
+      - run: "git clone https://github.com/bullet-train-co/bullet_train.git tmp/starter"
+
+      - run:
+          name: Link starter repository to the Ruby gem being tested.
+          command: "grep -v 'gem \"bullet_train-roles\"' tmp/starter/Gemfile > tmp/starter/Gemfile.tmp && mv tmp/starter/Gemfile.tmp tmp/starter/Gemfile && echo 'gem \"bullet_train-roles\", path: \"../..\"' >> tmp/starter/Gemfile"
+
+      # TODO Figure out how to make these work for `tmp/starter`
+      # - restore_cache: *restore_bundler_cache
+      # - restore_cache: *restore_yarn_cache
 
       # Install dependencies
-      - ruby/bundle-install
-      - run: bundle clean --force
+      - run: "cd tmp/starter && bundle install"
+      - run: "cd tmp/starter && bundle clean --force"
+      - run: "cd tmp/starter && bundle exec rake bt:link"
+      - run: "cd tmp/starter && yarn install"
+      - run: "cd tmp/starter && yarn build"
+      - run: "cd tmp/starter && yarn build:css"
 
-      # We run this because the DB might not be available for a while due to a race condition.
-      - run: dockerize -wait tcp://localhost:5432 -timeout 1m
+      - *wait_for_docker
 
       - run:
           name: Run tests with Knapsack Pro
           command: |
+            cd tmp/starter
             export RAILS_ENV=test
             bundle exec rails "knapsack_pro:queue:minitest[--verbose]"
           environment:
@@ -102,9 +140,48 @@ jobs:
       # - store_test_results:
       #     path: test/reports
 
+  'Starter Repo Minitest for Super Scaffolding':
+    docker:
+      - <<: *ruby_node_browsers_docker_image
+      - <<: *postgres_docker_image
+      - image: circleci/redis
+    executor: ruby/default
+    steps:
+      - browser-tools/install-browser-tools
+      - checkout
+      - run: "git clone https://github.com/bullet-train-co/bullet_train.git tmp/starter"
+
+      - run:
+          name: Link starter repository to the Ruby gem being tested.
+          command: "grep -v 'gem \"bullet_train-roles\"' tmp/starter/Gemfile > tmp/starter/Gemfile.tmp && mv tmp/starter/Gemfile.tmp tmp/starter/Gemfile && echo 'gem \"bullet_train-roles\", path: \"../..\"' >> tmp/starter/Gemfile"
+
+      # TODO Figure out how to make these work for `tmp/starter`
+      # # Restore dependency caches
+      # - restore_cache: *restore_bundler_cache
+      # - restore_cache: *restore_yarn_cache
+
+      # Install dependencies
+      - run: "cd tmp/starter && bundle install"
+      - run: "cd tmp/starter && bundle clean --force"
+      - run: "cd tmp/starter && bundle exec rake bt:link"
+      - run: "cd tmp/starter && yarn install"
+      - run: "cd tmp/starter && yarn build"
+      - run: "cd tmp/starter && yarn build:css"
+
+      - *wait_for_docker
+
+      - run:
+          name: 'Setup Super Scaffolding System Test'
+          command: "cd tmp/starter && bundle exec test/bin/setup-super-scaffolding-system-test"
+      - run:
+          name: 'Run Super Scaffolding Test'
+          command: "cd tmp/starter && bundle exec rails test test/system/super_scaffolding_test.rb"
+
 workflows:
   version: 2
   build:
     jobs:
-      - 'Standard Ruby'
-      - 'Minitest'
+      - 'Local Minitest'
+      - 'Local Standard Ruby'
+      - 'Starter Repo Minitest'
+      - 'Starter Repo Minitest for Super Scaffolding'

data/Gemfile.lock

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

data/README.md

@@ -68,7 +68,7 @@ editor:
   manageable_roles:
     - editor
   models:
-    Project: manage
+    Project: crud
 
 billing:
   manageable_roles:
@@ -98,7 +98,8 @@ The following things are true given the example configuration above:
  - By default, users on a team are read-only participants.
  - Users with the `editor` role:
    - can give other users the `editor` role.
-   - can modify project details.
+   - can perform crud actions on project (create, read, update and destroy).
+   - cannot perform any custom controller actions the projects controller responds to
  - Users with the `billing` role:
    - can give other users the `billing` role.
    - can create and update billing subscriptions.

data/lib/bullet_train/roles/version.rb

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

data/lib/models/role.rb

@@ -89,9 +89,9 @@ class Role < ActiveYaml::Base
     !default?
   end
 
-  def ability_generator(user, through, parent)
+  def ability_generator(user, through, parent, intermediary)
     models.each do |model_name, _|
-      ag = AbilityGenerator.new(self, model_name, user, through, parent)
+      ag = AbilityGenerator.new(self, model_name, user, through, parent, intermediary)
       yield(ag)
     end
   end
@@ -125,7 +125,7 @@ class Role < ActiveYaml::Base
   class AbilityGenerator
     attr_reader :model
 
-    def initialize(role, model_name, user, through, parent_name)
+    def initialize(role, model_name, user, through, parent_name, intermediary = nil)
       begin
         @model = model_name.constantize
       rescue NameError
@@ -137,6 +137,8 @@ class Role < ActiveYaml::Base
       @through = through
       @parent = user.send(through).reflect_on_association(parent_name)&.klass
       @parent_ids = user.parent_ids_for(@role, @through, parent_name) if @parent
+      @intermediary = intermediary
+      @intermediary_class = @model.reflect_on_association(intermediary)&.class_name&.constantize if @intermediary.present?
     end
 
     def valid?
@@ -145,9 +147,16 @@ class Role < ActiveYaml::Base
 
     def actions
       return @actions if @actions
-      actions = (@ability_data["actions"] if @ability_data.is_a?(Hash)) || @ability_data
-      actions = [actions] unless actions.is_a?(Array)
-      @actions = actions.map!(&:to_sym)
+      @actions = (@ability_data["actions"] if @ability_data.is_a?(Hash)) || @ability_data
+      # crud is a special value that we substitute for the 4 crud actions
+      # This is instead of :manage which covers all 4 actions _and_ any extra actions the controller may respond to
+      @actions = crud_actions if @actions.to_s.downcase == "crud"
+      @actions = [actions] unless actions.is_a?(Array)
+      @actions.map!(&:to_sym)
+    end
+
+    def crud_actions
+      [:create, :read, :update, :destroy]
     end
 
     def possible_parent_associations
@@ -169,15 +178,16 @@ class Role < ActiveYaml::Base
       end
       parent_association = possible_parent_associations.find { |association| @model.method_defined?(association) || @model.method_defined?("#{association}_id") }
       return nil unless parent_association.present?
-      # If possible, use the team_id attribute because it saves us having to join all the way back to the sorce parent model
+      # If possible, use the team_id attribute because it saves us having to join all the way back to the source parent model
       # In some scenarios this may be quicker, or if the parent model is in a different database shard, it may not even
       # be possible to do the join
-      # using method_defined? will break with ActiveRecord 7 because now models have team_id defined if they include
-      # has_one :team, through: :membership
-      if @model.column_names.include?("#{parent_association}_id")
-        @condition = {"#{parent_association}_id".to_sym => @parent_ids}
+      parent_with_id = "#{parent_association}_id"
+      @condition = if @model.column_names.include?(parent_with_id)
+        {parent_with_id.to_sym => @parent_ids}
+      elsif @intermediary.present? && @model.method_defined?(@intermediary) && @intermediary_class&.column_names&.include?(parent_with_id)
+        {@intermediary.to_sym => {parent_with_id.to_sym => @parent_ids}}
       else
-        @condition = {parent_association => {id: @parent_ids}}
+        {parent_association => {id: @parent_ids}}
       end
     end
   end

data/lib/roles/permit.rb

@@ -2,7 +2,7 @@
 
 module Roles
   module Permit
-    def permit(user, through:, parent:, debug: false)
+    def permit(user, through:, parent:, debug: false, intermediary: nil)
       # Without this, you need to restart the server each time you make changes to the config/models/role.yml file
       Role.reload(true) if Rails.env.development?
 
@@ -13,14 +13,14 @@ module Roles
       user.send(through).map(&:roles).flatten.uniq.each do |role|
         unless added_roles.include?(role)
           output << "########### ROLE: #{role.key}"
-          output += add_abilities_for(role, user, through, parent)
+          output += add_abilities_for(role, user, through, parent, intermediary)
           added_roles << role
         end
 
         role.included_roles.each do |included_role|
           unless added_roles.include?(included_role)
             output << "############# INCLUDED ROLE: #{included_role.key}"
-            output += add_abilities_for(included_role, user, through, parent)
+            output += add_abilities_for(included_role, user, through, parent, intermediary)
           end
         end
       end
@@ -33,9 +33,9 @@ module Roles
       end
     end
 
-    def add_abilities_for(role, user, through, parent)
+    def add_abilities_for(role, user, through, parent, intermediary)
       output = []
-      role.ability_generator(user, through, parent) do |ag|
+      role.ability_generator(user, through, parent, intermediary) do |ag|
         if ag.valid?
           output << "can #{ag.actions}, #{ag.model}, #{ag.condition}"
           can(ag.actions, ag.model, ag.condition)

data/lib/roles/support.rb

@@ -71,7 +71,7 @@ module Roles
       end
 
       def roles=(roles)
-        self.update(role_ids: roles.map(&:key))
+        update(role_ids: roles.map(&:key))
       end
 
       def assignable_roles

data/lib/roles/user.rb

@@ -9,17 +9,16 @@ module Roles
     included do
       def parent_ids_for(role, through, parent)
         parent_id_column = "#{parent}_id"
-        key = "#{role.key}_#{through}_#{parent_id_column}s"
+        # key = "#{role.key}_#{through}_#{parent_id_column}s"
         # TODO Maybe we should make ability caching a default feature of the gem?
         # If we do that, we would just make it check whether `ability_cache` exists.
         # return ability_cache[key] if ability_cache && ability_cache[key]
         role = nil if role.default?
-        value = send(through).with_role(role).distinct.pluck(parent_id_column)
+        send(through).with_role(role).distinct.pluck(parent_id_column)
         # TODO Maybe we should make ability caching a default feature of the gem?
         # current_cache = ability_cache || {}
         # current_cache[key] = value
         # update_column :ability_cache, current_cache
-        value
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-roles
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Prabin Poudel
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-03 00:00:00.000000000 Z
+date: 2022-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug