X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=blobdiff_plain;f=config%2Fapplication.rb;h=346cb0d35571eb488353fb7126bbde47a868fab0;hp=56dcdc59d29ad4a78b6ff500a19d5a154bc34f76;hb=fb67ce965f46e26de56b4fa86f4600037260c702;hpb=339d45c101d93bf611299e3c90f3883f28937c2b

diff --git a/config/application.rb b/config/application.rb
index 56dcdc59..346cb0d3 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -15,9 +15,10 @@ if defined?(Bundler)
   # If you want your assets lazily compiled in production, use this line
   # Bundler.require(:default, :assets, Rails.env)
 end
+require 'manifest'
 
 module Pettanr
-  VERSION = '0.5.2'
+  VERSION = '0.6.2'
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
@@ -54,25 +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
   end
-end
   
-Pettanr::Application.licenses = YAML.load(open(Rails.root + 'config/license.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
+  
 y = YAML.load(open(Rails.root + 'config/picture_io.yml').read)
 require y[Rails.env]["adapter"]
 pio = PictureIO.const_get y[Rails.env]["io"]
@@ -89,5 +78,9 @@ end
 
 module Pettanr
   TestLayout = false
+  class BadRequest < StandardError
+  end
+  class NotWork < StandardError
+  end
 end