adhocracy 0.3.1 → 0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDgwMjJhOWRkMTNiNWVkODY3YjYwYWMzNjliZjNlZWQ5M2I2ODQwNQ==
+    ZGRlNDFlNTc1OWVlZTQ1ZjcwOTQyNjgzZTI1NWM3OGYwNDdlOTAxMA==
   data.tar.gz: !binary |-
-    NzVhY2E5Mjk0NzI3Yjk5NTJjMTg4NjgyZjg2MTA1MzcyMTZiZDJmZg==
+    MmUwMDlmNDlhZmM0NWY2NTZmZWQ1ZTU2N2JiNTUwMDAxYzUzNzkyOQ==
 SHA512:
   metadata.gz: !binary |-
-    YjgxNmFmZjkxYzZiY2ZkMzZjNmI3MzQ3NTE1NjY1N2ZhMWMzOTQxNDk4YjVl
-    ZjZiMGE4MTE3YWY3NWVjOGMwYzdiZDU5ODFhMzE4MjNkYzZiM2QwNjA3ODkz
-    ZjY5YjY3N2Y0YjZkYzQ1YmVkODIyOGQzZWRkMTkwZWVlNmZiNzg=
+    MDY3ODIxNGNjNDAwZDZkYzliMWE0OTAzZmExMzEzOGVkZTQ3YWQzMTcwZWU0
+    N2I5OGJmMWY5MTAxMDM2Nzg1NWU0ZDdkOWRlNTE0ZjQ3OGIwZTZlN2I4YzY2
+    NjJmZThiNzhmMDkwMmRkZjY5OWZjNjQ3ZWVlZGZjOWI5YzEzNWM=
   data.tar.gz: !binary |-
-    ZWVkZmUzYWNmYTcyOTgwZjlmNGQ5Zjg4ZDAyYmIzNDc1YjczODM0NGZhZjUx
-    ZTVmZGYwMTVmMzIxMzczODljZWM1NzliZjllNWU0MzRhNzEyYWJhZGI0Mzg2
-    Yzc4NjQyNWZmYmVmOTBmNmM2OGU5M2MyYmRjMWE1ZWE4NGJiNzA=
+    ZTYxNzQ5ZGVjNzkxYjNjZWU4YWQ0NGRjZWU1ZmU3MGFmNmFiM2FjNWQ3NTli
+    NjY3YThiZGM0NzA4YWRlOWJlYTgwOWYyMGM3ZGI0MjRjNmJhODM5OWFlYjU2
+    ZWIzYjM3MTk2NGIzMGVkOGVlMmM1ZTFhMjk3MjVkMzAyYzRkOWM=

data/app/models/adhocracy/membership.rb

@@ -4,6 +4,11 @@ module Adhocracy
     belongs_to :group, polymorphic: true
 
     validate :membership_is_unique
+    before_destroy :member_is_not_only_officer
+
+    def is_necessary_officer?
+      officer? && group.officers.length <= 1
+    end
 
     private
     def membership_is_unique
@@ -11,5 +16,9 @@ module Adhocracy
         errors[:base] << I18n.t("activerecord.errors.models.membership.not_unique")
       end
     end
+
+    def member_is_not_only_officer
+      return false if is_necessary_officer?
+    end
   end
 end

data/lib/adhocracy/acts_as_group.rb

@@ -56,7 +56,8 @@ module Adhocracy
 
       def demote_officer(member)
         membership = Adhocracy::Membership.find_by(member: member, group: self)
-        return false if !membership.present? || !membership.officer?
+        return false if !membership.present? || !membership.officer? ||
+          membership.is_necessary_officer?
         return membership.update_column(:officer, false)
       end
 

data/lib/adhocracy/version.rb

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

data/spec/lib/adhocracy/acts_as_group_spec.rb

@@ -233,6 +233,8 @@ module Adhocracy
     context "demotes officers" do
       before :each do
         @adhoc = FactoryGirl.create(:adhoc)
+        @first_officer = FactoryGirl.create(:user)
+        @adhoc.add_officer(@first_officer)
         @user = FactoryGirl.create(:user)
       end
 

data/spec/models/adhocracy/membership_spec.rb

@@ -17,5 +17,43 @@ module Adhocracy
       end
     end
 
+    context "must have at least one officer" do
+      before :each do
+        @adhoc = FactoryGirl.create(:adhoc)
+        @officer_1 = FactoryGirl.create(:user)
+        @member = FactoryGirl.create(:user)
+        @officer_1_membership = @adhoc.add_officer(@officer_1)
+        @member_membership = @adhoc.add_member(@member)
+      end
+
+      it "which cannot be removed" do
+        @adhoc.remove_member(@officer_1)
+        expect(@adhoc.has_officer?(@officer_1)).to be true
+      end
+
+      it "which cannot be demoted" do
+        @adhoc.demote_officer(@officer_1)
+        expect(@adhoc.has_officer?(@officer_1)).to be true
+      end
+
+      context "but if there is more than one" do
+
+        before :each do
+          @officer_2 = FactoryGirl.create(:user)
+          @officer_2_membership = @adhoc.add_officer(@officer_2)
+        end
+
+        it "an officer can be removed" do
+          @adhoc.remove_member(@officer_1)
+          expect(@adhoc.has_officer?(@officer_1)).to be false
+        end
+
+        it "an officer can be demoted" do
+          @adhoc.demote_officer(@officer_1)
+          expect(@adhoc.has_officer?(@officer_1)).to be false
+        end
+      end
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adhocracy
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: '0.4'
 platform: ruby
 authors:
 - timothycommoner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -253,50 +253,50 @@ signing_key:
 specification_version: 4
 summary: Adhocracy is group management engine for Rails.
 test_files:
-- spec/lib/adhocracy/acts_as_group_spec.rb
+- spec/models/adhocracy/membership_invitation_spec.rb
+- spec/models/adhocracy/membership_spec.rb
+- spec/models/adhocracy/membership_request_spec.rb
+- spec/factories/adhocracy_membership_requests.rb
+- spec/factories/adhocracy_memberships.rb
+- spec/factories/users.rb
+- spec/factories/adhoc.rb
+- spec/factories/adhocracy_membership_invitations.rb
 - spec/lib/adhocracy/acts_as_member_spec.rb
-- spec/dummy/README.rdoc
-- 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/lib/adhocracy/acts_as_group_spec.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.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/filter_parameter_logging.rb
 - spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/boot.rb
+- spec/dummy/config/application.rb
 - spec/dummy/config/database.yml
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/environments/production.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/environment.rb
+- spec/dummy/config/routes.rb
+- spec/dummy/db/schema.rb
+- spec/dummy/db/migrate/20140306214611_create_users.rb
+- spec/dummy/db/migrate/20140306214620_create_adhocs.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/assets/javascripts/application.js
 - 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/adhocracy_membership_invitations.rb
-- spec/factories/adhoc.rb
-- spec/factories/users.rb
+- spec/dummy/app/models/user.rb
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/config.ru
+- spec/dummy/README.rdoc
+- spec/dummy/public/422.html
+- spec/dummy/public/404.html
+- spec/dummy/public/500.html
+- spec/dummy/public/favicon.ico
+- spec/dummy/bin/rake
+- spec/dummy/bin/rails
+- spec/dummy/bin/bundle
 - spec/spec_helper.rb
-- spec/models/adhocracy/membership_invitation_spec.rb
-- spec/models/adhocracy/membership_spec.rb
-- spec/models/adhocracy/membership_request_spec.rb