adhocracy 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGIyMWQyYTE2OGZmM2MzMDRhNmJkYzYyZDcwMGM3ZWQzMDBkZDNjMw==
+    NDgwMjJhOWRkMTNiNWVkODY3YjYwYWMzNjliZjNlZWQ5M2I2ODQwNQ==
   data.tar.gz: !binary |-
-    YjdhYWMwMTNlYmE2YzYzNDYyNGQ3MTE3ZWRhY2RkMmYyYjczNzNlNA==
+    NzVhY2E5Mjk0NzI3Yjk5NTJjMTg4NjgyZjg2MTA1MzcyMTZiZDJmZg==
 SHA512:
   metadata.gz: !binary |-
-    MmYwZjA2ZDYxNzcwOTFmZDE3NDQzYWM2MWNkMjM2MTg1ODUxYjhkMGQyOTBm
-    OWUwODM3ZmE0MzNjNzllZjE5ZDQ3MWFkYTA1MmM2NzgwMTAzY2ExYzc5YmZi
-    ZTEzOGE0YmQ4YzU2ZDIyYWM4ZWYwMDQ5MjgyZWJmZTNhM2Q2NGU=
+    YjgxNmFmZjkxYzZiY2ZkMzZjNmI3MzQ3NTE1NjY1N2ZhMWMzOTQxNDk4YjVl
+    ZjZiMGE4MTE3YWY3NWVjOGMwYzdiZDU5ODFhMzE4MjNkYzZiM2QwNjA3ODkz
+    ZjY5YjY3N2Y0YjZkYzQ1YmVkODIyOGQzZWRkMTkwZWVlNmZiNzg=
   data.tar.gz: !binary |-
-    NTdkYjk0MGJmNzRiN2VjNmI1ZGUyMGI1NTVkZTE2NzE2OTliNDBjZTNiOWY4
-    NmNmNGE4ZDFmOTQ2MzFiNGNhMzQzZjRiODk4NzFhZmJkZjEwOTdmNjA1NDg3
-    NTU4YTg3MDZhYjUzODU2OTg1MTY5ZDAwOWMzOGUxNmI4OGUyZTg=
+    ZWVkZmUzYWNmYTcyOTgwZjlmNGQ5Zjg4ZDAyYmIzNDc1YjczODM0NGZhZjUx
+    ZTVmZGYwMTVmMzIxMzczODljZWM1NzliZjllNWU0MzRhNzEyYWJhZGI0Mzg2
+    Yzc4NjQyNWZmYmVmOTBmNmM2OGU5M2MyYmRjMWE1ZWE4NGJiNzA=

data/README.rdoc

@@ -68,14 +68,26 @@ Scenario: You want a special class of membership that has the privilege to edit
 Adhocracy allows for administrative members called officers. You can create a new officer with:
 
     @club.add_officer(@student)
-
-Alternatively, if `@student` is already a member, you can promote her with:
-
-    @club.promote_to_officer(@student)
+    # or
+    @student.promote(@club)
 
 Later, you can strip an officer of her title with:
 
     @club.demote_officer(@student)
+    # or
+    @student.demote(@club)
+
+You can check if a member is an officer with:
+
+    @club.has_officer?(@member)
+    # or
+    @member.officer_of?(@club)
+
+Or get a full list of officers:
+
+    @club.officers
+    # or of administered groups
+    @member.administrations
 
 === Inviting Members
 

data/lib/adhocracy/acts_as_group.rb

@@ -44,15 +44,14 @@ module Adhocracy
 
       def add_officer(member)
         membership = Adhocracy::Membership.where(member: member, group: self).
-          first_or_create(officer: true)
-        promote_to_officer(member, membership) unless membership.officer?
-        membership
-      end
-
-      def promote_to_officer(member, membership = nil)
-        membership ||= Adhocracy::Membership.find_by(member: member, group: self)
-        return false if !membership.present? || membership.officer?
-        return membership.update_column(:officer, true)
+          first_or_initialize(officer: true)
+        if membership.new_record?
+          membership.save
+        else
+          return false if membership.officer?
+          membership.update_column(:officer, true)
+        end
+        return membership
       end
 
       def demote_officer(member)
@@ -75,6 +74,11 @@ module Adhocracy
         MembershipAssociation.new(member: member, group: self).verify_membership
       end
 
+      def has_officer?(member)
+        Adhocracy::Membership.where(member: member, group: self,
+          officer: true).exists?
+      end
+
       def invited?(member, params = {})
         params.merge!({ member: member, group: self })
         MembershipAssociation.new(params).verify_membership_invitation

data/lib/adhocracy/acts_as_member.rb

@@ -10,6 +10,8 @@ module Adhocracy
           class_name: "Adhocracy::MembershipInvitation"
         has_many :membership_requests, as: :member,
           class_name: "Adhocracy::MembershipRequest"
+        has_many :officer_memberships, -> { where officer: true }, as: :member,
+          class_name: "Adhocracy::Membership"
 
         send :include, InstanceMethods
       end
@@ -20,6 +22,11 @@ module Adhocracy
         MembershipAssociation.new(member: self).list_groups_for_membership
       end
 
+      def administrations
+        Adhocracy::Membership.where(member: self, officer: true).
+          includes(:group).collect { |membership| membership.group }
+      end
+
       def group_invitations
         MembershipAssociation.new(member: self).
           list_groups_for_membership_invitation
@@ -34,6 +41,24 @@ module Adhocracy
         MembershipAssociation.new(member: self, group: group).create_membership
       end
 
+      def promote(group)
+        membership = Adhocracy::Membership.where(member: self, group: group).
+          first_or_initialize(officer: true)
+        if membership.new_record?
+          membership.save
+        else
+          return false if membership.officer?
+          membership.update_column(:officer, true)
+        end
+        return membership
+      end
+
+      def demote(member)
+        membership = Adhocracy::Membership.find_by(member: self, group: member)
+        return false if !membership.present? || !membership.officer?
+        return membership.update_column(:officer, false)
+      end
+
       def request_membership_in(group)
         MembershipAssociation.new(member: self, group: group).
           create_membership_request
@@ -47,6 +72,11 @@ module Adhocracy
         MembershipAssociation.new(member: self, group: group).verify_membership
       end
 
+      def officer_of?(group)
+        Adhocracy::Membership.where(member: self, group: group,
+          officer: true).exists?
+      end
+
       def invited_to?(group, params = {})
         params.merge!({ member: self, group: group })
         MembershipAssociation.new(params).verify_membership_invitation

data/lib/adhocracy/version.rb

@@ -1,3 +1,3 @@
 module Adhocracy
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/lib/adhocracy/acts_as_group_spec.rb

@@ -89,6 +89,15 @@ module Adhocracy
         expect(@adhoc.has_member?(@user)).to be false
       end
 
+      it "if an officer exists and returns true if it does" do
+        @adhoc.add_officer(@user)
+        expect(@adhoc.has_officer?(@user)).to be true
+      end
+
+      it "if an officer exists and returns false if it does not" do
+        expect(@adhoc.has_officer?(@user)).to be false
+      end
+
       it "if an invitation exists and returns true if it does" do
         @adhoc.invite_member(@user)
         expect(@adhoc.invited?(@user)).to be true
@@ -155,7 +164,7 @@ module Adhocracy
 
       it "not creating duplicate officers" do
         @adhoc.add_officer(@user)
-        expect(@adhoc.add_officer(@user).valid?).to be false
+        expect(@adhoc.add_officer(@user)).to be false
       end
 
       it "inviting members" do
@@ -210,24 +219,14 @@ module Adhocracy
       end
 
       it "if the member is a non-officer" do
-        @adhoc.add_member(@user)
-        @adhoc.promote_to_officer(@user)
-        expect(@adhoc.officers).to include @user
-      end
-
-      it "if the member is a non-officer member (and add_officer is used)" do
         @adhoc.add_member(@user)
         @adhoc.add_officer(@user)
         expect(@adhoc.officers).to include @user
       end
 
-      it "but returns false if the user is not a member" do
-        expect(@adhoc.promote_to_officer(@user)).to be false
-      end
-
       it "but returns false if the member is already an officer" do
         @adhoc.add_officer(@user)
-        expect(@adhoc.promote_to_officer(@user)).to be false
+        expect(@adhoc.add_officer(@user)).to be false
       end
     end
 

data/spec/lib/adhocracy/acts_as_member_spec.rb

@@ -30,7 +30,7 @@ module Adhocracy
         @adhoc4 = FactoryGirl.create(:adhoc)
         @adhoc5 = FactoryGirl.create(:adhoc)
         @user.join_group(@adhoc1)
-        @user.join_group(@adhoc3)
+        @user.promote(@adhoc3)
         @adhoc4.invite_member(@user)
         @user.request_membership_in(@adhoc5)
       end
@@ -43,6 +43,14 @@ module Adhocracy
         expect(@user.groups).to_not include @adhoc2, @adhoc4, @adhoc5
       end
 
+      it "including all administered groups" do
+        expect(@user.administrations).to include @adhoc3
+      end
+
+      it "excluding non-administered groups" do
+        expect(@user.administrations).to_not include @adhoc1, @adhoc2, @adhoc4, @adhoc5
+      end
+
       it "including all invited groups" do
         expect(@user.group_invitations).to include @adhoc4
       end
@@ -77,6 +85,15 @@ module Adhocracy
         expect(@user.member_of?(@adhoc)).to be false
       end
 
+      it "if an officer exists and returns true if it does" do
+        @user.promote(@adhoc)
+        expect(@user.officer_of?(@adhoc)).to be true
+      end
+
+      it "if an officer exists and returns false if it does not" do
+        expect(@user.officer_of?(@adhoc)).to be false
+      end
+
       it "if an invitation exists and returns true if it does" do
         @adhoc.invite_member(@user)
         expect(@user.invited_to?(@adhoc)).to be true
@@ -142,6 +159,16 @@ module Adhocracy
         expect(@user.join_group(@adhoc).valid?).to be false
       end
 
+      it "creating officers" do
+        @user.promote(@adhoc)
+        expect(@user.administrations).to include @adhoc
+      end
+
+      it "not creating duplicate officers" do
+        @user.promote(@adhoc)
+        expect(@user.promote(@adhoc)).to be false
+      end
+
       it "requesting memberships" do
         @user.request_membership_in(@adhoc)
         expect(@user.membership_requests).to include @adhoc
@@ -181,5 +208,40 @@ module Adhocracy
       end
     end
 
+    context "promotes members to officers" do
+      before :each do
+        @adhoc = FactoryGirl.create(:adhoc)
+        @user = FactoryGirl.create(:user)
+      end
+
+      it "if the member is a non-officer" do
+        @user.promote(@adhoc)
+        expect(@adhoc.officers).to include @user
+      end
+
+      it "but returns false if the member is already an officer" do
+        @user.promote(@adhoc)
+        expect(@user.promote(@adhoc)).to be false
+      end
+    end
+
+    context "demotes officers" do
+      before :each do
+        @adhoc = FactoryGirl.create(:adhoc)
+        @user = FactoryGirl.create(:user)
+      end
+
+      it "if the member is an officer" do
+        @user.promote(@adhoc)
+        @user.demote(@adhoc)
+        expect(@adhoc.officers).to_not include @user
+      end
+
+      it "but returns false if the member is not an officer" do
+        @adhoc.add_member(@user)
+        expect(@user.demote(@adhoc)).to be false
+      end
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adhocracy
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - timothycommoner
@@ -256,47 +256,47 @@ test_files:
 - spec/lib/adhocracy/acts_as_group_spec.rb
 - spec/lib/adhocracy/acts_as_member_spec.rb
 - spec/dummy/README.rdoc
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/models/adhoc.rb
-- spec/dummy/app/models/user.rb
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/db/migrate/20140306214611_create_users.rb
-- spec/dummy/db/migrate/20140306214620_create_adhocs.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/public/422.html
-- spec/dummy/public/404.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/public/500.html
-- spec/dummy/Rakefile
 - spec/dummy/bin/rails
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rake
+- spec/dummy/config.ru
+- spec/dummy/db/schema.rb
+- spec/dummy/db/migrate/20140306214611_create_users.rb
+- spec/dummy/db/migrate/20140306214620_create_adhocs.rb
+- spec/dummy/config/routes.rb
+- spec/dummy/config/application.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/production.rb
 - spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/application.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
+- spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/boot.rb
-- spec/dummy/config/routes.rb
+- spec/dummy/config/database.yml
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/environment.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config.ru
-- spec/spec_helper.rb
+- spec/dummy/Rakefile
+- spec/dummy/public/500.html
+- spec/dummy/public/404.html
+- spec/dummy/public/422.html
+- spec/dummy/public/favicon.ico
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/models/user.rb
+- spec/dummy/app/models/adhoc.rb
+- spec/factories/adhocracy_memberships.rb
 - spec/factories/adhocracy_membership_requests.rb
-- spec/factories/users.rb
 - spec/factories/adhocracy_membership_invitations.rb
-- spec/factories/adhocracy_memberships.rb
 - spec/factories/adhoc.rb
+- spec/factories/users.rb
+- spec/spec_helper.rb
+- spec/models/adhocracy/membership_invitation_spec.rb
 - spec/models/adhocracy/membership_spec.rb
 - spec/models/adhocracy/membership_request_spec.rb
-- spec/models/adhocracy/membership_invitation_spec.rb