enju_flower 0.1.0.pre23 → 0.1.0.pre24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7655037b45dfd20776d9e8e949f94c8865bd0cb8
-  data.tar.gz: a38c82612797330fc478e36c697fa2cd96d0b2df
+  metadata.gz: 2871bf334ffd51ecd31a7bb84963c3d7c50e12eb
+  data.tar.gz: 307a7edab8e22f08f6b62f76997cb04ee97abcce
 SHA512:
-  metadata.gz: 5af23cdcdf03b9ca1bec945c16a37d81d868ebf10973b6d47155e64a8dfde69117647aaa0bdbc827e15e45215c8832b39615648c649d22f63957bf3828ff0404
-  data.tar.gz: 7f2734294c1801faaaf6acff8cc7867bb8fe67e0c079c4e9a5371d6fc28a411947e926d6e1ecd5c5d5cda2a217e60d9491e82de728a572bef5da640d3ab2a9ee
+  metadata.gz: 7c9fb5b2512ddd25c7d9c6e8436a4cd66c9bbc40f1fa506aeb47fdd649078efc5da2116674cd657af88b9a13bd157d01370a858851b7ea5dc11f9afda882bbad
+  data.tar.gz: 83a1bc59e4463d22fe77d3d7efc3df6653b37d74cd43231960243ff3a2dd5d7c87550b3c312e7acc9f37941012916d74a0db2ce593cfa073c57cefd8a5e87715

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

@@ -7,6 +7,9 @@
         <%= series_statement.original_title %>
       <% end %>
       <%= series_statement.volume_number_string %>
+      <% unless series_statement.creator_string.blank? %>
+        (<%= series_statement.creator_string %>)
+      <% end %>
     </li>
   <% end %>
 </ul>

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

@@ -95,6 +95,7 @@
       <%= link_to((image_tag 'icons/feed.png', size: '16x16', alt: t('page.feed'), class: 'icon'), url_for(params.merge(format: :rss, page: nil, only_path: true))) -%> <%= link_to t('page.search_result_feed'), url_for(params.merge(format: :rss, page: nil, commit: nil, only_path: true)) -%>
     <%- end -%>
   </div>
+  <%= render 'manifestations/export_list' %>
 </div>
 
 <% if defined?(EnjuBookmark) %>

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

@@ -32,15 +32,17 @@
       $("a[rel='manifestation_<%= @manifestation.id -%>']").colorbox({transition:"none", photo:true});
     })
   </script>
-  <%- if user_signed_in? -%>
-    <div id="call_number_content">
-      <%- @manifestation.items.for_checkout.on_shelf.each do |item| -%>
-        <%- if item.hold?(current_user.profile.library) -%>
-          <%= call_number_label(item) -%>
-        <%- end -%>
+  <div id="call_number_content">
+    <%- @manifestation.items.for_checkout(nil).on_shelf.sort_by{|item|
+          holding_item_sort_criteria(item)
+        }.each_with_index do |item, idx| -%>
+      <%- if item.hold?(current_user.try(:profile).try(:library)) -%>
+        <%= call_number_label(item) -%>
+      <%- elsif idx < 3 -%>
+        <%= call_number_label(item) -%>
       <%- end -%>
-    </div>
-  <%- end -%>
+    <%- end -%>
+  </div>
 
   <div id="resource_bookmark_buttons">
       <ul>
@@ -78,5 +80,6 @@
       <%- if current_user.try(:has_role?, 'Librarian') -%>
         <%= render 'manifestations/edit_detail' %>
       <% end %>
+      <%= render 'manifestations/export_detail' %>
   </div>
 </div>

data/lib/enju_flower/version.rb

@@ -1,3 +1,3 @@
 module EnjuFlower
-  VERSION = "0.1.0.pre23"
+  VERSION = "0.1.0.pre24"
 end

data/spec/dummy/app/assets/javascripts/application.js

@@ -2,14 +2,12 @@
 // listed below.
 //
 // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
 //
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
+// compiled file.
 //
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
+// about supported directives.
 //
-//= require jquery
-//= require jquery_ujs
 //= require_tree .

data/spec/spec_helper.rb

@@ -9,7 +9,6 @@ require "capybara/rspec"
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../dummy/config/environment", __FILE__)
 require 'rspec/rails'
-require 'vcr'
 require 'factory_girl'
 require 'sunspot-rails-tester'
 require 'rspec/active_model/mocks'
@@ -55,6 +54,3 @@ end
 FactoryGirl.definition_file_paths << "#{::Rails.root}/../../spec/factories"
 FactoryGirl.find_definitions
 
-VCR.configure do |c|
-  c.allow_http_connections_when_no_cassette = true
-end

data/spec/views/manifestations/show.html.erb_spec.rb

@@ -11,6 +11,7 @@ describe "manifestations/show" do
     @item1 = FactoryGirl.create( :item_for_checkout, shelf_id: 2 )
     @item2 = FactoryGirl.create( :item_for_checkout, shelf_id: 4 )
     assign(:manifestation, @manifestation)
+    assign(:library_group, LibraryGroup.site_config)
   end
 
   it "renders attributes in <p>" do
@@ -18,4 +19,31 @@ describe "manifestations/show" do
     # Run the generator again with the --webrat flag if you want to use webrat matchers
     rendered.should match(/1/)
   end
+
+  it "should renders series_statement" do
+    series_statement = FactoryGirl.create(:series_statement,
+      creator_string: "Series Creator",
+      volume_number_string: "Volume 12"
+    )
+    @manifestation.series_statements << series_statement
+    render
+    expect(rendered).to include series_statement.original_title
+    expect(rendered).to include series_statement.volume_number_string
+    expect(rendered).to include series_statement.creator_string
+  end
+
+  describe "call_number_label" do
+    before(:each) do
+      profile = FactoryGirl.create(:profile, :library_id => 2)
+      user = FactoryGirl.create(:user, :profile => profile)
+      sign_in user
+    end
+    # Ref: next-l/enju_leaf#735
+    it "should renders call_number table even if identifier is nil" do
+      item = FactoryGirl.create(:item_for_checkout, :item_identifier => nil, :call_number => '010')
+      @manifestation.items << item
+      render
+      expect(rendered).to match /010/
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_flower
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre23
+  version: 0.1.0.pre24
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2015-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -28,16 +28,16 @@ dependencies:
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.20
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -128,42 +114,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc20
+        version: 1.1.0.rc22
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc20
+        version: 1.1.0.rc22
 - !ruby/object:Gem::Dependency
   name: enju_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre18
+        version: 0.1.0.pre19
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre18
+        version: 0.1.0.pre19
 - !ruby/object:Gem::Dependency
   name: enju_circulation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre47
+        version: 0.1.0.pre49
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre47
+        version: 0.1.0.pre49
 - !ruby/object:Gem::Dependency
   name: enju_bookmark
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre33
+        version: 0.1.0.pre34
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre33
+        version: 0.1.0.pre34
 - !ruby/object:Gem::Dependency
   name: mobylette
   requirement: !ruby/object:Gem::Requirement
@@ -293,7 +279,6 @@ files:
 - app/views/manifestations/_manifestation.html.erb
 - app/views/manifestations/_manifestation_list.html.erb
 - app/views/manifestations/_not_found.html.erb
-- app/views/manifestations/_paginate_id_link.html.erb
 - app/views/manifestations/_pickup.html.erb
 - app/views/manifestations/_pub_year_facet.html.erb
 - app/views/manifestations/_question_list.html.erb

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

@@ -1,30 +0,0 @@
-<% if flash[:search_query] %>
-<script>
-  $(function(){
-    if(typeof sessionStorage === "undefined"){
-      return;
-    }else{
-      var ids = JSON.parse(sessionStorage.getItem("<%= flash[:search_query] %>"));
-      var index = $.inArray(<%= manifestation.id %>, ids);
-      if(ids[index - 1] > 0){
-        $("#prev_link").html('<a href="<%= root_url %>manifestations/' + ids[index - 1] + '"><%= t('page.previous') %></a>');
-      };
-      if(ids[index + 1] > 0){
-        $("#next_link").html('<a href="<%= root_url %>manifestations/' + ids[index + 1] + '"><%= t('page.next') %></a>');
-      };
-    };
-  });
-</script>
-<% end %>
-
-<%= form_for :manifestations, url: manifestations_path, html: {method: 'get'} do -%>
-  <div>
-    <span id="next_link"><%= t('page.next') %></span>
-    <span id="prev_link"><%= t('page.previous') %></span>
-    <%= back_to_manifestation_index -%>
-    <%= label_tag :search_form_top, t('page.search_term') -%>:
-    <%= search_field_tag 'query', @query, {id: 'search_form_top', class: 'search_form_short', placeholder: t('page.search_term')} -%>
-    <%= submit_tag t('page.search') -%>
-    <%= link_to t('page.advanced_search'), page_advanced_search_path -%>
-  </div>
-<%- end -%>