Merge ac349a0 into ab03a52

Gemfile

@@ -9,6 +9,7 @@ gem "interactor"
 gem "figaro"
 gem "knock"
 gem "active_model_serializers"
+gem "rolify"
 
 group :developemnt, :test do
   gem "pry-byebug"

Gemfile.lock

@@ -178,6 +178,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
+    rolify (5.0.0)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
@@ -257,6 +258,7 @@ DEPENDENCIES
   puma
   rails (= 4.2.4)
   rails-api
+  rolify
   rspec-rails (~> 3.0)
   rubocop
   rubocop-rspec

app/models/game_night.rb

@@ -1,4 +1,6 @@
 class GameNight < ActiveRecord::Base
+  resourcify
+
   validates :time, presence: true
   validates :location_name, presence: true
 

app/models/group.rb

@@ -1,10 +1,10 @@
 class Group < ActiveRecord::Base
+  resourcify
+
   has_many :user_group_memberships
   has_many :users, through: :user_group_memberships
 
   has_many :game_nights
 
-  belongs_to :moderator, class_name: :User, foreign_key: :moderator_id
-
   validates :name, presence: true
 end

app/models/role.rb

@@ -0,0 +1,10 @@
+class Role < ActiveRecord::Base
+  has_and_belongs_to_many :users, join_table: :users_roles
+  belongs_to :resource, polymorphic: true
+
+  validates :resource_type,
+            inclusion: { in: Rolify.resource_types },
+            allow_nil: true
+
+  scopify
+end

app/models/user.rb

@@ -1,4 +1,5 @@
 class User < ActiveRecord::Base
+  rolify
   has_secure_password
 
   has_many :user_group_memberships

config/initializers/rolify.rb

@@ -0,0 +1,7 @@
+Rolify.configure do |config|
+  # By default ORM adapter is ActiveRecord. uncomment to use mongoid
+  # config.use_mongoid
+
+  # Dynamic shortcuts for User class (user.is_admin? like methods). Default is: false
+  # config.use_dynamic_shortcuts
+end

db/migrate/20160123201138_rolify_create_roles.rb

@@ -0,0 +1,19 @@
+class RolifyCreateRoles < ActiveRecord::Migration
+  def change
+    create_table(:roles) do |t|
+      t.string :name
+      t.references :resource, :polymorphic => true
+
+      t.timestamps
+    end
+
+    create_table(:users_roles, :id => false) do |t|
+      t.references :user
+      t.references :role
+    end
+
+    add_index(:roles, :name)
+    add_index(:roles, [ :name, :resource_type, :resource_id ])
+    add_index(:users_roles, [ :user_id, :role_id ])
+  end
+end

db/migrate/20160123223259_remove_organizer_id_from_game_nights.rb

@@ -0,0 +1,5 @@
+class RemoveOrganizerIdFromGameNights < ActiveRecord::Migration
+  def change
+    remove_column :game_nights, :organizer_id, :integer
+  end
+end

db/migrate/20160123223328_remove_moderator_id_from_groups.rb

@@ -0,0 +1,5 @@
+class RemoveModeratorIdFromGroups < ActiveRecord::Migration
+  def change
+    remove_column :groups, :moderator_id, :integer
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160110154158) do
+ActiveRecord::Schema.define(version: 20160123223328) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -23,7 +23,6 @@
     t.datetime "created_at",       null: false
     t.datetime "updated_at",       null: false
     t.integer  "group_id"
-    t.integer  "organizer_id"
     t.string   "name"
   end
 
@@ -36,11 +35,21 @@
     t.string   "country"
     t.string   "facebook"
     t.string   "twitter"
-    t.datetime "created_at",   null: false
-    t.datetime "updated_at",   null: false
-    t.integer  "moderator_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  create_table "roles", force: :cascade do |t|
+    t.string   "name"
+    t.integer  "resource_id"
+    t.string   "resource_type"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
+  add_index "roles", ["name", "resource_type", "resource_id"], name: "index_roles_on_name_and_resource_type_and_resource_id", using: :btree
+  add_index "roles", ["name"], name: "index_roles_on_name", using: :btree
+
   create_table "user_game_night_attendees", force: :cascade do |t|
     t.integer  "user_id"
     t.integer  "game_night_id"
@@ -77,6 +86,13 @@
     t.string   "country"
   end
 
+  create_table "users_roles", id: false, force: :cascade do |t|
+    t.integer "user_id"
+    t.integer "role_id"
+  end
+
+  add_index "users_roles", ["user_id", "role_id"], name: "index_users_roles_on_user_id_and_role_id", using: :btree
+
   add_foreign_key "game_nights", "groups"
   add_foreign_key "user_game_night_attendees", "game_nights"
   add_foreign_key "user_game_night_attendees", "users"

db/seeds.rb

@@ -1,7 +1,30 @@
-# This file should contain all the record creation needed to seed the database with its default values.
-# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
-#
-# Examples:
-#
-#   cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
-#   Mayor.create(name: 'Emanuel', city: cities.first)
+require 'faker'
+
+# create users
+5.times do
+  User.create(first_name: Faker::Name.first_name,
+              last_name: Faker::Name.last_name,
+              email: Faker::Internet.email,
+              city: Faker::Address.city,
+              state: Faker::Address.state,
+              country: Faker::Address.country,
+              password: "helloworld",
+              email_confirmed: true)
+end
+
+# create game_night
+5.times do
+  GameNight.create(name: Faker::Hipster.words(2),
+                   time: rand(7).days.from_now.to_date,
+                   location_name: Faker::Hipster.words(2),
+                   location_address: Faker::Address.street_name)
+end
+
+# create groups
+5.times do
+  Group.create(name: Faker::Hipster.words(2))
+end
+
+puts "#{User.count} Users created"
+puts "#{GameNight.count} GameNights created"
+puts "#{Group.count} Groups created"

spec/models/game_night_spec.rb

@@ -32,31 +32,27 @@
     let(:group)      { create(:group) }
 
     let(:game_night) do
-      create(:game_night, group_id: group.id, organizer_id: user1.id)
+      create(:game_night, group_id: group.id)
     end
 
     before do
-      UserGameNightAttendee.create(user_id:       user1.id,
-                                   game_night_id: game_night.id)
+      UserGameNightAttendance.create(user_id:       user1.id,
+                                     game_night_id: game_night.id)
 
-      UserGameNightAttendee.create(user_id:       user2.id,
-                                   game_night_id: game_night.id)
+      UserGameNightAttendance.create(user_id:       user2.id,
+                                     game_night_id: game_night.id)
     end
 
     it "belongs to group" do
       expect(game_night.group).to be_a(Group)
     end
 
-    it "has many user_game_night_attendees" do
+    it "has many user_game_night_attendances" do
       expect(game_night.user_game_night_attendees.count).to eq(2)
     end
 
-    it "has many users through user_game_night_attendees" do
+    it "has many users through user_game_night_attendance" do
       expect(game_night.users.count).to eq(2)
     end
-
-    it "has one organizer" do
-      expect(game_night.organizer).to eq(user1)
-    end
   end
 end

spec/models/group_spec.rb

@@ -28,10 +28,9 @@
   end
 
   describe "associations" do
-    let(:moderator)    { create(:confirmed_user) }
     let(:user1)        { create(:confirmed_user) }
     let(:user2)        { create(:confirmed_user) }
-    let(:group)        { create(:group, moderator_id: moderator.id) }
+    let(:group)        { create(:group) }
 
     before do
       UserGroupMembership.create(user_id: user1.id, group_id: group.id)
@@ -52,9 +51,5 @@
 
       expect(group.game_nights.count).to eq(2)
     end
-
-    it "belongs to a moderator" do
-      expect(group.moderator).to eq(moderator)
-    end
   end
 end