gaku 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c62b7a0bad0b0421791bf0522b4d26994c96f086
-  data.tar.gz: 2c3d59ec5c13c1d6f16750dcd14f994fc271b58c
+  metadata.gz: 5474503b8dd52288efd403fe8747063aeac22208
+  data.tar.gz: 5ee33d43e57e47d42fcbb4924639f579470c7962
 SHA512:
-  metadata.gz: eacd8170e31b8e687a47fce41df04bb88d3c8ca7476953a1f672526fd8fd5248c0f04e0b348146b009a9b716625054f5a289d179530fcab669e53041a29b842b
-  data.tar.gz: efcc6854ed4c3fbb040ecb05265ff957243e4b3efa1cc8e860ef4d538e126536e09a58a22d5d15780ed560ca3c4c9e409bf0a4dbde96da71e2f5e5f3cba79620
+  metadata.gz: 3fcc49533fa2d448820ed37720eb52fe340004e478945104279071e44ae3c2fad2924258f92cd0707c96d180fd220704f6c62d8bceef4708e3f0ebdecedfe14c
+  data.tar.gz: 42de59feb61a93ca0e63ee97278ccd3694b8d3263798fd24085df3cf3b87fb54a70b698d34d034cb0784f8f908ca8e28070ae9d79dba457974bf1126fa09ea07

data/README.md

@@ -1,6 +1,7 @@
+[![Gem Version](https://badge.fury.io/rb/gaku.png)](http://badge.fury.io/rb/gaku)
 [![Build Status](https://travis-ci.org/Genshin/gaku.png)](https://travis-ci.org/Genshin/gaku)
-[![Code Climate](https://codeclimate.com/github/Genshin/gaku.png)](https://codeclimate.com/github/Genshin/gaku)
 [![Coverage Status](https://coveralls.io/repos/Genshin/gaku/badge.png?branch=master)](https://coveralls.io/r/Genshin/gaku?branch=master)
+[![Code Climate](https://codeclimate.com/github/Genshin/gaku.png)](https://codeclimate.com/github/Genshin/gaku)
 
 GAKU Engine [学園陣]
 ====================
@@ -63,12 +64,19 @@ Create a new Rails application:
     $ rails _4.0.0_ new my_app
 
 
-Then add GAKU to your Gemfile.
+Then add GAKU to your Gemfile:
+```ruby
+gem 'globalize3',  github: 'globalize/globalize', branch: 'rails4', ref: '82b3b36308677745b261bd147dda00ed4560a25d'
+gem 'gaku', '~> 0.0.2'
+```
 
+Or use the master branch: 
 ```ruby
+gem 'globalize3',  github: 'globalize/globalize', branch: 'rails4', ref: '82b3b36308677745b261bd147dda00ed4560a25d'
 gem 'gaku', github: 'Genshin/gaku'
 ```
 
+
 Install dependencies:
 
     $ bundle
@@ -85,10 +93,10 @@ Sample Data
 -----------
 If you want to populate sample data:
 
-    $ rake gaku:sample:load
+    $ rake db:sample
 
 Defaults:
-user: admin pass: 123456
+user: admin / pass: 123456
 
 
 Run

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/core/app/controllers/concerns/enrollments_controller.rb

@@ -3,8 +3,7 @@ module EnrollmentsController
   include Gaku::ClassNameDetector
 
   def enroll_students
-    params[:selected_students].nil? ? @selected_students = [] : @selected_students = params[:selected_students]
-
+    @selected_students = params[:selected_students].presence || []
     enroll_selected_students
 
     if params[:source] == class_name_underscored_plural

data/core/app/controllers/gaku/contacts_controller.rb

@@ -5,9 +5,9 @@ module Gaku
 
     include PolymorphicResourceConcern
 
-    respond_to :js, :html
+    respond_to :js
 
-    before_action :set_contact_types
+    before_action :set_contact_types,    only: %i( new edit )
     before_action :set_unscoped_contact, only: %i( recovery destroy )
     before_action :set_contact,          only: %i( edit update soft_delete make_primary )
     before_action :set_polymorphic_resource
@@ -92,7 +92,7 @@ module Gaku
     end
 
     def set_contact_types
-      @contact_types = ContactType.all.map { |ct| [ct.name, ct.id] }
+      @contact_types = ContactType.all
     end
 
     def set_count

data/core/app/controllers/gaku/notes_controller.rb

@@ -1,50 +1,51 @@
 module Gaku
   class NotesController < GakuController
 
-    load_and_authorize_resource :note, class: Gaku::Note
+    #load_and_authorize_resource :note, class: Gaku::Note
 
-    before_filter :notable
-    inherit_resources
-    respond_to :js, :html
+    before_action :set_notable
+    before_action :set_note,    only: %i( edit update destroy )
+    respond_to :js
 
     def new
-      @note = @notable.notes.new
-      new!
+      @note = Note.new
+      respond_with @note
     end
 
     def create
       @note = @notable.notes.new(note_params)
-      create!
+      @note.save
+      set_count
+      respond_with @note
     end
 
-    protected
+    def edit
+    end
 
-    # def begin_of_association_chain
-    #   notable
-    #   @notable.notes
-    # end
+    def show
+    end
 
-    def note_params
-      params.require(:note).permit(note_attr)
+    def update
+      @note.update(note_params)
+      respond_with @note
     end
 
-    def resource_params
-      return [] if request.get?
-      [params.require(:note).permit(note_attr)]
+    def destroy
+      @note.destroy
+      set_count
+      respond_with @note
     end
 
     private
 
-    def note_attr
-      %i(title content)
+    def note_params
+      params.require(:note).permit(note_attr)
     end
 
-    def collection
-      @notes = @notable.notes
+    def note_attr
+      %i(title content)
     end
 
-    private
-
     def notable_klasses
       [
         Gaku::Student,
@@ -57,7 +58,15 @@ module Gaku
       ]
     end
 
-    def notable
+    def set_count
+      @count = @notable.reload.notes_count
+    end
+
+    def set_note
+      @note = Note.find(params[:id])
+    end
+
+    def set_notable
       unnamespaced_klass = ''
       klass = notable_klasses.find do |c|
         unnamespaced_klass = c.to_s.split('::')

data/core/app/controllers/gaku/syllabuses_controller.rb

@@ -1,43 +1,71 @@
 module Gaku
   class SyllabusesController < GakuController
 
-    load_and_authorize_resource class: Gaku::Syllabus
+    #load_and_authorize_resource class: Gaku::Syllabus
 
-    before_filter :before_show,  only: :show
-    before_filter :count,        only: [:create, :destroy, :index]
+    respond_to :js,   only: %i( new create edit update destroy )
+    respond_to :html, only: %i( index edit show )
 
-    inherit_resources
-    respond_to :js, :html
+    before_action :set_syllabus, only: %i( edit update destroy )
 
-    protected
+    def new
+      @syllabus = Syllabus.new
+      respond_with @syllabus
+    end
+
+    def create
+      @syllabus = Syllabus.new(syllabus_params)
+      @syllabus.save
+      set_count
+      respond_with @syllabus
+    end
 
-    def resource_params
-      return [] if request.get?
-      [params.require(:syllabus).permit(syllabus_attr)]
+    def index
+      @syllabuses = Syllabus.all
+      set_count
+      respond_with @syllabuses
+    end
+
+    def edit
+      set_grading_methods
+      set_notable
+    end
+
+    def update
+      @syllabus.update(syllabus_params)
+      respond_with @syllabus
+    end
+
+    def destroy
+      @syllabus.destroy
+      set_count
+      respond_with @syllabus
     end
 
     private
 
+    def syllabus_params
+      params.require(:syllabus).permit(syllabus_attr)
+    end
+
     def syllabus_attr
-      %i(name code credits description)
+      %i( name code credits description )
     end
 
-    def syllabus
+    def set_syllabus
       @syllabus = Syllabus.find(params[:id])
     end
 
-    def grading_methods
+    def set_grading_methods
       @grading_methods = GradingMethod.all
     end
 
-    def before_show
-      syllabus
+    def set_notable
       @notable = @syllabus
       @notable_resource = get_resource_name @notable
-      grading_methods
     end
 
-    def count
+    def set_count
       @count = Syllabus.count
     end
 

data/core/app/models/gaku/address.rb

@@ -27,7 +27,7 @@ module Gaku
     after_destroy :reset_counter_cache
 
     def make_primary
-      addresses.where('id != ?', id).update_all(primary: false)
+      addresses.where.not(id: id).update_all(primary: false)
       update_attribute(:primary, true)
       update_primary_address_field
     end

data/core/app/models/gaku/class_group_enrollment.rb

@@ -16,15 +16,16 @@ module Gaku
 
     after_save :save_student_class_and_number
 
+    def class_and_number
+      "#{class_group} - ##{seat_number}"
+    end
+
     private
 
     def save_student_class_and_number
       student.update_attribute(:class_and_number, class_and_number) if student
     end
 
-    def class_and_number
-      "#{class_group} - ##{seat_number}"
-    end
 
   end
 end

data/core/app/models/gaku/contact.rb

@@ -48,7 +48,7 @@ module Gaku
     end
 
     def make_primary
-      contacts.where(['id != ?', id]).update_all(primary: false)
+      contacts.where.not(id: id).update_all(primary: false)
       update_attribute(:primary, true)
 
       if contactable.has_attribute?(:primary_contact)
@@ -79,7 +79,7 @@ module Gaku
     end
 
     def remove_other_primary
-      contacts.where('id != ?', id).update_all(primary: false) if primary?
+      contacts.where.not(id: id).update_all(primary: false) if primary?
     end
 
     def ensure_first_is_primary

data/core/app/models/gaku/grading_method_set.rb

@@ -9,7 +9,7 @@ module Gaku
     before_save :ensure_first_is_primary, on: :create
 
     def make_primary
-      GradingMethodSet.where(['id != ?', id]).update_all({ primary: false })
+      GradingMethodSet.where.not(id: id).update_all({ primary: false })
       update_attribute(:primary, true)
     end
 

data/core/app/views/gaku/class_groups/students/enroll_students.js.erb

@@ -9,3 +9,9 @@ $('.class-group-enrollments-count').html('<%= print_count(@count, t_student_list
 
 $('#student-modal').modal('hide');
 showNotice("<%= render_flash %>");
+
+var enrollments = <%= raw @enrollments.map {|e| [e.student_id, e.class_and_number ]}.to_json %>
+enrollments.forEach(function(enrollment) {
+  $('#student-' + enrollment[0] + ' td:eq(5)' ).html(enrollment[1])
+})
+

data/core/app/views/gaku/contacts/_form_fields.html.slim

@@ -1,6 +1,6 @@
 .row-fluid
   .span6
-    = f.select :contact_type_id, @contact_types, {prompt: t(:'contact_type.choose')}, label: t(:'contact_type.plural')
+    = f.select :contact_type_id,  options_from_collection_for_select(@contact_types, :id, :name), {prompt: t(:'contact_type.choose')}, label: t(:'contact_type.plural')
   .span6
     = f.text_field :data, label: t(:'contact.data')
 

data/core/app/views/gaku/notes/create.js.erb

@@ -1,4 +1,4 @@
-$('#<%= @notable_resource %>-notes-index tbody').append('<%= render_js_partial("note", {note: @notable.notes.last}) %>');
+$('#<%= @notable_resource %>-notes-index tbody').append('<%= j render("note", {note: @note}) %>');
 $('#new-<%= @notable_resource %>-note form').each(function() {
 	this.reset();
 });
@@ -6,6 +6,6 @@ $('#new-<%= @notable_resource %>-note form').each(function() {
 $('#new-<%= @notable_resource %>-note').slide();
 $('#new-<%= @notable_resource %>-note-link').show();
 
-$('#<%= @notable_resource %>-notes-tab-link').html("<%= print_count(@notable.notes_count + 1, t('note.plural')) %>");
-$('.<%= @notable_resource %>-notes-count').html("<%= print_count(@notable.notes_count + 1, t('note.list')) %>");
+$('#<%= @notable_resource %>-notes-tab-link').html("<%= print_count(@count, t('note.plural')) %>");
+$('.<%= @notable_resource %>-notes-count').html("<%= print_count(@count, t('note.list')) %>");
 showNotice("<%= render_flash %>");

data/core/app/views/gaku/notes/destroy.js.erb

@@ -1,4 +1,4 @@
-$('#new-<%= @notable_resource %>-note-tab-link').html("<%= print_count(@notable.notes_count-1, t('note.plural')) %>");
-$('.<%= @notable_resource %>-notes-count').html("<%= print_count(@notable.notes_count-1, t('note.list')) %>");
-$('#<%= @notable_resource %>-notes-tab-link').html("<%= print_count(@notable.notes_count-1, t('note.plural')) %>");
+$('#new-<%= @notable_resource %>-note-tab-link').html("<%= print_count(@count, t('note.plural')) %>");
+$('.<%= @notable_resource %>-notes-count').html("<%= print_count(@count, t('note.list')) %>");
+$('#<%= @notable_resource %>-notes-tab-link').html("<%= print_count(@count, t('note.plural')) %>");
 showNotice("<%= render_flash %>");

data/core/app/views/gaku/notes/edit.js.erb

@@ -1,3 +1,3 @@
-$('#modal-dialogs').html('<%= render_js_partial("modal", {note: @note}) %>');
+$('#modal-dialogs').html('<%= j render("modal", {note: @note}) %>');
 $('#edit-note-modal').modal('show');
 $('.remote-form').enableValidations();

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

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

data/core/app/views/gaku/notes/show.js.erb

@@ -1,3 +1,3 @@
-$('#modal-dialogs').html("<%= render_js_partial('show_modal', {note: @note}) %>");
+$('#modal-dialogs').html("<%= j render('show_modal', {note: @note}) %>");
 $('#note').modal('show');
 

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

@@ -1,4 +1,4 @@
-$('tr#note-<%= @note.id %>').html('<%= render_js_partial("gaku/notes/fields", {note: @note}) %>');
-$('tr#note-<%= @note.id %>').append('<%= render_js_partial("buttons", {note: @note}) %>');
+$('tr#note-<%= @note.id %>').html('<%= j render("gaku/notes/fields", {note: @note}) %>');
+$('tr#note-<%= @note.id %>').append('<%= j render("buttons", {note: @note}) %>');
 $("#edit-note-modal").modal('hide');
 showNotice("<%= render_flash %>");

data/core/app/views/gaku/syllabuses/_syllabus_fields.html.slim

@@ -1,5 +1,4 @@
 = render 'gaku/shared/fields/syllabus_fields', syllabus: syllabus
 td
-  = link_to_show syllabus
-  = ajax_link_to_edit [:edit, syllabus]
-  = ajax_link_to_delete syllabus
+  = link_to_edit [:edit, syllabus]
+  = ajax_link_to_edit [:edit, syllabus]

data/core/app/views/gaku/syllabuses/_syllabuses.html.slim

@@ -6,6 +6,6 @@
       = th t(:'syllabus.description')
       = th t(:'syllabus.credits')
       = th t(:'exam.plural')
-      = th_actions 3
+      = th_actions 2
   tbody
     = render partial: 'syllabus', collection: @syllabuses, as: 'syllabus'

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

@@ -1,6 +1,7 @@
-$('table#syllabuses-index tbody').append('<%= render_js_partial("syllabus", {syllabus: @syllabus}) %>');
+showNotice("<%= render_flash %>");
+
+$('table#syllabuses-index tbody').append('<%= j render("syllabus", {syllabus: @syllabus}) %>');
 $('#new-syllabus form')[0].reset();
 $('#new-syllabus').slide();
 $('#new-syllabus-link').show();
-$('.syllabuses-count').html('<%= print_count(@count+1, t_syllabus_list) %>');
-showNotice("<%= render_flash %>");
+$('.syllabuses-count').html('<%= print_count(@count, t_syllabus_list) %>');

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

@@ -1,2 +1,2 @@
 showNotice("<%= render_flash %>");
-$('.syllabuses-count').html('<%= print_count(@count-1, t_syllabus_list) %>');
+$('.syllabuses-count').html('<%= print_count(@count, t_syllabus_list) %>');

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

@@ -1,3 +1,3 @@
-$('#modal-dialogs').html('<%= render_js_partial("modal", {syllabus: @syllabus}) %>');
+$('#modal-dialogs').html('<%= j render("modal", {syllabus: @syllabus}) %>');
 $('#syllabus-modal').modal('show');
 $('.remote-form').enableValidations();