source 'https://rubygems.org'
-gem 'rails', '~> 3.2.0'
+gem 'rails', '~> 4.1.0'
gem 'devise'
-# gem 'devise_token_auth'
+gem 'devise_token_auth'
gem 'rest-client'
gem 'underscore-rails'
# gem 'backbone-rails'
gem 'kaminari'
gem 'sanitize'
gem 'aws-s3'
-gem 'awesome_nested_set', '~> 2.0'
+gem 'aws-sdk', '< 2.0'
+gem 'awesome_nested_set', '~> 3.0'
gem 'validates_existence'
gem "validate_url"
gem "pettanr_creative_commons_v30_licenses"
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
gem 'i18n-js'
+gem 'nokogiri'
# Gems used only for assets and not required
# in production environments by default.
group :assets do
- gem 'sass-rails', '~> 3.0'
- gem 'coffee-rails', '~> 3.0'
- gem 'uglifier', '>= 1.0.3'
+ gem 'sass-rails', '~> 4.0'
+ gem 'coffee-rails', '~> 4.0'
+ gem 'uglifier', '>= 1.3.0'
# http://qiita.com/scivola/items/ec7625118fcf6de5203a
gem 'coffee-script-source', '~> 1.8.0'
end
gem 'factory_girl'
end
+gem 'tzinfo-data'
class ApplicationController < ActionController::Base
protect_from_forgery
layout :devise_layout
- before_filter :bf
+ before_action :bf
def devise_layout
if devise_controller?
class ArtistsController < ApplicationController
if Manifest.manifest.magic_numbers['run_mode'] == 0
- before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
- before_filter :authenticate_artist, :only => [:edit, :update, :destroy]
+ before_action :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_artist, :only => [:edit, :update, :destroy]
else
- before_filter :authenticate_resource_reader, :only => [
+ before_action :authenticate_resource_reader, :only => [
:index, :show
]
- before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
- before_filter :authenticate_artist, :only => [:edit, :update, :destroy]
+ before_action :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_artist, :only => [:edit, :update, :destroy]
end
def index
set_model
@item = @my_model_class.new
@item.supply_default
- @item.attributes = params[@my_model_class.item_name]
+ @item.attributes = @item.permit_params params
@item.overwrite @operators
render_create root_path
end
def update
set_edit
- @item.attributes = params[@my_model_class.item_name]
+ @item.attributes = @item.permit_params params
@item.overwrite @operators
render_update '/home/configure'
end
class AuthorsController < ApplicationController
if Manifest.manifest.magic_numbers['run_mode'] == 0
- before_filter :authenticate_user, :only => [:new, :create, :edit, :update]
- before_filter :authenticate_author, :only => [:edit, :update]
+ before_action :authenticate_user, :only => [:new, :create, :edit, :update]
+ before_action :authenticate_author, :only => [:edit, :update]
else
- before_filter :authenticate_reader, :only => [:index, :show]
- before_filter :authenticate_user, :only => [:new, :create, :edit, :update]
- before_filter :authenticate_author, :only => [:edit, :update]
+ before_action :authenticate_reader, :only => [:index, :show]
+ before_action :authenticate_user, :only => [:new, :create, :edit, :update]
+ before_action :authenticate_author, :only => [:edit, :update]
end
def index
set_model
@item = @my_model_class.new
@item.supply_default
- @item.attributes = params[@my_model_class.item_name]
+ @item.attributes = @item.permit_params params
@item.overwrite @operators
render_create root_path
end
def update
set_edit
- @item.attributes = params[@my_model_class.item_name]
+ @item.attributes = @item.permit_params params
@item.overwrite @operators
render_update '/home/configure'
end
class BalloonsController < ApplicationController
if Manifest.manifest.magic_numbers['run_mode'] == 0
- before_filter :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
- before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
+ before_action :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
+ before_action :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
else
- before_filter :authenticate_reader, :only => [
+ before_action :authenticate_reader, :only => [
:index, :show,
:by_author, :by_speech_balloon, :by_speech_balloon_template, :by_system_picture
]
- before_filter :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
- before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
+ before_action :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
+ before_action :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
end
def index
class ComicStoriesController < ApplicationController
if Manifest.manifest.magic_numbers['run_mode'] == 0
- before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
- before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
else
- before_filter :authenticate_reader, :only => [
+ before_action :authenticate_reader, :only => [
:index, :show, :by_story, :by_comic, :by_author
]
- before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
- before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
end
def index
set_model
@item = @my_model_class.new
@item.supply_default
- @item.attributes = params[@item.item_name]
+ @item.attributes = @item.permit_params params
@item.overwrite @operators
@binder = @my_model_class.binder_model.edit(@item.binder_id, @operators) if @item.binder_id
@panel = @my_model_class.destination_model.show(@item.destination_id, @operators) if @item.destination_id
set_model
@item = @my_model_class.edit(params[:id], @operators)
ot = @item.t
- @item.attributes = params[@item.item_name]
+ @item.attributes = @item.permit_params params
@item.overwrite @operators
@binder = @my_model_class.binder_model.edit(@item.binder_id, @operators) if @item.binder_id
# no check permission for destination
class ComicsController < ApplicationController
if Manifest.manifest.magic_numbers['run_mode'] == 0
- before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
- before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
else
- before_filter :authenticate_reader, :only => [
+ before_action :authenticate_reader, :only => [
:index, :show, :play, :by_story, :by_author
]
- before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
- before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
end
def index
@item = @my_model_class.new
@item.supply_default
@my_model_class.fold_extend_settings params[@my_model_class.item_name]
- @item.attributes = params[@my_model_class.item_name]
+ @item.attributes = @item.permit_params params
@item.overwrite @operators
render_create
end
def update
set_edit
@my_model_class.fold_extend_settings params[@my_model_class.item_name]
- @item.attributes = params[@my_model_class.item_name]
+ @item.attributes = @item.permit_params params
@item.overwrite @operators
render_update
end
class DemanderStatusesController < ApplicationController
- before_filter :authenticate_admin!, :only => [:index, :show, :edit, :update, :destroy]
+ before_action :authenticate_admin!, :only => [:index, :show, :edit, :update, :destroy]
def index
@page = DemanderStatus.page params[:page]
class DemandersController < ApplicationController
- before_filter :authenticate_demand_user!, :only => [:index, :show, :new, :create, :edit, :update, :destroy, :req, :licenses_export, :artists_export, :original_pictures_export, :pictures_export, :export]
+ before_action :authenticate_demand_user!, :only => [:index, :show, :new, :create, :edit, :update, :destroy, :req, :licenses_export, :artists_export, :original_pictures_export, :pictures_export, :export]
def index
@demander = @demand_user.demander
class FoldersController < ApplicationController
if Manifest.manifest.magic_numbers['run_mode'] == 0
- before_filter :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
else
- before_filter :authenticate_reader, :only => [:root, :index, :show, :watch]
- before_filter :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_reader, :only => [:root, :index, :show, :watch]
+ before_action :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
end
def root
class GroundColorsController < ApplicationController
if Manifest.manifest.magic_numbers['run_mode'] == 0
- before_filter :authenticate_user, :only => []
- before_filter :authenticate_author, :only => []
+ before_action :authenticate_user, :only => []
+ before_action :authenticate_author, :only => []
else
- before_filter :authenticate_reader, :only => [
+ before_action :authenticate_reader, :only => [
:index, :show, :by_panel, :by_author
]
- before_filter :authenticate_user, :only => []
- before_filter :authenticate_author, :only => []
+ before_action :authenticate_user, :only => []
+ before_action :authenticate_author, :only => []
end
def index
class GroundPicturesController < ApplicationController
if Manifest.manifest.magic_numbers['run_mode'] == 0
- before_filter :authenticate_user, :only => []
- before_filter :authenticate_author, :only => []
+ before_action :authenticate_user, :only => []
+ before_action :authenticate_author, :only => []
else
- before_filter :authenticate_reader, :only => [
+ before_action :authenticate_reader, :only => [
:index, :show, :by_panel, :by_author
]
- before_filter :authenticate_user, :only => []
- before_filter :authenticate_author, :only => []
+ before_action :authenticate_user, :only => []
+ before_action :authenticate_author, :only => []
end
def index
class HomeController < ApplicationController
- before_filter :authenticate_user, :only => [
+ before_action :authenticate_user, :only => [
:index, :show, :profile, :configure, :create_token, :delete_token,
:scrolls, :scroll_panels, :comics, :comic_stories, :stories, :story_sheets,
:sheets, :sheet_panels,
:panels, :panel_pictures, :speech_balloons, :balloons, :speeches, :ground_pictures, :ground_colors
]
- before_filter :authenticate_author, :only => [
+ before_action :authenticate_author, :only => [
:scrolls, :scroll_panels, :comics, :comic_stories, :stories, :story_sheets,
:sheets, :sheet_panels,
:panels, :panel_pictures, :speech_balloons, :balloons, :speeches, :ground_pictures, :ground_colors
]
- before_filter :authenticate_artist, :only => [:resource_pictures]
+ before_action :authenticate_artist, :only => [:resource_pictures]
def index
end
class LicenseGroupsController < ApplicationController
if Manifest.manifest.magic_numbers['run_mode'] == 0
else
- before_filter :authenticate_reader, :only => [
+ before_action :authenticate_reader, :only => [
:by_resource_picture
]
end
- before_filter :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
def index
filer_list
@item = @my_model_class.new
@item.supply_default
@my_model_class.fold_extend_settings params[@my_model_class.item_name]
- @item.attributes = params[@my_model_class.item_name]
+ @item.attributes = @item.permit_params params
@item.overwrite
render_create
end
def update
set_edit
@my_model_class.fold_extend_settings params[@my_model_class.item_name]
- @item.attributes = params[@my_model_class.item_name]
+ @item.attributes = @item.permit_params params
@item.overwrite
render_update
end
class LicensesController < ApplicationController
- before_filter :authenticate_resource_reader, :only => [
+ before_action :authenticate_resource_reader, :only => [
:by_license_group, :by_system_picture
]
- before_filter :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
def index
filer_list
@item = @my_model_class.new
@item.supply_default
@my_model_class.fold_extend_settings params[@my_model_class.item_name]
- @item.attributes = params[@my_model_class.item_name]
+ @item.attributes = @item.permit_params params
@item.overwrite
render_create
end
def update
set_edit
@my_model_class.fold_extend_settings params[@my_model_class.item_name]
- @item.attributes = params[@my_model_class.item_name]
+ @item.attributes = @item.permit_params params
@item.overwrite
render_update
end
class OriginalPictureLicenseGroupsController < ApplicationController
- before_filter :authenticate_user, :only => [:new, :create]
- before_filter :authenticate_artist, :only => [:new, :create]
+ before_action :authenticate_user, :only => [:new, :create]
+ before_action :authenticate_artist, :only => [:new, :create]
def new
@original_picture = OriginalPicture.show params[:original_picture_id], @operators
@item = @my_model_class.new
@my_model_class.fold_extend_settings params[@my_model_class.item_name]
- @item.attributes = params[@my_model_class.item_name]
+ @item.attributes = @item.permit_params params
@item.overwrite
@original_picture = OriginalPicture.show @item.original_picture, @operators
class OriginalPictureLicensesController < ApplicationController
- before_filter :authenticate_user, :only => [:new, :create]
- before_filter :authenticate_artist, :only => [:new, :create]
+ before_action :authenticate_user, :only => [:new, :create]
+ before_action :authenticate_artist, :only => [:new, :create]
def new
# use @item, @original_picture, @form
@item = @my_model_class.new
@my_model_class.fold_extend_settings params[@my_model_class.item_name]
- @item.attributes = params[@my_model_class.item_name]
+ @item.attributes = @item.permit_params params
@item.overwrite
@item.boosts 'post'
@original_picture = OriginalPicture.show @item.original_picture, @operators
if @item.valid?
# switch my_model_class
- @item = OriginalPictureLicense.build_resource_picture @item, @original_picture, params[@my_model_class.item_name]
+ @item = OriginalPictureLicense.build_resource_picture @item, @original_picture, @item.permit_params(params)
respond_to do |format|
format.html {
render main_app.new_resource_picture_path
#原画
class OriginalPicturesController < ApplicationController
- before_filter :authenticate_reader, :only => [:show, :history]
- before_filter :authenticate_user, :only => [:index, :new, :edit, :create, :update, :destroy]
- before_filter :authenticate_artist, :only => [:index, :new, :edit, :create, :update, :destroy]
+ before_action :authenticate_reader, :only => [:show, :history]
+ before_action :authenticate_user, :only => [:index, :new, :edit, :create, :update, :destroy]
+ before_action :authenticate_artist, :only => [:index, :new, :edit, :create, :update, :destroy]
def index
filer_list
class PanelPicturesController < ApplicationController
if Manifest.manifest.magic_numbers['run_mode'] == 0
- before_filter :authenticate_user, :only => []
- before_filter :authenticate_author, :only => []
+ before_action :authenticate_user, :only => []
+ before_action :authenticate_author, :only => []
else
- before_filter :authenticate_reader, :only => [
+ before_action :authenticate_reader, :only => [
:index, :show, :by_panel, :by_author
]
- before_filter :authenticate_user, :only => []
- before_filter :authenticate_author, :only => []
+ before_action :authenticate_user, :only => []
+ before_action :authenticate_author, :only => []
end
def index
class PanelsController < ApplicationController
if Manifest.manifest.magic_numbers['run_mode'] == 0
- before_filter :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
- before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
+ before_action :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
+ before_action :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
else
- before_filter :authenticate_reader, :only => [
+ before_action :authenticate_reader, :only => [
:index, :show, :by_scroll, :by_sheet, :by_author, :by_speech_balloon_template
]
- before_filter :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
- before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
+ before_action :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
+ before_action :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
end
private
class PicturesController < ApplicationController
if Manifest.manifest.magic_numbers['run_mode'] == 0
- before_filter :authenticate_user, :only => []
- before_filter :authenticate_author, :only => []
+ before_action :authenticate_user, :only => []
+ before_action :authenticate_author, :only => []
else
- before_filter :authenticate_user, :only => []
- before_filter :authenticate_resource_reader, :only => [
+ before_action :authenticate_user, :only => []
+ before_action :authenticate_resource_reader, :only => [
:show, :credit, :search
]
- before_filter :authenticate_author, :only => []
+ before_action :authenticate_author, :only => []
end
- before_filter :authenticate_admin, :only => [:index, :by_artist ]
+ before_action :authenticate_admin, :only => [:index, :by_artist ]
def index
filer_list
class ProviderSourcesController < ApplicationController
- before_filter :authenticate_admin!, :only => [:index, :import]
+ before_action :authenticate_admin!, :only => [:index, :import]
def index
@urls = MagicNumber['provider_sources']
class ProviderStatusesController < ApplicationController
- before_filter :authenticate_admin!, :only => [:index, :show, :edit, :update, :destroy, :licenses_import, :artists_import, :original_pictures_import, :import, :import_all]
+ before_action :authenticate_admin!, :only => [:index, :show, :edit, :update, :destroy, :licenses_import, :artists_import, :original_pictures_import, :import, :import_all]
def index
@page = ProviderStatus.page params[:page]
class ProvidersController < ApplicationController
- before_filter :authenticate_admin!, :only => [:index, :show, :destroy]
+ before_action :authenticate_admin!, :only => [:index, :show, :destroy]
def index
@page = Provider.page params[:page]
class ResourcePicturePicturesController < ApplicationController
if Manifest.manifest.magic_numbers['run_mode'] == 0
- before_filter :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
else
- before_filter :authenticate_reader, :only => [:index, :show, :by_original_picture, :by_resource_picture, :by_picture]
- before_filter :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_reader, :only => [:index, :show, :by_original_picture, :by_resource_picture, :by_picture]
+ before_action :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
end
def index
class ResourcePicturesController < ApplicationController
if Manifest.manifest.magic_numbers['run_mode'] == 0
- before_filter :authenticate_user, :only => [:new, :create, :update, :destroy]
- before_filter :authenticate_artist, :only => [:new, :create, :update, :destroy]
+ before_action :authenticate_user, :only => [:new, :create, :update, :destroy]
+ before_action :authenticate_artist, :only => [:new, :create, :update, :destroy]
else
- before_filter :authenticate_resource_reader, :only => [
+ before_action :authenticate_resource_reader, :only => [
:index, :show, :credit,
:by_original_picture, :by_license_group, :by_license, :by_artist
]
- before_filter :authenticate_user, :only => [:new, :create, :update, :destroy]
- before_filter :authenticate_artist, :only => [:new, :create, :update, :destroy]
+ before_action :authenticate_user, :only => [:new, :create, :update, :destroy]
+ before_action :authenticate_artist, :only => [:new, :create, :update, :destroy]
end
def index
jsn = JSON.parse_no_except(params[:json])
end
@prm = if params[:resource_picture] == nil or params[:resource_picture].empty?
- jsn
+ jsn
else
- params[:resource_picture]
+ @item.permit_params(:resource_picture)
end
@item = @original_picture.resource_picture || ResourcePicture.new
@item.attributes = @prm
class ScrollPanelsController < ApplicationController
if Manifest.manifest.magic_numbers['run_mode'] == 0
- before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
- before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
else
- before_filter :authenticate_reader, :only => [
+ before_action :authenticate_reader, :only => [
:index, :show, :by_panel, :by_scroll, :by_author
]
- before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
- before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
end
def index
set_model
@item = @my_model_class.new
@item.supply_default
- @item.attributes = params[@item.item_name]
+ @item.attributes = @item.permit_params params
@item.overwrite @operators
@binder = @my_model_class.binder_model.edit(@item.binder_id, @operators) if @item.binder_id
@panel = @my_model_class.destination_model.show(@item.destination_id, @operators) if @item.destination_id
set_model
@item = @my_model_class.edit(params[:id], @operators)
ot = @item.t
- @item.attributes = params[@item.item_name]
+ @item.attributes = @item.permit_params params
@item.overwrite @operators
@binder = @my_model_class.binder_model.edit(@item.binder_id, @operators) if @item.binder_id
# no check permission for destination
class ScrollsController < ApplicationController
if Manifest.manifest.magic_numbers['run_mode'] == 0
- before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
- before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
else
- before_filter :authenticate_reader, :only => [
+ before_action :authenticate_reader, :only => [
:top, :index, :show, :play, :by_panel, :by_author
]
- before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
- before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
end
def index
set_model
@item = @my_model_class.new
@item.supply_default
- @item.attributes = params[@my_model_class.item_name]
+ @item.attributes = @item.permit_params params
@item.overwrite @operators
render_create
end
def update
set_edit
- @item.attributes = params[@my_model_class.item_name]
+ @item.attributes = @item.permit_params params
@item.overwrite @operators
render_update
end
class SheetPanelsController < ApplicationController
if Manifest.manifest.magic_numbers['run_mode'] == 0
- before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
- before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
else
- before_filter :authenticate_reader, :only => [
+ before_action :authenticate_reader, :only => [
:index, :show, :by_sheet, :by_panel, :by_author
]
- before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
- before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
end
def index
class SheetsController < ApplicationController
if Manifest.manifest.magic_numbers['run_mode'] == 0
- before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
- before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
else
- before_filter :authenticate_reader, :only => [
+ before_action :authenticate_reader, :only => [
:index, :show, :play, :by_story, :by_panel, :by_author
]
- before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
- before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
end
def index
set_model
@item = @my_model_class.new
@item.supply_default
- jsn = nil
- if params[:json]
- jsn = JSON.parse_no_except(params[:json])
+ @prm = if params[:json]
+ JSON.parse_no_except(params[:json])
+ else
+ @item.permit_params params
end
- @prm = params[:sheet] || jsn
respond_to do |format|
if @item.store @prm, @operators
def update
set_edit
jsn = nil
- if params[:json]
- jsn = JSON.parse(params[:json])
+ @prm = if params[:json]
+ JSON.parse(params[:json])
+ else
+ @item.permit_params params
end
- @prm = params[:sheet] || jsn
respond_to do |format|
if @item.store @prm, @operators
updated_html_format format
class SpeechBalloonTemplatesController < ApplicationController
if Manifest.manifest.magic_numbers['run_mode'] == 0
- before_filter :authenticate_user, :only => []
+ before_action :authenticate_user, :only => []
else
- before_filter :authenticate_reader, :only => [
+ before_action :authenticate_reader, :only => [
:index, :show, :by_panel, :by_system_picture
]
- before_filter :authenticate_user, :only => []
+ before_action :authenticate_user, :only => []
end
- before_filter :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
def index
filer_list
class SpeechBalloonsController < ApplicationController
if Manifest.manifest.magic_numbers['run_mode'] == 0
- before_filter :authenticate_user, :only => []
- before_filter :authenticate_author, :only => []
+ before_action :authenticate_user, :only => []
+ before_action :authenticate_author, :only => []
else
- before_filter :authenticate_reader, :only => [
+ before_action :authenticate_reader, :only => [
:index, :show, :by_panel, :by_author, :by_speech_balloon_template
]
- before_filter :authenticate_user, :only => []
- before_filter :authenticate_author, :only => []
+ before_action :authenticate_user, :only => []
+ before_action :authenticate_author, :only => []
end
def index
class SpeechesController < ApplicationController
if Manifest.manifest.magic_numbers['run_mode'] == 0
- before_filter :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
- before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
+ before_action :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
+ before_action :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
else
- before_filter :authenticate_reader, :only => [
+ before_action :authenticate_reader, :only => [
:index, :show,
:by_author, :by_speech_balloon, :by_speech_balloon_template, :by_writing_format
]
- before_filter :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
- before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
+ before_action :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
+ before_action :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
end
- before_filter :authenticate_admin!, :only => []
+ before_action :authenticate_admin!, :only => []
def index
filer_list
class StoriesController < ApplicationController
if Manifest.manifest.magic_numbers['run_mode'] == 0
- before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
- before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
else
- before_filter :authenticate_reader, :only => [
+ before_action :authenticate_reader, :only => [
:index, :show, :play, :by_comic, :by_sheet, :by_author
]
- before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
- before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
end
def index
@story = @item
@item = @my_model_class.new
@item.supply_default
- @item.attributes = params[@my_model_class.item_name]
+ @item.attributes = @item.permit_params params
@item.overwrite @operators
render_create
end
def update
set_edit
@story = @item
- @item.attributes = params[@my_model_class.item_name]
+ @item.attributes = @item.permit_params params
@item.overwrite @operators
render_update
end
class StorySheetsController < ApplicationController
if Manifest.manifest.magic_numbers['run_mode'] == 0
- before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
- before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
else
- before_filter :authenticate_reader, :only => [
+ before_action :authenticate_reader, :only => [
:index, :show, :by_story, :by_sheet, :by_author
]
- before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
- before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
end
def index
set_model
@item = @my_model_class.new
@item.supply_default
- @item.attributes = params[@item.item_name]
+ @item.attributes = @item.permit_params params
@item.overwrite @operators
@binder = @my_model_class.binder_model.edit(@item.binder_id, @operators) if @item.binder_id
@panel = @my_model_class.destination_model.show(@item.destination_id, @operators) if @item.destination_id
set_model
@item = @my_model_class.edit(params[:id], @operators)
ot = @item.t
- @item.attributes = params[@item.item_name]
+ @item.attributes = @item.permit_params params
@item.overwrite @operators
@binder = @my_model_class.binder_model.edit(@item.binder_id, @operators) if @item.binder_id
# no check permission for destination
class SystemController < ApplicationController
- before_filter :authenticate_admin!, :except => [:start]
+ before_action :authenticate_admin!, :except => [:start]
#layout :system
end
def waiting_list
- @waits = Admin.find(:all, :conditions => ['approve = 0'])
+ @waits = Admin.where(approve: 0)
end
def accept_admin
class SystemPicturesController < ApplicationController
if Manifest.manifest.magic_numbers['run_mode'] == 0
- before_filter :authenticate_user, :only => []
- before_filter :authenticate_author, :only => []
+ before_action :authenticate_user, :only => []
+ before_action :authenticate_author, :only => []
else
- before_filter :authenticate_resource_reader, :only => [:index, :show]
- before_filter :authenticate_user, :only => []
- before_filter :authenticate_author, :only => []
+ before_action :authenticate_resource_reader, :only => [:index, :show]
+ before_action :authenticate_user, :only => []
+ before_action :authenticate_author, :only => []
end
- before_filter :authenticate_admin!, :only => []
+ before_action :authenticate_admin!, :only => []
def index
filer_list
class TopController < ApplicationController
if Manifest.manifest.magic_numbers['run_mode'] == 0
- before_filter :authenticate_user, :only => []
- before_filter :authenticate_author, :only => []
+ before_action :authenticate_user, :only => []
+ before_action :authenticate_author, :only => []
else
- before_filter :authenticate_reader, :only => []#[:index]
- before_filter :authenticate_user, :only => []
- before_filter :authenticate_author, :only => []
+ before_action :authenticate_reader, :only => []#[:index]
+ before_action :authenticate_user, :only => []
+ before_action :authenticate_author, :only => []
end
def index
class UserSessionsController < Devise::SessionsController
- prepend_before_filter :require_no_authentication, :only => [:create ]
+ prepend_before_action :require_no_authentication, :only => [:create ]
respond_to :json
def create
class WritingFormatsController < ApplicationController
if Manifest.manifest.magic_numbers['run_mode'] == 0
- before_filter :authenticate_user, :only => []
+ before_action :authenticate_user, :only => []
else
- before_filter :authenticate_reader, :only => [
+ before_action :authenticate_reader, :only => [
:index, :by_system_picture, :show
]
- before_filter :authenticate_user, :only => []
+ before_action :authenticate_user, :only => []
end
- before_filter :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
+ before_action :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
def index
filer_list
@item = @my_model_class.new
@item.supply_default
@my_model_class.fold_extend_settings params[@my_model_class.item_name]
- @item.attributes = params[@my_model_class.item_name]
+ @item.attributes = @item.permit_params params
@item.overwrite
render_create
end
def update
set_edit
@my_model_class.fold_extend_settings params[@my_model_class.item_name]
- @item.attributes = params[@my_model_class.item_name]
+ @item.attributes = @item.permit_params params
@item.overwrite
render_update
end
# , :encryptable, :lockable, :timeoutable and :omniauthable, :confirmable
devise :database_authenticatable, :registerable,
:recoverable, :rememberable, :trackable, :validatable
-
- # Setup accessible (or protected) attributes for your model
- attr_accessible :email, :password, :password_confirmation, :remember_me
def active_for_authentication?
super && (self.approve == 1)
end
def self.start(email, passwd)
- a = Admin.find(:first, :conditions => ['email = ?', email])
- if a
- a.password = passwd
- a.password_confirmation = passwd
- else
- a = Admin.create! :email => email, :password => passwd, :password_confirmation => passwd
- end
+ a = Admin.find_or_initialize_by(email: email)
+ a.password = passwd
+ a.password_confirmation = passwd
a.approve = 1
a.save!
end
+ private
+ def admin_params
+ params.require(:admin).permit(:email, :password, :password_confirmation, :remember_me, :authentication_token)
+ end
+
end
end
def self.find_by_author author
- Artist.find( :first, :conditions => ['author_id = ?', author.id])
+ Artist.where(author_id: author.id).first
end
def self.index_list_where list
end
def self.export(dt = nil)
- opt = {}
- cond = if dt
- ['artists.artists.provider = 0 and artists.updated_at >= ?', dt]
- else
- 'artists.artists.provider = 0'
- end
- opt.merge!({:conditions => cond})
- opt.merge!({:order => 'id'})
- Artist.find(:all, opt)
+ artists = Artist.where('artists.provider = 0')
+ artists = artists.where(['artists.updated_at >= ?', dt]) if dt
+ artists.order(:id)
end
end
# :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
devise :database_authenticatable, :registerable,
:recoverable, :rememberable, :trackable, :validatable
- # Setup accessible (or protected) attributes for your model
- attr_accessible :email, :password, :password_confirmation, :remember_me
def create_token
self.ensure_authentication_token
self.save
end
+ private
+ def demand_user_params
+ params.require(:demand_user).permit(:email, :password, :password_confirmation, :remember_me, :authentication_token)
+ end
+
end
attr = {
:name => key, :category_id => 0, :t => 0
}
- if i = self.find_by_name(key)
+ if i = self.find_by(name: key)
i.attributes = attr
i.save
else
:controller_name => (controller_name || name),
:action_name => action_name
}
- if i = self.find_by_name(key)
+ if i = self.find_by(name: key)
i.attributes = attr
i.save
else
end
def self.generate
- if r = self.find_by_name('/')
+ if r = self.find_by(name: '/')
else
r = self.create :name => '/', :category_id => 0, :t => 0
end
end
def self.list_by_name name
- License.find :all, :conditions => ['licenses.name = ?', name], :order => 'licenses.updated_at desc'
+ License.where(name: name).order(updated_at: :desc)
end
def self.store name, attr
end
def self.export(dt = nil)
- opt = {}
- opt.merge!({:conditions => ['updated_at >= ?', dt]}) if dt
-# opt.merge!({:order => 'name'})
- License.find(:all, opt)
+ licenses = License.all
+ licenses = licenses.where(['licenses.updated_at >= ?', dt]) if dt
+ licenses.order(:id)
end
end
end
def history
- Picture.find(:all, {:conditions => ['pictures.original_picture_id = ?', self.id], :order => 'pictures.revision desc'} )
+ Picture.where(original_picture_id: self.id).order(revision: :desc)
end
def self.show_opt
end
def self.export(dt = nil)
- opt = {}
- cond = if dt
- ['artists.author_id is not null and original_pictures.updated_at >= ?', dt]
- else
- 'artists.author_id is not null'
- end
- opt.merge!({:conditions => cond})
- opt.merge!({:include => {:resource_picture => {}, :artist => {}}, :order => 'original_pictures.id'})
- OriginalPicture.find(:all, opt)
+ original_pictures = OriginalPicture.includes(:resource_picture, :artist).where('artists.author_id is not null')
+ original_pictures = original_pictures.where(['original_pictures.updated_at >= ?', dt]) if dt
+ original_pictures.order('original_pictures.id').references(:artist)
end
def list_as_json_with_resource_picture
end
def self.publish oid, lsname, attr
- l = License.find_by_name lsname
+ l = License.find_by(name: lsname)
op = OriginalPicture.find oid
lg = l.license_group
attr[:license_id] = l.id
end
def new_revision
- Picture.maximum(:revision, :conditions => ['original_picture_id = ?', self.original_picture_id]).to_i + 1
+ Picture.where(original_picture_id: self.original_picture_id).maximum(:revision).to_i + 1
end
def enable?
end
def self.head opid
- Picture.find(:first, :conditions => ['original_picture_id = ?', opid], :order => 'pictures.revision desc')
+ Picture.where(original_picture_id: opid).order('pictures.revision desc').first
end
def head
end
def self.find_by_md5 md5
- r = Picture.find :all, :conditions => ['pictures.md5 = ?', md5], :order => 'pictures.updated_at desc'
+ r = Picture.where(md5: md5).order(updated_at: :desc)
end
def self.list_by_md5 md5, opid = nil
cond = if opid.blank?
- ['pictures.md5 = ?', md5]
+ {md5: md5}
else
- ['pictures.md5 = ? and pictures.original_picture_id <> ?', md5, opid]
+ ['md5 = :md5 and original_picture_id <> :opid', {md5: md5, opid: opid}]
end
- r = Picture.find :all, :conditions => cond, :order => 'pictures.updated_at desc'
+ r = Picture.where(cond).order(updated_at: :desc)
end
def self.exist_by_md5 md5, opid
end
def self.export(dt = nil)
- opt = {}
- cond = if dt
- ['artists.author_id is not null and pictures.updated_at >= ?', dt]
- else
- 'artists.author_id is not null'
- end
- opt.merge!({:conditions => cond})
- opt.merge!({:include => {:artist => {}}, :order => 'pictures.updated_at desc'})
- Picture.find(:all, opt)
+ pictures = Picture.includes(:artist).where('artists.author_id is not null')
+ pictures = pictures.where(['pictures.updated_at >= ?', dt]) if dt
+ pictures.order('pictures.updated_at desc').references(:artist)
end
def self.list_as_json_text ary
end
def self.remake_all
- ResourcePicture.find(:all).each do |resource_picture|
+ ResourcePicture.find_each do |resource_picture|
resource_picture.boosts 'post'
full = resource_picture.restore 'full'
imager = PettanImager.load full
has_many :scroll_panels
belongs_to :author
+ has_many :panels, :through => :scroll_panels
+
validates :title, :presence => true, :length => {:maximum => 100}
validates :visible, :presence => true, :numericality => true, :inclusion => {:in => 0..1}
validates :author_id, :presence => true, :numericality => true, :existence => {:both => false}
+ scope :find_index, -> do
+ where(arel_table[:visible].gt 0)
+ end
+
+ scope :find_private, -> (operators) do
+ where(author_id: operators.author.id)
+ end
+
+ scope :find_by_author, -> (author_id) do
+ find_index.where(author_id: author_id)
+ end
+
+ scope :with_panels, -> do
+ includes(scroll_panels: :panel)
+ end
+
+ scope :find_by_panel, -> (panel_id) do
+ with_panels.find_index.where(Panel.arel_table[:id].eq panel_id).references(:panel)
+ end
+
+ scope :find_play, -> (id) do
+ with_panels.find_index.where(id: id).references(:scroll_panels)
+ end
+
+ scope :find_private_play, -> (id, operators) do
+ with_panels.find_private(operators).where(self.arel_table[:id].eq id).references(:scroll_panels)
+ end
+
def supply_default
self.visible = 0 if self.visible.blank?
self.author_id = nil
validates :panel_id, :presence => true, :numericality => true, :existence => {:both => false}
validates :t, :presence => true, :numericality => {:greater_than_or_equal_to => 0}
+ scope :with_scroll, -> do
+ includes(:scroll)
+ end
+
+ scope :find_index, -> do
+ with_scroll.where(Scroll.arel_table[:visible].gt 0).references(:scroll)
+ end
+
+ scope :find_private, -> (operators) do
+ with_scroll.where(Scroll.arel_table[:author_id].eq operators.author.id).references(:scroll)
+ end
+
+ scope :find_by_scroll, -> (scroll_id) do
+ find_index.where(scroll_id: scroll_id).references(:scroll)
+ end
+
+ scope :find_by_panel, -> (panel_id) do
+ find_index.where(panel_id: panel_id).references(:scroll)
+ end
+
+ scope :find_by_author, -> (author_id) do
+ find_index.where(Scroll.arel_table[:author_id].eq author_id).references(:scroll)
+ end
+
def supply_default
self.scroll_id = nil
self.panel_id = nil
end
def self.by_author_list_includes
- {
- :scroll => {
- :author => {}
- }
- }
+ [:scroll => :author]
end
def self.show_opt
devise :database_authenticatable, :registerable,
:recoverable, :rememberable, :trackable, :validatable#, :confirmable
- # Setup accessible (or protected) attributes for your model
- attr_accessible :id, :name, :password, :password_confirmation, :remember_me , :email
def create_token
self.ensure_authentication_token
res
end
+ private
+ def user_params
+ params.require(:user).permit(:email, :password, :password_confirmation, :remember_me, :authentication_token)
+ end
+
end
end
def self.enable_list include_available = false
- r = WritingFormat.find(:all)
+ r = WritingFormat.all
unless include_available
r.delete_if {|wf|
wf.enable? == false
--- /dev/null
+#!/usr/bin/env ruby.exe
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')
--- /dev/null
+#!/usr/bin/env ruby.exe
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'
--- /dev/null
+#!/usr/bin/env ruby.exe
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run
require "active_record/railtie"
require "action_controller/railtie"
require "action_mailer/railtie"
-require "active_resource/railtie"
require "sprockets/railtie"
# require "rails/test_unit/railtie"
require 'digest/md5'
-require 'rubygems'
-
-# Set up gems listed in the Gemfile.
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' # Set up gems listed in the Gemfile.
# since you don't have to restart the web server when you make code changes.
config.cache_classes = false
- # Log error messages when you accidentally call methods on nil.
- config.whiny_nils = true
-
# Show full error reports and disable caching
config.consider_all_requests_local = true
config.action_controller.perform_caching = false
# Print deprecation notices to the Rails logger
config.active_support.deprecation = :log
- # Only use best-standards-support built into browsers
- config.action_dispatch.best_standards_support = :builtin
-
# Do not compress assets
config.assets.compress = false
# config.assets.digest = true
# config.static_cache_control = "public, max-age=1"
+config.eager_load = false
+config.active_record.migration_error = :page_load
end
# Send deprecation notices to registered listeners
config.active_support.deprecation = :notify
+config.eager_load = true
+config.active_record.migration_error = :page_load
end
require 'aws/s3'
require 'yaml'
config.serve_static_assets = true
config.static_cache_control = "public, max-age=3600"
- # Log error messages when you accidentally call methods on nil
- config.whiny_nils = true
-
# Show full error reports and disable caching
config.consider_all_requests_local = true
config.action_controller.perform_caching = false
# Print deprecation notices to the stderr
config.active_support.deprecation = :stderr
+config.eager_load = false
+config.active_record.migration_error = :page_load
end
module Pettanr
# match 'resource_pictures/full/:id(.:format)/' => 'resource_pictures#show'
# match 'pictures/:subdir/:id(.:format)/' => 'pictures#show'
#match 'scroll_panels/scroll/:id(.:format)' => 'scroll_panels#scroll'
- match 'top/(:action)', :controller => 'top'
- match 'home/(:action)', :controller => 'home'
- match 'system/(:action)', :controller => 'system'
+ match 'top/(:action)', :controller => 'top', via: [:get]
+ match 'home/(:action)', :controller => 'home', via: [:get]
+ match 'system/(:action)', :controller => 'system', via: [:get, :post]
#match 'authors/(:action(/:id))', :controller => 'authors'
# Sample of named route:
# This is a legacy wild controller route that's not recommended for RESTful applications.
# Note: This route will make all actions in every controller accessible via GET requests.
- match ':controller(/:action(/:id(.:format)))'
+ match ':controller(/:action(/:id(.:format)))', via: [:get, :post]
end
--- /dev/null
+development:\r
+ secret_key_base: 6809ff947425908bae66f4c4b2d9a88366d900609d88034914d5719ddf434123772c9cd26fd9d0a15fa080164c6fef77d74033a05de57f0694df0d52dad4e37a\r
+\r
+test:\r
+ secret_key_base: 6809ff947425908bae66f4c4b2d9a88366d900609d88034914d5719ddf434123772c9cd26fd9d0a15fa080164c6fef77d74033a05de57f0694df0d52dad4e37a\r
+\r
+production:\r
+ secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>\r
class ConnectStory < ActiveRecord::Migration
def up
- pn = Panel.find :all
- pn.each do |i|
+ pn = Panel.find_each do |i|
c = i.comic_id
t = i.t
a = i.author_id
s = i.id
- st = Story.find(:first, :conditions => ['comic_id = ? and panel_id = ? and t = ?', c, s, t])
+ st = Story.where(['comic_id = ? and panel_id = ? and t = ?', c, s, t]).first
st = Story.new(:comic_id => c, :panel_id => s, :t => t) unless st
st.author_id = a
st.save!
add_column :panels, :comic_id, :integer, :null => false, :default => 0
add_column :panels, :t, :integer, :null => false, :default => 0
remove_column :panels, :publish
- st = Story.find :all
- st.each do |i|
+ st = Story.find_each do |i|
c = i.comic_id
t = i.t
pn = Panel.find(i.panel_id)
require Rails.root + 'config/environment'
class CopyToScroll < ActiveRecord::Migration
def up
- ::Comic.find(:all).each do |i|
+ ::Comic.find_each do |i|
attr = i.attributes
attr.delete 'id'
::Scroll.create! attr
end
- ::Story.find(:all).each do |i|
+ ::Story.find_each do |i|
attr = i.attributes
attr.delete 'id'
attr.delete 'x'
class ArtistBelongsToUserData < ActiveRecord::Migration
def up
- Artist.find(:all).each do |artist|
+ Artist.find_each do |artist|
if artist.author_id
artist.user_id = Author.find(artist.author_id).user_id
else
class FixExtendSystemData < ActiveRecord::Migration
def up
- Balloon.find(:all).each do |balloon|
+ Balloon.find_each do |balloon|
sbt = balloon.speech_balloon.speech_balloon_template
if balloon.speech_balloon_template_classname == 'noname'
balloon.speech_balloon_template_id = sbt.id
end
balloon.save!
end
- Speech.find(:all).each do |speech|
+ Speech.find_each do |speech|
sbt = speech.speech_balloon.speech_balloon_template
if speech.speech_balloon_template_classname == 'noname'
speech.speech_balloon_template_id = sbt.id
speech.boosts 'post'
speech.save!
end
- License.find(:all).each do |license|
+ License.find_each do |license|
lg = license.license_group
if license.license_group_classname == 'noname'
license.license_group_classname = lg.classname
class FixExtSysPictData < ActiveRecord::Migration
def up
- ResourcePicture.find(:all).each do |resource_picture|
+ ResourcePicture.find_each do |resource_picture|
license = resource_picture.license
resource_picture.credit_picture_settings = license.credit_picture_settings
resource_picture.save!
end
- Picture.find(:all).each do |picture|
+ Picture.find_each do |picture|
license = picture.license
picture.credit_picture_settings = license.credit_picture_settings
picture.save!
class GenResourcePicturePictures < ActiveRecord::Migration
def up
- Picture.find(:all).each do |picture|
- resource_picture_picture = ResourcePicturePicture.find(:first, {:conditions => ['picture_id = ?', picture.id]})
+ Picture.find_each do |picture|
+ resource_picture_picture = ResourcePicturePicture.where(['picture_id = ?', picture.id]}).first
opid = picture.original_picture ? picture.original_picture.id : nil
rpid = picture.original_picture.resource_picture ? picture.original_picture.resource_picture.id : nil
if resource_picture_picture
module Locmare
class Booster
- attr :boost
+ attr :boost, :manifest
def initialize manifest, item
@manifest = manifest
class Base
attr_accessor :list_group_name, :list_name, :operators, :options, :item_name,
:controller_manifest, :action_manifest, :list_manifest, :model, :table_name,
- :page_status, :item_wheres, :list_wheres
+ :page_status, :item_wheres, :list_wheres, :wheres
def initialize list_group_name, list_name, operators, options = {}
@list_group_name = list_group_name
def arel
r = @model
+ return @model.__send__('find_' + @action_name)
+
+ r.includes(
+ self.include_hash
+ )
@wheres.each do |key|
n = key + '_list_where'
r = r.where(@model.respond_to?(n) ? @model.__send__(n, self) : self.__send__(n))
end
- r.includes(
+ r.references(
self.include_hash
)
end
r
end
+ def arel
+ r = @model
+ return @model.__send__('find_' + @action_name, self.filter_id)
+ end
+
end
end
end
def self.edit content_id, operators
- content = self.find content_id, self.show_opt
+ content = self.find content_id
raise ActiveRecord::Forbidden unless content.own?(operators)
content
end
def self.show item_id, operators = nil
opt = {}
opt.merge!(self.show_opt)
- item = self.find(item_id, opt)
+ item = self.find(item_id)
item.boosts 'read'
raise ActiveRecord::Forbidden if operators and item.visible?(operators) == false
item
#InstanceMethods
+ def my_manifest
+ self.class.my_manifest
+ end
+
def singular
self.class.singular
end
true
end
+ def permit_params params
+ attrs = self.my_manifest.attributes.keys
+ params.require(self.item_name).permit(attrs)
+ end
+
def editize?
self.respond_to? :editor
end
end
def self.max_t binder_id
- self.maximum(:t, :conditions => [self.binder_key + ' = ?', binder_id])
+ self.where([self.binder_key + ' = ?', binder_id]).maximum(:t)
end
def self.find_t binder_id, t
- self.find(:first, :conditions => [self.binder_key + ' = ? and t = ?', binder_id, t])
+ self.where([self.binder_key + ' = ? and t = ?', binder_id, t]).first
end
def self.collect_t binder_id
- r = self.find(:all, :conditions => [self.binder_key + ' = ?', binder_id], :order => 't')
+ r = self.where([self.binder_key + ' = ?', binder_id]).order('t')
r.map {|sp| sp.t}
end
# ClassMethods
def self.edit system_resource_id, operators
- system_resource = self.find system_resource_id, self.show_opt
+ system_resource = self.find system_resource_id
raise ActiveRecord::Forbidden unless system_resource.own?(operators)
system_resource
end
# ClassMethods
def self.enable_list
- self.find(:all).delete_if {|i|
+ self.all.delete_if {|i|
i.enable? == false
}
end
+++ /dev/null
-#!/usr/bin/env ruby
-
-vendored_cucumber_bin = Dir["#{File.dirname(__FILE__)}/../vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
-if vendored_cucumber_bin
- load File.expand_path(vendored_cucumber_bin)
-else
- require 'rubygems' unless ENV['NO_RUBYGEMS']
- require 'cucumber'
- load Cucumber::BINARY
-end
+++ /dev/null
-#!/usr/bin/env ruby.exe
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-APP_PATH = File.expand_path('../../config/application', __FILE__)
-require File.expand_path('../../config/boot', __FILE__)
-require 'rails/commands'
OSDN Git Service
