Skip to content

Commit

Permalink
apply rubocop
Browse files Browse the repository at this point in the history
  • Loading branch information
nabeta committed Jun 10, 2018
1 parent aaf352c commit 6149452
Show file tree
Hide file tree
Showing 11 changed files with 43 additions and 25 deletions.
18 changes: 18 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@
Rails:
Enabled: true
Layout/SpaceInsideHashLiteralBraces:
Enabled: false
Layout/SpaceInsideBlockBraces:
Enabled: false
Layout/SpaceBeforeBlockBraces:
Enabled: false
Style/WordArray:
Enabled: false
Style/Documentation:
Enabled: false
Style/StringLiterals:
Enabled: false
Style/AsciiComments:
Enabled: false
Metrics/MethodLength:
Enabled: false
Metrics/LineLength:
Enabled: false
Metrics/BlockLength:
Enabled: false
6 changes: 3 additions & 3 deletions app/controllers/page_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ class PageController < ApplicationController
def index
if user_signed_in?
session[:user_return_to] = nil
#unless current_user.agent
# unless current_user.agent
# redirect_to new_user_agent_url(current_user); return
#end
# end
if defined?(EnjuBookmark)
@tags = current_user.bookmarks.tag_counts.sort{|a, b|
a.count <=> b.count
Expand All @@ -28,7 +28,7 @@ def index
else
if defined?(EnjuBookmark)
# TODO: タグ下限の設定
#@tags = Tag.all(limit: 50, order: 'taggings_count DESC')
# @tags = Tag.all(limit: 50, order: 'taggings_count DESC')
@tags = Bookmark.tag_counts.sort{|a, b|
a.count <=> b.count
}.reverse[0..49]
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/mime_types.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Mime::Type.register "image/jpeg", :jpg
Mime::Type.register "application/octet-stream", :download
Mime::Type.register "application/xml", :sru
#Mime::Type.register "application/xml", :openurl
# Mime::Type.register "application/xml", :openurl
Mime::Type.register "application/xml", :mods
Mime::Type.register "application/rdf+xml", :rdf
Mime::Type.register "application/svg+xml", :svg
16 changes: 8 additions & 8 deletions enju_leaf.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,23 @@ Gem::Specification.new do |s|
s.test_files = Dir["spec/**/*"] - Dir["spec/dummy/log/*"] - Dir["spec/dummy/solr/{data,pids,default,development,test}/*"] - Dir["spec/dummy/tmp/*"]

s.add_dependency "enju_seed", "~> 0.3.0.beta.3"
#s.add_dependency "enju_library", "~> 0.2.0.beta.1"
#s.add_dependency "enju_manifestation_viewer", "~> 0.2.0.beta.1"
#s.add_dependency "elasticsearch-rails", "~> 5.0"
# s.add_dependency "enju_library", "~> 0.2.0.beta.1"
# s.add_dependency "enju_manifestation_viewer", "~> 0.2.0.beta.1"
# s.add_dependency "elasticsearch-rails", "~> 5.0"
s.add_dependency "bootstrap-sass", "~> 3.3.7"
s.add_dependency "slim-rails"
#s.add_dependency "postrank-uri"
# s.add_dependency "postrank-uri"

s.add_development_dependency "pg"
s.add_development_dependency "rspec-rails", "~> 3.5"
#s.add_development_dependency "enju_circulation", "~> 0.2.0.beta.1"
#s.add_development_dependency "enju_bookmark", "~> 0.2.0.beta.1"
#s.add_development_dependency "enju_search_log", "~> 0.2.0.beta.1"
# s.add_development_dependency "enju_circulation", "~> 0.2.0.beta.1"
# s.add_development_dependency "enju_bookmark", "~> 0.2.0.beta.1"
# s.add_development_dependency "enju_search_log", "~> 0.2.0.beta.1"
s.add_development_dependency "simplecov"
s.add_development_dependency "factory_bot_rails"
s.add_development_dependency "sunspot_matchers"
s.add_development_dependency "rspec-activemodel-mocks"
#s.add_development_dependency "charlock_holmes"
# s.add_development_dependency "charlock_holmes"
s.add_development_dependency "redis-rails"
s.add_development_dependency "resque"
s.add_development_dependency "capybara"
Expand Down
12 changes: 6 additions & 6 deletions lib/generators/enju_leaf/setup/templates/db/seeds.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
# Don't edit the following lines!

Sunspot.session = Sunspot::Rails::StubSessionProxy.new(Sunspot.session)
#unless solr = Sunspot.commit rescue nil
# unless solr = Sunspot.commit rescue nil
# raise "Solr is not running."
#end
# end

def new_profile
profile = Profile.new
Expand All @@ -32,9 +32,9 @@ def new_profile
profile
end

#Patron.reindex
#Library.reindex
#Shelf.reindex
# Patron.reindex
# Library.reindex
# Shelf.reindex

system_user = User.find_by(username: 'system') || User.new
system_user.username = 'system'
Expand All @@ -51,7 +51,7 @@ def new_profile
user.email = email
user.password = password
user.password_confirmation = password
#user.confirm!
# user.confirm!
user.role = Role.find_by(name: 'Administrator')
profile = new_profile
profile.user_number = '0'
Expand Down
2 changes: 1 addition & 1 deletion spec/dummy/app/models/user.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
class User < ActiveRecord::Base
devise :database_authenticatable, #:registerable,
:recoverable, :rememberable, :trackable, #, :validatable
:recoverable, :rememberable, :trackable, # , :validatable
:lockable, :lock_strategy => :none, :unlock_strategy => :none

include EnjuSeed::EnjuUser
Expand Down
4 changes: 2 additions & 2 deletions spec/dummy/db/migrate/005_create_manifestations.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ def change
t.integer :frequency_id, null: false, default: 1
t.boolean :subscription_master, default: false, null: false
end
#add_index :manifestations, :carrier_type_id
# add_index :manifestations, :carrier_type_id
add_index :manifestations, :access_address
#add_index :manifestations, :frequency_id
# add_index :manifestations, :frequency_id
add_index :manifestations, :updated_at
add_index :manifestations, :date_of_publication
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ def change
create_table :subscriptions do |t|
t.text :title, null: false
t.text :note
#t.integer :subscription_list_id, :integer
# t.integer :subscription_list_id, :integer
t.references :user, foreign_key: true
t.integer :order_list_id
t.integer :subscribes_count, default: 0, null: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def self.up
t.datetime :created_at
end

#add_index :taggings, :tag_id
# add_index :taggings, :tag_id
add_index :taggings, [:taggable_id, :taggable_type, :context]
end

Expand Down
2 changes: 1 addition & 1 deletion spec/dummy/db/migrate/20120319173203_create_accepts.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ class CreateAccepts < ActiveRecord::Migration[5.1]
def change
create_table :accepts do |t|
t.references :basket, foreign_key: {on_delete: :nullify}, type: :uuid
#t.references :item, foreign_key: true, type: :uuid, null: false
# t.references :item, foreign_key: true, type: :uuid, null: false
t.references :librarian, foreign_key: {to_table: :users}, null: false

t.timestamps
Expand Down
2 changes: 1 addition & 1 deletion spec/dummy/db/migrate/20150924115059_create_withdraws.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ class CreateWithdraws < ActiveRecord::Migration[5.1]
def change
create_table :withdraws do |t|
t.references :basket, foreign_key: {on_delete: :nullify}, type: :uuid
#t.references :item, foreign_key: true, type: :uuid
# t.references :item, foreign_key: true, type: :uuid
t.references :librarian, foreign_key: {to_table: :users}, null: false

t.timestamps
Expand Down

0 comments on commit 6149452

Please sign in to comment.