From 0d42079611ed2aeacd71b926580fdc3b943cf1ba Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 6 Apr 2014 12:22:11 -0400 Subject: make editing user permissions work --- app/models/user.rb | 157 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 104 insertions(+), 53 deletions(-) (limited to 'app/models') diff --git a/app/models/user.rb b/app/models/user.rb index 64dd7ed..626e4bf 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -9,57 +9,108 @@ class User < ActiveRecord::Base before_save { self.email = email.downcase } before_save { self.user_name = user_name } - def after_initialize - self.permissions = 0 - end + def self.permission_bits + return { + :create_tournament => 1, + :edit_tournament => 2, + :join_tournament => 3, + :delete_tournament => 4, - def can?(action) - return true - case action - when :create_tournament - return true - when :edit_tournament - return true - when :join_tournament - return true - when :delete_tournament + :create_game => 5, + :edit_game => 6, + :delete_game => 7, - when :create_game - when :edit_game - when :delete_game + :create_user => 8, + :edit_user => 9, + :delete_user => 10, - when :create_user - return false - when :edit_user - when :delete_user + :create_alert => 11, + :edit_alert => 12, + :delete_alert => 13, - when :create_alert - when :edit_alert - when :delete_alert + :create_pm => 14, + :edit_pm => 15, + :delete_pm => 16, - when :create_pm - when :edit_pm - when :delete_pm + :create_session => 17, + :delete_session => 18, - when :create_session - return false - when :delete_session + :edit_permissions => 19, + } + end - else + def can?(action) + bit = User.permission_bits[action] + if bit.nil? return false + else + return (self.permissions & (2**bit) != 0) + end + end + + def add_ability(action) + bit = User.permission_bits[action.to_sym] + unless bit.nil? + self.permissions |= 2**bit + end + end + + def remove_ability(action) + bit = User.permission_bits[action.to_sym] + unless bit.nil? + self.permissions &= ~ (2**bit) + end + end + + + # A representation of the permission bits as a mock-array. + def abilities + @abilities ||= Abilities.new(self) + end + def abilities=(new) + new.each do |k,v| + if v == "0" + v = false + end + abilities[k] = v + end + end + + # A thin array-like wrapper around the permission bits to make it + # easy to modify them using a form. + class Abilities + def initialize(user) + @user = user + end + def [](ability) + return @user.can?(ability) + end + def []=(ability, val) + if val + @user.add_ability(ability) + else + @user.remove_ability(ability) + end + end + def keys + User.permission_bits.keys + end + def method_missing(name, *args) + if name.to_s.ends_with?('=') + self[name.to_s.sub(/=$/, '').to_sym] = args.first + else + return self[name.to_sym] + end end end - ## # VAILD_EMAIL is the regex used to validate a user given email. VALID_EMAIL_REG = /\A\S+@\S+\.\S+\z/i - ## # VALID_USER_NAME checks to make sure a user's user_name # is in the proper format. VALID_USER_NAME_REG = /\A[a-zA-Z0-9\-]+\z/ - ## # The following lines put a user account through a series of # validations in order to make sure all of their information # is in the proper format. @@ -78,7 +129,6 @@ class User < ActiveRecord::Base format: {with: VALID_USER_NAME_REG }, uniqueness: {case_sensitive: false }) - ## # Instead of adding password and password_confirmation # attributes, requiring the presence of a password, # requiring that pw and pw_com match, and add an authenticate @@ -88,26 +138,27 @@ class User < ActiveRecord::Base has_secure_password validates :password, length: { minimum: 6 } -end -class NilUser - def nil? - return true - end - def can?(action) - case action - when :create_user - return true - when :create_session + + class NilUser + def nil? return true - else - return false end - end - def method_missing(name, *args) - # Throw an error if User doesn't have this method - super unless User.new.respond_to?(name) - # User has this method -- return a blank value - # 'false' if the method ends with '?'; 'nil' otherwise. - name.ends_with?('?') ? false : nil + def can?(action) + case action + when :create_user + return true + when :create_session + return true + else + return false + end + end + def method_missing(name, *args) + # Throw an error if User doesn't have this method + super unless User.new.respond_to?(name) + # User has this method -- return a blank value + # 'false' if the method ends with '?'; 'nil' otherwise. + name.to_s.ends_with?('?') ? false : nil + end end end -- cgit v1.2.3-54-g00ecf From 6be38bc3b6ee5546c0d1f26497c2687b4138df35 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 6 Apr 2014 13:58:56 -0400 Subject: User.permission_bits: return 2^n instead of n for each. This way they can easily be ORed together, C-like. --- app/models/user.rb | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) (limited to 'app/models') diff --git a/app/models/user.rb b/app/models/user.rb index 626e4bf..0b77ab1 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -11,31 +11,32 @@ class User < ActiveRecord::Base def self.permission_bits return { - :create_tournament => 1, - :edit_tournament => 2, - :join_tournament => 3, - :delete_tournament => 4, + :create_tournament => (2**1), + :edit_tournament => (2**2), + :join_tournament => (2**3), + :delete_tournament => (2**4), - :create_game => 5, - :edit_game => 6, - :delete_game => 7, + :create_game => (2**5), + :edit_game => (2**6), + :delete_game => (2**7), - :create_user => 8, - :edit_user => 9, - :delete_user => 10, + :create_user => (2**8), + :edit_user => (2**9), + :delete_user => (2**10), - :create_alert => 11, - :edit_alert => 12, - :delete_alert => 13, + :create_alert => (2**11), + :edit_alert => (2**12), + :delete_alert => (2**13), - :create_pm => 14, - :edit_pm => 15, - :delete_pm => 16, + :create_pm => (2**14), + :edit_pm => (2**15), + :delete_pm => (2**16), - :create_session => 17, - :delete_session => 18, + :create_session => (2**17), + :delete_session => (2**18), - :edit_permissions => 19, + :edit_permissions => (2**19), + :edit_server => (2**20), } end @@ -44,21 +45,21 @@ class User < ActiveRecord::Base if bit.nil? return false else - return (self.permissions & (2**bit) != 0) + return (self.permissions & bit != 0) end end def add_ability(action) bit = User.permission_bits[action.to_sym] unless bit.nil? - self.permissions |= 2**bit + self.permissions |= bit end end def remove_ability(action) bit = User.permission_bits[action.to_sym] unless bit.nil? - self.permissions &= ~ (2**bit) + self.permissions &= ~ bit end end -- cgit v1.2.3-54-g00ecf From cfaff7870d0348b25b3b4b2597950894ab25d989 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 6 Apr 2014 14:32:38 -0400 Subject: implement editing the default user permissions --- app/controllers/servers_controller.rb | 2 +- app/controllers/users_controller.rb | 2 +- app/models/server.rb | 36 +++++++++++++++++++++++++++++++++++ app/views/servers/_form.html.erb | 23 ++++++++++------------ app/views/servers/edit.html.erb | 2 +- app/views/servers/show.html.erb | 2 +- 6 files changed, 50 insertions(+), 17 deletions(-) (limited to 'app/models') diff --git a/app/controllers/servers_controller.rb b/app/controllers/servers_controller.rb index e3850b8..83a9f31 100644 --- a/app/controllers/servers_controller.rb +++ b/app/controllers/servers_controller.rb @@ -31,6 +31,6 @@ class ServersController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def server_params - params.require(:server).permit(:default_user_permissions) + params.require(:server).permit(:default_user_permissions, :default_user_abilities => User.permission_bits.keys) end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index dd66c18..637480f 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -33,7 +33,7 @@ class UsersController < ApplicationController return end - @user.permissions = 0 + @user.permissions = Server.first.default_user_permissions respond_to do |format| if @user.save sign_in @user diff --git a/app/models/server.rb b/app/models/server.rb index 120f0fa..5ba7524 100644 --- a/app/models/server.rb +++ b/app/models/server.rb @@ -1,2 +1,38 @@ class Server < ActiveRecord::Base + def default_user_abilities + @abilities ||= User::Abilities.new(DefaultUser.new(self)) + end + def default_user_abilities=(new) + new.each do |k,v| + if v == "0" + v = false + end + default_user_abilities[k] = v + end + end + class DefaultUser + def initialize(server) + @server = server + end + def can?(action) + bit = User.permission_bits[action] + if bit.nil? + return false + else + return (@server.default_user_permissions & bit != 0) + end + end + def add_ability(action) + bit = User.permission_bits[action.to_sym] + unless bit.nil? + @server.default_user_permissions |= bit + end + end + def remove_ability(action) + bit = User.permission_bits[action.to_sym] + unless bit.nil? + @server.default_user_permissions &= ~ bit + end + end + end end diff --git a/app/views/servers/_form.html.erb b/app/views/servers/_form.html.erb index 6211f9a..1afde11 100644 --- a/app/views/servers/_form.html.erb +++ b/app/views/servers/_form.html.erb @@ -1,20 +1,17 @@ <%= form_for(@server) do |f| %> - <% if @server.errors.any? %> -
-

<%= pluralize(@server.errors.count, "error") %> prohibited this server from being saved:

+ <%= render "common/error_messages", :target => @server %> -
    - <% @server.errors.full_messages.each do |msg| %> -
  • <%= msg %>
    • +
    + Default permissions for new users +
      + <%= fields_for "server[default_user_abilities]", @server.default_user_abilities do |a| %> + <% @server.default_user_abilities.keys.each do |ability| %> +
      • <% end %> -
    -
- <% end %> + <% end %> + + -
- <%= f.label :default_user_permissions %>
- <%= f.number_field :default_user_permissions %> -
<%= f.submit %>
diff --git a/app/views/servers/edit.html.erb b/app/views/servers/edit.html.erb index 99f7faa..d37864f 100644 --- a/app/views/servers/edit.html.erb +++ b/app/views/servers/edit.html.erb @@ -2,4 +2,4 @@ <%= render 'form' %> -<%= link_to 'Show', @server %> +<%= link_to server_path %> diff --git a/app/views/servers/show.html.erb b/app/views/servers/show.html.erb index 875be5d..54aaf66 100644 --- a/app/views/servers/show.html.erb +++ b/app/views/servers/show.html.erb @@ -3,4 +3,4 @@ <%= @server.default_user_permissions %>

-<%= link_to 'Edit', edit_server_path(@server) %> +<%= link_to 'Edit', edit_server_path %> -- cgit v1.2.3-54-g00ecf From f85943114dba527a1f87abb03229553472f57c0c Mon Sep 17 00:00:00 2001 From: tkimia Date: Sun, 6 Apr 2014 18:45:41 -0400 Subject: started SVG generation --- app/controllers/matches_controller.rb | 4 ++++ app/models/tournament.rb | 4 ++-- app/views/matches/index.html.erb | 32 +++++++++++++++++++++++++++----- 3 files changed, 33 insertions(+), 7 deletions(-) (limited to 'app/models') diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb index 31fc9ad..e773667 100644 --- a/app/controllers/matches_controller.rb +++ b/app/controllers/matches_controller.rb @@ -8,6 +8,10 @@ class MatchesController < ApplicationController def index @matches = @tournament.matches + # width of SVG + @width = 300 * (Math.log2(@matches.count).floor + 1) + 300; + # height of SVG + @height = 200 * 2**Math.log2(@matches.count).floor + 100; end def get_riot_info diff --git a/app/models/tournament.rb b/app/models/tournament.rb index e408cfe..0029de7 100644 --- a/app/models/tournament.rb +++ b/app/models/tournament.rb @@ -31,7 +31,7 @@ class Tournament < ActiveRecord::Base for i in 1..num_matches self.matches.create(name: "Match #{i}", status: 0) end - match_num = 0 + match_num = num_matches-1 team_num = 0 #for each grouping of min_players_per_team self.players.each_slice(min_players_per_team) do |players| @@ -39,7 +39,7 @@ class Tournament < ActiveRecord::Base self.matches[match_num].teams.push(Team.create(users: players)) #if the match is full, move to the next match, otherwise move to the next team if (team_num != 0 and team_num % max_teams_per_match == 0) - match_num += 1 + match_num -= 1 team_num = 0 else team_num += 1 diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb index 219507d..031b2a9 100644 --- a/app/views/matches/index.html.erb +++ b/app/views/matches/index.html.erb @@ -26,17 +26,39 @@
- +
- + <% (1..@matches.count).each do |i| %> - + <% when 0 %> + <% if @matches[i-1].teams.count < @tournament.min_teams_per_match %> + stroke="red" + fill-opacity="0.6" + <% else %> + stroke="green" + <% end %> + <% when 1 %> + stroke="orange" + <% when 2 %> + stroke="yellow" + <% when 3 %> + stroke="grey" + <% end %> + /> <% end %> + +
\ No newline at end of file -- cgit v1.2.3-54-g00ecf