From 2b2bb5b365e839906e7e411af3c9fc08ea6c4898 Mon Sep 17 00:00:00 2001 From: yasushiito Date: Sat, 2 Jun 2012 10:20:23 +0900 Subject: [PATCH] speech and balloon template deleted --- app/controllers/balloon_templates_controller.rb | 24 ----------- app/controllers/speech_templates_controller.rb | 25 ----------- app/helpers/balloon_templates_helper.rb | 2 - app/helpers/balloon_types_helper.rb | 2 - app/helpers/speech_templates_helper.rb | 2 - app/models/balloon_template.rb | 6 --- app/models/speech_template.rb | 3 -- app/views/balloon_templates/index.html.erb | 27 ------------ app/views/balloon_templates/list.html.erb | 33 -------------- app/views/layouts/test.html.erb | 5 +-- app/views/speech_templates/index.html.erb | 21 --------- app/views/speech_templates/list.html.erb | 27 ------------ config/routes.rb | 20 --------- .../20111206115439_create_balloon_templates.rb | 18 -------- .../20111206120252_create_speech_templates.rb | 15 ------- db/schema.rb | 50 +++++----------------- .../balloon_templates_controller_spec.rb | 7 --- .../speech_templates_controller_spec.rb | 7 --- spec/helpers/balloon_templates_helper_spec.rb | 15 ------- spec/helpers/speech_templates_helper_spec.rb | 15 ------- spec/json/invalid_speech_balloon_templates.json | 6 +-- spec/json/speech_balloon_templates.json | 4 +- spec/models/balloon_template_spec.rb | 5 --- spec/models/speech_template_spec.rb | 5 --- 24 files changed, 17 insertions(+), 327 deletions(-) delete mode 100644 app/controllers/balloon_templates_controller.rb delete mode 100644 app/controllers/speech_templates_controller.rb delete mode 100644 app/helpers/balloon_templates_helper.rb delete mode 100644 app/helpers/balloon_types_helper.rb delete mode 100644 app/helpers/speech_templates_helper.rb delete mode 100644 app/models/balloon_template.rb delete mode 100644 app/models/speech_template.rb delete mode 100644 app/views/balloon_templates/index.html.erb delete mode 100644 app/views/balloon_templates/list.html.erb delete mode 100644 app/views/speech_templates/index.html.erb delete mode 100644 app/views/speech_templates/list.html.erb delete mode 100644 db/migrate/20111206115439_create_balloon_templates.rb delete mode 100644 db/migrate/20111206120252_create_speech_templates.rb delete mode 100644 spec/controllers/balloon_templates_controller_spec.rb delete mode 100644 spec/controllers/speech_templates_controller_spec.rb delete mode 100644 spec/helpers/balloon_templates_helper_spec.rb delete mode 100644 spec/helpers/speech_templates_helper_spec.rb delete mode 100644 spec/models/balloon_template_spec.rb delete mode 100644 spec/models/speech_template_spec.rb diff --git a/app/controllers/balloon_templates_controller.rb b/app/controllers/balloon_templates_controller.rb deleted file mode 100644 index e224e2fb..00000000 --- a/app/controllers/balloon_templates_controller.rb +++ /dev/null @@ -1,24 +0,0 @@ -class BalloonTemplatesController < ApplicationController - before_filter :authenticate_user!, :only => [:index, :show] - before_filter :authenticate_admin!, :only => [:list, :browse] - - # GET /balloon_templates - # GET /balloon_templates.json - def index - @balloon_templates = BalloonTemplate.all - - respond_to do |format| - format.html # index.html.erb - format.json { render json: @balloon_templates } - end - end - - def list - @balloon_templates = BalloonTemplate.all - - respond_to do |format| - format.html { render layout: 'system' } - format.json { render json: @balloon_templates } - end - end -end diff --git a/app/controllers/speech_templates_controller.rb b/app/controllers/speech_templates_controller.rb deleted file mode 100644 index 60ac6c4d..00000000 --- a/app/controllers/speech_templates_controller.rb +++ /dev/null @@ -1,25 +0,0 @@ -class SpeechTemplatesController < ApplicationController - before_filter :authenticate_user!, :only => [:index, :show] - before_filter :authenticate_admin!, :only => [:list, :browse] - - # GET /speech_templates - # GET /speech_templates.json - def index - @speech_templates = SpeechTemplate.all - - respond_to do |format| - format.html # index.html.erb - format.json { render json: @speech_templates } - end - end - - def list - @speech_templates = SpeechTemplate.all - - respond_to do |format| - format.html { render layout: 'system' } - format.json { render json: @speech_templates } - end - end - -end diff --git a/app/helpers/balloon_templates_helper.rb b/app/helpers/balloon_templates_helper.rb deleted file mode 100644 index afab2a25..00000000 --- a/app/helpers/balloon_templates_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module BalloonTemplatesHelper -end diff --git a/app/helpers/balloon_types_helper.rb b/app/helpers/balloon_types_helper.rb deleted file mode 100644 index abc08474..00000000 --- a/app/helpers/balloon_types_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module BalloonTypesHelper -end diff --git a/app/helpers/speech_templates_helper.rb b/app/helpers/speech_templates_helper.rb deleted file mode 100644 index 3091a5da..00000000 --- a/app/helpers/speech_templates_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module SpeechTemplatesHelper -end diff --git a/app/models/balloon_template.rb b/app/models/balloon_template.rb deleted file mode 100644 index c050ed9d..00000000 --- a/app/models/balloon_template.rb +++ /dev/null @@ -1,6 +0,0 @@ -class BalloonTemplate < ActiveRecord::Base - belongs_to :speech_balloon - has_many :speech_templates, :dependent => :destroy - belongs_to :system_picture - accepts_nested_attributes_for :speech_templates -end diff --git a/app/models/speech_template.rb b/app/models/speech_template.rb deleted file mode 100644 index d0871b3e..00000000 --- a/app/models/speech_template.rb +++ /dev/null @@ -1,3 +0,0 @@ -class SpeechTemplate < ActiveRecord::Base - belongs_to :balloon_template -end diff --git a/app/views/balloon_templates/index.html.erb b/app/views/balloon_templates/index.html.erb deleted file mode 100644 index 93b1b812..00000000 --- a/app/views/balloon_templates/index.html.erb +++ /dev/null @@ -1,27 +0,0 @@ -

Listing balloon_templates

- - - - - - - - - - - - - -<% @balloon_templates.each do |balloon_template| %> - - - - - - - - - - -<% end %> -
speech balloonsystem_pictureTailsizeMinWidthMinHeightMaxWidthMaxHeight
<%= balloon_template.speech_balloon_id %><%= balloon_template.system_picture_id %><%= balloon_template.tail %><%= balloon_template.size %><%= balloon_template.min_width %><%= balloon_template.min_height %><%= balloon_template.max_width %><%= balloon_template.max_height %>
diff --git a/app/views/balloon_templates/list.html.erb b/app/views/balloon_templates/list.html.erb deleted file mode 100644 index 7a836143..00000000 --- a/app/views/balloon_templates/list.html.erb +++ /dev/null @@ -1,33 +0,0 @@ -

Listing balloon_templates

- - - - - - - - - - - - - - - - -<% @balloon_templates.each do |balloon_template| %> - - - - - - - - - - - - - -<% end %> -
idspeech balloonsystem_pictureTailsizeMinWidthMinHeightMaxWidthMaxHeightcreated_atupdated_at
<%= link_to balloon_template.id, :action => :browse, :id => balloon_template.id %><%= link_to balloon_template.speech_balloon_id, :controller => 'speech_balloons', :action => :browse, :id => balloon_template.speech_balloon_id %><%= link_to balloon_template.system_picture_id, :controller => 'system_pictures', :action => :browse, :id => balloon_template.system_picture_id %><%= balloon_template.tail %><%= balloon_template.size %><%= balloon_template.min_width %><%= balloon_template.min_height %><%= balloon_template.max_width %><%= balloon_template.max_height %><%= balloon_template.created_at %><%= balloon_template.updated_at %>
diff --git a/app/views/layouts/test.html.erb b/app/views/layouts/test.html.erb index 905f1f19..9bb1395e 100644 --- a/app/views/layouts/test.html.erb +++ b/app/views/layouts/test.html.erb @@ -32,12 +32,11 @@ <%= link_to 'original_pictures', original_pictures_path %> <%= link_to 'resource_pictures', resource_pictures_path %> <%= link_to 'panel_pictures', panel_pictures_path %> +<%= link_to 'speech_balloons', speech_balloons_path %> <%= link_to 'balloons', balloons_path %> <%= link_to 'speeches', speeches_path %> : -<%= link_to 'speech_balloons', speech_balloons_path %> -<%= link_to 'balloon_templates', balloon_templates_path %> -<%= link_to 'speech_templates', speech_templates_path %> +<%= link_to 'speech_balloon_templates', speech_balloon_templates_path %> : <%= link_to 'artists', artists_path %> <%= link_to 'system_pictures', system_pictures_path %> diff --git a/app/views/speech_templates/index.html.erb b/app/views/speech_templates/index.html.erb deleted file mode 100644 index 470ad0f0..00000000 --- a/app/views/speech_templates/index.html.erb +++ /dev/null @@ -1,21 +0,0 @@ -

Listing speech_templates

- - - - - - - - - - -<% @speech_templates.each do |speech_template| %> - - - - - - - -<% end %> -
balloon templatexyWidthHeight
<%= speech_template.balloon_template_id %><%= speech_template.x %><%= speech_template.y %><%= speech_template.width %><%= speech_template.height %>
diff --git a/app/views/speech_templates/list.html.erb b/app/views/speech_templates/list.html.erb deleted file mode 100644 index 8a7718d2..00000000 --- a/app/views/speech_templates/list.html.erb +++ /dev/null @@ -1,27 +0,0 @@ -

Listing speech_templates

- - - - - - - - - - - - - -<% @speech_templates.each do |speech_template| %> - - - - - - - - - - -<% end %> -
idballoon templatexyWidthHeightcreated_atupdated_at
<%= link_to speech_template.id, :action => :browse, :id => speech_template.id %><%= link_to speech_template.balloon_template_id, :controller => 'balloon_templates', :action => :browse, :id => speech_template.balloon_template_id %><%= speech_template.x %><%= speech_template.y %><%= speech_template.width %><%= speech_template.height %><%= speech_template.created_at %><%= speech_template.updated_at %>
diff --git a/config/routes.rb b/config/routes.rb index 0bb58aef..0eb6117c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -44,26 +44,6 @@ Pettanr::Application.routes.draw do delete :destroy end end - resources :speech_templates do - collection do - get :index - get :show - get :list - get :browse - end - member do - end - end - resources :balloon_templates do - collection do - get :index - get :show - get :list - get :browse - end - member do - end - end resources :speeches do collection do get :list diff --git a/db/migrate/20111206115439_create_balloon_templates.rb b/db/migrate/20111206115439_create_balloon_templates.rb deleted file mode 100644 index f5a1e93b..00000000 --- a/db/migrate/20111206115439_create_balloon_templates.rb +++ /dev/null @@ -1,18 +0,0 @@ -class CreateBalloonTemplates < ActiveRecord::Migration - def change - create_table :balloon_templates do |t| - t.integer :speech_balloon_id, :null => false - t.integer :system_picture_id, :null => false - t.integer :tail, :null => false, :default => 1 - t.integer :size, :null => false, :default => 1 - t.integer :min_width, :null => false, :default => 0 - t.integer :max_width, :null => false, :default => 0 - t.integer :min_height, :null => false, :default => 0 - t.integer :max_height, :null => false, :default => 0 - - t.timestamps - end - add_index :balloon_templates, [:speech_balloon_id] - add_index :balloon_templates, [:speech_balloon_id, :tail, :size], :unique => true, :name => 'balloon_templates_idts' - end -end diff --git a/db/migrate/20111206120252_create_speech_templates.rb b/db/migrate/20111206120252_create_speech_templates.rb deleted file mode 100644 index 81120fa9..00000000 --- a/db/migrate/20111206120252_create_speech_templates.rb +++ /dev/null @@ -1,15 +0,0 @@ -class CreateSpeechTemplates < ActiveRecord::Migration - def change - create_table :speech_templates do |t| - t.integer :balloon_template_id, :null => false - t.integer :x, :null => false - t.integer :y, :null => false - t.integer :t, :null => false, :default => 1 - t.integer :width, :null => false - t.integer :height, :null => false - - t.timestamps - end - add_index :speech_templates, [:balloon_template_id, :t], :unique => true, :name => 'speech_templates_idt' - end -end diff --git a/db/schema.rb b/db/schema.rb index a1cc2093..5e69dc60 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -59,22 +59,6 @@ ActiveRecord::Schema.define(:version => 20120424100555) do add_index "authors", ["user_id"], :name => "index_authors_on_user_id", :unique => true - create_table "balloon_templates", :force => true do |t| - t.integer "speach_balloon_id", :null => false - t.integer "system_picture_id", :null => false - t.integer "tail", :default => 1, :null => false - t.integer "size", :default => 1, :null => false - t.integer "min_width", :default => 0, :null => false - t.integer "max_width", :default => 0, :null => false - t.integer "min_height", :default => 0, :null => false - t.integer "max_height", :default => 0, :null => false - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "balloon_templates", ["speach_balloon_id", "tail", "size"], :name => "balloon_templates_idts", :unique => true - add_index "balloon_templates", ["speach_balloon_id"], :name => "index_balloon_templates_on_speach_balloon_id" - create_table "balloons", :force => true do |t| t.integer "panel_id", :null => false t.integer "balloon_template_id", :null => false @@ -141,7 +125,6 @@ ActiveRecord::Schema.define(:version => 20120424100555) do add_index "licenses", ["url"], :name => "index_licenses_on_url", :unique => true create_table "original_licenses", :force => true do |t| - t.integer "artist_id", :null => false t.integer "license_id", :null => false t.string "name", :null => false t.string "url", :null => false @@ -192,11 +175,11 @@ ActiveRecord::Schema.define(:version => 20120424100555) do t.integer "width", :default => 200, :null => false t.integer "height", :default => 80, :null => false t.integer "border", :default => 1, :null => false - t.integer "x", :null => false - t.integer "y", :null => false - t.integer "z", :null => false - t.integer "t", :default => 1, :null => false - t.integer "author_id" + t.integer "x" + t.integer "y" + t.integer "z" + t.integer "t", :null => false + t.integer "author_id", :null => false t.datetime "created_at" t.datetime "updated_at" end @@ -238,24 +221,11 @@ ActiveRecord::Schema.define(:version => 20120424100555) do t.datetime "updated_at" end - add_index "speach_balloons", ["t"], :name => "speach_balloons_t", :unique => true - - create_table "speach_templates", :force => true do |t| - t.integer "balloon_template_id", :null => false - t.integer "x", :null => false - t.integer "y", :null => false - t.integer "t", :default => 1, :null => false - t.integer "width", :null => false - t.integer "height", :null => false - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "speach_templates", ["balloon_template_id", "t"], :name => "speach_templates_idt", :unique => true + add_index "speech_balloons", ["t"], :name => "speech_balloons_t", :unique => true - create_table "speaches", :force => true do |t| + create_table "speeches", :force => true do |t| t.integer "balloon_id", :null => false - t.integer "speach_template_id", :null => false + t.integer "speech_template_id", :null => false t.string "content" t.integer "x", :null => false t.integer "y", :null => false @@ -266,8 +236,8 @@ ActiveRecord::Schema.define(:version => 20120424100555) do t.datetime "updated_at" end - add_index "speaches", ["balloon_id", "t"], :name => "speaches_bt", :unique => true - add_index "speaches", ["balloon_id"], :name => "index_speaches_on_balloon_id" + add_index "speeches", ["balloon_id", "t"], :name => "speeches_bt", :unique => true + add_index "speeches", ["balloon_id"], :name => "index_speeches_on_balloon_id" create_table "system_pictures", :force => true do |t| t.string "ext", :null => false diff --git a/spec/controllers/balloon_templates_controller_spec.rb b/spec/controllers/balloon_templates_controller_spec.rb deleted file mode 100644 index 87fb414a..00000000 --- a/spec/controllers/balloon_templates_controller_spec.rb +++ /dev/null @@ -1,7 +0,0 @@ -# -*- encoding: utf-8 -*- -#フキダシ枠テンプレート -require 'spec_helper' - -describe BalloonTemplatesController do - #データはすべてSpeechBalloonsControllerから管理するので、ここから何かを要求することはない。 -end diff --git a/spec/controllers/speech_templates_controller_spec.rb b/spec/controllers/speech_templates_controller_spec.rb deleted file mode 100644 index a3d1f708..00000000 --- a/spec/controllers/speech_templates_controller_spec.rb +++ /dev/null @@ -1,7 +0,0 @@ -# -*- encoding: utf-8 -*- -#セリフテンプレート -require 'spec_helper' - -describe SpeechTemplatesController do - #データはすべてSpeechBalloonsControllerから管理するので、ここから何かを要求することはない。 -end diff --git a/spec/helpers/balloon_templates_helper_spec.rb b/spec/helpers/balloon_templates_helper_spec.rb deleted file mode 100644 index 4e6973e2..00000000 --- a/spec/helpers/balloon_templates_helper_spec.rb +++ /dev/null @@ -1,15 +0,0 @@ -require 'spec_helper' - -# Specs in this file have access to a helper object that includes -# the BaloonTemplatesHelper. For example: -# -# describe BaloonTemplatesHelper do -# describe "string concat" do -# it "concats two strings with spaces" do -# helper.concat_strings("this","that").should == "this that" -# end -# end -# end -describe BalloonTemplatesHelper do - pending "add some examples to (or delete) #{__FILE__}" -end diff --git a/spec/helpers/speech_templates_helper_spec.rb b/spec/helpers/speech_templates_helper_spec.rb deleted file mode 100644 index 242f9bd7..00000000 --- a/spec/helpers/speech_templates_helper_spec.rb +++ /dev/null @@ -1,15 +0,0 @@ -require 'spec_helper' - -# Specs in this file have access to a helper object that includes -# the SpeechTemplatesHelper. For example: -# -# describe SpeechTemplatesHelper do -# describe "string concat" do -# it "concats two strings with spaces" do -# helper.concat_strings("this","that").should == "this that" -# end -# end -# end -describe SpeechTemplatesHelper do - pending "add some examples to (or delete) #{__FILE__}" -end diff --git a/spec/json/invalid_speech_balloon_templates.json b/spec/json/invalid_speech_balloon_templates.json index 9ec2d2c7..10a9b839 100644 --- a/spec/json/invalid_speech_balloon_templates.json +++ b/spec/json/invalid_speech_balloon_templates.json @@ -1,7 +1,7 @@ { "square@pettan.com": { "classname": "Square", - "caption": "’·•ûŒ`", + "caption": "長方形", "default_width": 150, "default_height": 150, "templates": { @@ -20,7 +20,7 @@ }, "square@pettan.com": { "classname": "Square", - "caption": "’·•ûŒ`", + "caption": "長方形", "default_width": 150, "default_height": 150, "templates": { @@ -39,7 +39,7 @@ }, "square@pettan.com": { "classname": "Square", - "caption": "’·•ûŒ`", + "caption": "長方形", "default_width": 150, "default_height": 150, "templates": { diff --git a/spec/json/speech_balloon_templates.json b/spec/json/speech_balloon_templates.json index dadd1e9d..2e1ce872 100644 --- a/spec/json/speech_balloon_templates.json +++ b/spec/json/speech_balloon_templates.json @@ -1,7 +1,7 @@ { "square@pettan.com": { "classname": "Square", - "caption": "’·•ûŒ`", + "caption": "長方形", "default_width": 150, "default_height": 150, "templates": { @@ -20,7 +20,7 @@ }, "square with size@pettan.com": { "classname": "SquareWithSize", - "caption": "’·•ûŒ`‰ü", + "caption": "長方形改", "default_width": 150, "default_height": 100, "size_count": 3, diff --git a/spec/models/balloon_template_spec.rb b/spec/models/balloon_template_spec.rb deleted file mode 100644 index 7597de50..00000000 --- a/spec/models/balloon_template_spec.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'spec_helper' - -describe BalloonTemplate do - pending "add some examples to (or delete) #{__FILE__}" -end diff --git a/spec/models/speech_template_spec.rb b/spec/models/speech_template_spec.rb deleted file mode 100644 index d447a0f6..00000000 --- a/spec/models/speech_template_spec.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'spec_helper' - -describe SpeechTemplate do - pending "add some examples to (or delete) #{__FILE__}" -end -- 2.11.0