fix spec

[pettanr/pettanr.git] / config / application.rb

diff --git a/config/application.rb b/config/application.rb
index 8a2e303..17af8a0 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -8,7 +8,7 @@ require "active_resource/railtie"
 require "sprockets/railtie"
 # require "rails/test_unit/railtie"
 require 'digest/md5'
-
+$: << './lib'
 if defined?(Bundler)
   # If you precompile assets before deploying to production, use this line
   Bundler.require(*Rails.groups(:assets => %w(development test)))
@@ -39,6 +39,7 @@ config.assets.initialize_on_precompile = false
     # config.time_zone = 'Central Time (US & Canada)'
 
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    I18n.enforce_available_locales = false
     config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}').to_s]
     config.i18n.default_locale = :ja
 
@@ -54,53 +55,13 @@ config.assets.initialize_on_precompile = false
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
     
+    #config.autoload_paths += Dir["#{config.root}/lib/validators/*", "#{config.root}/lib/editor/*", "#{config.root}/lib/manifest/*"]
     config.autoload_paths += %W(#{config.root}/lib/validators)
     
-    def self.licenses=(ary)
-      @@licenses = ary
-    end
-    
-    def self.licenses
-      @@licenses || {}
-    end
-    
-    def self.speech_balloons=(ary)
-      @@speech_balloons = ary
-    end
-    
-    def self.speech_balloons
-      @@speech_balloons || {}
-    end
-     
-    def self.writing_formats=(ary)
-      @@writing_formats = ary
-    end
-    
-    def self.writing_formats
-      @@writing_formats || {}
-    end
-    
-    def self.elements=(ary)
-      @@elements = ary
-    end
-    
-    def self.elements
-      @@elements || {}
-    end
   end
-end
   
-Pettanr::Application.licenses = YAML.load(open(Rails.root + 'config/license.yml').read)
-Pettanr::Application.speech_balloons = YAML.load(open(Rails.root + 'config/speech_balloon.yml').read)
-Pettanr::Application.writing_formats = YAML.load(open(Rails.root + 'config/writing_format.yml').read)
-Pettanr::Application.elements = YAML.load(open(Rails.root + 'config/element.yml').read)
-MagicNumber = YAML.load(open(Rails.root + 'config/magic_number.yml').read)
-MagicNumber['test_layout'] = if File.exist? Rails.root + 'config/test_layout'
-  'test'
-else
-  false
 end
-MagicNumber['profile'] = JSON.parse(open(Rails.root + 'config/profile.json').read).first[1] #strip profile body
+  
 y = YAML.load(open(Rails.root + 'config/picture_io.yml').read)
 require y[Rails.env]["adapter"]
 pio = PictureIO.const_get y[Rails.env]["io"]