gaku 0.0.1 → 0.0.2

data/core/app/views/gaku/syllabuses/new.js.erb

@@ -1,3 +1,3 @@
-$('#new-syllabus').html('<%= render_js_partial("form") %>').slide();
+$('#new-syllabus').html('<%= j render("form") %>').slide();
 $('#new-syllabus-link').hide();
 $('.remote-form').enableValidations();

data/core/app/views/gaku/syllabuses/update.js.erb

@@ -1,4 +1,4 @@
 $('#syllabus-modal').modal('hide');
 $('#syllabus-modal').remove();
 showNotice("<%= render_flash %>");
-$('tr.syllabus-<%= @syllabus.id %>').html('<%= render_js_partial("gaku/shared/fields/syllabus_fields", {syllabus: @syllabus}) %>');
+$('tr.syllabus-<%= @syllabus.id %>').html('<%= j render("gaku/shared/fields/syllabus_fields", {syllabus: @syllabus}) %>');

data/core/config/routes.rb

@@ -171,14 +171,6 @@ Gaku::Core::Engine.routes.draw do
 
     end
 
-    resources :contacts do
-      member do
-        post :make_primary
-        get :soft_delete
-        get :recovery
-      end
-    end
-
     resources :notes
     resources :course_enrollments, controller: 'students/course_enrollments'
     resources :class_group_enrollments, controller: 'students/class_group_enrollments'

data/core/gaku_core.gemspec

@@ -21,20 +21,32 @@ Gem::Specification.new do |s|
   s.requirements << 'redis'
 
   s.add_dependency 'rails', '~> 4.0.0'
+  s.add_dependency 'coffee-rails', '~> 4.0.0'
+  s.add_dependency 'sass-rails',   '~> 4.0.0'
+  s.add_dependency 'uglifier',     '~> 1.3'
   s.add_dependency 'turbolinks'
 
+  s.add_dependency 'pg'
+
   s.add_dependency 'slim', '~> 2.0.1'
   s.add_dependency 'inherited_resources'
   s.add_dependency 'responders'
   s.add_dependency 'paper_trail', '3.0.0.beta1'
   s.add_dependency 'globalize3'
   s.add_dependency 'draper', '~> 1.0'
+  s.add_dependency 'paperclip'
+  s.add_dependency 'ransack', '~> 1.0'
+  s.add_dependency 'kaminari'
+
+  s.add_dependency 'devise', '~> 3.0.0'
+  s.add_dependency 'devise-i18n'
+  s.add_dependency 'cancan'
 
   s.add_dependency 'rails4_client_side_validations', '0.0.3'
   s.add_dependency 'gaku_forms', '0.1.5'
-  s.add_dependency 'gaku_nested_forms', '~> 0.1.0'
+  s.add_dependency 'gaku_nested_forms', '0.1.0'
   s.add_dependency 'nested_form'
-  s.add_dependency 'gaku_helpers'
+  s.add_dependency 'gaku_helpers', '0.0.7'
 
   s.add_dependency 'rails-i18n'
   s.add_dependency 'i18n-js'
@@ -48,20 +60,12 @@ Gem::Specification.new do |s|
   s.add_dependency 'bootstrap-sass'
   s.add_dependency 'bootstrap-datepicker-rails'
 
-  s.add_dependency 'paperclip'
-  s.add_dependency 'ransack', '~> 1.0'
-  s.add_dependency 'kaminari'
-
-  s.add_dependency 'devise', '~> 3.0.0'
-  s.add_dependency 'devise-i18n'
-  s.add_dependency 'cancan'
-
   #spreadsheet handling
   s.add_dependency 'roo'
   s.add_dependency 'gen_sheet'
   s.add_dependency 'thinreports-rails'
 
-  s.add_dependency 'highline', '= 1.6.11'
+  s.add_dependency 'highline', '1.6.11'
   s.add_dependency 'rubyzip', '0.9.9'
 
   s.add_dependency 'sidekiq'

data/core/lib/gaku/testing/factories/note_factory.rb

@@ -3,6 +3,10 @@ FactoryGirl.define do
   factory :note, class: Gaku::Note do
     title 'Excellent'
     content 'Excellent student'
+
+    factory :invalid_note do
+      title nil
+    end
   end
 
 end

data/core/lib/gaku/testing/factories/syllabus_factory.rb

@@ -5,6 +5,10 @@ FactoryGirl.define do
     code '12345'
     description 'Short description'
     credits 'Huge Credits'
+
+    factory :invalid_syllabus do
+      code nil
+    end
   end
 
   trait :with_exam do

data/core/lib/gaku/testing/request_helpers.rb

@@ -52,6 +52,11 @@ module Gaku::Testing::RequestHelpers
     '.edit-link'
   end
 
+  def js_edit_link
+    '.js-edit-link'
+  end
+
+
   def recovery_link
     '.recovery-link'
   end

data/core/spec/controllers/gaku/addresses_controller_spec.rb

@@ -7,7 +7,7 @@ describe Gaku::AddressesController do
   let!(:student) { create(:student) }
   let!(:country) { create(:country, name: 'USA', iso: 'US') }
 
-  context 'as admin' do
+  context 'as admin', type: :address do
     before { as :admin }
 
     context 'student' do

data/core/spec/controllers/gaku/contacts_controller_spec.rb

@@ -2,12 +2,12 @@ require 'spec_helper'
 
 describe Gaku::ContactsController do
 
-  let(:contact_type) { create(:contact_type) }
+  let!(:contact_type) { create(:contact_type) }
   let(:contact) { create(:contact, contactable: student, contact_type: contact_type) }
   let(:invalid_contact) { create(:invalid_contact, contactable: student) }
   let!(:student) { create(:student) }
 
-  context 'as admin' do
+  context 'as admin', type: :contact do
     before { as :admin }
 
     context 'js' do
@@ -17,6 +17,10 @@ describe Gaku::ContactsController do
 
         it { should respond_with 200 }
         it('assigns @contact') { expect(assigns(:contact)).to be_a_new(Gaku::Contact) }
+        it('assigns @contact_types') { expect(assigns(:contact_types)).to eq [contact_type] }
+        it('assigns @polymorphic_resource_name') { expect(assigns(:polymorphic_resource_name)).to eq 'student-contact' }
+        it('assigns @polymorphic_resource') { expect(assigns(:polymorphic_resource)).to eq student }
+        it('assigns @nested_resources') { expect(assigns(:nested_resources)).to eq [] }
         it('renders the :new template') { template? :new }
       end
 
@@ -41,6 +45,21 @@ describe Gaku::ContactsController do
             valid_js_create
             expect(assigns(:count)).to eq 1
           end
+
+          it 'assigns @polymorphic_resource_name' do
+            valid_js_create
+            expect(assigns(:polymorphic_resource_name)).to eq 'student-contact'
+          end
+
+          it 'assigns @polymorphic_resource' do
+            valid_js_create
+            expect(assigns(:polymorphic_resource)).to eq student
+          end
+
+          it 'assigns @nested_resources' do
+            valid_js_create
+            expect(assigns(:nested_resources)).to eq []
+          end
         end
 
         context 'with invalid attributes' do
@@ -71,6 +90,10 @@ describe Gaku::ContactsController do
 
         it { should respond_with 200 }
         it('assigns @contact') { expect(assigns(:contact)).to eq contact }
+        it('assigns @contact_types') { expect(assigns(:contact_types)).to eq [contact_type] }
+        it('assigns @polymorphic_resource_name') { expect(assigns(:polymorphic_resource_name)).to eq 'student-contact' }
+        it('assigns @polymorphic_resource') { expect(assigns(:polymorphic_resource)).to eq student }
+        it('assigns @nested_resources') { expect(assigns(:nested_resources)).to eq [] }
         it('renders the :edit template') { template? :edit }
       end
 
@@ -82,6 +105,9 @@ describe Gaku::ContactsController do
 
           it { should respond_with 200 }
           it('assigns @contact') { expect(assigns(:contact)).to eq contact }
+          it('assigns @polymorphic_resource_name') { expect(assigns(:polymorphic_resource_name)).to eq 'student-contact' }
+          it('assigns @polymorphic_resource') { expect(assigns(:polymorphic_resource)).to eq student }
+          it('assigns @nested_resources') { expect(assigns(:nested_resources)).to eq [] }
           it('sets flash') { flash_updated? }
           it "changes contact's attributes" do
             expect(contact.reload.data).to eq 'mobifon'
@@ -113,6 +139,21 @@ describe Gaku::ContactsController do
           end.to change(Gaku::Contact, :count).by(-1)
         end
 
+        it 'assigns @polymorphic_resource_name' do
+          js_delete
+          expect(assigns(:polymorphic_resource_name)).to eq 'student-contact'
+        end
+
+        it 'assigns @polymorphic_resource' do
+          js_delete
+          expect(assigns(:polymorphic_resource)).to eq student
+        end
+
+        it 'assigns @nested_resources' do
+          js_delete
+          expect(assigns(:nested_resources)).to eq []
+        end
+
         it 'decrements @count' do
           js_delete
           expect(assigns(:count)).to eq 0
@@ -126,48 +167,78 @@ describe Gaku::ContactsController do
 
 
       describe 'XHR PATCH #soft_delete' do
-        let(:get_soft_delete) { gaku_js_patch :soft_delete, id: contact.id, student_id: student.id }
+        let(:js_get_soft_delete) { gaku_js_patch :soft_delete, id: contact.id, student_id: student.id }
 
         it 'redirects' do
-          get_soft_delete
+          js_get_soft_delete
           should respond_with(200)
         end
 
         it 'assigns  @contact' do
-          get_soft_delete
+          js_get_soft_delete
           expect(assigns(:contact)).to eq contact
         end
 
+        it 'assigns @polymorphic_resource_name' do
+          js_get_soft_delete
+          expect(assigns(:polymorphic_resource_name)).to eq 'student-contact'
+        end
+
+        it 'assigns @polymorphic_resource' do
+          js_get_soft_delete
+          expect(assigns(:polymorphic_resource)).to eq student
+        end
+
+        it 'assigns @nested_resources' do
+          js_get_soft_delete
+          expect(assigns(:nested_resources)).to eq []
+        end
+
         it 'updates :deleted attribute' do
           expect do
-            get_soft_delete
+            js_get_soft_delete
             contact.reload
           end.to change(contact, :deleted)
         end
       end
 
       describe 'XHR PATCH #recovery' do
-        let(:get_recovery) { gaku_js_patch :recovery, id: contact.id, student_id: student.id }
+        let(:js_get_recovery) { gaku_js_patch :recovery, id: contact.id, student_id: student.id }
 
         it 'is successfull' do
-          get_recovery
+          js_get_recovery
           should respond_with(200)
         end
 
         it 'assigns  @contact' do
-          get_recovery
+          js_get_recovery
           expect(assigns(:contact)).to eq contact
         end
 
+        it 'assigns @polymorphic_resource_name' do
+          js_get_recovery
+          expect(assigns(:polymorphic_resource_name)).to eq 'student-contact'
+        end
+
+        it 'assigns @polymorphic_resource' do
+          js_get_recovery
+          expect(assigns(:polymorphic_resource)).to eq student
+        end
+
+        it 'assigns @nested_resources' do
+          js_get_recovery
+          expect(assigns(:nested_resources)).to eq []
+        end
+
         it 'renders :recovery' do
-          get_recovery
+          js_get_recovery
           should render_template :recovery
-       end
+        end
 
         it 'updates :deleted attribute' do
           contact.soft_delete
           expect do
-            get_recovery
+            js_get_recovery
             contact.reload
           end.to change(contact, :deleted)
         end

data/core/spec/controllers/gaku/notes_controller_spec.rb

@@ -0,0 +1,143 @@
+require 'spec_helper'
+
+describe Gaku::NotesController do
+
+  let(:note) { create(:note, notable: student) }
+  let(:invalid_note) { build(:invalid_note, notable: student) }
+  let!(:student) { create(:student) }
+
+  context 'as admin', type: :note do
+    before { as :admin }
+
+    context 'student' do
+
+      describe 'XHR GET #new' do
+        before { gaku_js_get :new, student_id: student.id }
+
+        it { should respond_with 200 }
+        it('assigns @note') { expect(assigns(:note)).to be_a_new(Gaku::Note) }
+        it('assigns @notable') { expect(assigns(:notable)).to eq student }
+        it('renders the :new template') { template? :new }
+      end
+
+      describe 'XHR POST #create' do
+        context 'with valid attributes' do
+          let(:valid_js_create) do
+            gaku_js_post :create, note: attributes_for(:note), student_id: student.id
+          end
+
+          it 'creates new note' do
+            expect do
+              expect do
+                valid_js_create
+              end.to change(Gaku::Note, :count).by(1)
+            end.to change(student.notes, :count).by(1)
+          end
+
+          it 'renders flash' do
+            valid_js_create
+            flash_created?
+          end
+
+          it 'sets @notable' do
+            valid_js_create
+            expect(assigns(:notable)).to eq student
+          end
+
+          it 'increments @count' do
+            valid_js_create
+            expect(assigns(:count)).to eq 1
+          end
+        end
+
+        context 'with invalid attributes' do
+          let(:invalid_js_create) do
+            gaku_js_post :create, note: attributes_for(:invalid_note), student_id: student.id
+          end
+
+          it 'does not save the new note' do
+            expect do
+              invalid_js_create
+            end.to_not change(Gaku::Note, :count)
+          end
+
+          it 're-renders the new method' do
+            invalid_js_create
+            template? :create
+          end
+
+          it "doesn't increment @count" do
+            invalid_js_create
+            expect(assigns(:count)).to eq 0
+          end
+        end
+      end
+
+      describe 'XHR GET #edit' do
+        before { gaku_js_get :edit, id: note.id, student_id: student.id }
+
+        it { should respond_with 200 }
+        it('assigns @note') { expect(assigns(:note)).to eq note }
+        it('assigns @notable') { expect(assigns(:notable)).to eq student }
+        it('renders the :edit template') { template? :edit }
+      end
+
+      describe 'PATCH #update' do
+        context 'with valid attributes' do
+          before do
+            gaku_js_patch :update, id: note.id, student_id: student.id, note: attributes_for(:note, title: 'mobifon')
+          end
+
+          it { should respond_with 200 }
+          it('assigns @note') { expect(assigns(:note)).to eq note }
+          it('assigns @notable') { expect(assigns(:notable)).to eq student }
+          it('sets flash') { flash_updated? }
+          it "changes note's attributes" do
+            expect(note.reload.title).to eq 'mobifon'
+          end
+        end
+
+        context 'with invalid attributes' do
+          before do
+            gaku_js_patch :update, id: note.id, student_id: student.id, note: attributes_for(:invalid_note, title: '')
+          end
+
+          it { should respond_with 200 }
+          it('assigns @note') { expect(assigns(:note)).to eq note }
+          it "does not change note's attributes" do
+            expect(note.reload.title).not_to eq ''
+          end
+        end
+      end
+
+      describe 'XHR DELETE #destroy' do
+
+        let(:js_delete) { gaku_js_delete :destroy, id: note.id, student_id: student.id }
+
+        it 'deletes the note' do
+          note
+          expect do
+            js_delete
+          end.to change(Gaku::Note, :count).by(-1)
+        end
+
+        it('assigns @notable') do
+          js_delete
+          expect(assigns(:notable)).to eq student
+        end
+
+        it 'decrements @count' do
+          js_delete
+          expect(assigns(:count)).to eq 0
+        end
+
+        it 'sets flash' do
+          js_delete
+          flash_destroyed?
+        end
+      end
+
+    end
+
+  end
+end