test

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 1f7eb0e..bd57e43 100644 (file)
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -30,6 +30,7 @@ Pettanr::Application.configure do
   # Expands the lines which load the assets
   config.assets.debug = true
 end
+y = YAML.load(open(Rails.root + 'config/aws.yaml').read)
 
 require 'local_picture'
 PictureIO.setup do |config|

diff --git a/db/schema.rb b/db/schema.rb
index 0389aba..b1a4f0b 100644 (file)
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -70,14 +70,14 @@ ActiveRecord::Schema.define(:version => 20120102071851) do
   add_index "authors", ["reset_password_token"], :name => "index_authors_on_reset_password_token", :unique => true\r
 \r
   create_table "balloon_templates", :force => true do |t|\r
-    t.integer  "speach_balloon_id",                  :null => false\r
-    t.integer  "resource_picture_id",                :null => false\r
-    t.integer  "tail",                :default => 1, :null => false\r
-    t.integer  "border",              :default => 1, :null => false\r
-    t.integer  "min_width",           :default => 0, :null => false\r
-    t.integer  "max_width",           :default => 0, :null => false\r
-    t.integer  "min_height",          :default => 0, :null => false\r
-    t.integer  "max_height",          :default => 0, :null => false\r
+    t.integer  "speach_balloon_id",                :null => false\r
+    t.integer  "system_picture_id",                :null => false\r
+    t.integer  "tail",              :default => 1, :null => false\r
+    t.integer  "border",            :default => 1, :null => false\r
+    t.integer  "min_width",         :default => 0, :null => false\r
+    t.integer  "max_width",         :default => 0, :null => false\r
+    t.integer  "min_height",        :default => 0, :null => false\r
+    t.integer  "max_height",        :default => 0, :null => false\r
     t.datetime "created_at"\r
     t.datetime "updated_at"\r
   end\r
@@ -88,7 +88,7 @@ ActiveRecord::Schema.define(:version => 20120102071851) do
   create_table "balloons", :force => true do |t|\r
     t.integer  "panel_id",                           :null => false\r
     t.integer  "balloon_template_id",                :null => false\r
-    t.integer  "resource_picture_id",                :null => false\r
+    t.integer  "system_picture_id",                  :null => false\r
     t.integer  "tail",                :default => 1, :null => false\r
     t.integer  "border",              :default => 1, :null => false\r
     t.integer  "zindex",                             :null => false\r