enju_news 0.1.0.pre8 → 0.1.0.pre9
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/models/news_feed.rb +5 -6
- data/app/models/news_post.rb +3 -4
- data/lib/enju_news/version.rb +1 -1
- data/spec/cassette_library/NewsFeed/should_get_content.yml +548 -486
- data/spec/cassette_library/NewsFeed/should_not_get_content_if_the_feed_is_invalid.yml +9 -7
- data/spec/cassette_library/NewsFeed/should_reload_content.yml +548 -486
- data/spec/dummy/app/assets/javascripts/application.js +10 -6
- data/spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb +5 -0
- data/spec/dummy/db/schema.rb +2 -1
- data/spec/factories/user.rb +0 -3
- data/spec/fixtures/library_groups.yml +5 -0
- data/spec/fixtures/news_feeds.yml +4 -5
- data/spec/fixtures/news_posts.yml +3 -4
- data/spec/models/news_feed_spec.rb +4 -5
- data/spec/models/news_post_spec.rb +3 -4
- metadata +31 -15
@@ -1,9 +1,13 @@
|
|
1
|
-
// This is a manifest file that'll be compiled into
|
2
|
-
//
|
3
|
-
//
|
1
|
+
// This is a manifest file that'll be compiled into application.js, which will include all the files
|
2
|
+
// listed below.
|
3
|
+
//
|
4
|
+
// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
|
5
|
+
// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
|
6
|
+
//
|
4
7
|
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
|
5
|
-
//
|
8
|
+
// compiled file.
|
9
|
+
//
|
10
|
+
// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
|
11
|
+
// about supported directives.
|
6
12
|
//
|
7
|
-
//= require jquery
|
8
|
-
//= require jquery_ujs
|
9
13
|
//= require_tree .
|
data/spec/dummy/db/schema.rb
CHANGED
@@ -11,7 +11,7 @@
|
|
11
11
|
#
|
12
12
|
# It's strongly recommended that you check this file into your version control system.
|
13
13
|
|
14
|
-
ActiveRecord::Schema.define(version:
|
14
|
+
ActiveRecord::Schema.define(version: 20150221063719) do
|
15
15
|
|
16
16
|
create_table "accepts", force: :cascade do |t|
|
17
17
|
t.integer "basket_id"
|
@@ -100,6 +100,7 @@ ActiveRecord::Schema.define(version: 20140811031145) do
|
|
100
100
|
t.datetime "updated_at"
|
101
101
|
t.text "admin_networks"
|
102
102
|
t.string "url", default: "http://localhost:3000/"
|
103
|
+
t.text "settings"
|
103
104
|
end
|
104
105
|
|
105
106
|
add_index "library_groups", ["short_name"], name: "index_library_groups_on_short_name"
|
data/spec/factories/user.rb
CHANGED
@@ -2,7 +2,6 @@ FactoryGirl.define do
|
|
2
2
|
factory :admin, :class => User do |f|
|
3
3
|
f.sequence(:username){|n| "admin_#{n}"}
|
4
4
|
f.sequence(:email){|n| "admin_#{n}@example.jp"}
|
5
|
-
f.email_confirmation{|u| u.email}
|
6
5
|
f.password 'adminpassword'
|
7
6
|
f.password_confirmation 'adminpassword'
|
8
7
|
f.after(:create) do |user|
|
@@ -16,7 +15,6 @@ FactoryGirl.define do
|
|
16
15
|
factory :librarian, :class => User do |f|
|
17
16
|
f.sequence(:username){|n| "librarian_#{n}"}
|
18
17
|
f.sequence(:email){|n| "librarian_#{n}@example.jp"}
|
19
|
-
f.email_confirmation{|u| u.email}
|
20
18
|
f.password 'librarianpassword'
|
21
19
|
f.password_confirmation 'librarianpassword'
|
22
20
|
f.after(:create) do |user|
|
@@ -30,7 +28,6 @@ FactoryGirl.define do
|
|
30
28
|
factory :user, :class => User do |f|
|
31
29
|
f.sequence(:username){|n| "user_#{n}"}
|
32
30
|
f.sequence(:email){|n| "user_#{n}@example.jp"}
|
33
|
-
f.email_confirmation{|u| u.email}
|
34
31
|
f.password 'userpassword'
|
35
32
|
f.password_confirmation 'userpassword'
|
36
33
|
f.after(:create) do |user|
|
@@ -7,6 +7,11 @@ one:
|
|
7
7
|
note:
|
8
8
|
my_networks: 0.0.0.0/0
|
9
9
|
url: "http://localhost:3000/"
|
10
|
+
settings: <% if Rails::VERSION::MAJOR > 3 %>
|
11
|
+
"{\"max_number_of_results\":200,\"family_name_first\":true,\"book_jacket_source\":\"google\",\"screenshot_generator\":\"mozshot\"}"
|
12
|
+
<% else %>
|
13
|
+
"---\n:max_number_of_results: 200\n:family_name_first: true\n:book_jacket_source: \"google\"\n:screenshot_generator: \"mozshot\""
|
14
|
+
<% end %>
|
10
15
|
|
11
16
|
|
12
17
|
# == Schema Information
|
@@ -16,11 +16,10 @@ news_feed_00002:
|
|
16
16
|
#
|
17
17
|
# id :integer not null, primary key
|
18
18
|
# library_group_id :integer default(1), not null
|
19
|
-
# title :string
|
20
|
-
# url :string
|
19
|
+
# title :string
|
20
|
+
# url :string
|
21
21
|
# body :text
|
22
22
|
# position :integer
|
23
|
-
# created_at :datetime
|
24
|
-
# updated_at :datetime
|
23
|
+
# created_at :datetime
|
24
|
+
# updated_at :datetime
|
25
25
|
#
|
26
|
-
|
@@ -26,8 +26,7 @@ news_post_00002:
|
|
26
26
|
# note :text
|
27
27
|
# position :integer
|
28
28
|
# draft :boolean default(FALSE), not null
|
29
|
-
# created_at :datetime
|
30
|
-
# updated_at :datetime
|
31
|
-
# url :string
|
29
|
+
# created_at :datetime
|
30
|
+
# updated_at :datetime
|
31
|
+
# url :string
|
32
32
|
#
|
33
|
-
|
@@ -31,11 +31,10 @@ end
|
|
31
31
|
#
|
32
32
|
# id :integer not null, primary key
|
33
33
|
# library_group_id :integer default(1), not null
|
34
|
-
# title :string
|
35
|
-
# url :string
|
34
|
+
# title :string
|
35
|
+
# url :string
|
36
36
|
# body :text
|
37
37
|
# position :integer
|
38
|
-
# created_at :datetime
|
39
|
-
# updated_at :datetime
|
38
|
+
# created_at :datetime
|
39
|
+
# updated_at :datetime
|
40
40
|
#
|
41
|
-
|
@@ -18,8 +18,7 @@ end
|
|
18
18
|
# note :text
|
19
19
|
# position :integer
|
20
20
|
# draft :boolean default(FALSE), not null
|
21
|
-
# created_at :datetime
|
22
|
-
# updated_at :datetime
|
23
|
-
# url :string
|
21
|
+
# created_at :datetime
|
22
|
+
# updated_at :datetime
|
23
|
+
# url :string
|
24
24
|
#
|
25
|
-
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: enju_news
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.0.
|
4
|
+
version: 0.1.0.pre9
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Kosuke Tanabe
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-
|
11
|
+
date: 2015-11-07 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: faraday
|
@@ -42,16 +42,16 @@ dependencies:
|
|
42
42
|
name: mysql2
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
44
44
|
requirements:
|
45
|
-
- - "
|
45
|
+
- - "~>"
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version:
|
47
|
+
version: 0.3.20
|
48
48
|
type: :development
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
|
-
- - "
|
52
|
+
- - "~>"
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version:
|
54
|
+
version: 0.3.20
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: pg
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
@@ -72,14 +72,14 @@ dependencies:
|
|
72
72
|
requirements:
|
73
73
|
- - "~>"
|
74
74
|
- !ruby/object:Gem::Version
|
75
|
-
version: '3.
|
75
|
+
version: '3.3'
|
76
76
|
type: :development
|
77
77
|
prerelease: false
|
78
78
|
version_requirements: !ruby/object:Gem::Requirement
|
79
79
|
requirements:
|
80
80
|
- - "~>"
|
81
81
|
- !ruby/object:Gem::Version
|
82
|
-
version: '3.
|
82
|
+
version: '3.3'
|
83
83
|
- !ruby/object:Gem::Dependency
|
84
84
|
name: factory_girl_rails
|
85
85
|
requirement: !ruby/object:Gem::Requirement
|
@@ -98,16 +98,16 @@ dependencies:
|
|
98
98
|
name: vcr
|
99
99
|
requirement: !ruby/object:Gem::Requirement
|
100
100
|
requirements:
|
101
|
-
- - "
|
101
|
+
- - "~>"
|
102
102
|
- !ruby/object:Gem::Version
|
103
|
-
version: '0'
|
103
|
+
version: '3.0'
|
104
104
|
type: :development
|
105
105
|
prerelease: false
|
106
106
|
version_requirements: !ruby/object:Gem::Requirement
|
107
107
|
requirements:
|
108
|
-
- - "
|
108
|
+
- - "~>"
|
109
109
|
- !ruby/object:Gem::Version
|
110
|
-
version: '0'
|
110
|
+
version: '3.0'
|
111
111
|
- !ruby/object:Gem::Dependency
|
112
112
|
name: webmock
|
113
113
|
requirement: !ruby/object:Gem::Requirement
|
@@ -170,14 +170,28 @@ dependencies:
|
|
170
170
|
requirements:
|
171
171
|
- - "~>"
|
172
172
|
- !ruby/object:Gem::Version
|
173
|
-
version: 1.1.0.
|
173
|
+
version: 1.1.0.rc22
|
174
174
|
type: :development
|
175
175
|
prerelease: false
|
176
176
|
version_requirements: !ruby/object:Gem::Requirement
|
177
177
|
requirements:
|
178
178
|
- - "~>"
|
179
179
|
- !ruby/object:Gem::Version
|
180
|
-
version: 1.1.0.
|
180
|
+
version: 1.1.0.rc22
|
181
|
+
- !ruby/object:Gem::Dependency
|
182
|
+
name: appraisal
|
183
|
+
requirement: !ruby/object:Gem::Requirement
|
184
|
+
requirements:
|
185
|
+
- - ">="
|
186
|
+
- !ruby/object:Gem::Version
|
187
|
+
version: '0'
|
188
|
+
type: :development
|
189
|
+
prerelease: false
|
190
|
+
version_requirements: !ruby/object:Gem::Requirement
|
191
|
+
requirements:
|
192
|
+
- - ">="
|
193
|
+
- !ruby/object:Gem::Version
|
194
|
+
version: '0'
|
181
195
|
description: News article management for Next-L Enju
|
182
196
|
email:
|
183
197
|
- nabeta@fastmail.fm
|
@@ -292,6 +306,7 @@ files:
|
|
292
306
|
- spec/dummy/db/migrate/20140720170714_add_default_library_id_to_user_import_file.rb
|
293
307
|
- spec/dummy/db/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb
|
294
308
|
- spec/dummy/db/migrate/20140811031145_add_expired_at_to_profile.rb
|
309
|
+
- spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb
|
295
310
|
- spec/dummy/db/schema.rb
|
296
311
|
- spec/dummy/public/404.html
|
297
312
|
- spec/dummy/public/422.html
|
@@ -333,7 +348,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
333
348
|
version: 1.3.1
|
334
349
|
requirements: []
|
335
350
|
rubyforge_project:
|
336
|
-
rubygems_version: 2.4.5
|
351
|
+
rubygems_version: 2.4.5.1
|
337
352
|
signing_key:
|
338
353
|
specification_version: 4
|
339
354
|
summary: enju_news plugin
|
@@ -408,6 +423,7 @@ test_files:
|
|
408
423
|
- spec/dummy/db/migrate/20140720170714_add_default_library_id_to_user_import_file.rb
|
409
424
|
- spec/dummy/db/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb
|
410
425
|
- spec/dummy/db/migrate/20140811031145_add_expired_at_to_profile.rb
|
426
|
+
- spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb
|
411
427
|
- spec/dummy/db/schema.rb
|
412
428
|
- spec/dummy/public/404.html
|
413
429
|
- spec/dummy/public/422.html
|