enju_flower 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53d028a988ba3b0195065dc43865613e60b71c25
-  data.tar.gz: bf0642c799a8be52462438c5b4addc4c944fb86c
+  metadata.gz: 5e16a3b142da1d42f515eed7b5b332093d272186
+  data.tar.gz: 779356ad558e59217bc20a92e457dc3912ac822d
 SHA512:
-  metadata.gz: 42b788c25ea149caa4e08800cd5a9f3584c4265ca705bdf3ca62c7fc076a0a6790bcb9827eed435fc2384f27fcde2cd3698b469fb27b6714e31f5b2cdc70a642
-  data.tar.gz: d8af90fe6bbedd9d248d9d9e968de07f3826a9a16c92a21af578cc7685375c050ad3f9c0a441d5fd18a7a1eae6184d12df4ee14d163ae0192a0959a8f4f5e608
+  metadata.gz: 6da773c46dc1578cfda2218bb7dfcf429def31603817454f2bdf9d8aec997ca26ba1391839cd6bd5be79ed4134e02c8806062985b7dac516616aba602901501a
+  data.tar.gz: 4ff39364aff8e0cfb3ab4f624dfeacc3d5ad0e2310fdb2c47ce5a78286bc239ddda4ee940c2b1a0e5cdefa8662473b113e1b23b3524a2b4243e4c41e8ba3a71b

data/README.rdoc

@@ -1,11 +1,11 @@
 = Next-L Enju Flower
-{<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]
-{<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]
+{<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]
+{<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]
 {<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]
 
 == Related projects
 * {Next-L Enju Root}[https://github.com/next-l/enju_root]
-* {Next-L Enju Leaf}[https://github.com/next-l/enju_leaf]
+* {Next-L Enju Leaf}[https://github.com/next-l/enju_flower]
 
 == Authors and contributors
 * {TANABE, Kosuke}[https://github.com/nabeta]

data/app/views/manifestations/_holding.html.erb

@@ -1,3 +1,7 @@
 <div class="holding_index" id="holding_<%= manifestation.id -%>" style="display: none">
-  <%= render 'manifestations/show_holding', manifestation: manifestation -%>
+  <% if current_user.try(:has_role?, 'Librarian') %>
+    <%= render 'manifestations/show_holding', manifestation: manifestation, items: manifestation.items -%>
+  <% else %>
+    <%= render 'manifestations/show_holding', manifestation: manifestation, items: manifestation.items.for_checkout.on_shelf -%>
+  <% end %>
 </div>

data/app/views/manifestations/_show_detail_librarian.html.erb

@@ -112,8 +112,8 @@
         </tr>
       </table>
     <% end %>
-      <%- if manifestation.items.on_shelf.exists? -%>
-        <%= render 'manifestations/show_holding', manifestation: manifestation -%>
+      <%- if manifestation.items.exists? -%>
+        <%= render 'manifestations/show_holding', manifestation: manifestation, items: manifestation.items %>
       <%- end -%>
     </div>
     <%= render 'manifestations/tab_list', manifestation: manifestation %>

data/app/views/manifestations/_show_detail_user.html.erb

@@ -113,7 +113,7 @@
       </table>
     <% end %>
       <%- if manifestation.items.for_checkout.on_shelf.exists? -%>
-        <%= render 'manifestations/show_holding', manifestation: manifestation -%>
+        <%= render 'manifestations/show_holding', manifestation: manifestation, items: manifestation.items.for_checkout.on_shelf %>
       <%- end -%>
     </div>
     <%= render 'manifestations/tab_list', manifestation: manifestation %>

data/app/views/manifestations/_show_holding.html.erb

@@ -10,11 +10,6 @@
       <th><%= t('activerecord.models.circulation_status') -%></th>
     <% end %>
   </tr>
-  <% if current_user.try(:has_role?, 'Librarian') %>
-    <% items = manifestation.items %>
-  <% else %>
-    <% items = manifestation.items.for_checkout.on_shelf %>
-  <% end %>
   <%- items.each do |item| -%>
     <tr>
       <td>

data/app/views/manifestations/show.mobile.erb

@@ -15,6 +15,6 @@
 </tr>
 </table>
 <%- if @manifestation.items.for_checkout.on_shelf.exists? -%>
-  <%= render 'manifestations/show_holding', manifestation: @manifestation -%>
+  <%= render 'manifestations/show_holding', manifestation: @manifestation, items: @manifestation.items.for_checkout.on_shelf %>
 <%- end -%>
 </div>

data/lib/enju_flower/version.rb

@@ -1,3 +1,3 @@
 module EnjuFlower
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/dummy/config/initializers/assets.rb

@@ -0,0 +1,12 @@
+# Be sure to restart your server when you modify this file.
+
+# Version of your assets, change this if you want to expire all your assets.
+Rails.application.config.assets.version = '1.0'
+
+# Add additional assets to the asset load path
+# Rails.application.config.assets.paths << Emoji.images_path
+
+# Precompile additional assets.
+# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+# Rails.application.config.assets.precompile += %w( search.js )
+Rails.application.config.assets.precompile += %w( *.png *.gif )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_flower
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2015-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -94,34 +94,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sunspot_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: enju_leaf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: enju_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: enju_bookmark
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: mobylette
   requirement: !ruby/object:Gem::Requirement
@@ -351,13 +365,13 @@ files:
 - spec/dummy/bin/setup
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
-- spec/dummy/config/application.yml
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
 - spec/dummy/config/environment.rb
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/devise.rb
 - spec/dummy/config/initializers/inflections.rb
@@ -674,7 +688,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Next-L Enju Flower
@@ -703,13 +717,13 @@ test_files:
 - spec/dummy/bin/rake
 - spec/dummy/bin/setup
 - spec/dummy/config/application.rb
-- spec/dummy/config/application.yml
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
 - spec/dummy/config/environment.rb
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/devise.rb
 - spec/dummy/config/initializers/inflections.rb

data/spec/dummy/config/application.yml

@@ -1,42 +0,0 @@
-defaults: &defaults
-  enju:
-    web_hostname: localhost
-    web_port_number: 3000
-
-  family_name_first: true
-  max_number_of_results: 500
-  write_search_log_to_file: true
-  csv_charset_conversion: true
-
-# Choose a locale from 'ca', 'de', 'fr', 'jp', 'uk', 'us'
-#AMAZON_AWS_HOSTNAME = 'ecs.amazonaws.com'
-  amazon:
-    aws_hostname: ecs.amazonaws.jp
-    hostname: www.amazon.co.jp
-    access_key: REPLACE_WITH_YOUR_AMAZON_ACCESS_KEY
-    secret_access_key: REPLACE_WITH_YOUR_AMAZON_SECRET_ACCESS_KEY
-
-# :google, :amazon
-  book_jacket:
-    source: :google
-    unknown_resource:
-
-# :mozshot, :simpleapi, :heartrails, :thumbalizr
-  screenshot:
-    generator: :mozshot
-
-  uploaded_file:
-    storage: :local
-
-  manifestation:
-    facet:
-      pub_year_range_interval: 10
-
-development:
-  <<: *defaults
-
-test:
-  <<: *defaults
-
-production:
-  <<: *defaults