gaku_core 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcb426d951c61713b636dee09d55b6bc8e7b85cc
-  data.tar.gz: 91ad68aec6ebc6d5ccdb8cb32aac61a67cebb70c
+  metadata.gz: 62259b8d3e4b700989fae5be8df0837d8898f000
+  data.tar.gz: 907f6db5e00791e00700934cadfde7fad86d0d18
 SHA512:
-  metadata.gz: f576bfec86bf557608ee5eddb2a688a956e4382c86c00f3d92364698a8dc5b5e3280deb79d8aace00e0f6249d10d512634856bf896d210ec70cbd28c8fa38d56
-  data.tar.gz: d4ca1b4c15ed3763afe14eecfaf2346c1aa47ce724c985cbc8ce2d6e53887eaf5e09f7ae1c91e345032b903ecd9f68d544065f62ca9705d9a6177565e58253dc
+  metadata.gz: 7bf1951ae5cb1c4d6dad60d38584fb7cd4e64ff5de3a462b077f28566b28999445c6d306459bbc1dbeba7f404c0ca93ea5dfd487fe0ea1a4f3ae41fd800e7409
+  data.tar.gz: 2af760ba5e089c8496df12b6e14af6a298e30a83420541546604ffb6c5013271e2e9ab1e5ddd161ed53d36aa395cd2c716c5a5e180d5f831529b22a148c6821e

data/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/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/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/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

data/db/default/gaku/countries.rb

@@ -0,0 +1,14 @@
+require 'carmen'
+
+Carmen::Country.all.each do |country|
+  unless Gaku::Country.exists?(iso: country.alpha_2_code)
+
+    Gaku::Country.create!(name: country.name,
+      iso3: country.alpha_3_code,
+      iso: country.alpha_2_code,
+      iso_name: country.name.upcase,
+      numcode: country.numeric_code,
+      states_required: country.subregions?)
+
+  end
+end

data/db/default/gaku/presets.rb

@@ -12,7 +12,7 @@ if Gaku::Preset.count.zero?
                                       changes: 25 },
                         person: { gender: true },
                         student: { id_code: '%year-%yearly_serial', increment_foreign_id_code: 1 },
-                        address: { country: 'JP', state: 'Aichi', city: 'Nagoya' },
+                        address: { country: '114', state: '1308', city: 'Nagoya' },
                         grading: { scheme: '', method: '' },
                         export_formats: { spreadsheets: 'xls', printables: 'pdf', documents: 'xls' },
 

data/db/default/gaku/states.rb

@@ -0,0 +1,9 @@
+Gaku::Country.where(states_required: true).each do |country|
+  carmen_country = Carmen::Country.named(country.name)
+
+  carmen_country.subregions.each do |subregion|
+    unless Gaku::State.exists?(name: subregion.name, country_iso: country.iso)
+      Gaku::State.create!(name: subregion.name, abbr: subregion.code, country_iso: country.iso)
+    end
+  end
+end

data/db/migrate/20150213095508_improve_countries_and_states.rb

@@ -0,0 +1,5 @@
+class ImproveCountriesAndStates < ActiveRecord::Migration
+  def change
+    add_column :gaku_countries, :states_required, :boolean
+  end
+end

data/lib/gaku/core.rb

@@ -11,6 +11,7 @@ require 'cancan'
 require 'kaminari'
 require 'globalize'
 require 'draper'
+require 'carmen'
 
 module Gaku
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaku_core
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Rei Kagetsuki
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -69,6 +69,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: carmen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: globalize
   requirement: !ruby/object:Gem::Requirement
@@ -406,14 +420,14 @@ files:
 - db/default/gaku/attendance_types.rb
 - db/default/gaku/commute_method_types.rb
 - db/default/gaku/contact_types.yml
-- db/default/gaku/countries.yml
+- db/default/gaku/countries.rb
 - db/default/gaku/departments.rb
 - db/default/gaku/enrollment_status.rb
 - db/default/gaku/master_school.rb
 - db/default/gaku/presets.rb
 - db/default/gaku/roles.yml
 - db/default/gaku/scholarship_statuses.rb
-- db/default/gaku/states.yml
+- db/default/gaku/states.rb
 - db/migrate/20120202111850_presets.rb
 - db/migrate/20131014065028_translations.rb
 - db/migrate/20131025073352_gaku_core.rb
@@ -437,6 +451,7 @@ files:
 - db/migrate/20140715135152_create_semester_attendance_table.rb
 - db/migrate/20140718105226_create_student_review_categories_table.rb
 - db/migrate/20140728121353_create_student_review_table.rb
+- db/migrate/20150213095508_improve_countries_and_states.rb
 - db/schema.rb
 - db/seeds.rb
 - lib/gaku/class_name_detector.rb