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 27fb18a commit ae582f3
Show file tree
Hide file tree
Showing 12 changed files with 25 additions and 25 deletions.
8 changes: 4 additions & 4 deletions app/models/news_feed.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ class NewsFeed < ActiveRecord::Base
default_scope { order("news_feeds.position") }
belongs_to :library_group, validate: true

validates_presence_of :title, :url, :library_group
validates :title, :url, :library_group, presence: true
validates_associated :library_group
validates_length_of :url, maximum: 255
validates :url, length: { maximum: 255 }
before_save :fetch

acts_as_list
Expand All @@ -30,15 +30,15 @@ def content
# rss = RSS::Parser.parse(feed)
# rss.to_s
# => ""
#if rss.nil?
# if rss.nil?
begin
rss = RSS::Parser.parse(body)
rescue RSS::InvalidRSSError
rss = RSS::Parser.parse(body, false)
rescue RSS::NotWellFormedError, TypeError
nil
end
#end
# end
end
end

Expand Down
2 changes: 1 addition & 1 deletion app/models/news_post.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class NewsPost < ActiveRecord::Base
belongs_to :user
belongs_to :required_role, class_name: 'Role', foreign_key: 'required_role_id', validate: true

validates_presence_of :title, :body, :user_id
validates :title, :body, :user_id, presence: true
validates_associated :user
validate :check_date

Expand Down
8 changes: 4 additions & 4 deletions app/views/news_posts/index.rss.builder
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ xml.instruct! :xml, version: "1.0"
xml.rss('version' => "2.0",
'xmlns:opensearch' => "http://a9.com/-/spec/opensearch/1.1/",
'xmlns:dc' => "http://purl.org/dc/elements/1.1/",
'xmlns:atom' => "http://www.w3.org/2005/Atom"){
xml.channel{
'xmlns:atom' => "http://www.w3.org/2005/Atom") do
xml.channel do
xml.title t('news_post.library_group_news_post', library_group_name: @library_group.display_name.localize)
xml.link news_posts_url
xml.description "Next-L Enju, an open source integrated library system developed by Project Next-L"
Expand All @@ -28,5 +28,5 @@ xml.rss('version' => "2.0",
end
end
end
}
}
end
end
12 changes: 6 additions & 6 deletions enju_news.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ Gem::Specification.new do |s|

s.add_dependency "enju_library", "~> 0.2.5"

s.add_development_dependency "coveralls"
s.add_development_dependency "enju_leaf", "~> 1.2.2"
s.add_development_dependency "sqlite3"
s.add_development_dependency "factory_bot_rails"
s.add_development_dependency "mysql2"
s.add_development_dependency "pg", "~> 0.21"
s.add_development_dependency "rspec-rails", "~> 3.5"
s.add_development_dependency "factory_bot_rails"
s.add_development_dependency "vcr", "~> 4.0"
s.add_development_dependency "webmock"
s.add_development_dependency "simplecov"
s.add_development_dependency "sunspot_solr", "2.2.0"
s.add_development_dependency "sqlite3"
s.add_development_dependency "sunspot-rails-tester"
s.add_development_dependency "coveralls"
s.add_development_dependency "sunspot_solr", "2.2.0"
s.add_development_dependency "vcr", "~> 4.0"
s.add_development_dependency "webmock"
end
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
6 changes: 3 additions & 3 deletions spec/dummy/db/migrate/005_create_manifestations.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ def change
t.integer :frequency_id, default: 1, null: false
t.boolean :subscription_master, default: false, null: false
end
#add_index :manifestations, :carrier_type_id
#add_index :manifestations, :required_role_id
# add_index :manifestations, :carrier_type_id
# add_index :manifestations, :required_role_id
add_index :manifestations, :access_address
#add_index :manifestations, :frequency_id
# add_index :manifestations, :frequency_id
add_index :manifestations, :manifestation_identifier
add_index :manifestations, :updated_at
add_index :manifestations, :date_of_publication
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ class AddConstraintsToMostRecentForUserImportFileTransitions < ActiveRecord::Mig
disable_ddl_transaction!

def up
add_index :user_import_file_transitions, [:user_import_file_id, :most_recent], unique: true, where: "most_recent", name: "index_user_import_file_transitions_parent_most_recent" #, algorithm: :concurrently
add_index :user_import_file_transitions, [:user_import_file_id, :most_recent], unique: true, where: "most_recent", name: "index_user_import_file_transitions_parent_most_recent" # , algorithm: :concurrently
change_column_null :user_import_file_transitions, :most_recent, false
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ class AddConstraintsToMostRecentForUserExportFileTransitions < ActiveRecord::Mig
disable_ddl_transaction!

def up
add_index :user_export_file_transitions, [:user_export_file_id, :most_recent], unique: true, where: "most_recent", name: "index_user_export_file_transitions_parent_most_recent" #, algorithm: :concurrently
add_index :user_export_file_transitions, [:user_export_file_id, :most_recent], unique: true, where: "most_recent", name: "index_user_export_file_transitions_parent_most_recent" # , algorithm: :concurrently
change_column_null :user_export_file_transitions, :most_recent, false
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ class AddConstraintsToMostRecentForAgentImportFileTransitions < ActiveRecord::Mi
disable_ddl_transaction!

def up
add_index :agent_import_file_transitions, [:agent_import_file_id, :most_recent], unique: true, where: "most_recent", name: "index_agent_import_file_transitions_parent_most_recent" #, algorithm: :concurrently
add_index :agent_import_file_transitions, [:agent_import_file_id, :most_recent], unique: true, where: "most_recent", name: "index_agent_import_file_transitions_parent_most_recent" # , algorithm: :concurrently
change_column_null :agent_import_file_transitions, :most_recent, false
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ class AddConstraintsToMostRecentForResourceImportFileTransitions < ActiveRecord:
disable_ddl_transaction!

def up
add_index :resource_import_file_transitions, [:resource_import_file_id, :most_recent], unique: true, where: "most_recent", name: "index_resource_import_file_transitions_parent_most_recent" #, algorithm: :concurrently
add_index :resource_import_file_transitions, [:resource_import_file_id, :most_recent], unique: true, where: "most_recent", name: "index_resource_import_file_transitions_parent_most_recent" # , algorithm: :concurrently
change_column_null :resource_import_file_transitions, :most_recent, false
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ class AddConstraintsToMostRecentForResourceExportFileTransitions < ActiveRecord:
disable_ddl_transaction!

def up
add_index :resource_export_file_transitions, [:resource_export_file_id, :most_recent], unique: true, where: "most_recent", name: "index_resource_export_file_transitions_parent_most_recent" #, algorithm: :concurrently
add_index :resource_export_file_transitions, [:resource_export_file_id, :most_recent], unique: true, where: "most_recent", name: "index_resource_export_file_transitions_parent_most_recent" # , algorithm: :concurrently
change_column_null :resource_export_file_transitions, :most_recent, false
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ class AddConstraintsToMostRecentForImportRequestTransitions < ActiveRecord::Migr
disable_ddl_transaction!

def up
add_index :import_request_transitions, [:import_request_id, :most_recent], unique: true, where: "most_recent", name: "index_import_request_transitions_parent_most_recent" #, algorithm: :concurrently
add_index :import_request_transitions, [:import_request_id, :most_recent], unique: true, where: "most_recent", name: "index_import_request_transitions_parent_most_recent" # , algorithm: :concurrently
change_column_null :import_request_transitions, :most_recent, false
end

Expand Down

0 comments on commit ae582f3

Please sign in to comment.