houston-core 0.7.0 → 0.8.0.pre

data/app/views/users/_form.html.erb

@@ -36,20 +36,11 @@
       </div>
     </div>
 
-    <% if can?(:manage, @user) %>
+    <% if current_user.owner? %>
       <div class="control-group">
         <%= f.label :role, :class => "control-label" %>
         <div class="controls">
-          <%= f.select :role, Houston.config.roles, :class => "select_field" %>
-        </div>
-      </div>
-    <% end %>
-
-    <% if can?(:manage, @user) %>
-      <div class="control-group">
-        <%= f.label :administrator, :class => "control-label" %>
-        <div class="controls">
-          <%= f.check_box :administrator, :class => "checkbox" %>
+          <%= f.select :role, User::ROLES, {class: "select_field"}, {disabled: (current_user == @user)} %>
         </div>
       </div>
     <% end %>

data/app/views/users/index.html.erb

@@ -1,8 +1,8 @@
 <% content_for :title do %>
 <h1 class="project-banner space-below">
-  Team
-  <%= link_to "New Team Member", new_user_path, :class => "btn btn-primary" if can?(:create, User) %>
-  
+  Users
+  <%= link_to "New User", new_user_path, :class => "btn btn-primary" if can?(:create, User) %>
+
   <%= render partial: "projects/keyboard_shortcuts" %>
 </h1>
 <% end %>
@@ -18,15 +18,11 @@
           <th class="user-email">Email</th>
           <th class="user-nickname">Nickname</th>
           <th class="user-role">Role</th>
-          <th class="user-tickets-filed"><small>Tickets<br />Filed</small></th>
-          <th class="user-tickets-invalid"><small>Dupicate<br />or Invalid</small></th>
-          <th class="user-tickets-fixed"><small>Fixed</small></th>
-          <td class="user-actions"></td>
           <td class="table-margin"></td>
         </tr>
       </thead>
       <tbody>
-        <% @users.each do |user|; stats = @ticket_stats_by_user[user] %>
+        <% @users.each do |user| %>
           <tr id="user_<%= user.id %>">
             <td class="table-margin"></td>
             <td class="user-avatar"><%= avatar_for(user, size: 32) %></td>
@@ -38,15 +34,7 @@
             </td>
             <td class="user-email"><%= mail_to user.email %></td>
             <td class="user-email"><%= user.nickname %></td>
-            <td class="user-role"><%= user.role %><%= ", Admin" if user.administrator? %></td>
-            <td class="user-tickets-filed"><%= stats[:tickets] %></td>
-            <td class="user-tickets-invalid">
-              <%= number_to_percentage stats[:invalid_tickets], precision: 0 if stats[:tickets] > 0 %>
-            </td>
-            <td class="user-tickets-fixed">
-              <%= number_to_percentage stats[:fixed_tickets], precision: 0 if stats[:tickets] > 0 %>
-            </td>
-            <td class="user-actions"></td>
+            <td class="user-role"><%= user.role %></td>
             <td class="table-margin"></td>
           </tr>
         <% end %>
@@ -62,15 +50,15 @@
     $.tablesorter.addParser({
       id: 'name',
       type: 'text',
-      is: function(s) { return false; }, // return false so this parser is not auto detected 
+      is: function(s) { return false; }, // return false so this parser is not auto detected
       format: function(s, table, td) {
         var $td = $(td),
             firstName = $td.find('.first-name').text(),
             lastName = $td.find('.last-name').text();
         return lastName + ' ' + firstName;
       }
-    }); 
-    
+    });
+
     $(function() {
       $('#users').tablesorter({
         headers: { 2: { sorter: 'name' } }

data/app/views/users/new.html.erb

@@ -1,7 +1,7 @@
 <% content_for :title do %>
 <h1 class="project-banner space-below">
   <%= avatar_for(@user, size: 40) %>
-  New Team Member
+  New User
 </h1>
 <% end %>
 

data/config/initializers/inflections.rb

@@ -3,12 +3,13 @@
 # Add new inflection rules using the following format. Inflections
 # are locale specific, and you may define rules for as many different
 # locales as you wish. All of these examples are active by default:
-# ActiveSupport::Inflector.inflections(:en) do |inflect|
-#   inflect.plural /^(ox)$/i, '\1en'
-#   inflect.singular /^(ox)en/i, '\1'
-#   inflect.irregular 'person', 'people'
-#   inflect.uncountable %w( fish sheep )
-# end
+ActiveSupport::Inflector.inflections(:en) do |inflect|
+  # inflect.plural /^(ox)$/i, '\1en'
+  # inflect.singular /^(ox)en/i, '\1'
+  # inflect.irregular 'person', 'people'
+  # inflect.uncountable %w( fish sheep )
+  inflect.irregular "team_user", "teams_users"
+end
 
 # These inflection rules are supported but not enabled by default:
 # ActiveSupport::Inflector.inflections(:en) do |inflect|

data/config/routes.rb

@@ -26,39 +26,30 @@ Rails.application.routes.draw do
 
 
 
-  # Pretickets
+  # Teams
 
-  get "pretickets/by_project/:slug", to: "project_pretickets#show", :as => :project_pretickets
+  resources :teams
 
+  scope "teams/:team_id" do
+    resources :projects, only: [:new]
 
-
-  # Exceptions
-
-  post "projects/:slug/exceptions/merge_several", to: "project_exceptions#merge_several"
-  post "projects/:slug/exceptions/unmerge_several", to: "project_exceptions#unmerge_several"
-  post "projects/:slug/exceptions/delete_several", to: "project_exceptions#delete_several"
+    get "projects/new/github", to: "projects#new_from_github", as: :add_github_projects
+    post "projects/new/github", to: "projects#create_from_github"
+  end
 
 
 
   # Projects
 
-  resources :projects do
+  resources :projects, except: [:new] do
     member do
       put :retire
     end
 
     post "follow", to: "project_roles#create", :as => :follow
     delete "unfollow", to: "project_roles#destroy", :as => :unfollow
-
-    get "deploys/:id", to: "deploys#show", :as => :deploy
-
-    post "deploy", to: "deploys#create"
-    post "deploy/:environment", to: "deploys#create"
   end
 
-  get "projects/new/github", to: "projects#new_from_github", as: :add_github_projects
-  post "projects/new/github", to: "projects#create_from_github"
-
 
 
   # Web Hooks
@@ -75,6 +66,17 @@ Rails.application.routes.draw do
 
 
 
+  # Deploys
+
+  scope "projects/:project_id" do
+    get "deploys/:id", to: "deploys#show", :as => :deploy
+
+    post "deploy", to: "deploys#create"
+    post "deploy/:environment", to: "deploys#create"
+  end
+
+
+
   # Releases
 
   scope "projects/:project_id" do

data/db/migrate/20160812233255_repurpose_users_role.rb

@@ -0,0 +1,16 @@
+class RepurposeUsersRole < ActiveRecord::Migration
+  def up
+    rename_column :users, :role, :legacy_role
+    rename_column :users, :administrator, :legacy_administrator
+
+    add_column :users, :role, :string, default: "Member"
+    User.where(legacy_administrator: true).update_all(role: "Owner")
+  end
+
+  def down
+    remove_column :users, :role
+
+    rename_column :users, :legacy_role, :role
+    rename_column :users, :legacy_administrator, :administrator
+  end
+end

data/db/migrate/20160813001242_create_teams.rb

@@ -0,0 +1,42 @@
+class CreateTeams < ActiveRecord::Migration
+  def up
+    create_table :teams do |t|
+      t.string :name
+      t.jsonb :props, default: "{}"
+    end
+
+    # Each project belongs to only one team
+    add_column :projects, :team_id, :integer
+
+    # Each user can belong to many teams
+    # and can have 0 or several roles on each team
+    create_table :teams_users do |t|
+      t.references :team, :user
+      t.string :roles, array: true
+
+      t.timestamps
+      t.index [:team_id, :user_id], unique: true
+    end
+    # rename_table :roles, :project_roles
+
+    # create_table :roles do |t|
+    #   t.references :user
+    #   t.references :team
+    #   t.string :name, false
+    #
+    #   t.timestamps
+    #   t.index [:user_id, :team_id]
+    #   t.index [:user_id, :team_id, :name]
+    # end
+  end
+
+  def down
+    drop_table :teams
+    # drop_table :roles
+    drop_table :teams_users
+
+    remove_column :projects, :team_id
+
+    # rename_table :project_roles, :roles
+  end
+end

data/db/structure.sql

@@ -470,39 +470,6 @@ CREATE SEQUENCE persistent_triggers_id_seq
 ALTER SEQUENCE persistent_triggers_id_seq OWNED BY persistent_triggers.id;
 
 
---
--- Name: project_quotas; Type: TABLE; Schema: public; Owner: -; Tablespace: 
---
-
-CREATE TABLE project_quotas (
-    id integer NOT NULL,
-    project_id integer NOT NULL,
-    week date NOT NULL,
-    value integer NOT NULL,
-    created_at timestamp without time zone,
-    updated_at timestamp without time zone
-);
-
-
---
--- Name: project_quotas_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE project_quotas_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: project_quotas_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE project_quotas_id_seq OWNED BY project_quotas.id;
-
-
 --
 -- Name: projects; Type: TABLE; Schema: public; Owner: -; Tablespace: 
 --
@@ -528,7 +495,8 @@ CREATE TABLE projects (
     feature_states hstore DEFAULT ''::hstore NOT NULL,
     selected_features text[],
     head_sha character varying,
-    props jsonb DEFAULT '{}'::jsonb
+    props jsonb DEFAULT '{}'::jsonb,
+    team_id integer
 );
 
 
@@ -815,6 +783,69 @@ CREATE SEQUENCE tasks_id_seq
 ALTER SEQUENCE tasks_id_seq OWNED BY tasks.id;
 
 
+--
+-- Name: teams; Type: TABLE; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE TABLE teams (
+    id integer NOT NULL,
+    name character varying,
+    props jsonb DEFAULT '{}'::jsonb
+);
+
+
+--
+-- Name: teams_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE teams_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: teams_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE teams_id_seq OWNED BY teams.id;
+
+
+--
+-- Name: teams_users; Type: TABLE; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE TABLE teams_users (
+    id integer NOT NULL,
+    team_id integer,
+    user_id integer,
+    roles character varying[],
+    created_at timestamp without time zone,
+    updated_at timestamp without time zone
+);
+
+
+--
+-- Name: teams_users_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE teams_users_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: teams_users_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE teams_users_id_seq OWNED BY teams_users.id;
+
+
 --
 -- Name: test_errors; Type: TABLE; Schema: public; Owner: -; Tablespace: 
 --
@@ -1106,9 +1137,9 @@ CREATE TABLE users (
     invitation_limit integer,
     invited_by_id integer,
     invited_by_type character varying,
-    role character varying DEFAULT 'Guest'::character varying,
+    legacy_role character varying DEFAULT 'Guest'::character varying,
     authentication_token character varying,
-    administrator boolean DEFAULT false,
+    legacy_administrator boolean DEFAULT false,
     unfuddle_id integer,
     first_name character varying,
     last_name character varying,
@@ -1120,7 +1151,8 @@ CREATE TABLE users (
     current_project_id integer,
     nickname character varying,
     username character varying,
-    props jsonb DEFAULT '{}'::jsonb
+    props jsonb DEFAULT '{}'::jsonb,
+    role character varying DEFAULT 'Member'::character varying
 );
 
 
@@ -1143,37 +1175,6 @@ CREATE SEQUENCE users_id_seq
 ALTER SEQUENCE users_id_seq OWNED BY users.id;
 
 
---
--- Name: value_statements; Type: TABLE; Schema: public; Owner: -; Tablespace: 
---
-
-CREATE TABLE value_statements (
-    id integer NOT NULL,
-    project_id integer NOT NULL,
-    weight double precision NOT NULL,
-    text character varying NOT NULL
-);
-
-
---
--- Name: value_statements_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE value_statements_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: value_statements_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE value_statements_id_seq OWNED BY value_statements.id;
-
-
 --
 -- Name: versions; Type: TABLE; Schema: public; Owner: -; Tablespace: 
 --
@@ -1283,13 +1284,6 @@ ALTER TABLE ONLY oauth_providers ALTER COLUMN id SET DEFAULT nextval('oauth_prov
 ALTER TABLE ONLY persistent_triggers ALTER COLUMN id SET DEFAULT nextval('persistent_triggers_id_seq'::regclass);
 
 
---
--- Name: id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY project_quotas ALTER COLUMN id SET DEFAULT nextval('project_quotas_id_seq'::regclass);
-
-
 --
 -- Name: id; Type: DEFAULT; Schema: public; Owner: -
 --
@@ -1339,6 +1333,20 @@ ALTER TABLE ONLY sprints ALTER COLUMN id SET DEFAULT nextval('sprints_id_seq'::r
 ALTER TABLE ONLY tasks ALTER COLUMN id SET DEFAULT nextval('tasks_id_seq'::regclass);
 
 
+--
+-- Name: id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY teams ALTER COLUMN id SET DEFAULT nextval('teams_id_seq'::regclass);
+
+
+--
+-- Name: id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY teams_users ALTER COLUMN id SET DEFAULT nextval('teams_users_id_seq'::regclass);
+
+
 --
 -- Name: id; Type: DEFAULT; Schema: public; Owner: -
 --
@@ -1395,13 +1403,6 @@ ALTER TABLE ONLY user_credentials ALTER COLUMN id SET DEFAULT nextval('user_cred
 ALTER TABLE ONLY users ALTER COLUMN id SET DEFAULT nextval('users_id_seq'::regclass);
 
 
---
--- Name: id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY value_statements ALTER COLUMN id SET DEFAULT nextval('value_statements_id_seq'::regclass);
-
-
 --
 -- Name: id; Type: DEFAULT; Schema: public; Owner: -
 --
@@ -1489,14 +1490,6 @@ ALTER TABLE ONLY persistent_triggers
     ADD CONSTRAINT persistent_triggers_pkey PRIMARY KEY (id);
 
 
---
--- Name: project_quotas_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
---
-
-ALTER TABLE ONLY project_quotas
-    ADD CONSTRAINT project_quotas_pkey PRIMARY KEY (id);
-
-
 --
 -- Name: projects_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
 --
@@ -1553,6 +1546,22 @@ ALTER TABLE ONLY tasks
     ADD CONSTRAINT tasks_pkey PRIMARY KEY (id);
 
 
+--
+-- Name: teams_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
+--
+
+ALTER TABLE ONLY teams
+    ADD CONSTRAINT teams_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: teams_users_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
+--
+
+ALTER TABLE ONLY teams_users
+    ADD CONSTRAINT teams_users_pkey PRIMARY KEY (id);
+
+
 --
 -- Name: test_errors_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
 --
@@ -1633,14 +1642,6 @@ ALTER TABLE ONLY users
     ADD CONSTRAINT users_pkey PRIMARY KEY (id);
 
 
---
--- Name: value_statements_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
---
-
-ALTER TABLE ONLY value_statements
-    ADD CONSTRAINT value_statements_pkey PRIMARY KEY (id);
-
-
 --
 -- Name: versions_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
 --
@@ -1782,20 +1783,6 @@ CREATE INDEX index_milestones_on_destroyed_at ON milestones USING btree (destroy
 CREATE INDEX index_milestones_on_project_id ON milestones USING btree (project_id);
 
 
---
--- Name: index_project_quotas_on_project_id_and_week; Type: INDEX; Schema: public; Owner: -; Tablespace: 
---
-
-CREATE UNIQUE INDEX index_project_quotas_on_project_id_and_week ON project_quotas USING btree (project_id, week);
-
-
---
--- Name: index_project_quotas_on_week; Type: INDEX; Schema: public; Owner: -; Tablespace: 
---
-
-CREATE INDEX index_project_quotas_on_week ON project_quotas USING btree (week);
-
-
 --
 -- Name: index_projects_on_slug; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
@@ -1901,6 +1888,13 @@ CREATE UNIQUE INDEX index_sprints_tasks_on_sprint_id_and_task_id ON sprints_task
 CREATE UNIQUE INDEX index_tasks_on_ticket_id_and_number ON tasks USING btree (ticket_id, number);
 
 
+--
+-- Name: index_teams_users_on_team_id_and_user_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE UNIQUE INDEX index_teams_users_on_team_id_and_user_id ON teams_users USING btree (team_id, user_id);
+
+
 --
 -- Name: index_test_errors_on_sha; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
@@ -2220,8 +2214,6 @@ INSERT INTO schema_migrations (version) VALUES ('20130420174002');
 
 INSERT INTO schema_migrations (version) VALUES ('20130420174126');
 
-INSERT INTO schema_migrations (version) VALUES ('20130427223925');
-
 INSERT INTO schema_migrations (version) VALUES ('20130428005808');
 
 INSERT INTO schema_migrations (version) VALUES ('20130504014802');
@@ -2332,8 +2324,6 @@ INSERT INTO schema_migrations (version) VALUES ('20140429000919');
 
 INSERT INTO schema_migrations (version) VALUES ('20140506032958');
 
-INSERT INTO schema_migrations (version) VALUES ('20140506035755');
-
 INSERT INTO schema_migrations (version) VALUES ('20140515174322');
 
 INSERT INTO schema_migrations (version) VALUES ('20140515200824');
@@ -2486,3 +2476,7 @@ INSERT INTO schema_migrations (version) VALUES ('20160713204605');
 
 INSERT INTO schema_migrations (version) VALUES ('20160715173039');
 
+INSERT INTO schema_migrations (version) VALUES ('20160812233255');
+
+INSERT INTO schema_migrations (version) VALUES ('20160813001242');
+