enju_library 0.2.3 → 0.2.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/library_groups_controller.rb +23 -1
- data/app/models/library.rb +0 -3
- data/app/models/library_group.rb +25 -1
- data/app/policies/library_group_policy.rb +4 -0
- data/app/views/library_groups/_form.html.erb +8 -0
- data/app/views/library_groups/show.html.erb +6 -0
- data/config/locales/translation_en.yml +1 -0
- data/config/locales/translation_ja.yml +1 -0
- data/db/migrate/20171126133835_rename_login_banner_to_old_login_banner.rb +5 -0
- data/db/migrate/20171126135238_add_foreign_key_to_library_group_id_on_library.rb +5 -0
- data/db/migrate/20180102162311_add_header_logo_meta_to_library_group.rb +5 -0
- data/lib/enju_library/engine.rb +1 -0
- data/lib/enju_library/version.rb +1 -1
- data/lib/generators/enju_library/setup/templates/db/fixtures/library_group/translations.yml +6 -10
- data/lib/generators/enju_library/setup/templates/db/fixtures/library_groups.yml +0 -1
- data/lib/generators/enju_library/update/update_generator.rb +9 -0
- data/spec/controllers/accepts_controller_spec.rb +5 -5
- data/spec/controllers/baskets_controller_spec.rb +1 -1
- data/spec/controllers/bookstores_controller_spec.rb +6 -6
- data/spec/controllers/budget_types_controller_spec.rb +1 -1
- data/spec/controllers/libraries_controller_spec.rb +6 -6
- data/spec/controllers/request_status_types_controller_spec.rb +6 -6
- data/spec/controllers/request_types_controller_spec.rb +6 -6
- data/spec/controllers/search_engines_controller_spec.rb +12 -12
- data/spec/controllers/shelves_controller_spec.rb +7 -7
- data/spec/controllers/subscribes_controller_spec.rb +12 -12
- data/spec/controllers/subscriptions_controller_spec.rb +11 -11
- data/spec/controllers/user_groups_controller_spec.rb +12 -12
- data/spec/controllers/user_import_files_controller_spec.rb +4 -4
- data/spec/controllers/withdraws_controller_spec.rb +1 -1
- data/spec/dummy/db/schema.rb +3 -2
- data/spec/factories/accepts.rb +4 -4
- data/spec/factories/basket.rb +2 -2
- data/spec/factories/bookstore.rb +1 -1
- data/spec/factories/budget_types.rb +1 -1
- data/spec/factories/checkout.rb +1 -1
- data/spec/factories/item.rb +2 -2
- data/spec/factories/library.rb +2 -2
- data/spec/factories/manifestation.rb +1 -1
- data/spec/factories/profile.rb +2 -2
- data/spec/factories/request_status_type.rb +1 -1
- data/spec/factories/request_type.rb +1 -1
- data/spec/factories/search_engine.rb +1 -1
- data/spec/factories/shelf.rb +2 -2
- data/spec/factories/subscribe.rb +3 -3
- data/spec/factories/subscription.rb +2 -2
- data/spec/factories/user.rb +1 -1
- data/spec/factories/user_group.rb +1 -1
- data/spec/factories/withdraw.rb +4 -4
- data/spec/fixtures/library_groups.yml +8 -2
- data/spec/models/accept_spec.rb +1 -1
- data/spec/models/budget_type_spec.rb +1 -1
- data/spec/models/library_group_spec.rb +7 -1
- data/spec/models/library_spec.rb +1 -1
- data/spec/models/user_import_file_spec.rb +4 -4
- data/spec/models/withdraw_spec.rb +1 -1
- data/spec/rails_helper.rb +3 -3
- data/spec/support/controller_macros.rb +3 -3
- data/spec/views/accepts/index.html.erb_spec.rb +1 -1
- data/spec/views/accepts/new.html.erb_spec.rb +1 -1
- data/spec/views/libraries/show.html.erb_spec.rb +1 -1
- data/spec/views/withdraws/edit.html.erb_spec.rb +1 -1
- data/spec/views/withdraws/index.html.erb_spec.rb +1 -1
- data/spec/views/withdraws/show.html.erb_spec.rb +1 -1
- metadata +16 -26
data/spec/models/library_spec.rb
CHANGED
@@ -97,9 +97,9 @@ describe UserImportFile do
|
|
97
97
|
|
98
98
|
describe "when its mode is 'update'" do
|
99
99
|
before(:each) do
|
100
|
-
|
100
|
+
FactoryBot.create(:user,
|
101
101
|
username: 'user001',
|
102
|
-
profile:
|
102
|
+
profile: FactoryBot.create(:profile)
|
103
103
|
)
|
104
104
|
end
|
105
105
|
it "should update users" do
|
@@ -119,7 +119,7 @@ describe UserImportFile do
|
|
119
119
|
|
120
120
|
it "should not overwrite with null value" do
|
121
121
|
user = User.where(username: 'user001').first
|
122
|
-
user.profile =
|
122
|
+
user.profile = FactoryBot.create(:profile,
|
123
123
|
user_number: '001',
|
124
124
|
full_name: 'User 001',
|
125
125
|
full_name_transcription: 'User 001',
|
@@ -175,7 +175,7 @@ describe UserImportFile do
|
|
175
175
|
|
176
176
|
it "should not remove users if there are checkouts" do
|
177
177
|
user001 = User.where(username: 'user001').first
|
178
|
-
|
178
|
+
FactoryBot.create(:checkout, user: user001, item: FactoryBot.create(:item))
|
179
179
|
old_count = User.count
|
180
180
|
@file = UserImportFile.create user_import: File.new("#{Rails.root}/../../examples/user_delete_file.tsv"), user: users(:admin)
|
181
181
|
@file.remove
|
@@ -4,7 +4,7 @@ RSpec.describe Withdraw, type: :model do
|
|
4
4
|
fixtures :all
|
5
5
|
|
6
6
|
it "should change circulation_status" do
|
7
|
-
withdraw =
|
7
|
+
withdraw = FactoryBot.create(:withdraw)
|
8
8
|
withdraw.item.circulation_status.name.should eq 'Removed'
|
9
9
|
withdraw.item.use_restriction.name.should eq 'Not For Loan'
|
10
10
|
end
|
data/spec/rails_helper.rb
CHANGED
@@ -11,7 +11,7 @@ abort("The Rails environment is running in production mode!") if Rails.env.produ
|
|
11
11
|
require 'spec_helper'
|
12
12
|
require 'rspec/rails'
|
13
13
|
# Add additional requires below this line. Rails is not loaded until this point!
|
14
|
-
require '
|
14
|
+
require 'factory_bot'
|
15
15
|
require 'sunspot-rails-tester'
|
16
16
|
require 'rspec/active_model/mocks'
|
17
17
|
Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
|
@@ -75,6 +75,6 @@ RSpec.configure do |config|
|
|
75
75
|
end
|
76
76
|
end
|
77
77
|
|
78
|
-
|
79
|
-
|
78
|
+
FactoryBot.definition_file_paths << "#{::Rails.root}/../../spec/factories"
|
79
|
+
FactoryBot.find_definitions
|
80
80
|
|
@@ -2,21 +2,21 @@ module ControllerMacros
|
|
2
2
|
def login_admin
|
3
3
|
before(:each) do
|
4
4
|
@request.env["devise.mapping"] = Devise.mappings[:admin]
|
5
|
-
sign_in
|
5
|
+
sign_in FactoryBot.create(:admin)
|
6
6
|
end
|
7
7
|
end
|
8
8
|
|
9
9
|
def login_librarian
|
10
10
|
before(:each) do
|
11
11
|
@request.env["devise.mapping"] = Devise.mappings[:librarian]
|
12
|
-
sign_in
|
12
|
+
sign_in FactoryBot.create(:librarian)
|
13
13
|
end
|
14
14
|
end
|
15
15
|
|
16
16
|
def login_user
|
17
17
|
before(:each) do
|
18
18
|
@request.env["devise.mapping"] = Devise.mappings[:user]
|
19
|
-
sign_in
|
19
|
+
sign_in FactoryBot.create(:user)
|
20
20
|
end
|
21
21
|
end
|
22
22
|
|
@@ -7,7 +7,7 @@ describe "accepts/new" do
|
|
7
7
|
assign(:accept, stub_model(Accept,
|
8
8
|
:item_id => 1
|
9
9
|
).as_new_record)
|
10
|
-
assign(:basket,
|
10
|
+
assign(:basket, FactoryBot.create(:basket))
|
11
11
|
assign(:accepts, Kaminari::paginate_array([
|
12
12
|
stub_model(Accept,
|
13
13
|
:item_id => 1,
|
@@ -4,7 +4,7 @@ describe "libraries/show" do
|
|
4
4
|
fixtures :all
|
5
5
|
before(:each) do
|
6
6
|
@events = Kaminari::paginate_array([]).page(1)
|
7
|
-
assign(:library,
|
7
|
+
assign(:library, FactoryBot.create(:library, :street => "\tStreet 1-2"))
|
8
8
|
end
|
9
9
|
|
10
10
|
it "renders a library detail" do
|
@@ -14,7 +14,7 @@ RSpec.describe "withdraws/index", type: :view do
|
|
14
14
|
:created_at => Time.zone.now
|
15
15
|
)
|
16
16
|
]).page(1))
|
17
|
-
basket =
|
17
|
+
basket = FactoryBot.create(:basket)
|
18
18
|
assign(:basket, basket)
|
19
19
|
assign(:withdraw, basket.withdraws.new)
|
20
20
|
view.stub(:current_user).and_return(User.friendly.find('enjuadmin'))
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: enju_library
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.2.
|
4
|
+
version: 0.2.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Kosuke Tanabe
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2018-01-07 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: enju_seed
|
@@ -81,27 +81,13 @@ dependencies:
|
|
81
81
|
- !ruby/object:Gem::Version
|
82
82
|
version: '4.3'
|
83
83
|
- !ruby/object:Gem::Dependency
|
84
|
-
name:
|
85
|
-
requirement: !ruby/object:Gem::Requirement
|
86
|
-
requirements:
|
87
|
-
- - "~>"
|
88
|
-
- !ruby/object:Gem::Version
|
89
|
-
version: 5.1.0.beta2
|
90
|
-
type: :development
|
91
|
-
prerelease: false
|
92
|
-
version_requirements: !ruby/object:Gem::Requirement
|
93
|
-
requirements:
|
94
|
-
- - "~>"
|
95
|
-
- !ruby/object:Gem::Version
|
96
|
-
version: 5.1.0.beta2
|
97
|
-
- !ruby/object:Gem::Dependency
|
98
|
-
name: globalize-accessors
|
84
|
+
name: paperclip-meta
|
99
85
|
requirement: !ruby/object:Gem::Requirement
|
100
86
|
requirements:
|
101
87
|
- - ">="
|
102
88
|
- !ruby/object:Gem::Version
|
103
89
|
version: '0'
|
104
|
-
type: :
|
90
|
+
type: :runtime
|
105
91
|
prerelease: false
|
106
92
|
version_requirements: !ruby/object:Gem::Requirement
|
107
93
|
requirements:
|
@@ -128,14 +114,14 @@ dependencies:
|
|
128
114
|
requirements:
|
129
115
|
- - "~>"
|
130
116
|
- !ruby/object:Gem::Version
|
131
|
-
version: 0.2.
|
117
|
+
version: 0.2.3
|
132
118
|
type: :development
|
133
119
|
prerelease: false
|
134
120
|
version_requirements: !ruby/object:Gem::Requirement
|
135
121
|
requirements:
|
136
122
|
- - "~>"
|
137
123
|
- !ruby/object:Gem::Version
|
138
|
-
version: 0.2.
|
124
|
+
version: 0.2.3
|
139
125
|
- !ruby/object:Gem::Dependency
|
140
126
|
name: enju_manifestation_viewer
|
141
127
|
requirement: !ruby/object:Gem::Requirement
|
@@ -170,28 +156,28 @@ dependencies:
|
|
170
156
|
requirements:
|
171
157
|
- - "~>"
|
172
158
|
- !ruby/object:Gem::Version
|
173
|
-
version: 0.2.
|
159
|
+
version: 0.2.2
|
174
160
|
type: :development
|
175
161
|
prerelease: false
|
176
162
|
version_requirements: !ruby/object:Gem::Requirement
|
177
163
|
requirements:
|
178
164
|
- - "~>"
|
179
165
|
- !ruby/object:Gem::Version
|
180
|
-
version: 0.2.
|
166
|
+
version: 0.2.2
|
181
167
|
- !ruby/object:Gem::Dependency
|
182
168
|
name: enju_circulation
|
183
169
|
requirement: !ruby/object:Gem::Requirement
|
184
170
|
requirements:
|
185
171
|
- - "~>"
|
186
172
|
- !ruby/object:Gem::Version
|
187
|
-
version: 0.2.
|
173
|
+
version: 0.2.4
|
188
174
|
type: :development
|
189
175
|
prerelease: false
|
190
176
|
version_requirements: !ruby/object:Gem::Requirement
|
191
177
|
requirements:
|
192
178
|
- - "~>"
|
193
179
|
- !ruby/object:Gem::Version
|
194
|
-
version: 0.2.
|
180
|
+
version: 0.2.4
|
195
181
|
- !ruby/object:Gem::Dependency
|
196
182
|
name: sqlite3
|
197
183
|
requirement: !ruby/object:Gem::Requirement
|
@@ -249,7 +235,7 @@ dependencies:
|
|
249
235
|
- !ruby/object:Gem::Version
|
250
236
|
version: '3.5'
|
251
237
|
- !ruby/object:Gem::Dependency
|
252
|
-
name:
|
238
|
+
name: factory_bot_rails
|
253
239
|
requirement: !ruby/object:Gem::Requirement
|
254
240
|
requirements:
|
255
241
|
- - ">="
|
@@ -587,6 +573,9 @@ files:
|
|
587
573
|
- db/migrate/20160813203039_add_user_id_to_library_group.rb
|
588
574
|
- db/migrate/20170305064014_add_csv_charset_conversion_to_library_group.rb
|
589
575
|
- db/migrate/20171014084528_add_header_logo_to_library_group.rb
|
576
|
+
- db/migrate/20171126133835_rename_login_banner_to_old_login_banner.rb
|
577
|
+
- db/migrate/20171126135238_add_foreign_key_to_library_group_id_on_library.rb
|
578
|
+
- db/migrate/20180102162311_add_header_logo_meta_to_library_group.rb
|
590
579
|
- lib/enju_library.rb
|
591
580
|
- lib/enju_library/engine.rb
|
592
581
|
- lib/enju_library/version.rb
|
@@ -600,6 +589,7 @@ files:
|
|
600
589
|
- lib/generators/enju_library/setup/templates/db/fixtures/request_status_types.yml
|
601
590
|
- lib/generators/enju_library/setup/templates/db/fixtures/request_types.yml
|
602
591
|
- lib/generators/enju_library/setup/templates/db/fixtures/shelves.yml
|
592
|
+
- lib/generators/enju_library/update/update_generator.rb
|
603
593
|
- lib/tasks/color.rb
|
604
594
|
- lib/tasks/enju_library_tasks.rake
|
605
595
|
- spec/controllers/accepts_controller_spec.rb
|
@@ -985,7 +975,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
985
975
|
version: '0'
|
986
976
|
requirements: []
|
987
977
|
rubyforge_project:
|
988
|
-
rubygems_version: 2.
|
978
|
+
rubygems_version: 2.6.14
|
989
979
|
signing_key:
|
990
980
|
specification_version: 4
|
991
981
|
summary: enju_library plugin
|