gaku_core 0.2.4 → 0.3.0.pre.0

data/lib/gaku/grading/single/ordinal.rb

@@ -1,11 +1,10 @@
 class Gaku::Grading::Single::Ordinal < Gaku::Grading::Single::BaseMethod
 
-  attr_accessor :criteria
+  # attr_accessor :criteria
 
   def grade_exam
     exam = @gradable
-
-    percentage = Gaku::Grading::Single::Percentage.new(exam, @student).grade
+    percentage = Gaku::Grading::Single::Percentage.new(exam, @student, gradable_scope).grade
     @result = { id: @student.id, score: ordinal(percentage['score']) }
   end
 

data/lib/gaku/grading/single/percentage.rb

@@ -7,10 +7,9 @@ class Gaku::Grading::Single::Percentage < Gaku::Grading::Single::BaseMethod
 
     @scores = []
     @max_score = exam.max_score
-
     exam.exam_portions.each_with_index do |exam_portion, index|
-      ep_score = @student.exam_portion_scores.where(exam_portion_id: exam_portion.id).first_or_create!
-      @scores << ep_score.score if ep_score.score
+      ep_score = @student.exam_portion_scores.where(gradable: gradable_scope, exam_portion_id: exam_portion.id).first_or_create
+      @scores << ep_score.score if ep_score && ep_score.score
     end
 
     @result = { id: @student.id, score: formated_score }

data/lib/gaku/grading/single/score.rb

@@ -3,10 +3,9 @@ class Gaku::Grading::Single::Score < Gaku::Grading::Single::BaseMethod
   def grade_exam
     @score = nil
     exam = @gradable
-
     exam.exam_portions.each_with_index do |exam_portion, index|
-      ep_score = @student.exam_portion_scores.where(exam_portion_id: exam_portion.id).first_or_create!
-      @score = @score.to_f + ep_score.score if ep_score.score
+      ep_score = @student.exam_portion_scores.where(gradable: gradable_scope, exam_portion_id: exam_portion.id).first_or_create
+      @score = @score.to_f + ep_score.score if ep_score && ep_score.score
     end
 
     @result = { id: @student.id, score: @score }

data/lib/gaku/testing/common_rake.rb

@@ -20,14 +20,55 @@ namespace :common do
                                  ]
 
     puts 'Setting up dummy database...'
-    cmd = 'bundle exec rake db:drop db:create db:migrate db:test:prepare RAILS_ENV=test'
 
-    if RUBY_PLATFORM =~ /mswin/ # windows
-      cmd += ' >nul'
+    if (!!(`PGPASSWORD=manabu psql postgres --user manabu -c "SELECT current_setting('is_superuser');"` =~ /on/))
+      `bundle exec rails app:update:bin db:environment:set db:drop db:create db:migrate db:test:prepare RAILS_ENV=test`
     else
-      cmd += ' >/dev/null'
+      printf "Database was not accessible. How would you like to proceed?\n" \
+        "(1) Try to create user and database automatically (requires sudo)\n" \
+        "(2) Attempt to run creation tasks/migrations. This requires the following:\n" \
+        "\t * HStore installed\n" \
+        "\t * Postgres user \"manabu\" with password \"manabu\"\n" \
+        "\t * Database \"gaku_test\" and \"gaku_development\" with full permission granted to \"manabu\"\n" \
+        "\t * Database \"gaku_test\" and \"gaku_development\" are *empty*\n" \
+        "Please enter 1 or 2. Enter anything else or simply hit enter to cancel: "
+      selection = STDIN.getc
+      case selection
+        when '1' then
+          puts 'Creating user and database automatically...'
+          _autopilot_setup
+        when '2' then
+          puts 'Running creation tasks/migrations...'
+          `bundle exec rails app:update:bin db:environment:set db:migrate RAILS_ENV=test`
+        else
+          puts
+      end
     end
-
-    system(cmd)
   end
 end
+
+def _autopilot_setup
+  term_cover = " 1> /dev/null 2> /dev/null"
+  puts "Setting up DB User, Database, and Extensions..."
+  `sudo -u postgres psql -c "CREATE USER manabu WITH PASSWORD 'manabu';"#{term_cover}`
+  `sudo -u postgres psql -c "ALTER USER manabu CREATEDB;"#{term_cover}`
+  `sudo -u postgres psql -c "CREATE EXTENSION IF NOT EXISTS hstore;"#{term_cover}`
+
+  `sudo -u postgres psql -c "DROP DATABASE gaku_test;"#{term_cover}`
+  `sudo -u postgres psql -c "CREATE DATABASE gaku_test;"#{term_cover}`
+  `sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE \"gaku_test\" to manabu;"#{term_cover}`
+  `sudo -u postgres psql gaku_test -c "CREATE EXTENSION hstore;"#{term_cover}`
+  `sudo -u postgres psql -c "ALTER DATABASE gaku_test OWNER TO manabu;"#{term_cover}`
+  
+  `sudo -u postgres psql -c "DROP DATABASE gaku_development;"#{term_cover}`
+  `sudo -u postgres psql -c "CREATE DATABASE gaku_development;"#{term_cover}`
+  `sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE \"gaku_development\" to manabu;"#{term_cover}`
+  `sudo -u postgres psql gaku_development -c "CREATE EXTENSION hstore;"#{term_cover}`
+  `sudo -u postgres psql -c "ALTER DATABASE gaku_development OWNER TO manabu;"#{term_cover}`
+  puts "Done."
+
+  puts "Running tasks..."
+  `bundle exec rails app:update:bin db:environment:set db:migrate RAILS_ENV=test`
+  puts "Done. If the test app does not run normally please follow the setup guide at: "
+  puts "https://github.com/GAKUEngine/gaku"
+end

data/lib/gaku/testing/controller_helpers.rb

@@ -92,10 +92,12 @@ module Gaku::Testing::ControllerHelpers
     process(action, method, parameters, session, flash)
   end
 
-  def process_js_gaku_action(action, method = 'GET', parameters = nil, session = nil, flash = nil)
-    parameters ||= {}
-    parameters.reverse_merge!(format: :js)
-    xml_http_request(method, action, parameters, session, flash)
+  def process_js_gaku_action(action, method = 'GET', params = nil, session = nil, flash = nil)
+    # parameters ||= {}
+    # parameters.reverse_merge!(format: :js)
+    # xml_http_request(method, action, parameters, session, flash)
+    process action, method: method, params: params.reverse_merge!(format: :js), session: session, flash: flash, xhr: true
+
   end
 
 end

data/lib/gaku/testing/factories/address_factory.rb

@@ -1,9 +1,9 @@
 FactoryGirl.define do
 
   factory :address, class: Gaku::Address do
-    address1 { Faker::Address.street_address }
-    address2 { Faker::Address.street_address }
-    city     { Faker::Address.city }
+    address1 { FFaker::Address.street_address }
+    address2 { FFaker::Address.street_address }
+    city     { FFaker::Address.city }
 
     state
     country

data/lib/gaku/testing/factories/campus_factory.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
 
   factory :campus, class: Gaku::Campus do
-    name { Faker::Education.school_generic_name }
+    name { FFaker::Education.school_generic_name }
     school
 
     factory :invalid_campus do

data/lib/gaku/testing/factories/enrollment_factory.rb

@@ -3,7 +3,7 @@
 
     factory "#{resource}_enrollment", class: Gaku::Enrollment do
       student
-      association :enrollmentable, factory: resource
+      association :enrollable, factory: resource
     end
 
   end

data/lib/gaku/testing/factories/guardian_factory.rb

@@ -1,8 +1,8 @@
 FactoryGirl.define do
 
   factory :guardian, class: Gaku::Guardian do
-    name { Faker::Name.first_name }
-    surname { Faker::Name.last_name }
+    name { FFaker::Name.first_name }
+    surname { FFaker::Name.last_name }
     relationship 'Relationship'
 
     factory(:invalid_guardian) { name nil }

data/lib/gaku/testing/factories/program_factory.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
 
   factory :program, class: Gaku::Program do
-    name { Faker::Education.degree }
+    name { FFaker::Education.degree }
     description 'Superior Ruby Skills'
     school
   end

data/lib/gaku/testing/factories/school_factory.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
 
   factory :school, class: Gaku::School do
-    name { Faker::Education.school_generic_name }
+    name { FFaker::Education.school_generic_name }
     slogan 'Draw the individual potencial'
     description 'Nagoya University description'
     founded Date.new(1950, 4, 1)

data/lib/gaku/testing/factories/student_factory.rb

@@ -1,11 +1,13 @@
+require 'ffaker'
+
 FactoryGirl.define  do
 
   factory :student, class: Gaku::Student do
-    name { Faker::Name.first_name }
-    middle_name { Faker::Name.first_name }
-    surname { Faker::Name.last_name }
-    name_reading { Faker::Name.first_name }
-    surname_reading { Faker::Name.last_name }
+    name { FFaker::Name.first_name }
+    middle_name { FFaker::Name.first_name }
+    surname { FFaker::Name.last_name }
+    name_reading { FFaker::Name.first_name }
+    surname_reading { FFaker::Name.last_name }
     gender true
     birth_date Date.today
   end

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

@@ -1,7 +1,7 @@
 FactoryGirl.define do
 
   factory :syllabus, class: Gaku::Syllabus do
-    name { Faker::Name.name }
+    name { FFaker::Name.name }
     code '12345'
     description 'Short description'
     credits 'Huge Credits'

data/lib/gaku/testing/factories/teacher_factory.rb

@@ -1,10 +1,10 @@
 FactoryGirl.define  do
 
   factory :teacher, class: Gaku::Teacher do
-    name { Faker::Name.first_name }
-    surname { Faker::Name.last_name }
-    name_reading { Faker::Name.first_name }
-    surname_reading { Faker::Name.last_name }
+    name { FFaker::Name.first_name }
+    surname { FFaker::Name.last_name }
+    name_reading { FFaker::Name.first_name }
+    surname_reading { FFaker::Name.last_name }
     gender true
 
     factory :invalid_teacher do

data/lib/gaku/testing/factories/user_factory.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
   factory :user, class: Gaku::User do
-    username { Faker::Internet.user_name }
-    email { Faker::Internet.email }
+    username { FFaker::Internet.user_name }
+    email { FFaker::Internet.email }
     password 'secret'
     password_confirmation 'secret'
 

data/lib/generators/gaku/docker/docker_generator.rb

@@ -0,0 +1,58 @@
+require 'rails/generators'
+require 'highline/import'
+require 'bundler'
+require 'bundler/cli'
+
+module Gaku
+  class DockerGenerator < Rails::Generators::Base
+
+    class_option :auto_accept, type: :boolean
+    class_option :lib_name, type: :string, default: 'gaku'
+    class_option :env, type: :string, default: 'development'
+
+    def self.source_paths
+      paths = superclass.source_paths
+      paths << File.expand_path('../templates', "../../#{__FILE__}")
+      paths << File.expand_path('../templates', "../#{__FILE__}")
+      paths << File.expand_path('../templates', __FILE__)
+      paths.flatten
+    end
+
+    def copy_database_yml
+      copy_file 'config/database.yml', 'config/database.yml'
+    end
+
+    def copy_wait_bin
+      copy_file 'bin/check_postgres.sh', 'bin/check_postgres.sh'
+      chmod "bin/check_postgres.sh", 0755
+    end
+
+    def add_route
+      route "mount Gaku::Core::Engine, at: '/'"
+    end
+
+    def install_migrations
+      say_status :copying, 'migrations'
+      rake 'gaku:install:migrations'
+    end
+
+    def setup_assets
+      @lib_name = 'gaku'
+      %w( javascripts stylesheets images ).each do |path|
+        empty_directory "app/assets/#{path}/gaku/frontend" if defined? Gaku::Frontend || Rails.env.test?
+        empty_directory "app/assets/#{path}/gaku/admin" if defined? Gaku::Admin || Rails.env.test?
+      end
+
+      if defined? Gaku::Frontend || Rails.env.test?
+        template 'app/assets/javascripts/gaku/frontend/all.js'
+        template 'app/assets/stylesheets/gaku/frontend/all.css'
+      end
+
+      if defined? Gaku::Admin || Rails.env.test?
+        template 'app/assets/javascripts/gaku/admin/all.js'
+        template 'app/assets/stylesheets/gaku/admin/all.css'
+      end
+    end
+
+  end
+end

data/lib/generators/gaku/docker/templates/app/assets/javascripts/gaku/admin/all.js

@@ -0,0 +1,10 @@
+// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+//= require jquery
+//= require jquery_ujs
+//= require gaku/admin
+//= require_tree .

data/lib/generators/gaku/docker/templates/app/assets/javascripts/gaku/archive/all.js

@@ -0,0 +1,10 @@
+// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+//= require jquery
+//= require jquery_ujs
+//= require gaku/archive
+//= require_tree .

data/lib/generators/gaku/docker/templates/app/assets/javascripts/gaku/frontend/all.js

@@ -0,0 +1,10 @@
+// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+//= require jquery
+//= require jquery_ujs
+//= require gaku/frontend
+//= require_tree .

data/lib/generators/gaku/docker/templates/app/assets/stylesheets/gaku/admin/all.css

@@ -0,0 +1,9 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *
+ *= require gaku/admin
+ *= require_self
+ *= require_tree .
+*/

data/lib/generators/gaku/docker/templates/app/assets/stylesheets/gaku/archive/all.css

@@ -0,0 +1,9 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *
+ *= require gaku/archive
+ *= require_self
+ *= require_tree .
+*/

data/lib/generators/gaku/docker/templates/app/assets/stylesheets/gaku/frontend/all.css

@@ -0,0 +1,9 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *
+ *= require gaku/frontend
+ *= require_self
+ *= require_tree .
+*/

data/lib/generators/gaku/docker/templates/bin/check_postgres.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+while ! pg_isready -h postgres -p 5432 > /dev/null 2> /dev/null; do
+  echo "Connecting to postgresql failed"
+  sleep 1
+done
+rm /app/tmp/pids/server.pid
+bundle check || bundle install
+
+psql --host=postgres --port=5432 -U postgres -c "CREATE USER manabu WITH PASSWORD 'manabu';"
+psql --host=postgres --port=5432 -U postgres -c "ALTER USER manabu WITH SUPERUSER;"
+psql --host=postgres --port=5432 -U postgres -c "CREATE EXTENSION IF NOT EXISTS hstore;"
+
+bundle exec rake db:create
+bundle exec rake db:migrate
+exec "$@"

data/lib/generators/gaku/docker/templates/config/database.yml

@@ -0,0 +1,2 @@
+development:
+  url: postgres://manabu:manabu@postgres:5432/gaku_development

data/lib/generators/gaku/dummy/dummy_generator.rb

@@ -25,7 +25,6 @@ module Gaku
       opts[:force] = true
       opts[:skip_bundle] = true
       opts[:old_style_hash] = true
-
       puts 'Generating dummy Rails application...'
       invoke Rails::Generators::AppGenerator, [File.expand_path(dummy_path, destination_root)], opts
     end

data/lib/generators/gaku/dummy/templates/rails/application.rb

@@ -7,4 +7,3 @@ Bundler.require(:default, Rails.env)
 require '<%= lib_name %>'
 
 <%= application_definition %>
-

data/lib/generators/gaku/dummy/templates/rails/database.yml

@@ -1,17 +1,18 @@
-development:
+default: &default
   host: localhost
   adapter: postgresql
-  database: gaku_development
-  username: postgres
+  username: manabu
+  password: manabu
   min_messages: warning
+
+development:
+  <<: *default
+  database: gaku_development
+
 test:
-  host: localhost
-  adapter: postgresql
+  <<: *default
   database: gaku_test
-  username: postgres
-  min_messages: warning
+
 production:
-  adapter: postgresql
+  <<: *default
   database: gaku_production
-  username: postgres
-  min_messages: warning