enju_biblio 0.1.0.pre19 → 0.1.0.pre20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 492d07e919bd0b6d032e5bceb42cd366508824ea
-  data.tar.gz: bf2ff09837b39c2f5229178629b8df38ac4080a3
+  metadata.gz: aecbc0477fe4b4c9060346bfda5ac15c2cd035d1
+  data.tar.gz: 56e785276f3708e7675dfeffc3b005841ba09968
 SHA512:
-  metadata.gz: 2c244ec3c024c969f4515747c5fb05210679abd6131e6548d95afd73b11423d05872edb7c507425b95c3e842c12fc58c805287aba4e74c00412fb8a1c174f1ec
-  data.tar.gz: a27b1e601fd0918a8b4076a5043492311a9481734a7c254869c434d3b9c0eda8b523db97120be9548023101e8827bfaba8701264d84f17d45191c0d7beac1dc3
+  metadata.gz: 7bec7bf7ef3bc253b7d1b031e02ab5b5073a2dd3dd4f81673aeb9e6e30373e71e38adbb607db040ec954abfbdae11f7cb187928234ed1cc59fc1a0a173e65b7b
+  data.tar.gz: 6cae1aa3708892aa5e323593c5c1f694c786a62f4f3f9d18194f4547bb4545e6ad29131322b05d462fdf03010d336db67c481cc5e7baf6f4f58e23f1e5bc71c8

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

@@ -1,5 +1,5 @@
 <div id="manifestation_book_jacket">
-  <%- if manifestation -%>
+  <%- if manifestation and defined?(EnjuBookJacket) -%>
     <%= book_jacket(manifestation) -%>
   <%- end -%>
 </div>

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

@@ -4,18 +4,3 @@
 
 <%= paginate(manifestations) -%>
 <br />
-
-<div>
-  <%- if manifestations and manifestations.size > @manifestations.limit_value.div(2) -%>
-    <%= form_for :manifestations, :html => {:method => 'get'} do -%>
-      <p>
-        <%= label_tag :search_form_bottom, t('page.search_term') -%>:
-        <%= search_field_tag 'query', h(@query), {:id => 'search_form_bottom', :class => 'search_form', :placeholder => t('page.search_term')} -%>
-        <%= hidden_field_tag 'reservable', h(@reservable) if @reservable -%>
-        <%= submit_tag t('page.search') -%>
-        <br />
-        <%= link_to t('page.advanced_search'), page_advanced_search_path -%>
-      </p>
-    <%- end -%>
-  <%- end -%>
-</div>

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

@@ -9,18 +9,6 @@
                   <div class="access_address">
                     <%= link_to manifestation.access_address, manifestation.access_address if manifestation.access_address.present? -%>
                   </div>
-                  <%- unless manifestation.items.on_shelf.empty? -%>
-                    (<%= link_to_function t('page.holding'), "$('#holding_#{manifestation.id}').toggle()" -%>)
-                  <%- end -%>
-                  <% if defined?(EnjuBookmark) %>
-                    <%- if manifestation.tags.first -%>
-                      (<%= link_to_function t('activerecord.models.tag'), "$('#tag_#{manifestation.id}').toggle()" -%>)
-                    <%- end -%>
-                    <%= render 'manifestations/show_tag', :manifestation => manifestation -%>
-                  <% end %>
-                  <%= render 'manifestations/holding', :manifestation => manifestation -%>
-                  <%# グループ表示の部分テンプレート %>
-                  <%= render 'manifestations/show_group', :manifestation => manifestation -%>
                 <% end %>
               <% end %>
             </td>

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

@@ -12,14 +12,6 @@
           <%- end -%>
         </p>
       <% end %>
-      <% if defined?(EnjuBookmark) %>
-        <p>
-          <strong><%= t('page.tag') -%>:</strong>
-          <%- manifestation.tags.each do |tag| -%>
-            <%= link_to tag.name, manifestations_path(:tag => tag.name) -%>
-         <%- end -%>
-        </p>
-      <% end %>
     </div>
     <div style="clear: both"></div>
     <div style="margin-top: 5px">

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

@@ -74,14 +74,6 @@
             </td>
           </tr>
         <% end %>
-        <% if defined?(EnjuBookmark) %>
-          <tr>
-            <td><%= t('activerecord.models.tag') -%>:</td>
-            <td>
-              <%= render 'manifestations/tag_list', :manifestation => manifestation -%>
-            </td>
-          </tr>
-        <% end %>
         <%- unless manifestation.periodical? -%>
           <tr>
             <td><%= t('page.identifier') -%>:</td>

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

@@ -65,14 +65,6 @@
             </tr>
           <%- end -%>
         <% end %>
-        <% if defined?(EnjuBookmark) %>
-          <tr>
-            <td><%= t('activerecord.models.tag') -%>:</td>
-            <td>
-              <%= render 'manifestations/tag_list', :manifestation => manifestation -%>
-            </td>
-          </tr>
-        <% end %>
         <%- unless manifestation.periodical? -%>
           <tr>
             <td><%= t('page.identifier') -%>:</td>

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

@@ -40,21 +40,6 @@
         </td>
       <% end %>
     </tr>
-    <% if can? :update, item %>
-      <script>
-        $(function(){
-          $('a#item_identifier_item_<%= item.id %>').data(
-            'powertip',
-            'item_identifier: <%= item.item_identifier %>'
-          );
-          $('a#item_identifier_item_<%= item.id %>').powerTip({
-            placement: 'e',
-            mouseOnToPopup: true
-          });
-        });
-      </script>
-      <%= render 'items/tooltip', :item => item %>
-    <% end %>
   <%- end -%>
 </table>
 </div>

data/app/views/manifestations/index.atom.builder

@@ -5,9 +5,6 @@ atom_feed(:url => manifestations_url(:format => :atom)) do |feed|
   @manifestations.each do |manifestation|
     feed.entry(manifestation) do |entry|
       entry.title(manifestation.original_title)
-      if defined?(EnjuBookmark)
-        entry.content(manifestation.tags.join(' '), :type => 'html')
-      end
 
       manifestation.creators.readable_by(current_user).each do |patron|
         entry.author do |author|

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

@@ -54,22 +54,16 @@
     </p>
 
     <div class="autopagerize_page_element" id="list">
-      <%= render 'manifestations/list', :manifestations => @manifestations -%>
+      <table class="table table-striped index" id="manifestation_list">
+        <%= render @manifestations %>
+      </table>
+
+      <%= paginate(@manifestations) -%>
+      <br />
     </div>
 
-    <% if defined?(EnjuBookmark) %>
-      <div id="tag_cloud">
-        <h3 class="resource_title"><%= t('activerecord.models.tag') -%></h3>
-        <div id="tag_cloud_list"></div>
-        <%= image_tag 'spinner.gif', :id => 'spinner_tag_cloud',
-          :style => 'padding-bottom: 15px; padding-left: 40px;' -%>
-      </div>
-    <% end %>
   <%- else -%>
     <!-- TODO: 検索結果が少ない場合にも表示させる -->
-    <%- if @suggested_tag -%>
-      <p><%= t('page.did_you_mean') -%>: <%= link_to @suggested_tag.name, manifestations_path(:tag => @suggested_tag.name) -%></p>
-    <%- end -%>
     <%= render 'manifestations/not_found' -%>
   <%- end -%>
 
@@ -82,31 +76,8 @@
   <% if @series_statement and can?(:update, @series_statement) %>
     <%= render 'submenu_series_statement' %>
   <% end %>
-  <h3><%= link_to h("#{t('page.total')}: #{@count[:query_result]}"), url_for(params.merge(:action => 'index', :view => nil, :carrier_type => nil, :library => nil, :language => nil, :subject => nil, :only_path => true))  -%></h3>
-    <%- if @manifestations.total_count > 0 -%>
-      <%= render 'manifestations/all_facet' -%>
-    <%- end -%>
-  <div>
-    <%- if params[:library_id].blank? -%>
-      <%= link_to((image_tag 'icons/feed.png', :size => '16x16', :alt => t('page.feed'), :class => 'icon'), url_for(params.merge(:format => :rss, :page => nil, :library_id => nil, :only_path => true))) -%> <%= link_to t('page.search_result_feed'), url_for(params.merge(:format => :rss, :page => nil, :library_id => nil, :commit => nil, :only_path => true)) -%>
-    <%- else -%>
-      <%= 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>
 </div>
 
-<% if defined?(EnjuBookmark) %>
-  <script type="text/javascript">
-    window.onload = function() {
-      $("#tag_cloud_list").load('<%= url_for(params.merge(:view => "tag_cloud", :only_path => true)) -%>', hideTagCloudSpinner);
-    }
-
-    function hideTagCloudSpinner(){
-      $("#spinner_tag_cloud").hide();
-    }
-  </script>
-<% end %>
-
 <% if @manifestation_ids and @search_query %>
   <%= render 'session_ids' %>
 <% end %>

data/app/views/manifestations/index.opds.builder

@@ -10,9 +10,6 @@ atom_feed(:url => manifestations_url(:format => :atom),
     feed.entry(manifestation) do |entry|
       entry.link :rel => "http://opds-spec.org/acquisition/borrow", :href => manifestation_url(manifestation), :type => 'text/html'
       entry.title(manifestation.original_title)
-      if defined?(EnjuBookmark)
-        entry.content(manifestation.tags.join(' '), :type => 'html')
-      end
 
       manifestation.creators.readable_by(current_user).each do |patron|
         entry.author do |author|

data/app/views/manifestations/index.rss.builder

@@ -30,11 +30,6 @@ xml.rss('version' => "2.0",
             xml.pubDate manifestation.date_of_publication.try(:utc).try(:rfc822)
             xml.link manifestation_url(manifestation)
             xml.guid manifestation_url(manifestation), :isPermaLink => "true"
-            if defined?(EnjuBookmark)
-              manifestation.tags.each do |tag|
-                xml.category tag
-              end
-            end
             xml.tag! "dc:identifier", manifestation.isbn
           end
         end

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

@@ -48,9 +48,6 @@
           <%- if current_user.email.present? -%>
             <li><%= link_to t('manifestation.send_email'), manifestation_path(:mode => 'send_email'), :data => {:confirm => t('page.are_you_sure')} -%></li>
           <%- end -%>
-          <% if defined?(EnjuBookmark) %>
-            <li><%= link_to_bookmark(@manifestation) %></li>
-          <% end %>
         <% end %>
 
         <%- unless @manifestation.carrier_type.name == 'file' -%>

data/lib/enju_biblio/engine.rb

@@ -9,6 +9,7 @@ require 'dynamic_form'
 require 'simple_form'
 require 'resque_mailer'
 require 'library_stdnums'
+require 'lisbn'
 require 'nkf'
 begin
   require 'charlock_holmes/string'

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.1.0.pre19"
+  VERSION = "0.1.0.pre20"
 end

data/spec/controllers/manifestations_controller_spec.rb

@@ -182,41 +182,6 @@ describe ManifestationsController do
         assigns(:query).should eq '2005 date_of_publication_d:[* TO 2000-12-31T14:59:59Z]'
       end
 
-      it "should get index_all_facet" do
-        get :index, :query => '2005', :view => 'all_facet'
-        response.should be_success
-        assigns(:carrier_type_facet).should_not be_empty
-        assigns(:language_facet).should_not be_empty
-        assigns(:library_facet).should_not be_empty
-      end
-
-      it "should get index_carrier_type_facet" do
-        get :index, :query => '2005', :view => 'carrier_type_facet'
-        response.should be_success
-        assigns(:carrier_type_facet).should_not be_empty
-      end
-
-      it "should get index_language_facet" do
-        get :index, :query => '2005', :view => 'language_facet'
-        response.should be_success
-        assigns(:language_facet).should_not be_empty
-      end
-
-      it "should get index_library_facet" do
-        get :index, :query => '2005', :view => 'library_facet'
-        response.should be_success
-        assigns(:library_facet).should_not be_empty
-      end
-
-      it "should get index_pub_year_facet" do
-        get :index, :view => 'pub_year_facet'
-        response.should be_success
-        assigns(:pub_year_facet).first.value.should eq 2010.0..2020.0
-        assigns(:pub_year_facet).first.count.should eq 1
-        assigns(:pub_year_facet).last.value.should eq 2000.0..2010.0
-        assigns(:pub_year_facet).last.count.should eq 1
-      end
-
       it "should get tag_cloud" do
         get :index, :query => '2005', :view => 'tag_cloud'
         response.should be_success

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_biblio
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre19
+  version: 0.1.0.pre20
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-24 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -310,14 +310,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.130115
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.130115
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: enju_library
   requirement: !ruby/object:Gem::Requirement
@@ -394,14 +394,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre4
+        version: 0.1.0.pre6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre4
+        version: 0.1.0.pre6
 - !ruby/object:Gem::Dependency
   name: enju_export
   requirement: !ruby/object:Gem::Requirement
@@ -665,11 +665,9 @@ files:
 - app/views/manifestation_relationships/index.html.erb
 - app/views/manifestation_relationships/new.html.erb
 - app/views/manifestation_relationships/show.html.erb
-- app/views/manifestations/_all_facet.html.erb
 - app/views/manifestations/_attachment_file.html.erb
 - app/views/manifestations/_book_jacket.html.erb
 - app/views/manifestations/_call_number.html.erb
-- app/views/manifestations/_carrier_type_facet.html.erb
 - app/views/manifestations/_edition_and_number.html.erb
 - app/views/manifestations/_form.html.erb
 - app/views/manifestations/_history_list.html.erb
@@ -681,17 +679,13 @@ files:
 - app/views/manifestations/_index_form_manifestation.html.erb
 - app/views/manifestations/_index_form_publisher.html.erb
 - app/views/manifestations/_index_form_series_statement.html.erb
-- app/views/manifestations/_language_facet.html.erb
-- app/views/manifestations/_library_facet.html.erb
 - app/views/manifestations/_list.html.erb
 - 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
-- app/views/manifestations/_reservable_facet.html.erb
 - app/views/manifestations/_search_engine.html.erb
 - app/views/manifestations/_serial_form.html.erb
 - app/views/manifestations/_session_ids.html.erb
@@ -1145,6 +1139,10 @@ files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
+- spec/dummy/solr/data/test/index/segments.gen
+- spec/dummy/solr/data/test/index/segments_fj
+- spec/dummy/solr/data/test/spellchecker/segments.gen
+- spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/tmp/cache/4F7/F90/default_role
 - spec/dummy/tmp/cache/6E4/420/search_engine_all
 - spec/factories/basket.rb
@@ -1371,7 +1369,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: enju_biblio plugin
@@ -1571,6 +1569,10 @@ test_files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
+- spec/dummy/solr/data/test/index/segments.gen
+- spec/dummy/solr/data/test/index/segments_fj
+- spec/dummy/solr/data/test/spellchecker/segments.gen
+- spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/tmp/cache/4F7/F90/default_role
 - spec/dummy/tmp/cache/6E4/420/search_engine_all
 - spec/factories/basket.rb

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

@@ -1,8 +0,0 @@
-<%= render 'manifestations/carrier_type_facet' -%>
-<%= render 'manifestations/library_facet' -%>
-<%= render 'manifestations/language_facet' -%>
-<%= render 'manifestations/pub_year_facet' -%>
-<%=
-    #render 'manifestations/subject_facet'
--%>
-<%= render 'manifestations/reservable_facet' if defined?(EnjuCirculation) -%>

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

@@ -1,9 +0,0 @@
-<h4><%= t('activerecord.models.carrier_type') -%></h4>
-<ul>
-  <%- @carrier_type_facet.each do |facet| -%>
-    <li><%= carrier_type_facet(facet) %></li>
-  <%- end -%>
-  <%- if params[:carrier_type] -%>
-    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(:carrier_type => nil, :page => nil, :view => nil, :only_path => true)) -%></li>
-  <%- end -%>
-</ul>

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

@@ -1,16 +0,0 @@
-<h4><%= t('activerecord.models.language') -%></h4>
-<ul>
-  <%- languages = params[:language].to_s.split -%>
-  <%- current_languages = languages.dup -%>
-  <%- @language_facet.each do |facet| -%>
-    <%- language = Language.where(:name => facet.value).select([:name, :display_name]).first -%>
-    <%- if language -%>
-      <li>
-        <%= language_facet(language, current_languages, facet) %>
-      </li>
-    <%- end -%>
-  <%- end -%>
-  <%- if params[:language] -%>
-    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(:language => nil, :page => nil, :view => nil, :only_path => true)) -%></li>
-  <%- end -%>
-</ul>

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

@@ -1,11 +0,0 @@
-<h4><%= t('activerecord.models.library') -%></h4>
-<ul>
-  <%- libraries = params[:library].to_s.split -%>
-  <%- @library_facet.each do |facet| -%>
-    <%- current_libraries = libraries.dup -%>
-    <%= library_facet(current_libraries, facet) %>
-  <%- end -%>
-  <%- if params[:library] -%>
-    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(:library => nil, :page => nil, :view => nil, :only_path => true)) -%></li>
-  <%- end -%>
-</ul>

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

@@ -1,11 +0,0 @@
-<h4><%= t('activerecord.attributes.manifestation.date_of_publication') -%></h4>
-<ul>
-  <%- @pub_year_facet.each do |facet| -%>
-    <li>
-      <%= pub_year_facet(params[:pub_date_from].to_s, params[:pub_date_to].to_s, facet) %>
-    </li>
-  <%- end -%>
-  <%- if params[:pub_date_from] and params[:pub_date_to] -%>
-    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(:pub_date_from => nil, :pub_date_to => nil, :page => nil, :view => nil, :only_path => true)) -%></li>
-  <%- end -%>
-</ul>

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

@@ -1,14 +0,0 @@
-<h4><%= t('manifestation.reservable') -%></h4>
-<ul>
-  <%- @reservable_facet.each do |facet| -%>
-    <% facet.value ? facet_reservable = true : facet_reservable = false %>
-    <li>
-      <%- if @reservable == facet_reservable -%><strong><%- end -%>
-      <%= link_to "#{localized_boolean(facet.value)} (#{facet.count})", url_for(params.merge(:page => nil, :reservable => facet.value.to_s, :view => nil, :only_path => true)) -%>
-      <%- if @reservable == facet_reservable -%></strong><%- end -%>
-    </li>
-  <%- end -%>
-  <%- unless @reservable.nil? -%>
-    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(:reservable => nil, :page => nil, :view => nil, :only_path => true)) -%></li>
-  <%- end -%>
-</ul>