1.1pre1
This commit is contained in:
parent
3a2b273316
commit
6b030fd41d
83 changed files with 1089 additions and 136 deletions
|
@ -2,6 +2,9 @@ class Ability
|
|||
def self.allowed(object, subject)
|
||||
case subject.class.name
|
||||
when "Project" then project_abilities(object, subject)
|
||||
when "Issue" then issue_abilities(object, subject)
|
||||
when "Note" then note_abilities(object, subject)
|
||||
when "Snippet" then snippet_abilities(object, subject)
|
||||
else []
|
||||
end
|
||||
end
|
||||
|
@ -12,6 +15,7 @@ class Ability
|
|||
rules << [
|
||||
:read_project,
|
||||
:read_issue,
|
||||
:read_snippet,
|
||||
:read_team_member,
|
||||
:read_note
|
||||
] if project.readers.include?(user)
|
||||
|
@ -19,16 +23,35 @@ class Ability
|
|||
rules << [
|
||||
:write_project,
|
||||
:write_issue,
|
||||
:write_snippet,
|
||||
:write_note
|
||||
] if project.writers.include?(user)
|
||||
|
||||
rules << [
|
||||
:admin_project,
|
||||
:admin_issue,
|
||||
:admin_snippet,
|
||||
:admin_team_member,
|
||||
:admin_note
|
||||
] if project.admins.include?(user)
|
||||
|
||||
rules.flatten
|
||||
end
|
||||
|
||||
class << self
|
||||
[:issue, :note, :snippet].each do |name|
|
||||
define_method "#{name}_abilities" do |user, subject|
|
||||
if subject.author == user
|
||||
[
|
||||
:"read_#{name}",
|
||||
:"write_#{name}",
|
||||
:"admin_#{name}"
|
||||
]
|
||||
else
|
||||
subject.respond_to?(:project) ?
|
||||
project_abilities(user, subject.project) : []
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -37,5 +37,6 @@ end
|
|||
# created_at :datetime
|
||||
# updated_at :datetime
|
||||
# closed :boolean default(FALSE), not null
|
||||
# position :integer default(0)
|
||||
#
|
||||
|
||||
|
|
|
@ -22,6 +22,10 @@ class Note < ActiveRecord::Base
|
|||
|
||||
scope :common, where(:noteable_id => nil)
|
||||
|
||||
scope :last_week, where("created_at >= :date", :date => (Date.today - 7.days))
|
||||
scope :since, lambda { |day| where("created_at >= :date", :date => (day)) }
|
||||
scope :fresh, order("created_at DESC")
|
||||
|
||||
mount_uploader :attachment, AttachmentUploader
|
||||
end
|
||||
# == Schema Information
|
||||
|
|
|
@ -7,6 +7,7 @@ class Project < ActiveRecord::Base
|
|||
has_many :users_projects, :dependent => :destroy
|
||||
has_many :users, :through => :users_projects
|
||||
has_many :notes, :dependent => :destroy
|
||||
has_many :snippets, :dependent => :destroy
|
||||
|
||||
validates :name,
|
||||
:uniqueness => true,
|
||||
|
@ -125,6 +126,34 @@ class Project < ActiveRecord::Base
|
|||
end
|
||||
end
|
||||
|
||||
def heads
|
||||
@heads ||= repo.heads
|
||||
end
|
||||
|
||||
def fresh_commits
|
||||
commits = heads.map do |h|
|
||||
repo.commits(h.name, 10)
|
||||
end.flatten.uniq { |c| c.id }
|
||||
|
||||
commits.sort! do |x, y|
|
||||
y.committed_date <=> x.committed_date
|
||||
end
|
||||
|
||||
commits[0..10]
|
||||
end
|
||||
|
||||
def commits_since(date)
|
||||
commits = heads.map do |h|
|
||||
repo.log(h.name, nil, :since => date)
|
||||
end.flatten.uniq { |c| c.id }
|
||||
|
||||
commits.sort! do |x, y|
|
||||
y.committed_date <=> x.committed_date
|
||||
end
|
||||
|
||||
commits
|
||||
end
|
||||
|
||||
def tree(fcommit, path = nil)
|
||||
fcommit = commit if fcommit == :head
|
||||
tree = fcommit.tree
|
||||
|
|
51
app/models/snippet.rb
Normal file
51
app/models/snippet.rb
Normal file
|
@ -0,0 +1,51 @@
|
|||
class Snippet < ActiveRecord::Base
|
||||
include Utils::Colorize
|
||||
|
||||
belongs_to :project
|
||||
belongs_to :author, :class_name => "User"
|
||||
has_many :notes, :as => :noteable
|
||||
|
||||
attr_protected :author, :author_id, :project, :project_id
|
||||
|
||||
validates_presence_of :project_id
|
||||
validates_presence_of :author_id
|
||||
|
||||
validates :title,
|
||||
:presence => true,
|
||||
:length => { :within => 0..255 }
|
||||
|
||||
validates :file_name,
|
||||
:presence => true,
|
||||
:length => { :within => 0..255 }
|
||||
|
||||
validates :content,
|
||||
:presence => true,
|
||||
:length => { :within => 0..10000 }
|
||||
|
||||
|
||||
def self.content_types
|
||||
[
|
||||
".rb", ".py", ".pl", ".scala", ".c", ".cpp", ".java",
|
||||
".haml", ".html", ".sass", ".scss", ".xml", ".php", ".erb",
|
||||
".js", ".sh", ".coffee", ".yml", ".md"
|
||||
]
|
||||
end
|
||||
|
||||
def colorize
|
||||
system_colorize(content, file_name)
|
||||
end
|
||||
end
|
||||
# == Schema Information
|
||||
#
|
||||
# Table name: snippets
|
||||
#
|
||||
# id :integer not null, primary key
|
||||
# title :string(255)
|
||||
# content :text
|
||||
# author_id :integer not null
|
||||
# project_id :integer not null
|
||||
# created_at :datetime
|
||||
# updated_at :datetime
|
||||
# file_name :string(255)
|
||||
#
|
||||
|
|
@ -5,7 +5,8 @@ class User < ActiveRecord::Base
|
|||
:recoverable, :rememberable, :trackable, :validatable
|
||||
|
||||
# Setup accessible (or protected) attributes for your model
|
||||
attr_accessible :email, :password, :password_confirmation, :remember_me, :name, :projects_limit
|
||||
attr_accessible :email, :password, :password_confirmation, :remember_me,
|
||||
:name, :projects_limit, :skype, :linkedin, :twitter
|
||||
|
||||
has_many :users_projects, :dependent => :destroy
|
||||
has_many :projects, :through => :users_projects
|
||||
|
@ -58,5 +59,8 @@ end
|
|||
# name :string(255)
|
||||
# admin :boolean default(FALSE), not null
|
||||
# projects_limit :integer
|
||||
# skype :string
|
||||
# linkedin :string
|
||||
# twitter :string
|
||||
#
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue