effective_organizations 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2ee1cb9ffc7df883ea343966168245ab3d77ba59ef9753a20d825702ba46aaa
-  data.tar.gz: fcd8f65d9dbc66c5073077e6bd7fe9f48774c4444d965c7c4ce95d09c3d97935
+  metadata.gz: cacbee4a7dd40f4151038a00c39b0e7ef134f0ec739ee29753bc8aa34a73dc8c
+  data.tar.gz: 38e3039961b2ff7ceff0b66090370c9ace3f54ab6f16c666cdc68ca82b699d03
 SHA512:
-  metadata.gz: a34485e30e3d66f85cb4dff1ed2ccd6656134ac5171c2ceae64e8fc30336144c1ac6c9889dab98b018dbdad0c2b3bda96e583f70583a9907f09eaf1ed4ebe1a0
-  data.tar.gz: fb7e677000619da597b0b43f5ae827211d2d55fca0d51326559b27bb7fc7fbd7b3155260afa37f7768360a0f695d2d80667dabc680414f2479582c645c438dac
+  metadata.gz: bd0fd64f099a8a15adb96f3d7d0be5952e4a371f33beddab08427491b818fdcfd12484c376fceb8f0b468ed88423cd47f95c39f8bd9d45e14d2f51c98071b7fa
+  data.tar.gz: 5a69fcb0b32b336e92cfe714c4641e1f38b7a549080e11e20c27031320a9a661d02c06fb7567831f04e105c0f7b9f3c1f4ee003342d67b0a05e4348317feffd9

data/app/models/concerns/effective_organizations_organization.rb

@@ -6,11 +6,7 @@ module EffectiveOrganizationsOrganization
   extend ActiveSupport::Concern
 
   module Base
-    def effective_organizations_organization(users_source_type: nil)
-      @effective_organizations_organization_opts = {
-        users_source_type: users_source_type
-      }
-
+    def effective_organizations_organization
       include ::EffectiveOrganizationsOrganization
     end
   end
@@ -34,9 +30,6 @@ module EffectiveOrganizationsOrganization
 
     accepts_nested_attributes_for :representatives, allow_destroy: true
 
-    has_many :users, through: :representatives,
-      source_type: (@effective_organizations_organization_opts[:users_source_type] || (name.start_with?('Effective') ? '::User' : "#{name.split('::').first}::Organization"))
-
     effective_resource do
       title                 :string
       category              :string
@@ -56,10 +49,6 @@ module EffectiveOrganizationsOrganization
 
   # Instance Methods
 
-  def to_s
-    title.presence || 'New Organization'
-  end
-
   def representative(user:)
     representatives.find { |rep| rep.user_id == user.id }
   end
@@ -69,4 +58,8 @@ module EffectiveOrganizationsOrganization
     representative(user: user) || representatives.build(user: user)
   end
 
+  def users
+    representatives.reject(&:marked_for_destruction?).map(&:user)
+  end
+
 end

data/app/models/concerns/effective_organizations_user.rb

@@ -6,11 +6,7 @@ module EffectiveOrganizationsUser
   extend ActiveSupport::Concern
 
   module Base
-    def effective_organizations_user(organizations_source_type: nil)
-      @effective_organizations_user_opts = {
-        organizations_source_type: organizations_source_type
-      }
-
+    def effective_organizations_user
       include ::EffectiveOrganizationsUser
     end
   end
@@ -20,19 +16,25 @@ module EffectiveOrganizationsUser
   end
 
   included do
-    # My teams
     has_many :representatives, -> { Effective::Representative.sorted },
       class_name: 'Effective::Representative', inverse_of: :user, dependent: :delete_all
 
     accepts_nested_attributes_for :representatives, allow_destroy: true
-
-    # App scoped
-    has_many :organizations, through: :representatives,
-      source_type: @effective_organizations_user_opts[:organizations_source_type] || "#{name.split('::').first}::Organization"
   end
 
+  # Instance Methods
+
   def representative(organization:)
     representatives.find { |rep| rep.organization_id == organization.id }
   end
 
+  # Find or build
+  def build_representative(organization:)
+    representative(organization: organization) || representatives.build(organization: organization)
+  end
+
+  def organizations
+    representatives.reject(&:marked_for_destruction?).map(&:organization)
+  end
+
 end

data/lib/effective_organizations/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrganizations
-  VERSION = '0.0.6'.freeze
+  VERSION = '0.0.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_organizations
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-20 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails