gaku 0.0.2 → 0.0.3

data/core/lib/gaku/core.rb

@@ -18,16 +18,15 @@ require 'inherited_resources'
 require 'draper'
 require 'kaminari'
 require 'rails4_client_side_validations'
-require 'sidekiq/web'
 require 'paper_trail'
-require 'globalize3'
-require 'thinreports-rails'
+require 'globalize'
 require 'bootstrap-sass'
 require 'bootstrap-datepicker-rails'
 require 'nested_form'
 require 'gaku_helpers'
 require 'gaku_forms'
 require 'gaku_nested_forms'
+require 'thinreports-rails'
 
 module Gaku
 

data/core/lib/gaku/core/version.rb

@@ -1,5 +1,5 @@
 module Gaku
   def self.version
-    '0.0.1'
+    '0.0.3'
   end
 end

data/core/lib/generators/gaku/install/install_generator.rb

@@ -34,16 +34,6 @@ module Gaku
       remove_file 'public/index.html'
     end
 
-    def clear_logs
-      remove_file 'log/sidekiq.log'
-      add_file 'log/sidekiq.log'
-    end
-
-    def add_files
-      template 'config/sidekiq.yml', 'config/sidekiq.yml'
-      template 'Procfile', 'Procfile'
-    end
-
     def setup_assets
       @lib_name = 'gaku'
       %w{javascripts stylesheets images}.each do |path|
@@ -58,6 +48,7 @@ module Gaku
       empty_directory 'app/overrides'
     end
 
+
     def configure_application
       application <<-APP
 

data/core/spec/models/address_spec.rb

@@ -20,7 +20,7 @@ describe Gaku::Address do
   describe 'validations' do
     it { should validate_presence_of :address1 }
     it { should validate_presence_of :city }
-    it { should validate_presence_of :country_id }
+    it { should validate_presence_of :country }
   end
 
   describe '.before_save' do

data/core/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 require 'rubygems'
-require 'sidekiq'
 
 ENV['RAILS_ENV'] ||= 'test'
 require File.expand_path('../dummy/config/environment', __FILE__)
@@ -9,7 +8,9 @@ require 'database_cleaner'
 require 'active_record/fixtures'
 require 'factory_girl_rails'
 require 'paperclip/matchers'
-require 'sidekiq/testing'
+require 'handy_controller_helpers'
+require 'ffaker'
+require 'shoulda-matchers'
 
 require 'gaku/testing/env'
 require 'gaku/testing/factories'
@@ -34,7 +35,6 @@ if ENV['COVERAGE']
     add_filter '/config/**'
     add_group 'Controllers', 'app/controllers'
     add_group 'Helpers', 'app/helpers'
-    add_group 'Workers', 'app/workers'
     add_group 'Mailers', 'app/mailers'
     add_group 'Models', 'app/models'
     add_group 'Libraries', 'lib'

data/gaku_dependencies.rb

@@ -1,24 +1,14 @@
 source 'http://production.s3.rubygems.org'
 
-gem 'globalize3',  github: 'globalize/globalize', branch: 'rails4', ref: '82b3b36308677745b261bd147dda00ed4560a25d'
-
 group :development do
   gem 'guard'
+  gem 'rubocop'
   gem 'guard-rspec'
   gem 'guard-bundler'
-  gem 'guard-cop'
+  gem 'guard-rubocop'
 end
 
 group :test do
-  gem 'rspec-rails'
-  gem 'factory_girl_rails', '~> 4.2.1'
-  gem 'ffaker'
-  gem 'shoulda-matchers', '~> 2.4.0'
-  gem 'handy_controller_helpers', '0.0.3'
-  gem 'capybara', '= 1.1.3'
-  gem 'selenium-webdriver'
-  gem 'poltergeist'
-  gem 'database_cleaner'
   gem 'simplecov'
   gem 'coveralls', require: false
 end

data/sample/db/sample/gaku/changes/student_changes.rb

@@ -3,9 +3,9 @@ require 'shared_sample_data'
 
 say "Creating #{@count[:changes]} student changes ...".yellow
 
-commute_method_type = Gaku::CommuteMethodType.where(name: 'Changed CommuteMethodType').first_or_create!
-scholarship_status = Gaku::ScholarshipStatus.where(name: 'Changed Scholarship Status').first_or_create!
-enrollment_status = Gaku::EnrollmentStatus.where(code: 'changed_enrollment_status').first_or_create!
+commute_method_type = Gaku::CommuteMethodType.create!(name: 'Changed CommuteMethodType')
+scholarship_status = Gaku::ScholarshipStatus.create!(name: 'Changed Scholarship Status')
+enrollment_status = Gaku::EnrollmentStatus.create!(code: 'changed_enrollment_status')
 
 counter = 0
 

data/sample/gaku_sample.gemspec

@@ -20,5 +20,4 @@ Gem::Specification.new do |s|
   s.requirements << 'redis'
 
   s.add_dependency 'gaku_core', version
-  s.add_dependency 'ffaker'
 end

data/sample/lib/shared_sample_data.rb

@@ -9,8 +9,8 @@
 @home_phone = Gaku::ContactType.where(name: 'Home Phone').first_or_create!
 @email = Gaku::ContactType.where(name: 'Email').first_or_create!
 @enrollment_status = Gaku::EnrollmentStatus.where(code: 'admitted').first.try(:code)
-@commute_method_type = Gaku::CommuteMethodType.where(name: 'Superbike').first_or_create!
-@scholarship_status = Gaku::ScholarshipStatus.where(name: 'Charity').first_or_create!
+@commute_method_type = Gaku::CommuteMethodType.create!(name: 'Superbike')
+@scholarship_status = Gaku::ScholarshipStatus.create!(name: 'Charity')
 
 @john_doe = {
   name: 'John',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaku
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Rei Kagetsuki
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-10 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gaku_core
@@ -19,28 +19,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: gaku_sample
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
 description: It allows for full student management, grading etc. It's bascally what
   all student grading tools are with some unique features
 email: info@genshin.org
@@ -240,7 +240,6 @@ files:
 - core/app/controllers/gaku/students/class_group_enrollments_controller.rb
 - core/app/controllers/gaku/students/course_enrollments_controller.rb
 - core/app/controllers/gaku/students/guardians_controller.rb
-- core/app/controllers/gaku/students/importer_controller.rb
 - core/app/controllers/gaku/students/simple_grades_controller.rb
 - core/app/controllers/gaku/students/student_achievements_controller.rb
 - core/app/controllers/gaku/students/student_specialties_controller.rb
@@ -248,7 +247,6 @@ files:
 - core/app/controllers/gaku/syllabuses/assignments_controller.rb
 - core/app/controllers/gaku/syllabuses/exam_syllabuses_controller.rb
 - core/app/controllers/gaku/syllabuses/exams_controller.rb
-- core/app/controllers/gaku/syllabuses/importer_controller.rb
 - core/app/controllers/gaku/syllabuses_controller.rb
 - core/app/controllers/gaku/teachers_controller.rb
 - core/app/decorators/gaku/guardian_decorator.rb
@@ -293,6 +291,7 @@ files:
 - core/app/models/gaku/course_enrollment.rb
 - core/app/models/gaku/course_group.rb
 - core/app/models/gaku/course_group_enrollment.rb
+- core/app/models/gaku/disposal.rb
 - core/app/models/gaku/enrollment_status.rb
 - core/app/models/gaku/exam.rb
 - core/app/models/gaku/exam_portion.rb
@@ -308,7 +307,6 @@ files:
 - core/app/models/gaku/grading_method_set.rb
 - core/app/models/gaku/grading_method_set_item.rb
 - core/app/models/gaku/guardian.rb
-- core/app/models/gaku/import_file.rb
 - core/app/models/gaku/install.rb
 - core/app/models/gaku/lesson.rb
 - core/app/models/gaku/lesson_plan.rb
@@ -880,6 +878,8 @@ files:
 - core/app/views/gaku/shared/menu/_global.html.erb
 - core/app/views/gaku/shared/multi_error.js.erb
 - core/app/views/gaku/shared/notice.js.erb
+- core/app/views/gaku/shared/overrides/students/_import_link.html.slim
+- core/app/views/gaku/shared/overrides/syllabuses/_import_link.html.slim
 - core/app/views/gaku/shared/student/_academic.html.slim
 - core/app/views/gaku/shared/student/_edit.html.slim
 - core/app/views/gaku/shared/student/_personal.html.slim
@@ -943,8 +943,6 @@ files:
 - core/app/views/gaku/students/guardians/recovery.js.erb
 - core/app/views/gaku/students/guardians/show.html.slim
 - core/app/views/gaku/students/guardians/update.js.erb
-- core/app/views/gaku/students/importer/index.html.slim
-- core/app/views/gaku/students/importer/roster_import_preview.html.slim
 - core/app/views/gaku/students/index.html.slim
 - core/app/views/gaku/students/index.js.erb
 - core/app/views/gaku/students/index.pdf.thinreports
@@ -1029,7 +1027,6 @@ files:
 - core/app/views/gaku/syllabuses/exams/edit.js.erb
 - core/app/views/gaku/syllabuses/exams/new.js.erb
 - core/app/views/gaku/syllabuses/exams/update.js.erb
-- core/app/views/gaku/syllabuses/importer/index.html.slim
 - core/app/views/gaku/syllabuses/index.html.slim
 - core/app/views/gaku/syllabuses/new.js.erb
 - core/app/views/gaku/syllabuses/update.js.erb
@@ -1061,8 +1058,6 @@ files:
 - core/app/views/kaminari/_page.html.erb
 - core/app/views/kaminari/_paginator.html.erb
 - core/app/views/kaminari/_prev_page.html.erb
-- core/app/workers/gaku/importers/students/roster_worker.rb
-- core/app/workers/gaku/importers/students/school_station_zaikousei_worker.rb
 - core/config/initializers/active_record.rb
 - core/config/initializers/client_side_validations.rb
 - core/config/initializers/devise.rb
@@ -1073,7 +1068,6 @@ files:
 - core/config/initializers/mime_types.rb
 - core/config/initializers/paper_trail.rb
 - core/config/initializers/ruby_template_handler.rb
-- core/config/initializers/sidekiq.rb
 - core/config/initializers/translation_missing.rb
 - core/config/initializers/wrap_parameters.rb
 - core/config/locales/bg.yml
@@ -1091,7 +1085,8 @@ files:
 - core/db/default/gaku/roles.yml
 - core/db/default/gaku/scholarship_statuses.rb
 - core/db/default/gaku/states.yml
-- core/db/migrate/20120202111850_gaku_core.rb
+- core/db/migrate/20120202111850_translated_tables.rb
+- core/db/migrate/20131014065028_gaku_core.rb
 - core/db/schema.rb
 - core/db/seeds.rb
 - core/gaku_core.gemspec
@@ -1102,18 +1097,9 @@ files:
 - core/lib/gaku/core/engine.rb
 - core/lib/gaku/core/url_helpers.rb
 - core/lib/gaku/core/version.rb
-- core/lib/gaku/exporters/roster_exporter.rb
 - core/lib/gaku/grading/calculations.rb
 - core/lib/gaku/grading/grade.rb
 - core/lib/gaku/grading/japanese_hs_standard.rb
-- core/lib/gaku/importers/key_mapper.rb
-- core/lib/gaku/importers/logger.rb
-- core/lib/gaku/importers/students/guardians.rb
-- core/lib/gaku/importers/students/personal_information.rb
-- core/lib/gaku/importers/students/roster.rb
-- core/lib/gaku/importers/students/roster_to_student.rb
-- core/lib/gaku/importers/students/school_station_zaikousei.rb
-- core/lib/gaku/importers/students/student_identity.rb
 - core/lib/gaku/testing/auth_helpers.rb
 - core/lib/gaku/testing/common_rake.rb
 - core/lib/gaku/testing/controller_helpers.rb
@@ -1149,7 +1135,6 @@ files:
 - core/lib/gaku/testing/factories/grading_method_set_factory.rb
 - core/lib/gaku/testing/factories/grading_method_set_item_factory.rb
 - core/lib/gaku/testing/factories/guardian_factory.rb
-- core/lib/gaku/testing/factories/import_file_factory.rb
 - core/lib/gaku/testing/factories/lesson_factory.rb
 - core/lib/gaku/testing/factories/lesson_plan_factory.rb
 - core/lib/gaku/testing/factories/level_factory.rb
@@ -1189,11 +1174,8 @@ files:
 - core/lib/generators/gaku/dummy/templates/rails/routes.rb
 - core/lib/generators/gaku/dummy/templates/rails/script/rails
 - core/lib/generators/gaku/install/install_generator.rb
-- core/lib/generators/gaku/install/templates/Procfile
 - core/lib/generators/gaku/install/templates/app/assets/javascripts/gaku/all.js
 - core/lib/generators/gaku/install/templates/app/assets/stylesheets/gaku/all.css
-- core/lib/generators/gaku/install/templates/config/sidekiq.yml
-- core/lib/generators/gaku/install/templates/log/sidekiq.log
 - core/lib/tasks/admin_user.rake
 - core/lib/tasks/core.rake
 - core/lib/tasks/reset.rake
@@ -1230,7 +1212,6 @@ files:
 - core/spec/controllers/gaku/teachers_controller_spec.rb
 - core/spec/coverage/.last_run.json
 - core/spec/coverage/.resultset.json
-- core/spec/integration/importers/roster_spec.rb
 - core/spec/integration/student_address_versioning_spec.rb
 - core/spec/integration/student_contact_vesioning_spec.rb
 - core/spec/integration/student_versioning_spec.rb
@@ -1269,7 +1250,6 @@ files:
 - core/spec/models/grading_method_set_spec.rb
 - core/spec/models/grading_method_spec.rb
 - core/spec/models/guardian_spec.rb
-- core/spec/models/import_file_spec.rb
 - core/spec/models/lesson_plan_spec.rb
 - core/spec/models/lesson_spec.rb
 - core/spec/models/level_spec.rb
@@ -1370,7 +1350,6 @@ files:
 - core/spec/requests/students/guardians/contacts_spec.rb
 - core/spec/requests/students/guardians/guardians_spec.rb
 - core/spec/requests/students/guardians/picture_spec.rb
-- core/spec/requests/students/import_export.rb
 - core/spec/requests/students/notes_spec.rb
 - core/spec/requests/students/picture_spec.rb
 - core/spec/requests/students/scholarship_status_spec.rb
@@ -1397,7 +1376,6 @@ files:
 - core/spec/support/requests/shared_contacts_spec.rb
 - core/spec/support/requests/shared_notes_spec.rb
 - core/spec/support/sample_roster.ods
-- core/spec/support/sample_roster.xls
 - core/spec/support/shared_examples/addressable.rb
 - core/spec/support/shared_examples/allow.rb
 - core/spec/support/shared_examples/avatarable.rb
@@ -1406,7 +1384,6 @@ files:
 - core/spec/support/shared_examples/notable.rb
 - core/spec/support/shared_examples/person.rb
 - core/spec/support/shared_examples/thrashable.rb
-- core/spec/workers/roster_spec.rb
 - core/vendor/assets/javascripts/backbone.js
 - core/vendor/assets/javascripts/tablefix.js.coffee
 - doc/authorized_service_providers/Genshin/genshin_okazaki_office.geojson
@@ -1461,7 +1438,7 @@ requirements:
 - postgres
 - redis
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: GAKU is a student/assignment focused student and school management system

data/core/app/controllers/gaku/students/importer_controller.rb

@@ -1,75 +0,0 @@
-# -*- encoding: utf-8 -*-
-require 'GenSheet'
-module Gaku
-  class Students::ImporterController < GakuController
-
-    skip_authorization_check
-    before_action :load_templates, only: :index
-
-    def index
-      @importer_types = {I18n.t('student.roster_sheet') => :import_roster, 'School Station' => :import_school_station_zaikousei}
-      # render 'gaku/students/importer/index'
-    end
-
-    def get_roster
-      template = Template.find(params[:template][:id])
-      #read file from paperclip obejct
-      source_file = File.new(template.file.path)
-      #process with GenSheet
-      sheet = GenSheet.new(source_file).to_xls
-
-      send_file sheet
-    end
-
-    def get_registration_roster
-      exporter = Gaku::Exporters::RosterExporter.new
-      file = exporter.export({})
-    end
-
-    def create
-      redirect_to importer_index_path, alert: I18n.t('errors.messages.file_unreadable') && return if params[:importer][:data_file].nil?
-      file = ImportFile.new(import_params)
-      file.context = 'students'
-      raise 'COULD NOT SAVE FILE' unless file.save
-
-      case params[:importer][:importer_type]
-      when 'import_roster'
-        import_roster(file)
-      when 'import_school_station_zaikousei'
-        import_school_station_zaikousei(file)
-      end
-    end
-
-    private
-
-    def import_params
-      params.require(:importer).permit(:data_file, :importer_type)
-    end
-
-    def load_templates
-      @templates ||= Template.all
-    end
-
-
-    def import_roster(file)
-      if file.data_file.content_type == 'application/vnd.ms-excel' ||
-          file.data_file.content_type == 'application/vnd.oasis.opendocument.spreadsheet' ||
-          file.data_file.content_type == 'application/xls'
-        Gaku::Importers::Students::RosterWorker.perform_async(file.id)
-        render text: 'Importing Roster'
-      else
-        redirect_to importer_index_path, alert: '[' + file.data_file.content_type + '] ' + I18n.t('errors.messages.file_type_unsupported')
-      end
-    end
-
-    def import_school_station_zaikousei(file)
-      if file.data_file.content_type == 'application/vnd.ms-excel'
-        Gaku::Importers::Students::SchoolStationZaikouseiWorker.perform_async(file.id)
-        render text: '在校生をSchoolStationからインポート中。'
-      else
-        redirect_to importer_index_path, alert: I18n.t('errors.messages.file_type_unsupported')
-      end
-    end
-
-  end
-end

data/core/app/controllers/gaku/syllabuses/importer_controller.rb

@@ -1,19 +0,0 @@
-# -*- encoding: utf-8 -*-
-module Gaku
-  class Syllabuses::ImporterController < GakuController
-
-    skip_authorization_check
-
-    def index
-      #@importer_types = ["GAKU Engine"]
-      render 'gaku/syllabuses/importer/index'
-    end
-
-    def get_template
-    end
-
-    def import_from_template
-    end
-
-  end
-end