openstax_accounts 7.8.0 → 7.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e2fb6f3993c4913a847ecd653f5745e75294ac7
-  data.tar.gz: 8b27e285cdc80bda53772124a57acfb9db3d9c13
+  metadata.gz: 3bef0159179b28deec9d472b9cb27364f042ab36
+  data.tar.gz: 896f0a36f899d4151cb8c262b59be7e463a726aa
 SHA512:
-  metadata.gz: c344bc633749967e366d6a80147c4b34cfa5721695f0dca7ce5984c5ba803c73f73eceed5567f8f4c01d5f4f328ce80228859121f680ce87d11d7af8965e02bb
-  data.tar.gz: bfc6844d37c3fbe70cf3c6735960d504d6982743b4b000d678ff3b6848cd9d879b293db7271187251cc4767461f5bf22ad767fddb041574a995f876a880dde21
+  metadata.gz: 5e882df36bb92b078455d41fff3b98585f11f9c5a79758f52644be6ca3de0beabd5d00f81f2f0d96f79fce0184c66a9aef617d75bb71d3546d0ce94c6cddad1d
+  data.tar.gz: c08ecff3ccc0285ee52f4ec1003fd901571c2d1db40a6c3cf70b39908169113af456c55ed4fee971cb269094cd716287a68230a16e19359975084f5d1dc5fca6

data/Rakefile

@@ -11,12 +11,12 @@ load 'rails/tasks/engine.rake'
 
 Bundler::GemHelper.install_tasks
 
-begin
-  require 'rspec/core/rake_task'
+Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each { |f| load f }
 
-  RSpec::Core::RakeTask.new(spec: 'app:db:test:prepare')
+require 'rspec/core'
+require 'rspec/core/rake_task'
 
-  task default: :spec
-rescue LoadError
-  # no rspec available
-end
+desc 'Run all specs in spec directory (excluding plugin specs)'
+RSpec::Core::RakeTask.new(spec: 'app:db:test:prepare')
+
+task default: :spec

data/app/handlers/openstax/accounts/sessions_callback.rb

@@ -45,7 +45,6 @@ module OpenStax
               end
 
               account.uuid = raw_info['uuid']
-
             end
           end
 

data/app/models/openstax/accounts/account.rb

@@ -31,6 +31,7 @@ module OpenStax::Accounts
 
     validates :openstax_uid, uniqueness: { allow_nil: true }
     validates :username, uniqueness: { allow_nil: true }
+    validates :uuid, uniqueness: { allow_nil: true }
 
     before_update :update_openstax_accounts, if: :should_send_updates_to_accounts?
 

data/app/models/openstax/accounts/group.rb

@@ -13,17 +13,23 @@ module OpenStax::Accounts
 
     has_many :group_members, dependent: :destroy,
              class_name: 'OpenStax::Accounts::GroupMember',
-             primary_key: :openstax_uid, inverse_of: :group
+             primary_key: :openstax_uid,
+             inverse_of: :group
     has_many :members, through: :group_members, source: :user
 
     has_one :container_group_nesting, dependent: :destroy,
-            class_name: 'OpenStax::Accounts::GroupNesting', primary_key: :openstax_uid,
-            foreign_key: :member_group_id, inverse_of: :member_group
+            class_name: 'OpenStax::Accounts::GroupNesting',
+            primary_key: :openstax_uid,
+            foreign_key: :member_group_id,
+            inverse_of: :member_group
     has_one :container_group, through: :container_group_nesting
 
-    has_many :member_group_nestings, dependent: :destroy,
-             class_name: 'OpenStax::Accounts::GroupNesting', primary_key: :openstax_uid,
-             foreign_key: :container_group_id, inverse_of: :container_group
+    has_many :member_group_nestings,
+             class_name: 'OpenStax::Accounts::GroupNesting',
+             primary_key: :openstax_uid,
+             foreign_key: :container_group_id,
+             dependent: :destroy,
+             inverse_of: :container_group
     has_many :member_groups, through: :member_group_nestings
 
     validates :openstax_uid, uniqueness: true, presence: true
@@ -34,14 +40,31 @@ module OpenStax::Accounts
     before_update :update_openstax_accounts_group, unless: :syncing_or_stubbing?
     before_destroy :destroy_openstax_accounts_group, unless: :syncing_or_stubbing?
 
-    scope :visible_for, lambda { |account|
-      next where(is_public: true) unless account.is_a? OpenStax::Accounts::Account
-
-      includes(:group_members).includes(:group_owners)
-      .where{((is_public.eq true) |\
-               (group_members.user_id.eq my{account.id}) |\
-               (group_owners.user_id.eq my{account.id}))}
-    }
+    scope(
+      :visible_for, ->(account) do
+        next where(is_public: true) unless account.is_a? OpenStax::Accounts::Account
+
+        groups = arel_table
+        group_members = OpenStax::Accounts::GroupMember.arel_table
+        group_owners = OpenStax::Accounts::GroupOwner.arel_table
+
+        where(
+          groups[:is_public].eq(true).or(
+            OpenStax::Accounts::GroupMember.where(
+              group_members[:group_id].eq(groups[:openstax_uid]).and(
+                group_members[:user_id].eq(account.id)
+              )
+            ).exists
+          ).or(
+            OpenStax::Accounts::GroupOwner.where(
+              group_owners[:group_id].eq(groups[:openstax_uid]).and(
+                group_owners[:user_id].eq(account.id)
+              )
+            ).exists
+          )
+        )
+      end
+    )
 
     def has_owner?(account)
       return false unless account.is_a? OpenStax::Accounts::Account
@@ -91,11 +114,12 @@ module OpenStax::Accounts
       return [] unless persisted?
       reload
 
-      gids = [openstax_uid] + (Group.includes(:member_group_nestings)
-                                    .where(member_group_nestings: {
-                                             member_group_id: openstax_uid
-                                           })
-                                    .first.try(:supertree_group_ids) || [])
+      gids = [openstax_uid] + (
+        self.class.joins(:member_group_nestings)
+                  .where(openstax_accounts_group_nestings: { member_group_id: openstax_uid })
+                  .first
+                  .try!(:supertree_group_ids) || []
+      )
       update_column(:cached_supertree_group_ids, gids)
       self.cached_supertree_group_ids = gids
     end
@@ -105,11 +129,10 @@ module OpenStax::Accounts
       return [] unless persisted?
       reload
 
-      gids = [openstax_uid] + Group.includes(:container_group_nesting)
-                                   .where(container_group_nesting: {
-                                            container_group_id: openstax_uid
-                                          })
-                                   .collect{|g| g.subtree_group_ids}.flatten
+      gids = [openstax_uid] +
+        self.class.joins(:container_group_nesting)
+                  .where(openstax_accounts_group_nestings: { container_group_id: openstax_uid })
+                  .map { |group| group.subtree_group_ids }.flatten
       update_column(:cached_subtree_group_ids, gids)
       self.cached_subtree_group_ids = gids
     end

data/app/routines/openstax/accounts/search_local_accounts.rb

@@ -2,6 +2,8 @@ module OpenStax
   module Accounts
     class SearchLocalAccounts
 
+      ACCOUNTS = OpenStax::Accounts::Account.arel_table
+
       SORTABLE_FIELDS = {
         'username' => :username,
         'first_name' => :first_name,
@@ -23,9 +25,11 @@ module OpenStax
         params[:pp] ||= args[2]
         params[:p] ||= args[3]
 
-        run(:search, :relation => OpenStax::Accounts::Account.unscoped,
-                     :sortable_fields => SORTABLE_FIELDS,
-                     :params => params) do |with|
+
+
+        run(:search, relation: OpenStax::Accounts::Account.unscoped,
+                     sortable_fields: SORTABLE_FIELDS,
+                     params: params) do |with|
 
           with.default_keyword :any
 
@@ -33,7 +37,8 @@ module OpenStax
             names.each do |name|
               sanitized_names = to_string_array(name, append_wildcard: true)
               next @items = @items.none if sanitized_names.empty?
-              @items = @items.where{username.like_any sanitized_names}
+
+              @items = @items.where(ACCOUNTS[:username].matches_any(sanitized_names))
             end
           end
 
@@ -41,7 +46,8 @@ module OpenStax
             names.each do |name|
               sanitized_names = to_string_array(name, append_wildcard: true)
               next @items = @items.none if sanitized_names.empty?
-              @items = @items.where{first_name.like_any sanitized_names}
+
+              @items = @items.where(ACCOUNTS[:first_name].matches_any(sanitized_names))
             end
           end
 
@@ -49,7 +55,8 @@ module OpenStax
             names.each do |name|
               sanitized_names = to_string_array(name, append_wildcard: true)
               next @items = @items.none if sanitized_names.empty?
-              @items = @items.where{last_name.like_any sanitized_names}
+
+              @items = @items.where(ACCOUNTS[:last_name].matches_any(sanitized_names))
             end
           end
 
@@ -57,7 +64,8 @@ module OpenStax
             names.each do |name|
               sanitized_names = to_string_array(name, append_wildcard: true)
               next @items = @items.none if sanitized_names.empty?
-              @items = @items.where{full_name.like_any sanitized_names}
+
+              @items = @items.where(ACCOUNTS[:full_name].matches_any(sanitized_names))
             end
           end
 
@@ -65,10 +73,13 @@ module OpenStax
             names.each do |name|
               sanitized_names = to_string_array(name, append_wildcard: true)
               next @items = @items.none if sanitized_names.empty?
-              @items = @items.where{(username.like_any sanitized_names) | \
-                                    (first_name.like_any sanitized_names) | \
-                                    (last_name.like_any sanitized_names) | \
-                                    (full_name.like_any sanitized_names)}
+
+              @items = @items.where(
+                ACCOUNTS[:username].matches_any(sanitized_names)
+                  .or(ACCOUNTS[:first_name].matches_any(sanitized_names))
+                  .or(ACCOUNTS[:last_name].matches_any(sanitized_names))
+                  .or(ACCOUNTS[:full_name].matches_any(sanitized_names))
+              )
             end
           end
 
@@ -76,7 +87,7 @@ module OpenStax
             ids.each do |id|
               sanitized_ids = to_string_array(id)
               next @items = @items.none if sanitized_ids.empty?
-              @items = @items.where{(openstax_uid.eq_any sanitized_ids)}
+              @items = @items.where(ACCOUNTS[:openstax_uid].eq_any(sanitized_ids))
             end
           end
 
@@ -86,11 +97,13 @@ module OpenStax
               sanitized_ids = to_string_array(term)
               next @items = @items.none if sanitized_names.empty? || sanitized_ids.empty?
 
-              @items = @items.where{(username.like_any sanitized_names) | \
-                                    (first_name.like_any sanitized_names) | \
-                                    (last_name.like_any sanitized_names) | \
-                                    (full_name.like_any sanitized_names) | \
-                                    (openstax_uid.eq_any sanitized_ids)}
+              @items = @items.where(
+                ACCOUNTS[:username].matches_any(sanitized_names)
+                  .or(ACCOUNTS[:first_name].matches_any(sanitized_names))
+                  .or(ACCOUNTS[:last_name].matches_any(sanitized_names))
+                  .or(ACCOUNTS[:full_name].matches_any(sanitized_names))
+                  .or(ACCOUNTS[:openstax_uid].eq_any(sanitized_ids))
+              )
             end
           end
 

data/db/migrate/10_assign_missing_uuids_for_local_accounts.rb

@@ -0,0 +1,11 @@
+class AssignMissingUuidsForLocalAccounts < ActiveRecord::Migration
+  def change
+    enable_extension 'pgcrypto'
+
+    OpenStax::Accounts::Account.where(uuid: nil).update_all('"uuid" = gen_random_uuid()')
+
+    change_column :openstax_accounts_accounts, :uuid, :uuid, using: 'uuid::uuid',
+                                                             default: 'gen_random_uuid()',
+                                                             null: false
+  end
+end

data/lib/openstax/accounts/engine.rb

@@ -11,7 +11,6 @@ require 'representable/json/collection'
 require 'roar'
 require 'roar/decorator'
 require 'roar/json'
-require 'squeel'
 require 'openstax/accounts/action_controller/base'
 require 'openstax/accounts/has_many_through_groups/active_record/base'
 
@@ -21,13 +20,13 @@ module OpenStax
       isolate_namespace OpenStax::Accounts
 
       initializer "openstax_accounts.factories",
-        :after => "factory_girl.set_factory_paths" do
-        FactoryGirl.definition_file_paths << File.join(root, 'spec', 'factories') if defined?(FactoryGirl)
+        after: "factory_bot.set_factory_paths" do
+        FactoryBot.definition_file_paths << File.join(root, 'spec', 'factories') if defined?(FactoryBot)
       end
 
       config.generators do |g|
-        g.test_framework :rspec, :view_specs => false, :fixture => false
-        g.fixture_replacement :factory_girl, :dir => 'spec/factories'
+        g.test_framework :rspec, view_specs: false, fixture: false
+        g.fixture_replacement :factory_bot, dir: 'spec/factories'
         g.assets false
         g.helper false
       end
@@ -54,7 +53,7 @@ module OpenStax
         provider :openstax,
                  OpenStax::Accounts.configuration.openstax_application_id,
                  OpenStax::Accounts.configuration.openstax_application_secret,
-                 :setup => SETUP_PROC
+                 setup: SETUP_PROC
       end
     end
   end

data/lib/openstax/accounts/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Accounts
-    VERSION = "7.8.0"
+    VERSION = "7.9.0"
   end
 end

data/spec/controllers/openstax/accounts/dev/accounts_controller_spec.rb

@@ -5,7 +5,7 @@ module OpenStax::Accounts
     describe AccountsController, type: :controller do
       routes { Engine.routes }
 
-      let!(:account) { FactoryGirl.create :openstax_accounts_account,
+      let!(:account) { FactoryBot.create :openstax_accounts_account,
                                           username: 'some_user',
                                           openstax_uid: 10 }
 

data/spec/controllers/openstax/accounts/sessions_controller_spec.rb

@@ -4,7 +4,7 @@ module OpenStax::Accounts
   describe SessionsController, type: :controller do
     routes { Engine.routes }
 
-    let!(:account) { FactoryGirl.create :openstax_accounts_account,
+    let!(:account) { FactoryBot.create :openstax_accounts_account,
                                         username: 'some_user',
                                         openstax_uid: 10 }
 

data/spec/dummy/config/database.yml

@@ -1,25 +1,15 @@
-# SQLite version 3.x
-#   gem install sqlite3
-#
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
-#
 default: &default
-  adapter: sqlite3
-  pool: 5
-  timeout: 5000
+  adapter: postgresql
+  username: <%= ENV['OX_AR_DB_USER'] || 'ox_accounts_rails' %>
+  password: <%= ENV['OX_AR_DB_PASS'] || 'ox_accounts_rails_secret_password' %>
 
 development:
   <<: *default
-  database: db/development.sqlite3
+  database: <%= ENV['OX_AR_DEV_DB'] || 'ox_tutor_dev' %>
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
   <<: *default
-  database: db/test.sqlite3
-
-production:
-  <<: *default
-  database: db/production.sqlite3
+  database: <%= ENV['OX_AR_TEST_DB'] || 'ox_tutor_test' %>

data/spec/dummy/db/schema.rb

@@ -13,6 +13,10 @@
 
 ActiveRecord::Schema.define(version: 1001) do
 
+  # These are extensions that must be enabled in order to support this database
+  enable_extension "plpgsql"
+  enable_extension "pgcrypto"
+
   create_table "openstax_accounts_accounts", force: :cascade do |t|
     t.integer  "openstax_uid"
     t.string   "username"
@@ -21,24 +25,24 @@ ActiveRecord::Schema.define(version: 1001) do
     t.string   "last_name"
     t.string   "full_name"
     t.string   "title"
-    t.datetime "created_at",                        null: false
-    t.datetime "updated_at",                        null: false
-    t.integer  "faculty_status",        default: 0, null: false
+    t.datetime "created_at",                                          null: false
+    t.datetime "updated_at",                                          null: false
+    t.integer  "faculty_status",        default: 0,                   null: false
     t.string   "salesforce_contact_id"
-    t.string   "uuid"
-    t.integer  "role",                  default: 0, null: false
+    t.uuid     "uuid",                  default: "gen_random_uuid()", null: false
+    t.integer  "role",                  default: 0,                   null: false
   end
 
-  add_index "openstax_accounts_accounts", ["access_token"], name: "index_openstax_accounts_accounts_on_access_token", unique: true
-  add_index "openstax_accounts_accounts", ["faculty_status"], name: "index_openstax_accounts_accounts_on_faculty_status"
-  add_index "openstax_accounts_accounts", ["first_name"], name: "index_openstax_accounts_accounts_on_first_name"
-  add_index "openstax_accounts_accounts", ["full_name"], name: "index_openstax_accounts_accounts_on_full_name"
-  add_index "openstax_accounts_accounts", ["last_name"], name: "index_openstax_accounts_accounts_on_last_name"
-  add_index "openstax_accounts_accounts", ["openstax_uid"], name: "index_openstax_accounts_accounts_on_openstax_uid", unique: true
-  add_index "openstax_accounts_accounts", ["role"], name: "index_openstax_accounts_accounts_on_role"
-  add_index "openstax_accounts_accounts", ["salesforce_contact_id"], name: "index_openstax_accounts_accounts_on_salesforce_contact_id"
-  add_index "openstax_accounts_accounts", ["username"], name: "index_openstax_accounts_accounts_on_username", unique: true
-  add_index "openstax_accounts_accounts", ["uuid"], name: "index_openstax_accounts_accounts_on_uuid", unique: true
+  add_index "openstax_accounts_accounts", ["access_token"], name: "index_openstax_accounts_accounts_on_access_token", unique: true, using: :btree
+  add_index "openstax_accounts_accounts", ["faculty_status"], name: "index_openstax_accounts_accounts_on_faculty_status", using: :btree
+  add_index "openstax_accounts_accounts", ["first_name"], name: "index_openstax_accounts_accounts_on_first_name", using: :btree
+  add_index "openstax_accounts_accounts", ["full_name"], name: "index_openstax_accounts_accounts_on_full_name", using: :btree
+  add_index "openstax_accounts_accounts", ["last_name"], name: "index_openstax_accounts_accounts_on_last_name", using: :btree
+  add_index "openstax_accounts_accounts", ["openstax_uid"], name: "index_openstax_accounts_accounts_on_openstax_uid", unique: true, using: :btree
+  add_index "openstax_accounts_accounts", ["role"], name: "index_openstax_accounts_accounts_on_role", using: :btree
+  add_index "openstax_accounts_accounts", ["salesforce_contact_id"], name: "index_openstax_accounts_accounts_on_salesforce_contact_id", using: :btree
+  add_index "openstax_accounts_accounts", ["username"], name: "index_openstax_accounts_accounts_on_username", unique: true, using: :btree
+  add_index "openstax_accounts_accounts", ["uuid"], name: "index_openstax_accounts_accounts_on_uuid", unique: true, using: :btree
 
   create_table "openstax_accounts_group_members", force: :cascade do |t|
     t.integer  "group_id",   null: false
@@ -47,8 +51,8 @@ ActiveRecord::Schema.define(version: 1001) do
     t.datetime "updated_at", null: false
   end
 
-  add_index "openstax_accounts_group_members", ["group_id", "user_id"], name: "index_openstax_accounts_group_members_on_group_id_and_user_id", unique: true
-  add_index "openstax_accounts_group_members", ["user_id"], name: "index_openstax_accounts_group_members_on_user_id"
+  add_index "openstax_accounts_group_members", ["group_id", "user_id"], name: "index_openstax_accounts_group_members_on_group_id_and_user_id", unique: true, using: :btree
+  add_index "openstax_accounts_group_members", ["user_id"], name: "index_openstax_accounts_group_members_on_user_id", using: :btree
 
   create_table "openstax_accounts_group_nestings", force: :cascade do |t|
     t.integer  "member_group_id",    null: false
@@ -57,8 +61,8 @@ ActiveRecord::Schema.define(version: 1001) do
     t.datetime "updated_at",         null: false
   end
 
-  add_index "openstax_accounts_group_nestings", ["container_group_id"], name: "index_openstax_accounts_group_nestings_on_container_group_id"
-  add_index "openstax_accounts_group_nestings", ["member_group_id"], name: "index_openstax_accounts_group_nestings_on_member_group_id", unique: true
+  add_index "openstax_accounts_group_nestings", ["container_group_id"], name: "index_openstax_accounts_group_nestings_on_container_group_id", using: :btree
+  add_index "openstax_accounts_group_nestings", ["member_group_id"], name: "index_openstax_accounts_group_nestings_on_member_group_id", unique: true, using: :btree
 
   create_table "openstax_accounts_group_owners", force: :cascade do |t|
     t.integer  "group_id",   null: false
@@ -67,8 +71,8 @@ ActiveRecord::Schema.define(version: 1001) do
     t.datetime "updated_at", null: false
   end
 
-  add_index "openstax_accounts_group_owners", ["group_id", "user_id"], name: "index_openstax_accounts_group_owners_on_group_id_and_user_id", unique: true
-  add_index "openstax_accounts_group_owners", ["user_id"], name: "index_openstax_accounts_group_owners_on_user_id"
+  add_index "openstax_accounts_group_owners", ["group_id", "user_id"], name: "index_openstax_accounts_group_owners_on_group_id_and_user_id", unique: true, using: :btree
+  add_index "openstax_accounts_group_owners", ["user_id"], name: "index_openstax_accounts_group_owners_on_user_id", using: :btree
 
   create_table "openstax_accounts_groups", force: :cascade do |t|
     t.integer  "openstax_uid",                               null: false
@@ -80,8 +84,8 @@ ActiveRecord::Schema.define(version: 1001) do
     t.datetime "updated_at",                                 null: false
   end
 
-  add_index "openstax_accounts_groups", ["is_public"], name: "index_openstax_accounts_groups_on_is_public"
-  add_index "openstax_accounts_groups", ["openstax_uid"], name: "index_openstax_accounts_groups_on_openstax_uid", unique: true
+  add_index "openstax_accounts_groups", ["is_public"], name: "index_openstax_accounts_groups_on_is_public", using: :btree
+  add_index "openstax_accounts_groups", ["openstax_uid"], name: "index_openstax_accounts_groups_on_openstax_uid", unique: true, using: :btree
 
   create_table "ownerships", force: :cascade do |t|
     t.integer  "owner_id",   null: false
@@ -90,7 +94,7 @@ ActiveRecord::Schema.define(version: 1001) do
     t.datetime "updated_at", null: false
   end
 
-  add_index "ownerships", ["owner_id", "owner_type"], name: "index_ownerships_on_owner_id_and_owner_type", unique: true
+  add_index "ownerships", ["owner_id", "owner_type"], name: "index_ownerships_on_owner_id_and_owner_type", unique: true, using: :btree
 
   create_table "users", force: :cascade do |t|
     t.integer  "account_id", null: false
@@ -98,6 +102,6 @@ ActiveRecord::Schema.define(version: 1001) do
     t.datetime "updated_at", null: false
   end
 
-  add_index "users", ["account_id"], name: "index_users_on_account_id", unique: true
+  add_index "users", ["account_id"], name: "index_users_on_account_id", unique: true, using: :btree
 
 end