effective_committees 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd2e7e60e604c2c37d662cde5abd1d4823b4400762bed564e734b50c65f16a5f
-  data.tar.gz: 713486d3de4e2aa4412762f243f0f9f352f5c74f7786cddc89e1781ef2b49de6
+  metadata.gz: dbb31cf79d4104f80164f1aa448576bdf3dbbf8d9546ee8168aad468bb3ac323
+  data.tar.gz: 91c44c4d88408777dbca98d9e5c9a27df9f57a7f4edd81be4cd62b53e7a7fd35
 SHA512:
-  metadata.gz: 4b3e9bd523495fb20bde48fac897b64bffd58f5197ef458008e95a7b6b752b74959dc2b67196c5471d9ceba45e0b5565fb334dd05fe3ddd33a6f60d03083c0bf
-  data.tar.gz: e3c37293212b4fd74121f1ca3fe2aba2a1d776199484cafba8821a0fc40466622f7df8bf9c06375bb4c60a26171e51adbd15562845ec0d2eb9cf3bb312f07423
+  metadata.gz: 784777f99c05787247df597ebd89faa5b536cf66ecb426d98e2e5d8750f370af1e419d54b23311b69f570fe6879023aa22dd7823fa5f1f8eb23fa588ea147075
+  data.tar.gz: dae5f13349c215669f55f1ee65479370235f9dc29a16a2df63b23a0e2028d85f5710d489baf74b0616f202bf8e6c80b8e8926f71b842da3e54091af2d171753f

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2022 Code and Effect Inc.
+Copyright 2023 Code and Effect Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/models/concerns/effective_committees_user.rb

@@ -20,6 +20,14 @@ module EffectiveCommitteesUser
       class_name: 'Effective::CommitteeMember', inverse_of: :user, dependent: :delete_all
 
     accepts_nested_attributes_for :committee_members, allow_destroy: true
+
+    scope :with_committee, -> (committees) {
+      committees = Resource.new(Effective::Committee).search_any(committees) if committees.kind_of?(String)
+      raise('expected an Effective::Committee') unless committees.present? && Array(committees).all? { |c| c.kind_of?(Effective::Committee) }
+
+      committee_members = Effective::CommitteeMember.where(committee: committees).where(user_type: name)
+      where(id: committee_members.select(:user_id))
+    }
   end
 
   # Instance Methods

data/app/models/effective/committee.rb

@@ -2,7 +2,7 @@
 
 module Effective
   class Committee < ActiveRecord::Base
-    self.table_name = EffectiveCommittees.committees_table_name.to_s
+    self.table_name = (EffectiveCommittees.committees_table_name || :committees).to_s
 
     acts_as_slugged
 

data/app/models/effective/committee_file.rb

@@ -2,7 +2,7 @@
 
 module Effective
   class CommitteeFile < ActiveRecord::Base
-    self.table_name = EffectiveCommittees.committee_files_table_name.to_s
+    self.table_name = (EffectiveCommittees.committee_files_table_name || :committee_files).to_s
 
     log_changes(to: :committee) if respond_to?(:log_changes)
 

data/app/models/effective/committee_folder.rb

@@ -2,7 +2,7 @@
 
 module Effective
   class CommitteeFolder < ActiveRecord::Base
-    self.table_name = EffectiveCommittees.committee_folders_table_name.to_s
+    self.table_name = (EffectiveCommittees.committee_folders_table_name || :committee_folders).to_s
 
     acts_as_slugged
     log_changes(to: :committee) if respond_to?(:log_changes)

data/app/models/effective/committee_member.rb

@@ -2,7 +2,7 @@
 
 module Effective
   class CommitteeMember < ActiveRecord::Base
-    self.table_name = EffectiveCommittees.committee_members_table_name.to_s
+    self.table_name = (EffectiveCommittees.committee_members_table_name || :committee_members).to_s
 
     attr_accessor :user_ids, :committee_ids
 

data/config/effective_committees.rb

@@ -1,9 +1,4 @@
 EffectiveCommittees.setup do |config|
-  config.committees_table_name = :committees
-  config.committee_members_table_name = :committee_members
-  config.committee_folders_table_name = :committee_folders
-  config.committee_files_table_name = :committee_files
-
   # Layout Settings
   # Configure the Layout per controller, or all at once
   # config.layout = { application: 'application', admin: 'admin' }

data/db/migrate/{01_create_effective_committees.rb.erb → 101_create_effective_committees.rb}

@@ -1,7 +1,7 @@
-class CreateEffectiveCommittees < ActiveRecord::Migration[6.1]
+class CreateEffectiveCommittees < ActiveRecord::Migration[6.0]
   def change
     # Committees
-    create_table <%= @committees_table_name %> do |t|
+    create_table :committees do |t|
       t.string :title
       t.string :slug
 
@@ -13,11 +13,11 @@ class CreateEffectiveCommittees < ActiveRecord::Migration[6.1]
       t.datetime :created_at
     end
 
-    add_index <%= @committees_table_name %>, :title
-    add_index <%= @committees_table_name %>, :slug
+    add_index :committees, :title
+    add_index :committees, :slug
 
     # Representatives
-    create_table <%= @committee_members_table_name %> do |t|
+    create_table :committee_members do |t|
       t.integer :committee_id
       t.string :committee_type
 
@@ -33,10 +33,10 @@ class CreateEffectiveCommittees < ActiveRecord::Migration[6.1]
       t.datetime :created_at
     end
 
-    add_index <%= @committee_members_table_name %>, [:committee_id]
-    add_index <%= @committee_members_table_name %>, [:user_id, :user_type]
+    add_index :committee_members, [:committee_id]
+    add_index :committee_members, [:user_id, :user_type]
 
-    create_table <%= @committee_folders_table_name %> do |t|
+    create_table :committee_folders do |t|
       t.integer :committee_id
       t.string :committee_type
 
@@ -50,10 +50,10 @@ class CreateEffectiveCommittees < ActiveRecord::Migration[6.1]
       t.datetime :created_at
     end
 
-    add_index <%= @committee_folders_table_name %>, [:committee_id, :committee_type]
-    add_index <%= @committee_folders_table_name %>, [:position]
+    add_index :committee_folders, [:committee_id, :committee_type]
+    add_index :committee_folders, [:position]
 
-    create_table <%= @committee_files_table_name %> do |t|
+    create_table :committee_files do |t|
       t.integer :committee_id
       t.string :committee_type
 

data/lib/effective_committees/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCommittees
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.3.1'.freeze
 end

data/lib/generators/effective_committees/install_generator.rb

@@ -20,10 +20,7 @@ module EffectiveMemberships
       end
 
       def create_migration_file
-        @committees_table_name  = ':' + EffectiveCommittees.committees_table_name.to_s
-        @committee_members_table_name  = ':' + EffectiveCommittees.committee_members_table_name.to_s
-
-        migration_template ('../' * 3) + 'db/migrate/01_create_effective_committees.rb.erb', 'db/migrate/create_effective_committees.rb'
+        migration_template ('../' * 3) + 'db/migrate/101_create_effective_committees.rb', 'db/migrate/create_effective_committees.rb'
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_committees
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-10 00:00:00.000000000 Z
+date: 2023-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: haml-rails
+  name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -217,7 +217,7 @@ files:
 - config/effective_committees.rb
 - config/locales/effective_committees.en.yml
 - config/routes.rb
-- db/migrate/01_create_effective_committees.rb.erb
+- db/migrate/101_create_effective_committees.rb
 - db/seeds.rb
 - lib/effective_committees.rb
 - lib/effective_committees/engine.rb
@@ -244,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Committees are groups of users that can all share files.