Merge ae1f292719 into 08e5f10559

app/controllers/organizations_controller.rb

@@ -0,0 +1,40 @@
+class OrganizationsController < ApplicationController
+  load_and_authorize_resource :organization
+
+  def index
+    @organizations = Organization.all
+  end
+
+  def create
+    @organization = Organization.new(organization_params)
+    if @organization.save
+      redirect_to organizations_path,
+                  notice: 'Organization successfully created'
+    else
+      redirect_to new_organization_path,
+                  error: @organization.errors.full_messages.join(', ')
+    end
+  end
+
+  def new
+    @organization = Organization.new
+  end
+
+  def edit; end
+
+  def update
+    if @organization.update_attributes(organization_params)
+      redirect_to organizations_path,
+                  notice: 'Organization successfully updated'
+    else
+      redirect_to edit_organization_path(@organization),
+                  error: @organization.errors.full_messages.join(', ')
+    end
+  end
+
+  private
+
+  def organization_params
+    params.require(:organization).permit(:name, :description, :picture)
+  end
+end

app/models/conference.rb

@@ -7,6 +7,8 @@ class Conference < ActiveRecord::Base
 
   default_scope { order('start_date DESC') }
 
+  belongs_to :organization
+
   has_paper_trail ignore: %i(updated_at guid revision events_per_week), meta: { conference_id: :id }
 
   has_and_belongs_to_many :questions
@@ -53,7 +55,8 @@ class Conference < ActiveRecord::Base
             :start_date,
             :end_date,
             :start_hour,
-            :end_hour, presence: true
+            :end_hour,
+            :organization, presence: true
 
   validates :short_title, uniqueness: true
   validates :short_title, format: { with: /\A[a-zA-Z0-9_-]*\z/ }

app/models/organization.rb

@@ -0,0 +1,7 @@
+class Organization < ActiveRecord::Base
+  has_many :conferences, dependent: :destroy
+
+  validates :name, presence: true
+
+  mount_uploader :picture, PictureUploader, mount_on: :picture
+end

app/views/organizations/_form.html.haml

@@ -0,0 +1,13 @@
+= semantic_form_for(@organization) do |f|
+  = f.inputs name: 'Organization details' do
+    = f.input :name, as: :string, required: true
+    = f.input :description, input_html: { rows: 5 }, placeholder: 'Decribe about your organization..'
+    = image_tag f.object.picture.thumb.url if f.object.picture?
+    - if @organization.picture
+      = image_tag(@organization.picture.thumb.url, width: '20%')
+    = f.input :picture
+  %p.text-right
+    - if @organization.new_record?
+      = f.submit 'Create Organization', class: 'btn btn-success'
+    - else
+      = f.submit 'Update Organization', class: 'btn btn-success'

app/views/organizations/edit.html.haml

@@ -0,0 +1,4 @@
+.container
+  .row
+    .col-md-12
+      = render 'form'

app/views/organizations/index.html.haml

@@ -0,0 +1,17 @@
+.container
+  .row
+    .col-md-12.page-header
+      %h1
+        Organizations
+        .btn-group.pull-right
+          = link_to 'Add new', new_organization_path, class: 'btn btn-mini btn-success'
+    - @organizations.each do |organization|
+      .col-md-4
+        .thumbnail
+          = image_tag(organization.picture.thumb.url, width: '20%')
+          .caption
+            %h4
+              = organization.name
+            %button.btn.btn-success Know More
+            = link_to 'Edit', edit_organization_path(organization), class: 'btn btn-mini btn-default'
+

app/views/organizations/new.html.haml

@@ -0,0 +1,4 @@
+.container
+  .row
+    .col-md-12
+      = render 'form'

config/routes.rb

@@ -102,7 +102,7 @@ Osem::Application.routes.draw do
     get '/revision_history/:id/revert_object' => 'versions#revert_object', as: 'revision_history_revert_object'
     get '/revision_history/:id/revert_attribute' => 'versions#revert_attribute', as: 'revision_history_revert_attribute'
   end
-
+  resources :organizations
   resources :conferences, only: [:index, :show] do
     resource :program, only: [] do
       resources :proposals, except: :destroy do

db/migrate/20170529215453_create_organizations.rb

@@ -0,0 +1,9 @@
+class CreateOrganizations < ActiveRecord::Migration
+  def change
+    create_table :organizations do |t|
+      t.string :name
+      t.text :description
+      t.string :picture
+    end
+  end
+end

db/migrate/20170531094817_add_organizaton_id_to_conference.rb

@@ -0,0 +1,5 @@
+class AddOrganizatonIdToConference < ActiveRecord::Migration
+  def change
+    add_column :conferences, :organization_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: 20170302145716) do
+ActiveRecord::Schema.define(version: 20170531094817) do
 
   create_table "ahoy_events", force: :cascade do |t|
     t.uuid     "visit_id",   limit: 16
@@ -100,6 +100,7 @@ ActiveRecord::Schema.define(version: 20170302145716) do
     t.string   "picture"
     t.integer  "start_hour",         default: 9
     t.integer  "end_hour",           default: 20
+    t.integer  "organization_id"
   end
 
   create_table "conferences_questions", id: false, force: :cascade do |t|
@@ -266,6 +267,12 @@ ActiveRecord::Schema.define(version: 20170302145716) do
     t.datetime "updated_at"
   end
 
+  create_table "organizations", force: :cascade do |t|
+    t.string "name"
+    t.text   "description"
+    t.string "picture"
+  end
+
   create_table "payments", force: :cascade do |t|
     t.string   "last4"
     t.integer  "amount"

spec/factories/organizations.rb

@@ -0,0 +1,13 @@
+FactoryGirl.define do
+  factory :organization do
+    name { Faker::Company.name }
+    description { Faker::Lorem.paragraph }
+
+    # after(:create) do |organization|
+    #   File.open("spec/support/logos/#{1 + rand(13)}.png") do |file|
+    #     organization.picture = file
+    #   end
+    #   organization.save!
+    # end
+  end
+end

spec/models/organization_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Organization do
+  let(:organization) { create(:organization) }
+
+  describe 'validation' do
+    it 'has a valid factory' do
+      expect(build(:organization)).to be_valid
+    end
+
+    it 'is not valid without a name' do
+      should validate_presence_of(:name)
+    end
+  end
+
+  describe 'associations' do
+    it { should have_many(:conferences).dependent(:destroy) }
+  end
+end