gaku 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61cd12f8ec08530ead7130e07f3a996328ce0223
-  data.tar.gz: ea89a634dc8e7a644a71e21aae97d3c3e97d6645
+  metadata.gz: dbff8e8ff7cf34e1fe4acb9ecb46a37454abd4a2
+  data.tar.gz: f2e535cb9bddff0a65bbd344a34578f20a48ccbc
 SHA512:
-  metadata.gz: cac9f742c3f0d4a76a5aa81a3b4386b96d30e08c1b0f904f67288828b872f1b75d449bf81155349dd2e21d2e0328111818c4dafe0b290b7bfb11efcf36117ce1
-  data.tar.gz: 864492eb9bf19cc743dcb9638bef733789aee8d64fb7fbabc1cd2718d49399fd9062edf2b10d61c1c481d252a84a8c19f5522ba69d68512bff4eb06a75945e0d
+  metadata.gz: 524ce4dc1e52790b22fffb7e69f9543b4fcf3396a9e9ed4962ffb4683541c890680b9a8596b8f1997da566fe08180bc5cd909e2c362563967c39718bb31676c7
+  data.tar.gz: 64afc20707a2fa9b66264a67b2973f5756cb87a7b462e7abcd758fae3a161d154a25dafe9a05526c03b375e22eb0c40478f3849db8e3d2035ba37611d3f1e6d9

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/admin/app/assets/javascripts/gaku/admin/base.js.coffee

@@ -26,12 +26,23 @@ $.fn.datepicker_i18n = ->
 
 $.fn.datepicker.defaults.format = "yyyy-mm-dd"
 
+window.load_preset_states = (preset_id)->
+  countryCode = $("#country_dropdown option:selected").val()
+  if countryCode
+    $.ajax
+      type: 'get'
+      url: '/admin/presets/states_list'
+      dataType: 'script'
+      data:
+        country_id: countryCode
+        preset_id: preset_id
+
 window.load_states = ->
   countryCode = $("#country_dropdown option:selected").val()
   if countryCode
     $.ajax
       type: 'get'
-      url: '/states'
+      url: '/admin/states_list'
       dataType: 'script'
       data:
         country_id: countryCode

data/admin/app/controllers/gaku/admin/campuses/addresses_controller.rb

@@ -13,6 +13,8 @@ module Gaku
     end
 
     def new
+      @default_country = Preset.country
+      @default_state = Preset.state
       @address = Address.new
       respond_with @address
     end

data/admin/app/controllers/gaku/admin/presets_controller.rb

@@ -2,7 +2,7 @@ module Gaku
   class Admin::PresetsController < Admin::BaseController
 
     respond_to :js,            only: %i( index edit update )
-    before_action :set_preset, except: :index
+    before_action :set_preset, except: %i( index states_list )
 
     def index
       @presets = Preset.all
@@ -13,6 +13,8 @@ module Gaku
     def edit
       @per_page_values = [10, 25, 50, 100]
       @countries = Country.all
+      @country = @preset['address']['country'] ? Country.find(@preset['address']['country']) : Country.first
+      @state = @preset['address']['state'] ? State.find(@preset['address']['state']) : nil
     end
 
     def update
@@ -20,6 +22,21 @@ module Gaku
       respond_with @preset, location: [:edit, :admin, @preset]
     end
 
+    def states_list
+      if params[:country_id]
+        @country = Country.find(params[:country_id])
+
+        if params[:preset_id]
+          @preset = Preset.find(params[:preset_id])
+          @state = @preset['address']['state'] ? State.find(@preset['address']['state']) : nil
+        end
+
+        @states = State.where(country_iso: @country.iso)
+      else
+        @states = State.all
+      end
+    end
+
     private
 
     def preset_params

data/admin/app/controllers/gaku/admin/states_list_controller.rb

@@ -0,0 +1,20 @@
+module Gaku
+  module Admin
+    class StatesListController < Admin::BaseController
+
+      respond_to :js, :json
+
+      def index
+        if params[:country_id]
+          @country = Country.find(params[:country_id])
+
+          @states = State.where(country_iso: @country.iso).order('name asc')
+          @state = Preset.state
+        else
+          @states = State.all
+        end
+
+      end
+    end
+  end
+end

data/admin/app/helpers/gaku/shared_helper.rb

@@ -9,12 +9,22 @@ module Gaku
       { t(:'gender.female') => false, t(:'gender.male') => true }
     end
 
-    def state_load(object)
-      object.country.nil? ? Gaku::State.none : object.country.states
+    def state_load(country_preset)
+      country = Gaku::Country.find_by(iso: country_preset)
+      if country
+        country.states
+      else
+        Gaku::State.none
+      end
     end
 
-    def disabled?(object)
-      object.new_record? || object.country.states.blank?
+    def disabled?(country_preset)
+      country = Gaku::Country.find_by(iso: country_preset)
+      if country
+        country.states_required
+      else
+        true
+      end
     end
 
     def render_flash

data/admin/app/views/gaku/admin/campuses/addresses/_addresses.html.slim

@@ -13,8 +13,8 @@
           tr
             = th t(:'address.title')
             = th t(:'address.country')
+            = th t(:'address.state.singular')
             = th t(:'address.zipcode')
-            = th t(:'address.state')
             = th t(:'address.city')
             = th t(:'address.address1')
             = th t(:'address.address2')

data/admin/app/views/gaku/admin/campuses/addresses/_form_fields.html.slim

@@ -3,23 +3,22 @@
     = f.text_field :title, label: t(:'address.title')
 
 .row
-  .col-md-3
-    = f.select :country_id, options_from_collection_for_select(@countries, :id, :name) , { prompt: t(:'address.choose_country'), selected: f.object.country_id || Gaku::Preset.address('country') }, id: "country_dropdown", label: t(:'address.country')
-  .col-md-3
+  .col-md-4
+    = f.select :country_id, options_from_collection_for_select(@countries, :id, :i18n_name, (f.object.country_id || @default_country.try(:id))) , { prompt: t(:'address.choose_country') }, { id: "country_dropdown", label: t(:'address.country') }
+  .col-md-4
     #state-dropdown
-      = f.collection_select :state_id, state_load(f.object), :id, :name, { prompt: t(:'address.state.choose')} , disabled: disabled?(f.object), label: t(:'address.state')
-
-  .col-md-3
+      = f.select :state_id, options_from_collection_for_select(state_load(f.object), :id, :i18n_name, (f.object.state_id || @default_state.try(:id))), { prompt: t(:'address.state.choose') }, { class: 'form-control', disabled: disabled?(f.object), label: t(:'address.state.singular') }
+  .col-md-4
+    = f.object.state_id || @default_state.try(:id)
+    / = f.object.to_json
     = f.text_field :zipcode, label: t(:'address.zipcode')
-  .col-md-3
-    button.col-md-12.btn.btn-primary = t(:'address.search')
 
 .row
-  .col-md-3
+  .col-md-4
     = f.text_field :city, value: f.object.city ||  Gaku::Preset.address('city'), label: t(:'address.city')
-  .col-md-3
+  .col-md-4
     = f.text_field :address1, label: t(:'address.address1')
-  .col-md-3
+  .col-md-4
     = f.text_field :address2, label: t(:'address.address2')
 
 javascript:

data/admin/app/views/gaku/admin/home/index.html.slim

@@ -1,5 +1,6 @@
 .row
-  .col-md-2
-    .panel-group#accordion
+  .panel-group#accordion
+    .col-md-2
       = render 'gaku/shared/menu/admin_menu'
-  .col-md-10#ajax-load
+
+  .col-md-10.pull-right#ajax-load

data/admin/app/views/gaku/admin/presets/_address.html.slim

@@ -4,12 +4,14 @@
       .col-md-4
         = f.fields_for :address do |a|
           = a.label t(:'preset.address.country')
-          = a.select :country, @countries, {selected: @preset['address']['country'], prompt: t(:'address.choose_country')}, { class: 'form-control' }
+          = a.select :country, options_from_collection_for_select(@countries, :id, :i18n_name, @country.try(:id)) , { prompt: t(:'address.choose_country') }, { id: "country_dropdown", class: 'form-control', label: t(:'address.country') }
 
       .col-md-4
         = f.fields_for :address do |a|
           = a.label t(:'preset.address.state')
-          = a.text_field :state, value: @preset['address']['state'], class: 'form-control'
+          #state-dropdown
+            = a.select :state, options_from_collection_for_select(state_load(@preset['address']['country']), :id, :i18n_name, @state.try(:id)), { prompt: t(:'address.state.choose') }, { class: 'form-control', disabled: disabled?(a.object), label: t(:'address.state') }
+
 
       .col-md-4
         = f.fields_for :address do |a|

data/admin/app/views/gaku/admin/presets/_no_states_select.html.slim

@@ -0,0 +1 @@
+= collection_select(:address, :state,  states,  :id, :name, {prompt: t(:'address.state.choose') }, disabled: true, class: 'span12 form-control')

data/admin/app/views/gaku/admin/presets/_states_select.html.slim

@@ -0,0 +1,3 @@
+= fields_for :preset do |f|
+  = f.fields_for :address do |a|
+    = a.select :state, options_from_collection_for_select(states, :id, :name, state.try(:id)), { prompt: t(:'address.state.choose') }, { class: 'form-control', label: t(:'address.state') }

data/admin/app/views/gaku/admin/presets/edit.js.erb

@@ -1 +1,7 @@
-$('#ajax-load').html('<%=j render "tabs" %>')
+$('#ajax-load').html('<%=j render "tabs" %>');
+
+$('body').on('change', '#country_dropdown', function() {
+  return load_preset_states(<%= @preset.id %>);
+});
+
+load_preset_states(<%= @preset.id %>);

data/admin/app/views/gaku/admin/presets/states_list.js.erb

@@ -0,0 +1,5 @@
+if(<%= @states.count %> > 0 ) {
+  $('#state-dropdown').html("<%=j render 'states_select', states: @states, state: @state %>");
+} else {
+  $('#state-dropdown').html("<%=j render 'no_states_select', states: @states %>");
+}

data/admin/app/views/gaku/admin/states_list/_no_states_select.html.slim

@@ -0,0 +1,4 @@
+= fields_for :address do |a|
+  = a.label :state_id,  t(:'address.state.singular')
+  = a.select :state_id, options_from_collection_for_select(states, :id, :i18n_name), { prompt: t(:'address.state.choose') }, disabled: true, class: 'form-control'
+

data/admin/app/views/gaku/admin/states_list/_states_select.html.slim

@@ -0,0 +1,3 @@
+= fields_for :address do |a|
+  = a.label :state_id,  t(:'address.state.singular')
+  = a.select :state_id, options_from_collection_for_select(states, :id, :i18n_name, state.try(:id)), { prompt: t(:'address.state.choose') }, { class: 'form-control' }

data/admin/app/views/gaku/admin/states_list/index.js.erb

@@ -0,0 +1,5 @@
+if(<%= @states.count %> > 0 ) {
+  $('#state-dropdown').html("<%=j render 'states_select', states: @states, state: @state %>");
+} else {
+  $('#state-dropdown').html("<%=j render 'no_states_select', states: @states %>");
+}

data/admin/config/routes.rb

@@ -17,11 +17,11 @@ Gaku::Core::Engine.routes.draw  do
     end
   end
 
-  resources :states, only: :index
-
   namespace :admin do
     root to: 'home#index'
 
+    resources :states_list, only: :index
+
     get 'school_details',          to: 'schools#show_master'
     get 'school_details/edit',     to: 'schools#edit_master'
     patch 'school_details/update', to: 'schools#update_master'
@@ -71,7 +71,9 @@ Gaku::Core::Engine.routes.draw  do
       resources :semesters, controller: 'school_years/semesters', except: %i( show )
     end
 
-    resources :presets
+    resources :presets do
+      get :states_list, on: :collection
+    end
 
   end
 end

data/admin/gaku_admin.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'sass-rails',                     '~> 5.0.0'
   s.add_dependency 'sass',                           '~> 3.2'
   s.add_dependency 'sprockets',                      '2.11.0'
-  s.add_dependency 'slim',                           '2.0.0'
+  s.add_dependency 'slim',                           '~> 3.0'
   s.add_dependency 'responders',                     '~> 2.0'
 
   s.add_dependency 'rails4_client_side_validations', '~> 4.2'
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'jquery-rails',                   '~> 3.1'
   s.add_dependency 'jquery-ui-rails',                '~> 4.2'
-  s.add_dependency 'jquery-minicolors-rails',        '2.1.1'
+  s.add_dependency 'jquery-minicolors-rails',        '2.1.4'
   s.add_dependency 'bootstrap-sass',                 '3.1.1.0'
   s.add_dependency 'bootstrap-datepicker-rails',     '~> 1.3.0.1'
   s.add_dependency 'nprogress-rails'

data/admin/lib/tasks/admin_user.rake

@@ -91,10 +91,11 @@ def create_admin_user
     say "\nWARNING: There is already a user with the username: #{username}, so no account changes were made.  If you wish to create an additional admin user, please run rake gaku:generate_admin again with a different username.\n\n"
   else
     say "Creating user..."
-    creator = Gaku::UserCreator.new(attributes).save
+    creator = Gaku::UserCreator.new(attributes)
+    creator.save
     admin = creator.get_user
     # create an admin role and and assign the admin user to that role
-    role = Gaku::Role.find_or_create_by_name 'Admin'
+    role = Gaku::Role.where(name: 'Admin').first_or_initialize
     admin.roles << role
     if admin.save
       say "User Created"

data/admin/spec/features/presets/address_preset_spec.rb

@@ -17,20 +17,20 @@ describe 'Admin Presets Students' do
   end
 
   it 'saves', js: true do
-    select country.name, from: 'preset_address_country'
-    fill_in 'preset_address_state', with: state.name
+    select country.name, from: 'country_dropdown'
+    select state.name, from: 'preset_address_state'
     fill_in 'preset_address_city', with: 'Varna'
     click submit
 
     flash_updated?
     click '#admin-preset-address-tab-link'
-    expect(find_field('preset_address_country').value).to eq country.name
-    expect(find_field('preset_address_state').value).to eq state.name
+    expect(find_field('country_dropdown').value).to eq "#{country.id}"
+    expect(find_field('preset_address_state').value).to eq "#{state.id}"
     expect(find_field('preset_address_city').value).to eq 'Varna'
 
     preset.reload
-    expect(preset['address']['country']). to eq country.name
-    expect(preset['address']['state']). to eq state.name
+    expect(preset['address']['country']). to eq "#{country.id}"
+    expect(preset['address']['state']). to eq "#{state.id}"
     expect(preset['address']['city']). to eq 'Varna'
   end
 

data/admin/spec/features/schools/campuses/addresses_spec.rb

@@ -7,7 +7,7 @@ describe 'Admin School Campuses Address' do
 
   let!(:country) { create(:country, name: 'USA', iso: 'US') }
   let(:country_without_state) { create(:country, name: 'Japan', iso: 'JP') }
-  let!(:state) { create(:state, name: 'Florida', country: country) }
+  let!(:state) { create(:state, name: 'Florida', abbr: 'FL', country: country) }
 
   before(:all) { set_resource 'admin-school-campus-address' }
   before { as :admin }
@@ -47,7 +47,7 @@ describe 'Admin School Campuses Address' do
     it 'changes country without state' do
       select "#{country_without_state}", from: 'country_dropdown'
       within('#state-dropdown') do
-        expect(page).to have_css('select#address_state_id[disabled]')
+        expect(page).to have_css('select#address_state_id', visible: false)
         has_no_content? state.name
       end
     end
@@ -98,7 +98,7 @@ describe 'Admin School Campuses Address' do
       it 'changes country without state' do
         select "#{country_without_state}", from: 'country_dropdown'
         within('#state-dropdown') do
-          expect(page).to have_css('select#address_state_id[disabled]')
+          expect(page).to have_css('select#address_state_id', visible: false)
           has_no_content? state.name
         end
       end

data/common_gaku_dependencies.rb

@@ -1,6 +1,6 @@
 group :test do
   gem 'capybara',                 '~> 2.4'
-  gem 'selenium-webdriver',       '2.43'
+  gem 'selenium-webdriver',       '2.45'
   gem 'poltergeist'
   gem 'launchy'
   gem 'handy_controller_helpers', '0.0.3'

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

@@ -34,12 +34,15 @@ module Gaku
     def set_locale
       if current_user && params[:locale]
         I18n.locale = params[:locale]
+        Carmen.i18n_backend.locale = I18n.locale
         current_user.settings[:locale] = params[:locale]
         notice = "Language is set to #{t('languages.' + current_user.locale)}"
         flash[:notice] = notice if current_user.save
       elsif current_user
         I18n.locale = current_user.settings[:locale]
+        Carmen.i18n_backend.locale = I18n.locale
       else
+        Carmen.i18n_backend.locale = I18n.default_locale
         I18n.default_locale
       end
     end

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

@@ -14,7 +14,17 @@ module Gaku
     end
 
     def to_s
-      name
+      i18n_name
     end
+
+    def i18n_name
+      carmen_country = Carmen::Country.coded(iso)
+      if carmen_country
+        carmen_country.name
+      else
+        name
+      end
+    end
+
   end
 end

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

@@ -44,5 +44,22 @@ module Gaku
       active.address[key.to_s] unless active.nil?
     end
 
+    def self.state
+      if active
+        State.find(active.address['state'])
+      else
+        State.first
+      end
+    end
+
+    def self.country
+      if active
+        Country.find(active.address['country'])
+      else
+        Country.first
+      end
+    end
+
+
   end
 end

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

@@ -1,5 +1,8 @@
 module Gaku
   class State < ActiveRecord::Base
+
+    default_scope { order(:abbr) }
+
     has_many :addresses
 
     belongs_to :country, foreign_key: :country_iso, primary_key: :iso
@@ -26,7 +29,17 @@ module Gaku
     end
 
     def to_s
-      name
+      i18n_name
+    end
+
+    def i18n_name
+      carmen_country = Carmen::Country.coded(country_iso)
+      if carmen_country && carmen_country.subregions? && carmen_country.subregions.coded(abbr)
+        carmen_country.subregions.coded(abbr).name
+      else
+        name
+      end
     end
+
   end
 end