enju_circulation 0.1.0.pre22 → 0.1.0.pre23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9149eb84811ea589471caba3692ee1e3904fc53
-  data.tar.gz: 54eeca60097095281d8dca365c2d97f7d80e4acd
+  metadata.gz: 77c9a59d9d930389176d1d8418bbcd90ba316861
+  data.tar.gz: 98b0b0b1225ca7b9d03f4ca07c8423c81a73542f
 SHA512:
-  metadata.gz: 88ed86c902c800f46708c32202e016feb8f4e3cf2e8e07780cdd7c0ef6b42b5e2e632c024838fa3252df5efe16a94faf790e9d537b5a62cd841fb1846da94f29
-  data.tar.gz: 3de8fb98c2829bda69ea50d4e7cbe570f218eb83496c8798a716270563b9f325f28e2a814b1f586b0c5fa8b702d5371627d9ab9991628ba50c24114a4540eaca
+  metadata.gz: cdb1eefc0b82e2d31907a98feebdb6d04518482e53c4147138a8538809323a023bda2581d193a12bcd55690ba05ba95a89a7d0f884ecf86d052846c5f9b93b6d
+  data.tar.gz: f0ece4ab0693619a208749b703a07285964d782f5bd8fa64726b3e7422ef80cb0db074b12d161e12b464e96b445f7118d49ef1c24bfe2161ea43cab08a48f34d

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.1.0.pre22"
+  VERSION = "0.1.0.pre23"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre22
+  version: 0.1.0.pre23
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_core
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre31
+        version: 0.1.0.pre33
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre31
+        version: 0.1.0.pre33
 - !ruby/object:Gem::Dependency
   name: enju_library
   requirement: !ruby/object:Gem::Requirement
@@ -378,8 +378,6 @@ files:
 - app/views/manifestation_reserve_stats/new.html.erb
 - app/views/manifestation_reserve_stats/show.csv.erb
 - app/views/manifestation_reserve_stats/show.html.erb
-- app/views/manifestations/_show_detail_librarian.html.erb
-- app/views/manifestations/_show_detail_user.html.erb
 - app/views/my_accounts/_feed_token.html.erb
 - app/views/reserve_stat_has_manifestations/_form.html.erb
 - app/views/reserve_stat_has_manifestations/edit.html.erb
@@ -637,16 +635,16 @@ 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/_1h2.fdt
-- spec/dummy/solr/data/test/index/_1h2.fdx
-- spec/dummy/solr/data/test/index/_1h2.fnm
-- spec/dummy/solr/data/test/index/_1h2.frq
-- spec/dummy/solr/data/test/index/_1h2.nrm
-- spec/dummy/solr/data/test/index/_1h2.prx
-- spec/dummy/solr/data/test/index/_1h2.tii
-- spec/dummy/solr/data/test/index/_1h2.tis
+- spec/dummy/solr/data/test/index/_1i5.fdt
+- spec/dummy/solr/data/test/index/_1i5.fdx
+- spec/dummy/solr/data/test/index/_1i5.fnm
+- spec/dummy/solr/data/test/index/_1i5.frq
+- spec/dummy/solr/data/test/index/_1i5.nrm
+- spec/dummy/solr/data/test/index/_1i5.prx
+- spec/dummy/solr/data/test/index/_1i5.tii
+- spec/dummy/solr/data/test/index/_1i5.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_2y7
+- spec/dummy/solr/data/test/index/segments_30d
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/basket.rb
@@ -756,7 +754,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: enju_circulation plugin
@@ -912,16 +910,16 @@ 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/_1h2.fdt
-- spec/dummy/solr/data/test/index/_1h2.fdx
-- spec/dummy/solr/data/test/index/_1h2.fnm
-- spec/dummy/solr/data/test/index/_1h2.frq
-- spec/dummy/solr/data/test/index/_1h2.nrm
-- spec/dummy/solr/data/test/index/_1h2.prx
-- spec/dummy/solr/data/test/index/_1h2.tii
-- spec/dummy/solr/data/test/index/_1h2.tis
+- spec/dummy/solr/data/test/index/_1i5.fdt
+- spec/dummy/solr/data/test/index/_1i5.fdx
+- spec/dummy/solr/data/test/index/_1i5.fnm
+- spec/dummy/solr/data/test/index/_1i5.frq
+- spec/dummy/solr/data/test/index/_1i5.nrm
+- spec/dummy/solr/data/test/index/_1i5.prx
+- spec/dummy/solr/data/test/index/_1i5.tii
+- spec/dummy/solr/data/test/index/_1i5.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_2y7
+- spec/dummy/solr/data/test/index/segments_30d
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/basket.rb

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

@@ -1,141 +0,0 @@
-  <div id="tabs">
-    <%= render 'manifestations/tab_menu', :manifestation => manifestation %>
-    <div id="detail">
-    <% cache([:manifestation => manifestation.id, :fragment => 'show_detail_librarian_html', :role => current_user_role_name, :locale => @locale]) do %>
-      <table class="table table-striped" id="resource_detail">
-        <%= embed_content(manifestation) -%>
-        <% if manifestation.title_alternative? %>
-          <tr>
-            <td style="width: 200px"><%= t('activerecord.attributes.manifestation.title_alternative') -%>:</td>
-            <td style="width: 500px"><%= manifestation.title_alternative -%></td>
-          </tr>
-        <% end %>
-        <%- if manifestation.series_statement -%>
-          <tr>
-            <td style="width: 200px"><%= t('activerecord.models.series_statement') -%>:</td>
-            <td style="width: 500px">
-              <%= link_to manifestation.series_statement.original_title, manifestation.series_statement -%>
-              <%= manifestation.volume_number_string %>
-              <%- if manifestation.issn.present? -%>
-                (<%= t('activerecord.attributes.manifestation.issn') -%>: <%= manifestation.issn -%>)
-              <%- end -%>
-            </td>
-          </tr>
-        <% end %>
-        <%= render 'edition_and_number', :manifestation => manifestation %>
-        <tr>
-          <td style="width: 200px"><%= t('page.form') -%>:</td>
-          <td style="width: 500px">
-            <%= form_icon(manifestation.carrier_type) -%> <%= manifestation.carrier_type.display_name.localize -%> /
-            <%= content_type_icon(manifestation.manifestation_content_type) -%> <%= manifestation.manifestation_content_type.display_name.localize if manifestation.manifestation_content_type -%>
-          </td>
-        </tr>
-        <tr>
-          <td><%= t('activerecord.models.language') -%>:</td>
-          <td><span itemprop="inLanguage"><%= manifestation.language.display_name.localize -%></span></td>
-        </tr>
-        <tr>
-          <td><%= t('manifestation.physical_description') -%>:</td>
-          <td>
-            <%- if manifestation.number_of_pages -%>
-              <span itemprop="numPages"><%= manifestation.number_of_pages -%></span> p.
-              (<%= manifestation.start_page -%> - <%= manifestation.end_page -%>)
-            <%- end -%>
-            <!-- TODO: センチメートル以外の単位 -->
-            <%- if manifestation.height -%>
-              <%= manifestation.height -%> cm.
-            <%- end -%>
-          </td>
-        </tr>
-        <tr>
-          <td><%= t('activerecord.attributes.manifestation.price') -%>:</td>
-          <td><%= manifestation.price -%></td>
-        </tr>
-        <% if defined?(EnjuSubject) %>
-          <tr>
-            <td><%= t('activerecord.models.subject') -%>:</td>
-            <td>
-              <%- unless manifestation.subjects.empty? -%>
-                <ul>
-                  <%- manifestation.subjects.each do |subject| -%>
-                    <li>
-                      <%= link_to subject.term, subject -%>
-                      <%- unless subject.classifications.empty? -%>
-                        (
-                        <%- subject.classifications.each do |classification| -%>
-                          <%= classification.classification_type.name -%>: <%= link_to classification.category, classification -%>
-                        <%- end -%>
-                        )
-                      <%- end -%>
-                    </li>
-                  <%- end -%>
-                </ul>
-              <%- end -%>
-            </td>
-          </tr>
-          <tr>
-            <td><%= t('activerecord.attributes.classification.category') %></td>
-            <td>
-              <%= manifestation.ndc %>
-            </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>
-            <td>
-              <%- if manifestation.isbn.present? -%>
-                ISBN: <span itemprop="isbn"><%= manifestation.isbn -%></span>
-                <%- if manifestation.isbn10.present? -%>
-                  ( <%= manifestation.isbn10 -%> )
-                <%- end -%>
-              <%- end -%>
-              <%- if manifestation.nbn.present? -%>
-                NBN: <%= manifestation.nbn -%>
-              <%- end -%>
-              <%- if manifestation.lccn.present? -%>
-                <br />
-                LCCN: <%= manifestation.lccn -%>
-              <%- end -%>
-            </td>
-          </tr>
-        <%- end -%>
-        <%- unless manifestation.attachment_file_name.blank? -%>
-          <%= render 'manifestations/attachment_file', :manifestation => manifestation -%>
-        <%- end -%>
-        <tr>
-          <td><%= t('page.created_at') -%>:</td>
-          <td><%=l manifestation.created_at if manifestation.created_at -%></td>
-        </tr>
-        <tr>
-          <td><%= t('page.updated_at') -%>:</td>
-          <td><%=l manifestation.updated_at if manifestation.updated_at -%></td>
-        </tr>
-        <tr>
-          <td><%= t('activerecord.attributes.manifestation.description') -%>:</td>
-          <td>
-            <%= raw simple_format(h(manifestation.description)) -%>
-          </td>
-        </tr>
-        <tr>
-          <td><%= t('activerecord.attributes.manifestation.note') -%>:</td>
-          <td>
-            <%= raw simple_format(h(manifestation.note)) -%>
-          </td>
-        </tr>
-      </table>
-    <% end %>
-      <%- if manifestation.items.on_shelf.exists? -%>
-        <%= render 'manifestations/show_holding', :manifestation => manifestation -%>
-      <%- end -%>
-    </div>
-    <%= render 'manifestations/tab_list', :manifestation => manifestation %>
-  </div>

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

@@ -1,136 +0,0 @@
-  <div id="tabs">
-    <%= render 'manifestations/tab_menu', :manifestation => manifestation %>
-    <div id="detail">
-    <% cache([:manifestation => manifestation.id, :fragment => 'show_detail_user_html', :role => current_user_role_name, :locale => @locale]) do %>
-      <table class="table table-striped" id="resource_detail">
-        <%= embed_content(manifestation) -%>
-        <% if manifestation.title_alternative? %>
-          <tr>
-            <td style="width: 200px"><%= t('activerecord.attributes.manifestation.title_alternative') -%>:</td>
-            <td style="width: 500px"><%= manifestation.title_alternative -%></td>
-          </tr>
-        <% end %>
-        <%- if manifestation.series_statement -%>
-          <tr>
-            <td style="width: 200px"><%= t('activerecord.models.series_statement') -%>:</td>
-            <td style="width: 500px">
-              <%= link_to manifestation.series_statement.original_title, manifestation.series_statement -%>
-              <%= manifestation.volume_number_string %>
-              <%- if manifestation.issn.present? -%>
-                (<%= t('activerecord.attributes.manifestation.issn') -%>: <%= manifestation.issn -%>)
-              <%- end -%>
-            </td>
-          </tr>
-        <% end %>
-        <%= render 'edition_and_number', :manifestation => manifestation %>
-        <tr>
-          <td style="width: 200px"><%= t('page.form') -%>:</td>
-          <td style="width: 500px">
-            <%= form_icon(manifestation.carrier_type) -%> <%= manifestation.carrier_type.display_name.localize -%> /
-            <%= content_type_icon(manifestation.manifestation_content_type) -%> <%= manifestation.manifestation_content_type.display_name.localize if manifestation.manifestation_content_type -%>
-          </td>
-        </tr>
-        <tr>
-          <td><%= t('activerecord.models.language') -%>:</td>
-          <td><span itemprop="inLanguage"><%= manifestation.language.display_name.localize -%></span></td>
-        </tr>
-        <tr>
-          <td><%= t('manifestation.physical_description') -%>:</td>
-          <td>
-            <%- if manifestation.number_of_pages -%>
-              <span itemprop="numPages"><%= manifestation.number_of_pages -%></span> p.
-              (<%= manifestation.start_page -%> - <%= manifestation.end_page -%>)
-            <%- end -%>
-            <!-- TODO: センチメートル以外の単位 -->
-            <%- if manifestation.height -%>
-              <%= manifestation.height -%> cm.
-            <%- end -%>
-          </td>
-        </tr>
-        <% if manifestation.price.present? %>
-          <tr>
-            <td><%= t('activerecord.attributes.manifestation.price') -%>:</td>
-            <td><%= manifestation.price -%></td>
-          </tr>
-        <% end %>
-        <% if defined?(EnjuSubject) %>
-          <%- unless manifestation.subjects.empty? -%>
-            <tr>
-              <td><%= t('activerecord.models.subject') -%>:</td>
-              <td>
-                <%- manifestation.subjects.each do |subject| -%>
-                  <%= link_to subject.term, subject -%>
-                <%- end -%>
-              </td>
-            </tr>
-          <%- end -%>
-          <tr>
-            <td><%= t('activerecord.attributes.classification.category') %></td>
-            <td>
-              <%= manifestation.ndc %>
-            </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>
-            <td>
-              <%- if manifestation.isbn.present? -%>
-                ISBN: <span itemprop="isbn"><%= manifestation.isbn -%></span>
-                <%- if manifestation.isbn10.present? -%>
-                  ( <%= manifestation.isbn10 -%> )
-                <%- end -%>
-              <%- end -%>
-              <%- if manifestation.nbn.present? -%>
-                NBN: <%= manifestation.nbn -%>
-              <%- end -%>
-              <%- if manifestation.lccn.present? -%>
-                <br />
-                LCCN: <%= manifestation.lccn -%>
-              <%- end -%>
-            </td>
-          </tr>
-        <%- end -%>
-        <%- unless manifestation.attachment_file_name.blank? -%>
-          <%= render 'manifestations/attachment_file', :manifestation => manifestation -%>
-        <%- end -%>
-        <tr>
-          <td><%= t('page.created_at') -%>:</td>
-          <td><%=l manifestation.created_at if manifestation.created_at -%></td>
-        </tr>
-        <tr>
-          <td><%= t('page.updated_at') -%>:</td>
-          <td><%=l manifestation.updated_at if manifestation.updated_at -%></td>
-        </tr>
-        <% if manifestation.description.present? %>
-          <tr>
-            <td><%= t('activerecord.attributes.manifestation.description') -%>:</td>
-            <td>
-              <%= raw simple_format(h(manifestation.description)) -%>
-            </td>
-          </tr>
-        <% end %>
-        <% if manifestation.note.present? %>
-          <tr>
-            <td><%= t('activerecord.attributes.manifestation.note') -%>:</td>
-            <td>
-              <%= raw simple_format(h(manifestation.note)) -%>
-            </td>
-          </tr>
-        <% end %>
-      </table>
-    <% end %>
-      <%- if manifestation.items.on_shelf.exists? -%>
-        <%= render 'manifestations/show_holding', :manifestation => manifestation -%>
-      <%- end -%>
-    </div>
-    <%= render 'manifestations/tab_list', :manifestation => manifestation %>
-  </div>