enju_flower 0.1.0.pre5 → 0.1.0.pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe77f1014183a755ac1e82337a3eddacf8550548
-  data.tar.gz: adfb92ef1c60b1ed59c4c681aa7f507424c2947e
+  metadata.gz: 7711f54778f3b74c9d47fe99629bfaace2f92cca
+  data.tar.gz: e0b715f7ab1c40c2f49a6b0a525061402e70ea11
 SHA512:
-  metadata.gz: fcdc2115b65e31e4c695cb604f54bbe3aa6d7f28a80316dbe55f0d82e0dbffb606eed7517ca6e5e9530d0fb4fda3599b0c599e740db8962e4289c1516d30dbdc
-  data.tar.gz: 28189c0c7fdf344ff351f6e3963752f31147816a8ef42a8fae0a7f8b942ce11f87cb42d350807fa461745749f2cce7c68bb823a7039f17bfdaae4c7563fd8194
+  metadata.gz: dedfc6c22f1e821ee65cd2ae38c42dcaeec519aba3f8c32d78dcf40c6511e7e1df5622fad564700d1582f516bc7b9fa3c73e1db0b3ff6970612bf21041aa3596
+  data.tar.gz: 808f1c1df3146eef2e7b6aec049ccdbbca3714d4d59a31dc1c7455cfa506fdc1241ffd1ab255b723117e8fdfed025cc814105eb509b2515c7d7386270863c38e

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

@@ -5,7 +5,9 @@
       <br />
       <%= link_to item.shelf.display_name.localize, library_shelf_path(item.shelf.library, item.shelf) -%>
       <br />
-      <%= item.circulation_status.display_name.localize if item.circulation_status -%>
+      <% if defined?(EnjuCirculation) %>
+        <%= item.circulation_status.display_name.localize if item.circulation_status -%>
+      <% end %>
 
     </td>
     <td class="call_number_table">

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

@@ -0,0 +1,21 @@
+<h2 class="resource_title">
+  [M]
+  <%= link_to @parent.original_title, @parent, :itemprop => 'name' -%>
+</h2>
+
+<div class="search_form">
+<%= form_for :manifestations, :url => manifestations_path, :html => {:method => 'get'} do -%>
+  <p>
+    <%= label_tag :search_form_top, t('page.search_term') -%>:
+    <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
+    <%= hidden_field_tag 'parent_id', @parent.id -%>
+    <%= hidden_field_tag 'reservable', h(@reservable) if @reservable -%>
+    <% if can? :update, Manifestation %>
+      <%= render 'page/add' %>
+    <% end %>
+    <%= submit_tag t('page.search') -%>
+    <br />
+    <%= link_to t('page.advanced_search'), page_advanced_search_path -%>
+  </p>
+<%- end -%>
+</div>

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

@@ -2,23 +2,23 @@
           <td style="width: 30px"><%= @manifestations.offset_value + 1 + manifestation_counter -%></td>
           <% cache([:manifestation => manifestation.id, :fragment => 'manifestation_html', :role => current_user_role_name, :locale => @locale]) do %>
             <td style="480px">
-              <% if manifestation.root_of_series? %>
-                <%= render 'manifestations/show_series_index', :manifestation => manifestation -%>
+              <% if manifestation.root_series_statement %>
+                <%= render 'manifestations/show_series_index', :manifestation => manifestation, :series_statement => manifestation.root_series_statement -%>
               <% else %>
-                  <%= render 'manifestations/show_index', :manifestation => manifestation -%>
-                  <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()" -%>)
+                <%= render 'manifestations/show_index', :manifestation => manifestation -%>
+                <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 -%>
-                  <% 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_tag', :manifestation => manifestation -%>
+                <% end %>
+                <%= render 'manifestations/holding', :manifestation => manifestation -%>
               <% end %>
             </td>
             <% if signed_in? %>
@@ -40,8 +40,8 @@
                   <% unless params[:mode] == 'add' %>
                     <%= link_to image_tag('icons/book_edit.png', :size => '16x16', :alt => t('page.edit')), edit_manifestation_path(manifestation) -%>
                     <% if @series_statement %>
-                      <% if manifestation.series_statement == @series_statement %>
-                        <%= link_to t('page.destroy'), series_statement_series_has_manifestation_path(manifestation.series_statement, manifestation.series_has_manifestation), :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+                      <% if manifestation.root_series_statement == @series_statement %>
+                        <%= link_to t('page.destroy'), series_statement_series_has_manifestation_path(manifestation.root_series_statement, manifestation.series_has_manifestations.where(:series_statement_id => manifestation.root_series_statement.id).first), :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
                       <% end %>
                     <% end %>
                   <% else %>
@@ -53,7 +53,7 @@
                     <% when @index_patron[:publisher] %>
                       <%= link_to t('page.add'), new_patron_produce_path(@index_patron[:publisher], :manifestation_id => manifestation.id) unless manifestation.publishers.include?(@index_patron[:publisher]) -%>
                     <% when @series_statement %>
-                      <% unless manifestation.series_statement -%>
+                      <% unless manifestation.series_statements.exists? -%>
                         <%= link_to t('page.add'), new_series_has_manifestation_path(:series_statement_id => @series_statement.id, :manifestation_id => manifestation.id) -%>
                       <% end %>
                     <% when @manifestation %>
@@ -61,7 +61,7 @@
                     <% when @item %>
                       <%= link_to t('page.change'), edit_exemplify_path(@item.exemplify, :manifestation_id => manifestation.id) unless @item.manifestation == manifestation -%>
                     <% else %>
-                      <%= link_to image_tag('icons/arrow_divide.png', :size => '16x16', :alt => t('manifestation.add_derivation')), manifestation_manifestations_path(manifestation, :mode => 'add') -%>
+                      <%= link_to image_tag('icons/arrow_divide.png', :size => '16x16', :alt => t('manifestation.add_derivation')), new_manifestation_path(:parent_id => manifestation.id) -%>
                     <% end %>
                   <%- end -%>
                 <%- end -%>

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

@@ -10,11 +10,19 @@
             <td style="width: 500px"><%= manifestation.title_alternative -%></td>
           </tr>
         <% end %>
-        <%- if manifestation.series_statement -%>
+        <%- if manifestation.series_statements.exists? -%>
           <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 -%>
+              <ul>
+                <% manifestation.series_statements.each do |series_statement| %>
+                  <% if series_statement.root_manifestation %>
+                    <li><%= link_to series_statement.original_title, series_statement.root_manifestation -%></li>
+                  <% else %>
+                    <li><%= series_statement.original_title -%></li>
+                  <% end %>
+                <% end %>
+              </ul>
               <%= manifestation.volume_number_string %>
               <%- if manifestation.issn.present? -%>
                 (<%= t('activerecord.attributes.manifestation.issn') -%>: <%= manifestation.issn -%>)

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

@@ -10,11 +10,15 @@
             <td style="width: 500px"><%= manifestation.title_alternative -%></td>
           </tr>
         <% end %>
-        <%- if manifestation.series_statement -%>
+        <%- if manifestation.series_statements.exists? -%>
           <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 -%>
+              <ul>
+                <% manifestation.series_statements.each do |series_statement| %>
+                  <li><%= link_to series_statement.original_title, series_statement -%></li>
+                <% end %>
+              </ul>
               <%= manifestation.volume_number_string %>
               <%- if manifestation.issn.present? -%>
                 (<%= t('activerecord.attributes.manifestation.issn') -%>: <%= manifestation.issn -%>)

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

@@ -1,16 +1,11 @@
 <strong>
-  <% if manifestation.root_of_series? %>
-    <%= link_to manifestation.series_statement.original_title, series_statement_manifestations_path(manifestation.series_statement, :query => @query) %>
+  <% if manifestation.root_series_statement %>
+    <%= link_to manifestation.root_series_statement.original_title, series_statement_manifestations_path(manifestation.root_series_statement, :query => @query) %>
   <% else %>
     <%= link_to title_with_volume_number(manifestation), manifestation -%>
   <% end %>
 </strong>
-  <% if manifestation.periodical_master? %>
-    <%- if manifestation.series_statement.try(:first_issue) and manifestation.series_statement.try(:latest_issue) -%>
-      <%= manifestation.series_statement.first_issue.date_of_publication.try(:year) -%>
-      -
-      <%= manifestation.series_statement.latest_issue.date_of_publication.try(:year) -%>
-    <%- end -%>
+  <% if manifestation.series_master? %>
     <%= image_tag('icons/newspaper.png', :size => '16x16', :alt => t('manifestation.serial')) -%>
   <%- end -%>
   <%= link_to form_icon(manifestation.carrier_type), manifestation -%>

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

@@ -0,0 +1,26 @@
+      <table class="table table-striped" id="resource_detail">
+        <tr>
+          <td style="width: 200px"><%= t('activerecord.attributes.series_statement.title_transcription') -%></td>
+          <td style="width: 490px"><%= @parent.title_transcription %></td>
+        </tr>
+        <tr>
+          <td style="width: 200px"><%= t('activerecord.attributes.series_statement.title_subseries') -%></td>
+          <td style="width: 490px"><%= @parent.root_series_statement.title_subseries %>
+            <% if @parent.root_series_statement.title_subseries_transcription? %>
+              (<%= @parent.root_series_statement.title_subseries_transcription %>)
+            <% end %>
+          </td>
+        </tr>
+        <tr>
+          <td><%= t('activerecord.attributes.series_statement.series_master') -%></td>
+          <td><%= localized_boolean(@parent.series_master?) %></td>
+        </tr>
+        <tr>
+          <td><%= t('activerecord.attributes.series_statement.series_statement_identifier') -%></td>
+          <td><%= @parent.root_series_statement.series_statement_identifier %></td>
+        </tr>
+        <tr>
+          <td><%= t('activerecord.attributes.series_statement.note') -%></td>
+          <td><%= @parent.note %></td>
+        </tr>
+    </table>

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

@@ -1,40 +1,23 @@
-<%= render 'manifestations/title', :manifestation => @manifestation.series_statement.root_manifestation -%>
+<%= render 'manifestations/title', :manifestation => @manifestation.root_series_statement.manifestation -%>
 
 <p>
   <strong><%= t('activerecord.attributes.series_statement.original_title') -%></strong>
-  <%= @manifestation.series_statement.original_title %>
+  <%= @manifestation.root_series_statement.original_title %>
 </p>
 
 <p>
   <strong><%= t('activerecord.attributes.series_statement.title_transcription') -%></strong>
-  <%= @manifestation.series_statement.title_transcription %>
+  <%= @manifestation.root_series_statement.title_transcription %>
 </p>
 
 <p>
   <strong><%= t('activerecord.attributes.series_statement.issn') -%></strong>
-  <%= @manifestation.series_statement.issn %>
+  <%= @manifestation.root_series_statement.issn %>
 </p>
 
-<!--
-<p>
-  <strong><%= t('activerecord.attributes.series_statement.numbering') -%></strong>
-  <%= @manifestation.series_statement.numbering %>
-</p>
-
-<p>
-  <strong><%= t('activerecord.attributes.series_statement.title_subseries') -%></strong>
-  <%= @manifestation.series_statement.title_subseries %>
-</p>
-
-<p>
-  <strong><%= t('activerecord.attributes.series_statement.numbering_subseries') -%></strong>
-  <%= @manifestation.series_statement.numbering_subseries %>
-</p>
--->
-
 <p>
   <strong><%= t('activerecord.attributes.series_statement.series_statement_identifier') -%></strong>
-  <%= @manifestation.series_statement.series_statement_identifier %>
+  <%= @manifestation.root_series_statement.series_statement_identifier %>
 </p>
 
-<%= render 'series_statements/manifestation_list', :series_statement => @manifestation.series_statement -%>
+<%= render 'series_statements/manifestation_list', :series_statement => @manifestation.root_series_statement -%>

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

@@ -1,12 +1,4 @@
-  <strong><%= link_to manifestation.series_statement.original_title, series_statement_manifestations_path(manifestation.series_statement, :query => @query) -%></strong>
-  <% if manifestation.periodical_master? %>
-    <%- if manifestation.series_statement.try(:first_issue) and manifestation.series_statement.try(:latest_issue) -%>
-      <%= manifestation.series_statement.first_issue.date_of_publication.try(:year) -%>
-      -
-      <%= manifestation.series_statement.latest_issue.date_of_publication.try(:year) -%>
-    <%- end -%>
-    <%= image_tag('icons/newspaper.png', :size => '16x16', :alt => t('manifestation.serial')) -%>
-  <%- end -%>
+<strong><%= link_to manifestation.original_title, manifestations_path(:parent_id => manifestation.id, :query => @query) -%></strong>
   <%= link_to form_icon(manifestation.carrier_type), manifestation -%>
   <%= link_to image_tag('icons/world_go.png', :size => '16x16', :alt => t('manifestation.web')), manifestation.access_address unless manifestation.access_address.blank? -%>
   <br />

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

@@ -12,8 +12,8 @@
           </td>
         </tr>
         <tr>
-          <td><%= t('activerecord.attributes.series_statement.periodical') -%></td>
-          <td><%= localized_boolean(@series_statement.periodical) %></td>
+          <td><%= t('activerecord.attributes.series_statement.root_manifestation_id') -%></td>
+          <td><%= link_to @series_statement.root_manifestation.original_title, @series_statement.root_manifestation %></td>
         </tr>
         <tr>
           <td><%= t('activerecord.attributes.series_statement.issn') -%></td>

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

@@ -0,0 +1,8 @@
+  <ul>
+    <% if can? :create, Manifestation %>
+      <li><%= link_to t('page.new', :model => t('activerecord.models.manifestation')), new_manifestation_path(:parent_id => @parent.id) %></li>
+    <% end %>
+    <% if can? :update, @parent %>
+      <li><%= link_to t('page.edit'), edit_manifestation_path(@parent) %></li>
+    <% end %>
+  </ul>

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

@@ -14,15 +14,15 @@
     <%= render 'index_form_manifestation' %>
   <% when @item %>
     <%= render 'index_form_item' %>
-  <% when @series_statement %>
-    <%= render 'index_form_series_statement' %>
+  <% when @parent %>
+    <%= render 'index_form_parent' %>
   <% else %>
     <%= render 'index_form' %>
   <% end %>
   <%= set_focus_on_search_form %>
 
-  <% if @series_statement %>
-    <%= render 'show_series_statement' %>
+  <% if @parent %>
+    <%= render 'show_parent' %>
   <% end %>
 
   <%- if @manifestations.total_count > 0 -%>
@@ -66,10 +66,6 @@
       </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 -%>
 
@@ -79,8 +75,8 @@
 </div>
 
 <div id="submenu" class="ui-corner-all">
-  <% if @series_statement and can?(:update, @series_statement) %>
-    <%= render 'submenu_series_statement' %>
+  <% if @parent and can?(:update, @parent) %>
+    <%= render 'submenu_parent' %>
   <% 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 -%>

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

@@ -90,7 +90,7 @@
               <li><%= link_to t('manifestation.edit_contributor'), expression_patrons_path(@manifestation) -%></li>
               <li><%= link_to t('manifestation.edit_publisher'), manifestation_patrons_path(@manifestation) -%></li>
               <%- if @manifestation.periodical? -%>
-                <li><%= link_to t('manifestation.add_next_issue'), new_series_statement_manifestation_path(@manifestation.series_statement) if @manifestation.series_statement -%></li>
+                <li><%= link_to t('manifestation.add_next_issue'), new_series_statement_manifestation_path(@manifestation.root_series_statement) if @manifestation.root_series_statement -%></li>
               <%- end -%>
             </ul>
           </li>

data/lib/enju_flower/version.rb

@@ -1,3 +1,3 @@
 module EnjuFlower
-  VERSION = "0.1.0.pre5"
+  VERSION = "0.1.0.pre6"
 end

data/spec/controllers/manifestations_controller_spec.rb

@@ -150,39 +150,10 @@ 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'
+      it "should get tag_cloud" do
+        get :index, :query => '2005', :view => 'tag_cloud'
         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
+        response.should render_template("manifestations/_tag_cloud")
       end
     end
   end
@@ -264,6 +235,18 @@ describe ManifestationsController do
         response.should be_success
       end
 
+      it "should show manifestation with tag_edit" do
+        get :show, :id => 1, :mode => 'tag_edit'
+        response.should render_template('manifestations/_tag_edit')
+        response.should be_success
+      end
+
+      it "should show manifestation with tag_list" do
+        get :show, :id => 1, :mode => 'tag_list'
+        response.should render_template('manifestations/_tag_list')
+        response.should be_success
+      end
+
       it "should show manifestation with show_creators" do
         get :show, :id => 1, :mode => 'show_creators'
         response.should render_template('manifestations/_show_creators')
@@ -402,9 +385,9 @@ describe ManifestationsController do
         end
 
         it "assigns a series_statement" do
-          post :create, :manifestation => @attrs.merge(:series_has_manifestation_attributes => {:series_statement_id => 1})
+          post :create, :manifestation => @attrs.merge(:series_statements_attributes => {[0] => {:original_title => SeriesStatement.find(1).original_title}})
           assigns(:manifestation).reload
-          assigns(:manifestation).series_statement.should eq SeriesStatement.find(1)
+          assigns(:manifestation).series_statements.pluck(:original_title).include?(series_statements(:one).original_title).should be_true
         end
 
         it "redirects to the created manifestation" do
@@ -512,7 +495,7 @@ describe ManifestationsController do
   describe "PUT update" do
     before(:each) do
       @manifestation = FactoryGirl.create(:manifestation)
-      @manifestation.series_statement = SeriesStatement.find(1)
+      @manifestation.series_statements = [SeriesStatement.find(1)]
       @attrs = valid_attributes
       @invalid_attrs = {:original_title => ''}
     end
@@ -526,9 +509,9 @@ describe ManifestationsController do
         end
 
         it "assigns a series_statement" do
-          put :update, :id => @manifestation.id, :manifestation => @attrs.merge(:series_has_manifestation_attributes => {:series_statement_id => 2})
+          put :update, :id => @manifestation.id, :manifestation => @attrs.merge(:series_statements_attributes => {[0] => {:original_title => series_statements(:two).original_title, "_destroy"=>"false"}})
           assigns(:manifestation).reload
-          assigns(:manifestation).series_statement.should eq SeriesStatement.find(2)
+          assigns(:manifestation).series_statements.pluck(:original_title).include?(series_statements(:two).original_title).should be_true
         end
 
         it "assigns the requested manifestation as @manifestation" do

data/spec/dummy/app/models/ability.rb

@@ -15,7 +15,7 @@
         end
         can [:read, :create, :update], Manifestation
         can [:destroy, :delete], Manifestation do |manifestation|
-          manifestation.items.empty? and !manifestation.periodical_master?
+          manifestation.items.empty? and !manifestation.series_master?
         end
         can :manage, [
           Create,
@@ -37,8 +37,7 @@
           RealizeType,
           ResourceImportFile,
           SeriesStatement,
-          SeriesStatementRelationship,
-          SeriesHasManifestation
+          SeriesStatementRelationship
         ]
         can :update, [
           ContentType,
@@ -74,7 +73,7 @@
         can :index, Manifestation
         can [:show, :create, :update], Manifestation
         can [:destroy, :delete], Manifestation do |manifestation|
-          manifestation.items.empty? and !manifestation.periodical_master?
+          manifestation.items.empty? and !manifestation.series_master?
         end
         can [:index, :create], Patron
         can :show, Patron do |patron|
@@ -97,8 +96,7 @@
           Realize,
           ResourceImportFile,
           SeriesStatement,
-          SeriesStatementRelationship,
-          SeriesHasManifestation
+          SeriesStatementRelationship
         ]
         can :read, [
           CarrierType,
@@ -165,8 +163,7 @@
           PatronRelationshipType,
           Produce,
           Realize,
-          SeriesStatement,
-          SeriesHasManifestation
+          SeriesStatement
         ]
       else
         can :index, Manifestation
@@ -198,8 +195,7 @@
           PictureFile,
           Produce,
           Realize,
-          SeriesStatement,
-          SeriesHasManifestation
+          SeriesStatement
         ]
       end
     end

data/spec/dummy/config/application.rb

@@ -59,5 +59,6 @@ end
 
 require 'enju_biblio'
 require 'enju_library'
+require 'enju_bookmark'
 require 'mobylette'
 require 'plugins'

data/spec/dummy/db/migrate/20130421093852_add_periodical_to_manifestation.rb

@@ -0,0 +1,5 @@
+class AddPeriodicalToManifestation < ActiveRecord::Migration
+  def change
+    add_column :manifestations, :periodical, :boolean
+  end
+end

data/spec/dummy/db/migrate/20130421155019_add_creator_string_to_series_statement.rb

@@ -0,0 +1,7 @@
+class AddCreatorStringToSeriesStatement < ActiveRecord::Migration
+  def change
+    add_column :series_statements, :creator_string, :text
+    add_column :series_statements, :volume_number_string, :text
+    add_column :series_statements, :volume_number_transcription_string, :text
+  end
+end

data/spec/dummy/db/migrate/20130421164124_add_series_master_to_series_statement.rb

@@ -0,0 +1,5 @@
+class AddSeriesMasterToSeriesStatement < ActiveRecord::Migration
+  def change
+    add_column :series_statements, :series_master, :boolean
+  end
+end

data/spec/dummy/db/migrate/20130429020822_add_root_manifestation_id_to_series_statement.rb

@@ -0,0 +1,6 @@
+class AddRootManifestationIdToSeriesStatement < ActiveRecord::Migration
+  def change
+    add_column :series_statements, :root_manifestation_id, :integer
+    add_index :series_statements, :root_manifestation_id
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20121116033446) do
+ActiveRecord::Schema.define(:version => 20130429020822) do
 
   create_table "baskets", :force => true do |t|
     t.integer  "user_id"
@@ -632,6 +632,7 @@ ActiveRecord::Schema.define(:version => 20121116033446) do
     t.integer  "month_of_publication"
     t.boolean  "fulltext_content"
     t.string   "doi"
+    t.boolean  "periodical"
   end
 
   add_index "manifestations", ["access_address"], :name => "index_manifestations_on_access_address"
@@ -1063,19 +1064,25 @@ ActiveRecord::Schema.define(:version => 20121116033446) do
     t.text     "title_subseries"
     t.text     "numbering_subseries"
     t.integer  "position"
-    t.datetime "created_at",                                       :null => false
-    t.datetime "updated_at",                                       :null => false
+    t.datetime "created_at",                                            :null => false
+    t.datetime "updated_at",                                            :null => false
     t.text     "title_transcription"
     t.text     "title_alternative"
     t.string   "series_statement_identifier"
     t.string   "issn"
-    t.boolean  "periodical",                    :default => false, :null => false
-    t.integer  "root_manifestation_id"
+    t.boolean  "periodical",                         :default => false, :null => false
+    t.integer  "manifestation_id"
     t.text     "note"
     t.text     "title_subseries_transcription"
+    t.text     "creator_string"
+    t.text     "volume_number_string"
+    t.text     "volume_number_transcription_string"
+    t.boolean  "series_master"
+    t.integer  "root_manifestation_id"
   end
 
-  add_index "series_statements", ["root_manifestation_id"], :name => "index_series_statements_on_manifestation_id"
+  add_index "series_statements", ["manifestation_id"], :name => "index_series_statements_on_manifestation_id"
+  add_index "series_statements", ["root_manifestation_id"], :name => "index_series_statements_on_root_manifestation_id"
   add_index "series_statements", ["series_statement_identifier"], :name => "index_series_statements_on_series_statement_identifier"
 
   create_table "shelves", :force => true do |t|

data/spec/dummy/solr/data/test/index/{_ay.fnm → _rs.fnm}

@@ -2,6 +2,6 @@
 class_nametitle_smconnect_title_sconnect_creator_sconnect_publisher_sisbn_smcarrier_type_s
 library_sm
 language_sitem_identifier_smshelf_smcreated_at_dupdated_at_dcreator_ids_imcontributor_ids_impublisher_ids_imitem_ids_imrequired_role_id_istart_page_i
-end_page_inumber_of_pages_iseries_statement_id_irepository_content_b
-creator_smsort_title_speriodical_bperiodical_master_b
-title_text
creator_text
contributor_text
publisher_text
item_identifier_text
aulast_text
aufirst_text
au_text
btitle_text
	isbn_text
original_manifestation_ids_imjtitle_text
pub_date_dm
+end_page_inumber_of_pages_irepository_content_b
+creator_smsort_title_speriodical_bseries_master_bresource_master_b
+title_text
creator_text
contributor_text
publisher_text
item_identifier_text
aulast_text
aufirst_text
au_text
btitle_text
	isbn_text
original_manifestation_ids_im

data/spec/dummy/solr/data/test/index/{_ay.nrm → _rs.nrm}

@@ -1 +1 @@
-NRM�turxtuxutrtwsssuuvyrttrvrrtxtxswuywtrtyvywtuwwttptxy|||||||||||tuuu|||||||||||||||||||||||||||||||||wxwwx|||||||||||||||||||||||||||||||||||||||||||||wxwwx|||||||||||||||||||||||||||u|||||||||||||||||uvw|||||||x|||||||||||||||||||||||||||||||||||||||y||||||||||||w���|||||||||||||||||||||||||||||||||��|||||||||||w���|||||||||||||||||||||||||||||||||xy|||||||||||tuuu|||||||||||||||||||||||||||||||||turxtuxutrtwsssuuvyrttrvrrtxtxswuywtrtyvywtuwwttpt||||��|||||��||||||||||||||||||||||||||||||||||||||tu|||||||||||||||||||||||||||||||||||||||||||||||
+NRM�turxtuxutrtwsssuuvyrttrvrrtxtxswuywtrtyvywtuwwttptxy|||||||||||tuuu|||||||||||||||||||||||||||||||||wxwwx|||||||||||||||||||||||||||||||||||||||||||||wxwwx|||||||||||||||||||||||||||u|||||||||||||||||uvw|||||||x|||||||||||||||||||||||||||||||||||||||y||||||||||||w���|||||||||||||||||||||||||||||||||��|||||||||||w���|||||||||||||||||||||||||||||||||xy|||||||||||tuuu|||||||||||||||||||||||||||||||||turxtuxutrtwsssuuvyrttrvrrtxtxswuywtrtyvywtuwwttpt||||��|||||��|||||||||||||||||||||||||||||||||||||

data/spec/dummy/solr/data/test/index/{_az.fnm → _rt.fnm}

@@ -2,6 +2,6 @@
 class_nametitle_smconnect_title_sconnect_creator_sconnect_publisher_sisbn_smcarrier_type_s
 library_sm
 language_sitem_identifier_smshelf_smcreated_at_dupdated_at_dcreator_ids_imcontributor_ids_impublisher_ids_imitem_ids_imrequired_role_id_istart_page_i
-end_page_inumber_of_pages_iseries_statement_id_irepository_content_b
-creator_smsort_title_speriodical_bperiodical_master_b
-title_text
creator_text
contributor_text
publisher_text
item_identifier_text
aulast_text
aufirst_text
au_text
btitle_text
	isbn_text
original_manifestation_ids_imjtitle_text
pub_date_dm
+end_page_inumber_of_pages_irepository_content_b
+creator_smsort_title_speriodical_bseries_master_bresource_master_b
+title_text
creator_text
contributor_text
publisher_text
item_identifier_text
aulast_text
aufirst_text
au_text
btitle_text
	isbn_text
original_manifestation_ids_im