Merge pull request #56 from gringocl/master

Change Users to Admins and Dudes to Members. closes #2

Rakefile

@@ -15,7 +15,7 @@ task :update_gems => :environment do
 
   users = {}
 
-  Dude.find(:all).map(&:ruby_gems_id).sort.each do |user|
+  Member.find(:all).map(&:ruby_gems_id).sort.each do |user|
     warn "Fetching #{user}"
     json = URI.parse("http://rubygems.org/api/v1/owners/#{user}/gems.json").read
     gems = JSON.parse json
@@ -35,7 +35,7 @@ task :update_gems => :environment do
   usernames      = users.keys.sort
   gemnames       = rubygems.keys.sort
   known_projects = Hash[Project.all.map { |p| [p.name, p] }]
-  known_users    = Hash[Dude.all.map { |u| [u.ruby_gems_id, u] }]
+  known_users    = Hash[Member.all.map { |u| [u.ruby_gems_id, u] }]
 
   add = (gemnames - known_projects.keys)
   del = (known_projects.keys - gemnames)
@@ -68,7 +68,7 @@ task :update_gems => :environment do
 
     users.each do |user|
       warn "  Adding user #{user}"
-      proj.dudes << known_users[user]
+      proj.members << known_users[user]
     end
   end
 end

app/controllers/about_controller.rb

@@ -4,7 +4,7 @@ def index
   end
 
   def people
-    @people = Dude.order('featured desc, name asc')
+    @people = Member.order('featured desc, name asc')
   end
 
   def projects

app/controllers/talks_controller.rb

@@ -10,11 +10,11 @@ def index
   def create
     #spam catch to redirect - maybe the bots were ignoring the spam field
     redirect_to talks_url and return if talk_params[:special_talk_requests].present?
-    
+
     @talk = Talk.new talk_params
 
     if @talk.save
-      admins = User.find_all_by_talk_notification(true).map(&:email)
+      admins = Admin.find_all_by_talk_notification(true).map(&:email)
       AdminMailer.admin_notification(admins,@talk).deliver unless admins.empty?
       redirect_to talks_url, notice: 'Talk was successfully created.'
     else

app/models/user.rb → app/models/admin.rb

@@ -1,4 +1,4 @@
-class User < ActiveRecord::Base
+class Admin < ActiveRecord::Base
   devise(:database_authenticatable,
          :recoverable,
          # :confirmable,  # TODO: figure out email on heroku

app/models/affiliation.rb

@@ -1,4 +1,4 @@
 class Affiliation < ActiveRecord::Base
-  belongs_to :dude
+  belongs_to :member
   belongs_to :project
 end

app/models/dude.rb → app/models/member.rb

@@ -1,4 +1,4 @@
-class Dude < ActiveRecord::Base
+class Member < ActiveRecord::Base
   habtm :projects, :join_table => :affiliations
 
   validates_presence_of :name

app/models/project.rb

@@ -1,5 +1,5 @@
 class Project < ActiveRecord::Base
-  habtm :dudes, :join_table => :affiliations
+  habtm :members, :join_table => :affiliations
 
   validates_presence_of :name
 end

app/views/about/projects.html.erb

@@ -1,5 +1,5 @@
 <p class="lead">
-  <%= @projects.size %> projects from just <%= Dude.count %> people...
+  <%= @projects.size %> projects from just <%= Member.count %> people...
   <%= ["Not bad!", "How prolific!", "I've seen better..."].sample %>
 </p>
 
@@ -10,8 +10,8 @@
       <%= project.description %>
       <h3>Authors</h3>
       <ul class='links'>
-        <% project.dudes.each do |dude| %>
-          <li><%= link_to dude.name, "/people##{dude.name.parameterize}" %></li>
+        <% project.members.each do |member| %>
+          <li><%= link_to member.name, "/people##{member.name.parameterize}" %></li>
         <% end %>
       </ul>
     </div>

config/initializers/rails_admin.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 RailsAdmin.config do |config|
-  config.current_user_method { current_user }
+  config.current_user_method { current_admin }
 
   config.main_app_name = ['Seattle.rb', 'Admin']
 end

config/routes.rb

@@ -5,7 +5,7 @@
 
   mount RailsAdmin::Engine => '/adminsrb', :as => 'rails_admin'
 
-  devise_for :users
+  devise_for :admins
 
   get "talks/checklist" => "talks#checklist"