Make super group additive

Author: wrozka

app/commands/add_committer_command.rb

@@ -0,0 +1,71 @@
+# encoding: utf-8
+#--
+#   Copyright (C) 2014 Gitorious AS
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#++
+require "use_case"
+require "virtus"
+
+class AddCommitterCommand
+  def initialize(user, repository)
+    @user = user
+    @repository = repository
+  end
+
+  def execute(committership)
+    committership.save
+    committership
+  end
+
+  def build(params)
+    if params.super_group?
+      @repository.committerships.add_super_group!
+    else
+      committership = @repository.committerships.new_committership
+      committership.committer = committer(params)
+      committership.creator = @user
+      committership.build_permissions(params.permissions)
+      committership
+    end
+  end
+
+  private
+
+  def committer(params)
+    if params.login
+      return User.find_by_login(params.login)
+    end
+    Team.find_by_name!(params.group_name)
+  end
+end
+
+class AddCommitterParams
+  include Virtus.model
+  attribute :permissions, Array[String]
+  attribute :user, Hash
+  attribute :group, Hash
+
+  def login
+    user["login"]
+  end
+
+  def group_name
+    group["name"]
+  end
+
+  def super_group?
+    group_name == "Super Group"
+  end
+end

app/controllers/committerships_controller.rb

@@ -29,20 +29,18 @@ def index
   end
 
   def create
-    committership = @repository.committerships.new_committership
-    committership.committer = committer
-    committership.creator = current_user
-    committership.build_permissions(params[:permissions])
+    outcome = AddCommitter.new(current_user, @repository).execute(params)
+    outcome.failure do |committership|
+      render_index(@repository, committership)
+    end
 
-    if committership.save
+    outcome.success do |committership|
       if committership.committer.is_a?(User)
         flash[:success] = "User added as committer"
       else
         flash[:success] = "Team added as committers"
       end
       redirect_to([@repository.project, @repository, :committerships])
-    else
-      render_index(@repository, committership)
     end
   end
 
@@ -99,13 +97,6 @@ def find_repository
     authorize_access_to(@repository.project)
   end
 
-  def committer
-    if params.key?(:user) && params[:user][:login]
-      return User.find_by_login(params[:user][:login])
-    end
-    Team.find_by_name!(params[:group][:name])
-  end
-
   def render_index(repository, committership)
     committerships = CommittershipPresenter.collection(repository.committerships.all, view_context)
     render(:index, :locals => {

app/models/committership.rb

@@ -21,7 +21,6 @@
 #++
 
 class Committership < ActiveRecord::Base
-
   CAN_REVIEW = 1 << 4
   CAN_COMMIT = 1 << 5
   CAN_ADMIN = 1 << 6
@@ -37,10 +36,6 @@ class Committership < ActiveRecord::Base
   belongs_to :creator, :class_name => "User"
   has_many :messages, :as => :notifiable
 
-  validates_presence_of :committer_id, :committer_type, :repository_id
-  validates_uniqueness_of :committer_id, :scope => [:committer_type, :repository_id],
-    :message => "is already a committer to this repository"
-
   attr_accessible :committer, :repository, :creator, :creator_id
 
   after_create :notify_repository_owners
@@ -54,6 +49,14 @@ class Committership < ActiveRecord::Base
   scope :committers, :conditions => ["(permissions & ?) != 0", CAN_COMMIT]
   scope :admins, :conditions => ["(permissions & ?) != 0", CAN_ADMIN]
 
+  def uniq?
+    committership = Committership.where(committer_type: committer_type,
+                                        repository_id: repository_id,
+                                        committer_id: committer_id).first
+
+    committership.nil? || committership == self
+  end
+
   def permission_mask_for(*perms)
     perms.inject(0) do |memo, perm_symbol|
       memo | PERMISSION_TABLE[perm_symbol]

app/models/repository_committerships.rb

@@ -128,6 +128,11 @@ def reload
     raw_all.reload
   end
 
+  def add_super_group!
+    repository.update_attribute(:super_group_removed, false)
+    super_group
+  end
+
   private
 
   def raw_all

app/models/super_group.rb

@@ -45,6 +45,9 @@ def cs.persisted?
     def cs.id
       SuperGroup.id
     end
+    def cs.save
+      nil
+    end
     cs
   end
 end

app/use_cases/add_committer.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+#--
+#   Copyright (C) 2014 Gitorious AS
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#++
+require "commands/add_committer_command"
+
+class AddCommitter
+  include UseCase
+
+  def initialize(user, repository)
+    input_class(AddCommitterParams)
+    step(AddCommitterCommand.new(user, repository), validator: CommittershipValidator)
+  end
+end

app/validators/committership_validator.rb

@@ -0,0 +1,31 @@
+# encoding: utf-8
+#--
+#   Copyright (C) 2014 Gitorious AS
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#++
+require "use_case"
+
+CommittershipValidator = UseCase::Validator.define do
+  validates_presence_of :committer_id, :committer_type, :repository_id, unless: :super_group?
+  validate :uniqueness, unless: :super_group?
+
+  def uniqueness
+    errors.add(:committer_id, 'is already a committer') if !uniq?
+  end
+
+  def super_group?
+    Gitorious::Configuration.get("enable_super_group") && SuperGroup.id == id
+  end
+end

app/views/site/faq.html.erb

@@ -57,7 +57,8 @@
         <p>
           Super group makes all the repositories available for registered
           user. It automatically adds a SuperGroup, that contains everyone,
-          to every project. It can be disabled in Gitorious configuration
+          to every repository. It can be removed from collaborators list as
+          any other group or disabled globallty in Gitorious configuration
           <code>config/gitorious.yml</code> by setting <code>enable_super_group: false</code>.
         </p>
       <% end %>

test/fake_use_case_helper.rb

@@ -0,0 +1,41 @@
+# encoding: utf-8
+#--
+#   Copyright (C) 2014 Gitorious AS
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#++
+
+module FakeUseCaseHelper
+  class FakeUseCase < Struct.new(:result)
+    def execute(*)
+      self
+    end
+
+    def success
+      if result[:success]
+        yield(result[:success])
+      end
+    end
+
+    def failure
+      if result[:failure]
+        yield(result[:failure])
+      end
+    end
+  end
+
+  def fake_use_case(opts)
+    FakeUseCase.new(opts)
+  end
+end

test/functional/committerships_controller_test.rb

@@ -74,44 +74,47 @@ def setup
   end
 
   context "POST create" do
+    include FakeUseCaseHelper
+
     should "add a Group as having committership" do
-      assert_difference("@repository.committerships.count") do
-        post :create, params(:group => {:name => @group.name}, :user => {}, :permissions => ["review"])
-      end
+      committership = Committership.new(committer: @group)
+      AddCommitter.stubs(:new)
+                  .with(@user, @repository)
+                  .returns(fake_use_case(success: committership))
+
+      post :create, params(:group => {:name => @group.name}, :user => {}, :permissions => ["review"])
       assert_response :redirect
-      assert_equal @group, Committership.last.committer
-      assert_equal @user, Committership.last.creator
       assert_equal "Team added as committers", flash[:success]
-      assert_equal [:review], Committership.last.permission_list
     end
 
     should "add a User as having committership" do
-      assert_difference("@repository.committerships.count") do
-        post :create, {
-          :project_id => @project.to_param,
-          :repository_id => @repository.to_param,
-          :user => {:login => users(:moe).login}, :group => {},
-          :permissions => ["review","commit"]
-        }
-        assert_nil flash[:error]
-        assert_response :redirect
-      end
-      assert_equal users(:moe), Committership.last.committer
-      assert_equal @user, Committership.last.creator
+      committership = Committership.new(committer: @user)
+      AddCommitter.stubs(:new)
+                  .with(@user, @repository)
+                  .returns(fake_use_case(success: committership))
+
+      post :create, {
+        :project_id => @project.to_param,
+        :repository_id => @repository.to_param,
+        :user => {:login => users(:moe).login}, :group => {},
+        :permissions => ["review","commit"]
+      }
+      assert_nil flash[:error]
+      assert_response :redirect
       assert_equal "User added as committer", flash[:success]
-      assert Committership.last.reviewer?
-      assert Committership.last.committer?
-      assert !Committership.last.admin?
     end
 
     should "not fail when the same user is added twice" do
-      assert_no_difference("@repository.committerships.count") do
-        post :create, params(
-          :group => {},
-          :user => { :login => users(:johan).login},
-          :permissions => ["review"]
-        )
-      end
+      committership = Committership.new(committer: @user)
+      AddCommitter.stubs(:new)
+                  .with(@user, @repository)
+                  .returns(fake_use_case(failure: committership))
+
+      post :create, params(
+        :group => {},
+        :user => { :login => users(:johan).login},
+        :permissions => ["review"]
+      )
       assert_response :success
     end
   end

test/test_helper.rb

@@ -45,6 +45,7 @@
 require "capybara_minitest_spec"
 require "capybara_test_case"
 require "view_context_helper"
+require "fake_use_case_helper"
 
 Minitest::Reporters.use!(Minitest::Reporters::DefaultReporter.new)