houston-core 0.7.0 → 0.8.0.pre

data/app/models/project.rb

@@ -4,6 +4,7 @@ class Project < ActiveRecord::Base
   include FeatureState
   include Houston::Props
 
+  belongs_to :team
   has_many :releases, dependent: :destroy
   has_many :commits, dependent: :destroy, extend: CommitSynchronizer
   has_many :tickets, dependent: :destroy, extend: TicketSynchronizer
@@ -12,22 +13,9 @@ class Project < ActiveRecord::Base
   has_many :test_runs, dependent: :destroy
   has_many :tests, dependent: :destroy
   has_many :deploys
-  has_many :roles, -> { joins(:user).merge(User.unretired) }, dependent: :destroy, validate: false
-  has_many :value_statements, dependent: :destroy
   has_many :pull_requests, class_name: "Github::PullRequest"
   belongs_to :head, class_name: "Commit", foreign_key: "head_sha", primary_key: "sha"
 
-  Houston.config.project_roles.each do |role|
-    collection_name = role.downcase.gsub(' ', '_').pluralize
-    class_eval <<-RUBY
-      has_many :#{collection_name}, -> { where(Role.arel_table[:name].eq("#{role}")) }, class_name: "User", through: :roles, source: :user
-    RUBY
-  end
-
-  accepts_nested_attributes_for :roles, :allow_destroy => true, # <-- !todo: authorized access only
-    reject_if: proc { |attrs| attrs[:user_id].blank? or attrs[:name].blank? }
-  accepts_nested_attributes_for :value_statements, :allow_destroy => true
-
   before_validation :generate_default_slug, :set_default_color
   validates_presence_of :name, :slug, :color
 
@@ -50,6 +38,8 @@ class Project < ActiveRecord::Base
     Houston.config.project_colors[color]
   end
 
+
+
   def environments
     @environments ||= deploys.environments.map(&:downcase).uniq
   end
@@ -66,6 +56,8 @@ class Project < ActiveRecord::Base
     Environment.new(self, environment_name)
   end
 
+
+
   def extended_attributes
     raise NotImplementedError, "This feature has been deprecated; use props"
   end
@@ -82,14 +74,14 @@ class Project < ActiveRecord::Base
     raise NotImplementedError, "This feature has been deprecated; use props"
   end
 
-  def testers
-    @testers ||= User.testers
-  end
+
 
   def self.[](slug)
     find_by_slug(slug)
   end
 
+
+
   def self.with_feature(feature)
     where ["? = ANY(projects.selected_features)", feature]
   end
@@ -113,24 +105,17 @@ class Project < ActiveRecord::Base
   # Teammates
   # ------------------------------------------------------------------------- #
 
+  delegate *Houston.config.roles.map { |role| role.downcase.gsub(" ", "_").pluralize }, to: :team
+
   def teammates
-    roles.participants.to_users
+    return User.none if team.nil?
+    team.users
   end
 
   def followers # <-- redefine followers to be everyone who participates in or follows the project
-    roles.to_users
-  end
-
-  def add_teammate(user_or_id, role="Follower")
-    attributes = {project: self, name: role}
-    attributes[user_or_id.is_a?(User) ? :user : :user_id] = user_or_id
-    roles.create!(attributes)
-  end
-
-  def is_teammate?(user_or_id)
-    roles.for_user(user_or_id).any?
+    puts "DEPRECATED: Project#followers is deprecated; use Project#teammates instead"
+    teammates
   end
-  alias :teammate? :is_teammate?
 
   # ------------------------------------------------------------------------- #
 

data/app/models/release.rb

@@ -3,7 +3,6 @@ class Release < ActiveRecord::Base
   after_create :load_commits!, :if => :can_read_commits?
   after_create :release_each_ticket!
   after_create :release_each_task!
-  after_create :release_each_antecedent!
   after_create { Houston.observer.fire "release:create", release: self }
   after_save :update_search_vector, :if => :search_vector_should_change?
 
@@ -18,8 +17,6 @@ class Release < ActiveRecord::Base
 
   default_scope { order("created_at DESC") }
 
-  delegate :maintainers, :to => :project
-
   validates_presence_of :user_id
   validates_uniqueness_of :deploy_id, :allow_nil => true
   validates_associated :release_changes
@@ -189,15 +186,6 @@ class Release < ActiveRecord::Base
 
 
 
-  def antecedents
-    @antecedents ||= (tickets.map(&:antecedents) + commits.map(&:antecedents))
-      .flatten
-      .uniq
-      .sort
-  end
-
-
-
   def ignore?
     !project.show_release_notes_for?(environment_name)
   end
@@ -242,12 +230,6 @@ private
     end
   end
 
-  def release_each_antecedent!
-    antecedents.each do |antecedent|
-      antecedent.released!(self)
-    end
-  end
-
   # http://www.postgresql.org/docs/9.1/static/textsearch-controls.html#TEXTSEARCH-HEADLINE
   def self.ts_headline(column, query, options={})
     column = arel_table[column] if column.is_a?(Symbol)

data/app/models/role.rb

@@ -5,29 +5,8 @@ class Role < ActiveRecord::Base
 
   validates :user_id, presence: true
   validates :project, presence: true
-  validates :name, presence: true, inclusion: {in: Houston.config.project_roles, message: "\"%{value}\" is unknown. It must be #{Houston.config.project_roles.to_sentence(last_word_connector: ", or ")}"}
-
-
-  Houston.config.project_roles.each do |role|
-    method_name = role.downcase.gsub(' ', '_')
-    class_eval <<-RUBY
-    def #{method_name}?
-      name == "#{role}"
-    end
-
-    def self.#{method_name.pluralize}
-      where(name: "#{role}")
-    end
-    RUBY
-  end
-
 
   class << self
-
-    def participants
-      where arel_table[:name].not_eq("Follower")
-    end
-
     def to_users
       User.where(id: all.select(:user_id))
     end
@@ -49,7 +28,6 @@ class Role < ActiveRecord::Base
     def any?
       count > 0
     end
-
   end
 
 end

data/app/models/team.rb

@@ -0,0 +1,43 @@
+class Team < ActiveRecord::Base
+  include Houston::Props
+
+  has_and_belongs_to_many :users, readonly: true
+  has_many :projects
+  has_many :roles, -> { joins(:user).merge(User.unretired) }, class_name: "TeamUser", dependent: :destroy, validate: false
+
+  default_scope -> { order(name: :asc) }
+
+  accepts_nested_attributes_for :roles, :allow_destroy => true, # <-- !todo: authorized access only
+    reject_if: proc { |attrs| attrs[:user_id].blank? }
+
+
+
+  Houston.config.roles.each do |role|
+    collection_name = role.downcase.gsub(' ', '_').pluralize
+    class_eval <<-RUBY
+      has_many :#{collection_name}, -> { where(Role.arel_table[:name].eq("#{role}")) }, class_name: "User", through: :roles, source: :user
+    RUBY
+  end
+
+
+
+  class << self
+    def projects
+      Project.where(team_id: all.select(:id))
+    end
+
+    def project_ids
+      projects.ids
+    end
+  end
+
+
+
+  def add_teammate(user_or_id, *desired_roles)
+    teammate = roles.find_or_initialize_by((user_or_id.is_a?(User) ? :user : :user_id) => user_or_id)
+    teammate.team = self
+    teammate.roles = teammate.roles | desired_roles
+    teammate.save!
+  end
+
+end

data/app/models/team_user.rb

@@ -0,0 +1,68 @@
+class TeamUser < ActiveRecord::Base
+
+  belongs_to :user
+  belongs_to :team
+  has_many :projects, through: :team
+
+  validates :user_id, presence: true
+  validates :team, presence: true
+  validate :roles_should_all_be_defined_by_config
+
+
+
+  Houston.config.roles.each do |role|
+    method_name = role.downcase.gsub(' ', '_')
+    class_eval <<-RUBY
+    def #{method_name}?
+      name == "#{role}"
+    end
+
+    def self.#{method_name.pluralize}
+      where(name: "#{role}")
+    end
+    RUBY
+  end
+
+
+
+  class << self
+    def to_users
+      User.where(id: all.select(:user_id))
+    end
+
+    def to_projects
+      Project.where(team_id: all.select(:team_id))
+    end
+
+    def with_role(role)
+      where ["? = ANY(roles)", role]
+    end
+
+    def for_user(user_or_id)
+      user_id = user_or_id.is_a?(User) ? user_or_id.id : user_or_id
+      where user_id: user_id
+    end
+
+    def any?
+      count > 0
+    end
+  end
+
+
+
+  def roles
+    super || []
+  end
+
+
+
+private
+
+  def roles_should_all_be_defined_by_config
+    roles.each do |role|
+      next if Houston.config.roles.member?(role)
+      errors.add :roles, "includes #{role.inspect} which is not a defined role (#{Houston.config.roles.join(", ")})"
+    end
+  end
+
+end

data/app/models/ticket.rb

@@ -4,7 +4,7 @@ class Ticket < ActiveRecord::Base
   self.inheritance_column = nil
 
   versioned only: [:summary, :description, :type,
-                   :tags, :antecedents, :prerequisites,
+                   :tags, :prerequisites,
                    :closed_at, :resolution, :milestone_id]
 
   belongs_to :project
@@ -29,13 +29,11 @@ class Ticket < ActiveRecord::Base
   before_save :parse_ticket_description, if: :description_changed?
   before_save :find_reporter, if: :find_reporter?
   after_save :propagate_milestone_change, if: :milestone_id_changed?
-  after_save :resolve_antecedents!, if: :just_resolved?
-  after_save :close_antecedents!, if: :just_closed?
   after_save :updated_milestone_attributes
 
   attr_readonly :number, :project_id
 
-  delegate :testers, :maintainers, :ticket_tracker, to: :project
+  delegate :ticket_tracker, to: :project
   delegate :nosync?, to: "self.class"
 
 
@@ -200,16 +198,6 @@ class Ticket < ActiveRecord::Base
 
 
 
-  def antecedents
-    (super || []).map { |s| TicketAntecedent.from_s(self, s) }
-  end
-
-  def antecedents=(antecedents)
-    super Array(antecedents).map(&:to_s)
-  end
-
-
-
   def tags
     (super || []).map(&TicketTag.method(:from_s))
   end
@@ -309,14 +297,6 @@ private
     closed_at_changed? && closed_at_was.nil?
   end
 
-  def resolve_antecedents!
-    antecedents.each(&:resolve!)
-  end
-
-  def close_antecedents!
-    antecedents.each(&:close!)
-  end
-
   def remote_ticket
     @remote_ticket ||= ticket_tracker.find_ticket_by_number(number)
   end

data/app/models/user.rb

@@ -2,8 +2,11 @@ class User < ActiveRecord::Base
   include Retirement
   include Houston::Props
 
-  has_many :roles, :dependent => :destroy
-  has_many :credentials, :class_name => "UserCredentials", :dependent => :destroy
+  ROLES = %w{Owner Admin Member}.freeze
+
+  has_many :roles, class_name: "TeamUser", dependent: :destroy
+  has_and_belongs_to_many :teams
+  has_many :credentials, :class_name => "UserCredentials", dependent: :destroy
   has_many :tickets, foreign_key: "reporter_id"
   has_and_belongs_to_many :commits
   belongs_to :current_project, class_name: "Project"
@@ -12,27 +15,14 @@ class User < ActiveRecord::Base
 
   default_scope { order("last_name, first_name") }
 
-  default_value_for :role, Houston.config.default_role
-
   validates :first_name, :last_name, :email, :presence => true, :length => {:minimum => 2}
-  validates :role, presence: true, inclusion: {in: Houston.config.roles, message: "%{value} is not one of the configured roles (#{Houston.config.roles.join(", ")})"}
+  validates :role, presence: true, inclusion: {in: ROLES, message: "%{value} is not one of the configured roles (#{ROLES.join(", ")})"}
   validate :all_email_addresses_must_be_unique
 
 
 
-  Houston.config.project_roles.each do |role|
-    method_name = role.downcase.gsub(' ', '_')
-    collection_name = method_name.pluralize
-
-    class_eval <<-RUBY
-    def self.#{collection_name}
-      Role.#{collection_name}.to_users
-    end
-    RUBY
-  end
-
-  Houston.config.roles.each do |role|
-    method_name = role.downcase.gsub(' ', '_')
+  ROLES.each do |role|
+    method_name = role.downcase.gsub(" ", "_")
     collection_name = method_name.pluralize
 
     class_eval <<-RUBY
@@ -47,15 +37,18 @@ class User < ActiveRecord::Base
   end
 
 
-  def self.administrators
-    where(administrator: true)
+  def developer?
+    puts "DEPRECATED: User#developer? will be removed"
+    legacy_role == "Developer"
   end
 
-
-  def self.participants
-    Role.participants.to_users
+  def tester?
+    puts "DEPRECATED: User#tester? will be removed"
+    legacy_role == "Tester"
   end
 
+
+
   def self.with_primary_email(email)
     email = email.downcase if email
     where(email: email)
@@ -72,8 +65,6 @@ class User < ActiveRecord::Base
     with_email_address(email_address).first
   end
 
-
-
   def email=(value)
     value = value.downcase if value
     super(value)
@@ -99,11 +90,11 @@ class User < ActiveRecord::Base
   end
 
   def follows?(project)
-    roles.to_projects.member?(project)
+    Role.where(user: self).to_projects.member?(project)
   end
 
   def followed_projects
-    roles.to_projects.unretired
+    Role.where(user: self).to_projects.unretired
   end
 
   def view_options
@@ -154,7 +145,7 @@ class User < ActiveRecord::Base
   # ------------------------------------------------------------------------- #
 
   def self.find_ldap_entry(ldap_connection, auth_key_value)
-    filter = Net::LDAP::Filter.eq(Houston::TMI::FIELD_USED_FOR_LDAP_LOGIN, auth_key_value)
+    filter = Net::LDAP::Filter.eq(Houston.config.authentication_strategy_configuration[:field], auth_key_value)
     ldap_connection.ldap.search(filter: filter).first
   end
 
@@ -162,7 +153,7 @@ class User < ActiveRecord::Base
     email = entry.mail.first.downcase
     user = where(email: email).first
     if user && user.username.nil?
-      user.update_column :username, entry[Houston::TMI::FIELD_USED_FOR_LDAP_LOGIN][0].to_s
+      user.update_column :username, entry[Houston.config.authentication_strategy_configuration[:field]][0].to_s
     end
     user
   end
@@ -170,7 +161,7 @@ class User < ActiveRecord::Base
   def self.create_from_ldap_entry(attributes, entry)
     create!(
       email: entry.mail.first.downcase,
-      username: entry[Houston::TMI::FIELD_USED_FOR_LDAP_LOGIN][0].to_s,
+      username: entry[Houston.config.authentication_strategy_configuration[:field]][0].to_s,
       password: attributes[:password],
       first_name: entry.givenname.first,
       last_name: entry.sn.first )