lib/camaraderie/user.rb in camaraderie-0.1.3 vs lib/camaraderie/user.rb in camaraderie-0.2

@@ -2,16 +2,16 @@
   module User
     extend ActiveSupport::Concern
 
     included do
       # Associations
-      has_many :memberships, dependent: :destroy
-      has_many :organizations, through: :memberships
+      has_many :memberships, dependent: :destroy, foreign_key: :user_id, class_name: 'Membership', inverse_of: :user
+      has_many :organizations, through: :memberships, class_name: Camaraderie.organization_class, inverse_of: :users
 
       Camaraderie.membership_types.each do |type|
         class_eval <<-RUBY, __FILE__, __LINE__ + 1
           def #{type}_of?(organization)
-            !!memberships.#{type.pluralize}.where(organization: organization).exists?
+            !!memberships.#{type.pluralize}.where(organization_id: organization.id).exists?
           end
         RUBY
       end
     end
   end