gaku_api 0.3.0.pre.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2022049a291ae30871d7cb99cd7e634c4793337a99da7b223b88247cc12da3a4
-  data.tar.gz: 539d9b8910f2ae44c1c315bb77121170bdb5940f664d3a7a0a60c5fc2ac8ab80
+  metadata.gz: 5ea10622d24546466a1c46120b63f984d893a851573ac7d2ce5e76ea6b469542
+  data.tar.gz: 2ad0cdc8046728259ade520dcb9c1ba0cc5e669b72062df7110c918fc2c7ce1d
 SHA512:
-  metadata.gz: d705d970e7707a30c5ac0ed92f9bcec973fff85c7a5bc01fa1cbb2efa2d6e105db378f28266643ddb4936bf64aaadfe7facf8a80159effab92b182b5bca0ddba
-  data.tar.gz: b8487fb3e71bc6467425a4fc9e32230cf1ba182bbfeca0a5450fbc034c05aaa61f43e289af118ab5e15c3fe31dddba1ca90c0bab170a4ff0b6ab241afa32c483
+  metadata.gz: f67a80667f4cd233d0a3f38ffed255d552a663de91b01c2988a0d8d7b7c9aaba42f5e14d2ad878564a6065502bd26ea5ce03136464e7da42aff3e14adf562b91
+  data.tar.gz: ea398b05187e36a8ac49b8e7d938b0978a68d7f43ad08b62e06f0a59047bf3e22c60ee4b4ad993e8ce4b4009b519b9ec45ebff905eed30d18b9f139ebd0f3f8d

data/app/controllers/gaku/api/v1/base_controller.rb

@@ -5,9 +5,9 @@ class Gaku::Api::V1::BaseController < Gaku::Api::ApplicationController
   before_action :set_default_format
   before_action :authenticate_request
 
-  # rescue_from StandardError do |exception|
-  #   render respond_format => { error: exception.message }, status: 500
-  # end
+  rescue_from StandardError do |exception|
+    render respond_format => { error: exception.message }, status: 500
+  end
 
   # rescue_from ActiveRecord::RecordNotFound, with: :render_not_found_response
   # rescue_from ActiveRecord::RecordInvalid, with: :render_unprocessable_entity_response
@@ -28,7 +28,7 @@ class Gaku::Api::V1::BaseController < Gaku::Api::ApplicationController
   end
 
   def meta_for(collection)
-    { count: collection.size , total_count: collection.total_count, page: collection.current_page }
+    { count: collection.size }
   end
 
   def authenticate_request

data/app/controllers/gaku/api/v1/contact_types_controller.rb

@@ -0,0 +1,27 @@
+module Gaku
+  module Api
+    module V1
+      class ContactTypesController < BaseController
+        skip_before_action :authenticate_request
+
+        def index
+          @contact_types = ContactType.all
+          collection_respond_to @contact_types, root: :contact_types
+        end
+
+        def create
+          @contact_types = ContactType.create!(contact_type_params)
+          member_respond_to @contact_types
+        end
+
+        private
+
+        def contact_type_params
+          params.require(:name)
+          params.permit(:name)
+        end
+
+      end
+    end
+  end
+end

data/app/controllers/gaku/api/v1/contacts_controller.rb

@@ -0,0 +1,41 @@
+module Gaku
+  module Api
+    module V1
+      class ContactsController < BaseController
+        skip_before_action :authenticate_request
+        before_action :set_contactable
+
+
+        def index
+          @contacts = @contactable.contacts.all
+          collection_respond_to @contacts, root: :contacts
+        end
+
+        def create
+          @contact = @contactable.contacts.create(contact_params)
+          member_respond_to @contact
+        end
+
+        private
+
+        def contact_params
+          params.require(contact_attributes)
+          params.permit(contact_attributes)
+        end
+
+
+        def contact_attributes
+          %i( contact_type_id data )
+        end
+
+
+        def set_contactable
+          model_name = params[:model_name]
+          @contactable = model_name.constantize.find(params[model_name.foreign_key])
+        end
+
+
+      end
+    end
+  end
+end

data/app/controllers/gaku/api/v1/students_controller.rb

@@ -7,11 +7,14 @@ module Gaku
         before_action :set_student, except: %i( index create )
 
         def index
-          @q = Student.includes(:primary_contact, :primary_address).search(params[:q])
-          @students = @q.result.page(params[:page])
+          @students = Student.includes(:primary_contact, :primary_address).all
           collection_respond_to @students, root: :students
         end
 
+        def picture
+          send_file @student.picture.path
+        end
+
         def show
           member_respond_to @student
         end
@@ -56,8 +59,8 @@ module Gaku
 
         def student_attributes
           %i(
-            name surname name_reading surname_reading birth_date gender scholarship_status_id,
-            enrollment_status_code commute_method_type_id admitted graduated picture
+            name surname name_reading surname_reading middle_name middle_name_reading
+            birth_date gender enrollment_status_code picture
           )
         end
 

data/app/serializers/gaku/contact_serializer.rb

@@ -0,0 +1,14 @@
+module Gaku
+  class ContactSerializer < ActiveModel::Serializer
+    attributes %i( id data contact_type_id )
+    attribute :student_id, if: :student_contact?
+
+    def student_id
+      object.contactable_id
+    end
+
+    def student_contact?
+      object.contactable_type == 'Gaku::Student'
+    end
+  end
+end

data/app/serializers/gaku/contact_type_serializer.rb

@@ -0,0 +1,5 @@
+module Gaku
+  class ContactTypeSerializer < ActiveModel::Serializer
+    attributes %i( id name )
+  end
+end

data/config/routes.rb

@@ -6,13 +6,16 @@ Gaku::Core::Engine.routes.draw do
       post 'authenticate', to: 'authentication#authenticate'
       post 'authenticate/refresh', to: 'authentication#refresh'
 
-      resources :students do
+      resources :students, model_name: 'Gaku::Student' do
         resources :guardians, controller: 'students/guardians'
         resources :student_guardians, controller: 'students/student_guardians', only: %i(create destroy)
         resources :courses, controller: 'students/courses'
         resources :class_groups, controller: 'students/class_groups'
         resources :extracurricular_activities, controller: 'students/extracurricular_activities'
         resources :exam_sessions, controller: 'students/exam_sessions'
+        resources :contacts
+
+        get :picture, on: :member
       end
 
       resources :courses do
@@ -26,6 +29,7 @@ Gaku::Core::Engine.routes.draw do
       end
 
       resources :syllabuses
+      resources :contact_types
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaku_api
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Rei Kagetsuki
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-26 00:00:00.000000000 Z
+date: 2018-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_command
@@ -88,28 +88,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0.pre.4
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0.pre.4
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: gaku_testing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0.pre.4
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0.pre.4
+        version: 0.3.0
 description: API functionality for GAKU Engine. See https://github.com/GAKUEngine/gaku
 email: info@gakuengine.com
 executables: []
@@ -122,6 +122,8 @@ files:
 - app/controllers/gaku/api/v1/base_controller.rb
 - app/controllers/gaku/api/v1/class_groups/enrollments_controller.rb
 - app/controllers/gaku/api/v1/class_groups/students_controller.rb
+- app/controllers/gaku/api/v1/contact_types_controller.rb
+- app/controllers/gaku/api/v1/contacts_controller.rb
 - app/controllers/gaku/api/v1/courses/enrollments_controller.rb
 - app/controllers/gaku/api/v1/courses/students_controller.rb
 - app/controllers/gaku/api/v1/courses_controller.rb
@@ -136,6 +138,8 @@ files:
 - app/controllers/gaku/api/v1/students_controller.rb
 - app/controllers/gaku/api/v1/syllabuses_controller.rb
 - app/serializers/gaku/class_group_serializer.rb
+- app/serializers/gaku/contact_serializer.rb
+- app/serializers/gaku/contact_type_serializer.rb
 - app/serializers/gaku/course_serializer.rb
 - app/serializers/gaku/enrollment_serializer.rb
 - app/serializers/gaku/exam_session_serializer.rb
@@ -172,9 +176,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.3