enju_flower 0.1.0 → 0.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/README.rdoc +3 -3
  3. data/app/views/manifestations/_holding.html.erb +5 -1
  4. data/app/views/manifestations/_show_detail_librarian.html.erb +2 -2
  5. data/app/views/manifestations/_show_detail_user.html.erb +1 -1
  6. data/app/views/manifestations/_show_holding.html.erb +0 -5
  7. data/app/views/manifestations/show.mobile.erb +1 -1
  8. data/lib/enju_flower/version.rb +1 -1
  9. data/spec/dummy/config/initializers/assets.rb +12 -0
  10. metadata +31 -17
  11. data/spec/dummy/config/application.yml +0 -42
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 53d028a988ba3b0195065dc43865613e60b71c25
4
- data.tar.gz: bf0642c799a8be52462438c5b4addc4c944fb86c
3
+ metadata.gz: 5e16a3b142da1d42f515eed7b5b332093d272186
4
+ data.tar.gz: 779356ad558e59217bc20a92e457dc3912ac822d
5
5
  SHA512:
6
- metadata.gz: 42b788c25ea149caa4e08800cd5a9f3584c4265ca705bdf3ca62c7fc076a0a6790bcb9827eed435fc2384f27fcde2cd3698b469fb27b6714e31f5b2cdc70a642
7
- data.tar.gz: d8af90fe6bbedd9d248d9d9e968de07f3826a9a16c92a21af578cc7685375c050ad3f9c0a441d5fd18a7a1eae6184d12df4ee14d163ae0192a0959a8f4f5e608
6
+ metadata.gz: 6da773c46dc1578cfda2218bb7dfcf429def31603817454f2bdf9d8aec997ca26ba1391839cd6bd5be79ed4134e02c8806062985b7dac516616aba602901501a
7
+ data.tar.gz: 4ff39364aff8e0cfb3ab4f624dfeacc3d5ad0e2310fdb2c47ce5a78286bc239ddda4ee940c2b1a0e5cdefa8662473b113e1b23b3524a2b4243e4c41e8ba3a71b
data/README.rdoc CHANGED
@@ -1,11 +1,11 @@
1
1
  = Next-L Enju Flower
2
- {<img src="https://travis-ci.org/next-l/enju_flower.png?branch=1.1" alt="Build Status" />}[https://travis-ci.org/next-l/enju_flower]
3
- {<img src="https://coveralls.io/repos/next-l/enju_flower/badge.png?branch=1.1" alt="Coverage Status" />}[https://coveralls.io/r/next-l/enju_flower?branch=1.1]
2
+ {<img src="https://travis-ci.org/next-l/enju_flower.svg?branch=1.1" alt="Build Status" />}[https://travis-ci.org/next-l/enju_flower]
3
+ {<img src="https://coveralls.io/repos/next-l/enju_flower/badge.svg?branch=1.1&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_flower?branch=1.1]
4
4
  {<img src="https://hakiri.io/github/next-l/enju_flower/1.1.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_flower/1.1]
5
5
 
6
6
  == Related projects
7
7
  * {Next-L Enju Root}[https://github.com/next-l/enju_root]
8
- * {Next-L Enju Leaf}[https://github.com/next-l/enju_leaf]
8
+ * {Next-L Enju Leaf}[https://github.com/next-l/enju_flower]
9
9
 
10
10
  == Authors and contributors
11
11
  * {TANABE, Kosuke}[https://github.com/nabeta]
data/app/views/manifestations/_holding.html.erb CHANGED
@@ -1,3 +1,7 @@
1
1
  <div class="holding_index" id="holding_<%= manifestation.id -%>" style="display: none">
2
- <%= render 'manifestations/show_holding', manifestation: manifestation -%>
2
+ <% if current_user.try(:has_role?, 'Librarian') %>
3
+ <%= render 'manifestations/show_holding', manifestation: manifestation, items: manifestation.items -%>
4
+ <% else %>
5
+ <%= render 'manifestations/show_holding', manifestation: manifestation, items: manifestation.items.for_checkout.on_shelf -%>
6
+ <% end %>
3
7
  </div>
data/app/views/manifestations/_show_detail_librarian.html.erb CHANGED
@@ -112,8 +112,8 @@
112
112
  </tr>
113
113
  </table>
114
114
  <% end %>
115
- <%- if manifestation.items.on_shelf.exists? -%>
116
- <%= render 'manifestations/show_holding', manifestation: manifestation -%>
115
+ <%- if manifestation.items.exists? -%>
116
+ <%= render 'manifestations/show_holding', manifestation: manifestation, items: manifestation.items %>
117
117
  <%- end -%>
118
118
  </div>
119
119
  <%= render 'manifestations/tab_list', manifestation: manifestation %>
data/app/views/manifestations/_show_detail_user.html.erb CHANGED
@@ -113,7 +113,7 @@
113
113
  </table>
114
114
  <% end %>
115
115
  <%- if manifestation.items.for_checkout.on_shelf.exists? -%>
116
- <%= render 'manifestations/show_holding', manifestation: manifestation -%>
116
+ <%= render 'manifestations/show_holding', manifestation: manifestation, items: manifestation.items.for_checkout.on_shelf %>
117
117
  <%- end -%>
118
118
  </div>
119
119
  <%= render 'manifestations/tab_list', manifestation: manifestation %>
data/app/views/manifestations/_show_holding.html.erb CHANGED
@@ -10,11 +10,6 @@
10
10
  <th><%= t('activerecord.models.circulation_status') -%></th>
11
11
  <% end %>
12
12
  </tr>
13
- <% if current_user.try(:has_role?, 'Librarian') %>
14
- <% items = manifestation.items %>
15
- <% else %>
16
- <% items = manifestation.items.for_checkout.on_shelf %>
17
- <% end %>
18
13
  <%- items.each do |item| -%>
19
14
  <tr>
20
15
  <td>
data/app/views/manifestations/show.mobile.erb CHANGED
@@ -15,6 +15,6 @@
15
15
  </tr>
16
16
  </table>
17
17
  <%- if @manifestation.items.for_checkout.on_shelf.exists? -%>
18
- <%= render 'manifestations/show_holding', manifestation: @manifestation -%>
18
+ <%= render 'manifestations/show_holding', manifestation: @manifestation, items: @manifestation.items.for_checkout.on_shelf %>
19
19
  <%- end -%>
20
20
  </div>
data/lib/enju_flower/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EnjuFlower
2
- VERSION = "0.1.0"
2
+ VERSION = "0.1.1"
3
3
  end
data/spec/dummy/config/initializers/assets.rb ADDED
@@ -0,0 +1,12 @@
1
+ # Be sure to restart your server when you modify this file.
2
+
3
+ # Version of your assets, change this if you want to expire all your assets.
4
+ Rails.application.config.assets.version = '1.0'
5
+
6
+ # Add additional assets to the asset load path
7
+ # Rails.application.config.assets.paths << Emoji.images_path
8
+
9
+ # Precompile additional assets.
10
+ # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
11
+ # Rails.application.config.assets.precompile += %w( search.js )
12
+ Rails.application.config.assets.precompile += %w( *.png *.gif )
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: enju_flower
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0
4
+ version: 0.1.1
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-11 00:00:00.000000000 Z
11
+ date: 2015-12-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sqlite3
@@ -58,14 +58,14 @@ dependencies:
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: '3.3'
61
+ version: '3.4'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: '3.3'
68
+ version: '3.4'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: simplecov
71
71
  requirement: !ruby/object:Gem::Requirement
@@ -94,34 +94,48 @@ dependencies:
94
94
  - - ">="
95
95
  - !ruby/object:Gem::Version
96
96
  version: '0'
97
+ - !ruby/object:Gem::Dependency
98
+ name: sunspot_rails
99
+ requirement: !ruby/object:Gem::Requirement
100
+ requirements:
101
+ - - '='
102
+ - !ruby/object:Gem::Version
103
+ version: 2.2.0
104
+ type: :development
105
+ prerelease: false
106
+ version_requirements: !ruby/object:Gem::Requirement
107
+ requirements:
108
+ - - '='
109
+ - !ruby/object:Gem::Version
110
+ version: 2.2.0
97
111
  - !ruby/object:Gem::Dependency
98
112
  name: sunspot_solr
99
113
  requirement: !ruby/object:Gem::Requirement
100
114
  requirements:
101
- - - "~>"
115
+ - - '='
102
116
  - !ruby/object:Gem::Version
103
- version: '2.2'
117
+ version: 2.2.0
104
118
  type: :development
105
119
  prerelease: false
106
120
  version_requirements: !ruby/object:Gem::Requirement
107
121
  requirements:
108
- - - "~>"
122
+ - - '='
109
123
  - !ruby/object:Gem::Version
110
- version: '2.2'
124
+ version: 2.2.0
111
125
  - !ruby/object:Gem::Dependency
112
126
  name: enju_leaf
113
127
  requirement: !ruby/object:Gem::Requirement
114
128
  requirements:
115
129
  - - "~>"
116
130
  - !ruby/object:Gem::Version
117
- version: 1.1.0
131
+ version: 1.1.2
118
132
  type: :development
119
133
  prerelease: false
120
134
  version_requirements: !ruby/object:Gem::Requirement
121
135
  requirements:
122
136
  - - "~>"
123
137
  - !ruby/object:Gem::Version
124
- version: 1.1.0
138
+ version: 1.1.2
125
139
  - !ruby/object:Gem::Dependency
126
140
  name: enju_manifestation_viewer
127
141
  requirement: !ruby/object:Gem::Requirement
@@ -142,14 +156,14 @@ dependencies:
142
156
  requirements:
143
157
  - - "~>"
144
158
  - !ruby/object:Gem::Version
145
- version: 0.1.0
159
+ version: 0.1.1
146
160
  type: :development
147
161
  prerelease: false
148
162
  version_requirements: !ruby/object:Gem::Requirement
149
163
  requirements:
150
164
  - - "~>"
151
165
  - !ruby/object:Gem::Version
152
- version: 0.1.0
166
+ version: 0.1.1
153
167
  - !ruby/object:Gem::Dependency
154
168
  name: enju_bookmark
155
169
  requirement: !ruby/object:Gem::Requirement
@@ -170,14 +184,14 @@ dependencies:
170
184
  requirements:
171
185
  - - "~>"
172
186
  - !ruby/object:Gem::Version
173
- version: 0.1.0
187
+ version: 0.1.1
174
188
  type: :development
175
189
  prerelease: false
176
190
  version_requirements: !ruby/object:Gem::Requirement
177
191
  requirements:
178
192
  - - "~>"
179
193
  - !ruby/object:Gem::Version
180
- version: 0.1.0
194
+ version: 0.1.1
181
195
  - !ruby/object:Gem::Dependency
182
196
  name: mobylette
183
197
  requirement: !ruby/object:Gem::Requirement
@@ -351,13 +365,13 @@ files:
351
365
  - spec/dummy/bin/setup
352
366
  - spec/dummy/config.ru
353
367
  - spec/dummy/config/application.rb
354
- - spec/dummy/config/application.yml
355
368
  - spec/dummy/config/boot.rb
356
369
  - spec/dummy/config/database.yml
357
370
  - spec/dummy/config/environment.rb
358
371
  - spec/dummy/config/environments/development.rb
359
372
  - spec/dummy/config/environments/production.rb
360
373
  - spec/dummy/config/environments/test.rb
374
+ - spec/dummy/config/initializers/assets.rb
361
375
  - spec/dummy/config/initializers/backtrace_silencers.rb
362
376
  - spec/dummy/config/initializers/devise.rb
363
377
  - spec/dummy/config/initializers/inflections.rb
@@ -674,7 +688,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
674
688
  version: '0'
675
689
  requirements: []
676
690
  rubyforge_project:
677
- rubygems_version: 2.4.5.1
691
+ rubygems_version: 2.5.0
678
692
  signing_key:
679
693
  specification_version: 4
680
694
  summary: Next-L Enju Flower
@@ -703,13 +717,13 @@ test_files:
703
717
  - spec/dummy/bin/rake
704
718
  - spec/dummy/bin/setup
705
719
  - spec/dummy/config/application.rb
706
- - spec/dummy/config/application.yml
707
720
  - spec/dummy/config/boot.rb
708
721
  - spec/dummy/config/database.yml
709
722
  - spec/dummy/config/environment.rb
710
723
  - spec/dummy/config/environments/development.rb
711
724
  - spec/dummy/config/environments/production.rb
712
725
  - spec/dummy/config/environments/test.rb
726
+ - spec/dummy/config/initializers/assets.rb
713
727
  - spec/dummy/config/initializers/backtrace_silencers.rb
714
728
  - spec/dummy/config/initializers/devise.rb
715
729
  - spec/dummy/config/initializers/inflections.rb
data/spec/dummy/config/application.yml DELETED
@@ -1,42 +0,0 @@
1
- defaults: &defaults
2
- enju:
3
- web_hostname: localhost
4
- web_port_number: 3000
5
-
6
- family_name_first: true
7
- max_number_of_results: 500
8
- write_search_log_to_file: true
9
- csv_charset_conversion: true
10
-
11
- # Choose a locale from 'ca', 'de', 'fr', 'jp', 'uk', 'us'
12
- #AMAZON_AWS_HOSTNAME = 'ecs.amazonaws.com'
13
- amazon:
14
- aws_hostname: ecs.amazonaws.jp
15
- hostname: www.amazon.co.jp
16
- access_key: REPLACE_WITH_YOUR_AMAZON_ACCESS_KEY
17
- secret_access_key: REPLACE_WITH_YOUR_AMAZON_SECRET_ACCESS_KEY
18
-
19
- # :google, :amazon
20
- book_jacket:
21
- source: :google
22
- unknown_resource:
23
-
24
- # :mozshot, :simpleapi, :heartrails, :thumbalizr
25
- screenshot:
26
- generator: :mozshot
27
-
28
- uploaded_file:
29
- storage: :local
30
-
31
- manifestation:
32
- facet:
33
- pub_year_range_interval: 10
34
-
35
- development:
36
- <<: *defaults
37
-
38
- test:
39
- <<: *defaults
40
-
41
- production:
42
- <<: *defaults