enju_flower 0.1.0.pre12 → 0.1.0.pre13

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

@@ -1,7 +1,7 @@
         <tr class="line<%= cycle("0", "1") -%>">
           <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">
+          <td style="480px">
+            <% cache([:manifestation => manifestation.id, :fragment => 'manifestation_html', :role => current_user_role_name, :locale => @locale]) do %>
               <% if manifestation.root_series_statement %>
                 <%= render 'manifestations/show_series_index', :manifestation => manifestation, :series_statement => manifestation.root_series_statement -%>
               <% else %>
@@ -18,9 +18,10 @@
                   <%- end -%>
                   <%= render 'manifestations/show_tag', :manifestation => manifestation -%>
                 <% end %>
-                <%= render 'manifestations/holding', :manifestation => manifestation -%>
               <% end %>
-            </td>
+              <%= render 'manifestations/holding', :manifestation => manifestation -%>
+            <% end %>
+          </td>
             <% if signed_in? %>
               <td id="edit_icons">
                 <% if defined?(EnjuCirculation) %>
@@ -52,5 +53,4 @@
                 <%- end -%>
               </td>
             <% end %>
-          <% end %>
         </tr>

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

@@ -34,7 +34,7 @@
           <%- if item.rent? -%>
             (
               <%= t('activerecord.attributes.checkout.due_date') -%>:
-              <%= l(item.checkouts.first.due_date, :format => :short) -%>
+              <%= l(item.latest_checkout.due_date, :format => :short) -%>
             )
           <%- end -%>
         </td>

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

@@ -29,7 +29,7 @@
         <%- if item.rent? -%>
           (
             <%= t('activerecord.attributes.checkout.due_date') -%>:
-            <%= l(item.checkouts.first.due_date, :format => :short) -%>
+            <%= l(item.last_checkout.due_date, :format => :short) -%>
           )
         <%- end -%>
       </td>

data/lib/enju_flower/version.rb

@@ -1,3 +1,3 @@
 module EnjuFlower
-  VERSION = "0.1.0.pre12"
+  VERSION = "0.1.0.pre13"
 end

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

@@ -8,8 +8,3 @@
 #   inflect.irregular 'person', 'people'
 #   inflect.uncountable %w( fish sheep )
 # end
-#
-# These inflection rules are supported but not enabled by default:
-# ActiveSupport::Inflector.inflections do |inflect|
-#   inflect.acronym 'RESTful'
-# end

data/spec/dummy/db/migrate/20130303104849_add_state_index_to_reserve.rb

@@ -0,0 +1,5 @@
+class AddStateIndexToReserve < ActiveRecord::Migration
+  def change
+    add_index :reserves, :state
+  end
+end

data/spec/dummy/db/migrate/20130303124821_add_retained_at_to_reserve.rb

@@ -0,0 +1,5 @@
+class AddRetainedAtToReserve < ActiveRecord::Migration
+  def change
+    add_column :reserves, :retained_at, :datetime
+  end
+end

data/spec/dummy/db/migrate/20130304015019_add_postponed_at_to_reserve.rb

@@ -0,0 +1,5 @@
+class AddPostponedAtToReserve < ActiveRecord::Migration
+  def change
+    add_column :reserves, :postponed_at, :datetime
+  end
+end

data/spec/dummy/db/migrate/20130416054135_add_circulation_status_id_to_item.rb

@@ -0,0 +1,8 @@
+class AddCirculationStatusIdToItem < ActiveRecord::Migration
+  def change
+    add_column :items, :circulation_status_id, :integer, :default => 5, :null => false
+    add_column :items, :checkout_type_id, :integer, :default => 1, :null => false
+    add_index :items, :circulation_status_id
+    add_index :items, :checkout_type_id
+  end
+end

data/spec/dummy/db/migrate/20130519065638_add_lock_version_to_reserve.rb

@@ -0,0 +1,5 @@
+class AddLockVersionToReserve < ActiveRecord::Migration
+  def change
+    add_column :reserves, :lock_version, :integer, :default => 0, :null => false
+  end
+end

data/spec/dummy/db/migrate/20130519065837_add_lock_version_to_checkin.rb

@@ -0,0 +1,5 @@
+class AddLockVersionToCheckin < ActiveRecord::Migration
+  def change
+    add_column :checkins, :lock_version, :integer, :default => 0, :null => false
+  end
+end

data/spec/dummy/solr/data/test/index/{_23k.fnm → _22.fnm}

@@ -4,5 +4,5 @@ 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_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
issn_smoriginal_manifestation_ids_im
+title_text
creator_text
contributor_text
publisher_text
item_identifier_text
aulast_text
aufirst_text
au_text
btitle_text
	isbn_text
issn_smoriginal_manifestation_ids_im
 pub_year_i

data/spec/dummy/solr/data/test/index/{_23k.nrm → _22.nrm}

@@ -1 +1 @@
-NRM�vruwvvuur|xttutttwwuuuuuuxx||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||xtt|uuutt||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||vruwvvuur|x||u|ttwwuuuuuuxx||||yx||y||||||||||||||||||||||||||||||||||||||||||||||||||||||||tt|t|||||||||||||||||||||||tt|t||||||||||||
+NRM�vruwvvuur|xutusttwwuuuuuuxx||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||xtt|uuutt||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||vruwvvuur|x||u|ttwwuuuuuuxx||||yx||y||||||||||||||||||||||||||||||||||||||||||||||||||||||||ww|s||||||||||||||||||||||||||s||||||||||||

data/spec/fixtures/agent_import_files.yml

@@ -0,0 +1,47 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
+agent_import_file_00001:
+  id: 1
+  agent_import_file_name: MyString
+  agent_import_file_size: 1
+  user_id: 1
+  agent_import_content_type: text/csv
+  state: completed
+agent_import_file_00002:
+  id: 2
+  agent_import_file_name: MyString
+  agent_import_file_size: 1
+  user_id: 1
+  agent_import_content_type: text/csv
+  state: pending
+agent_import_file_00003:
+  id: 3
+  agent_import_file_name: MyString
+  agent_import_file_size: 1
+  user_id: 1
+  agent_import_content_type: text/csv
+  state: pending
+
+# == Schema Information
+#
+# Table name: agent_import_files
+#
+#  id                        :integer          not null, primary key
+#  parent_id                 :integer
+#  content_type              :string(255)
+#  size                      :integer
+#  user_id                   :integer
+#  note                      :text
+#  executed_at               :datetime
+#  state                     :string(255)
+#  agent_import_file_name    :string(255)
+#  agent_import_content_type :string(255)
+#  agent_import_file_size    :integer
+#  agent_import_updated_at   :datetime
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
+#  agent_import_fingerprint  :string(255)
+#  error_message             :text
+#  edit_mode                 :string(255)
+#
+

data/spec/fixtures/agent_import_results.yml

@@ -0,0 +1,29 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
+one:
+  id: 1
+  agent_import_file_id: 1
+  agent_id: 1
+  user_id: 1
+  body: MyText
+
+two:
+  id: 2
+  agent_import_file_id: 1
+  agent_id: 1
+  user_id: 1
+  body: MyText
+
+# == Schema Information
+#
+# Table name: agent_import_results
+#
+#  id                   :integer          not null, primary key
+#  agent_import_file_id :integer
+#  agent_id             :integer
+#  user_id              :integer
+#  body                 :text
+#  created_at           :datetime         not null
+#  updated_at           :datetime         not null
+#
+

data/spec/fixtures/agent_relationships.yml

@@ -14,12 +14,12 @@ two:
 #
 # Table name: agent_relationships
 #
-#  id                          :integer          not null, primary key
-#  parent_id                   :integer
-#  child_id                    :integer
+#  id                         :integer          not null, primary key
+#  parent_id                  :integer
+#  child_id                   :integer
 #  agent_relationship_type_id :integer
-#  created_at                  :datetime         not null
-#  updated_at                  :datetime         not null
-#  position                    :integer
+#  created_at                 :datetime         not null
+#  updated_at                 :datetime         not null
+#  position                   :integer
 #
 

data/spec/fixtures/agents.yml

@@ -318,7 +318,7 @@ agent_00202:
 #  date_of_death                       :datetime
 #  language_id                         :integer          default(1), not null
 #  country_id                          :integer          default(1), not null
-#  agent_type_id                      :integer          default(1), not null
+#  agent_type_id                       :integer          default(1), not null
 #  lock_version                        :integer          default(0), not null
 #  note                                :text
 #  required_role_id                    :integer          default(1), not null
@@ -329,6 +329,6 @@ agent_00202:
 #  full_name_alternative_transcription :text
 #  birth_date                          :string(255)
 #  death_date                          :string(255)
-#  agent_identifier                   :string(255)
+#  agent_identifier                    :string(255)
 #
 

data/spec/fixtures/circulation_statuses.yml

@@ -0,0 +1,136 @@
+--- 
+circulation_status_00005: 
+  name: In Process  
+  display_name: In Process
+  updated_at: 2008-02-15 17:31:42.422676 +09:00
+  id: 5
+  note: ""
+  created_at: 2008-02-15 17:31:42.422676 +09:00
+  position: 5
+circulation_status_00006: 
+  name: In Transit Between Library Locations  
+  display_name: In Transit Between Library Locations
+  updated_at: 2008-02-15 17:31:51.227056 +09:00
+  id: 6
+  note: ""
+  created_at: 2008-02-15 17:31:51.227056 +09:00
+  position: 6
+circulation_status_00007: 
+  name: Lost  
+  display_name: Lost
+  updated_at: 2008-02-15 17:31:58.627987 +09:00
+  id: 7
+  note: ""
+  created_at: 2008-02-15 17:31:58.627987 +09:00
+  position: 7
+circulation_status_00008: 
+  name: Missing  
+  display_name: Missing
+  updated_at: 2008-02-15 17:32:07.006541 +09:00
+  id: 8
+  note: ""
+  created_at: 2008-02-15 17:32:07.006541 +09:00
+  position: 8
+circulation_status_00010: 
+  name: On Loan  
+  display_name: On Loan
+  updated_at: 2008-02-15 17:32:22.969896 +09:00
+  id: 10
+  note: ""
+  created_at: 2008-02-15 17:32:22.969896 +09:00
+  position: 10
+circulation_status_00009: 
+  name: Not Available  
+  display_name: Not Available
+  updated_at: 2008-02-15 17:32:15.454067 +09:00
+  id: 9
+  note: ""
+  created_at: 2008-02-15 17:32:15.454067 +09:00
+  position: 9
+circulation_status_00011: 
+  name: On Order  
+  display_name: On Order
+  updated_at: 2008-02-15 17:32:30.675735 +09:00
+  id: 11
+  note: ""
+  created_at: 2008-02-15 17:32:30.675735 +09:00
+  position: 11
+circulation_status_00012: 
+  name: Pending Transfer  
+  display_name: Pending Transfer
+  updated_at: 2008-02-15 17:32:39.395000 +09:00
+  id: 12
+  note: ""
+  created_at: 2008-02-15 17:32:39.395000 +09:00
+  position: 12
+circulation_status_00001: 
+  name: Available For Pickup  
+  display_name: Available For Pickup
+  updated_at: 2008-02-15 17:31:10.588524 +09:00
+  id: 1
+  note: ""
+  created_at: 2008-02-15 17:31:10.588524 +09:00
+  position: 1
+circulation_status_00002: 
+  name: Available On Shelf  
+  display_name: Available On Shelf
+  updated_at: 2008-02-15 17:31:18.946298 +09:00
+  id: 2
+  note: ""
+  created_at: 2008-02-15 17:31:18.946298 +09:00
+  position: 2
+circulation_status_00013: 
+  name: Recalled  
+  display_name: Recalled
+  updated_at: 2008-02-15 17:32:48.355304 +09:00
+  id: 13
+  note: ""
+  created_at: 2008-02-15 17:32:48.355304 +09:00
+  position: 13
+circulation_status_00014: 
+  name: Waiting To Be Reshelved  
+  display_name: Waiting To Be Reshelved
+  updated_at: 2008-02-15 17:32:59.078750 +09:00
+  id: 14
+  note: ""
+  created_at: 2008-02-15 17:32:59.078750 +09:00
+  position: 14
+circulation_status_00003: 
+  name: Circulation Status Undefined  
+  display_name: Circulation Status Undefined
+  updated_at: 2008-02-15 17:31:26.564769 +09:00
+  id: 3
+  note: ""
+  created_at: 2008-02-15 17:31:26.564769 +09:00
+  position: 3
+circulation_status_00004: 
+  name: Claimed Returned Or Never Borrowed  
+  display_name: Claimed Returned Or Never Borrowed
+  updated_at: 2008-02-15 17:31:35.786404 +09:00
+  id: 4
+  note: ""
+  created_at: 2008-02-15 17:31:35.786404 +09:00
+  position: 4
+circulation_status_00015: 
+  name: Removed
+  display_name: "en: Removed\r\n\
+    ja: 除籍済み"
+  id: 15
+  updated_at: 2008-02-15 17:31:35.786404 +09:00
+  note: ""
+  created_at: 2008-02-15 17:31:35.786404 +09:00
+  position: 15
+
+# == Schema Information
+#
+# Table name: circulation_statuses
+#
+#  id           :integer         not null, primary key
+#  name         :string(255)     not null
+#  display_name :text
+#  note         :text
+#  position     :integer
+#  created_at   :datetime
+#  updated_at   :datetime
+#
+

data/spec/fixtures/creates.yml

@@ -54,7 +54,7 @@ create_00104:
 # Table name: creates
 #
 #  id             :integer          not null, primary key
-#  agent_id      :integer          not null
+#  agent_id       :integer          not null
 #  work_id        :integer          not null
 #  position       :integer
 #  created_at     :datetime         not null

data/spec/fixtures/donates.yml

@@ -23,7 +23,7 @@ donate_00003:
 # Table name: donates
 #
 #  id         :integer          not null, primary key
-#  agent_id  :integer          not null
+#  agent_id   :integer          not null
 #  item_id    :integer          not null
 #  created_at :datetime         not null
 #  updated_at :datetime         not null

data/spec/fixtures/event_categories.yml

@@ -0,0 +1,55 @@
+--- 
+event_category_00002: 
+  name: closed
+  display_name: 休館日
+  updated_at: 2008-01-01 16:24:32.561469 +09:00
+  id: 2
+  note: ""
+  created_at: 2008-01-01 16:17:34.642433 +09:00
+  position: 2
+event_category_00003: 
+  name: おはなし会
+  display_name: おはなし会
+  updated_at: 2008-01-01 16:24:45.267241 +09:00
+  id: 3
+  note: ""
+  created_at: 2008-01-01 16:17:45.415487 +09:00
+  position: 3
+event_category_00004: 
+  name: 上映会
+  display_name: 上映会
+  updated_at: 2008-01-01 16:24:55.261682 +09:00
+  id: 4
+  note: ""
+  created_at: 2008-01-01 16:18:08.868680 +09:00
+  position: 4
+event_category_00005: 
+  name: 講演会
+  display_name: 講演会
+  updated_at: 2008-01-01 16:25:04.251141 +09:00
+  id: 5
+  note: ""
+  created_at: 2008-01-01 16:25:04.251141 +09:00
+  position: 5
+event_category_00001: 
+  name: unknown  
+  display_name: (not specified)
+  updated_at: 2008-01-01 16:24:17.869192 +09:00
+  id: 1
+  note: ""
+  created_at: 2008-01-01 16:17:12.549565 +09:00
+  position: 1
+
+# == Schema Information
+#
+# Table name: event_categories
+#
+#  id           :integer         not null, primary key
+#  name         :string(255)     not null
+#  display_name :text
+#  note         :text
+#  position     :integer
+#  created_at   :datetime
+#  updated_at   :datetime
+#
+

data/spec/fixtures/events.yml

@@ -0,0 +1,142 @@
+--- 
+event_00001: 
+  updated_at: 2008-01-13 02:54:43.764011 +09:00
+  event_category_id: 1
+  end_at: 2008-01-14 02:54:00 +09:00
+  name: !binary |
+    5LuV5LqL5aeL44KB
+
+  display_name: !binary |
+    5LuV5LqL5aeL44KB
+
+  deleted_at: 
+  start_at: 2008-01-13 02:54:00 +09:00
+  id: 1
+  note: !binary |
+    44Gq44KT44Go44GL44GL44KT44Go44GL
+
+  library_id: 2
+  created_at: 2008-01-01 16:20:54.372729 +09:00
+event_00002: 
+  updated_at: 2008-01-13 02:54:21.134175 +09:00
+  event_category_id: 2
+  end_at: 2008-01-14 02:54:00 +09:00
+  name: !binary |
+    44OG44K544OI
+
+  display_name: !binary |
+    44OG44K544OI
+
+  deleted_at: 
+  start_at: 2008-01-13 02:54:00 +09:00
+  id: 2
+  note: !binary |
+    44OG44K544OI55So44Gu44Kk44OZ44Oz44OI44Gn44GZ44CC
+
+  library_id: 2
+  created_at: 2008-01-01 20:54:25.803201 +09:00
+event_00003: 
+  updated_at: 2008-02-05 20:00:35.319131 +09:00
+  event_category_id: 1
+  end_at: 2008-02-05 00:00:00 +09:00
+  name: !binary |
+    44Of44O844OG44Kj44Oz44Kw
+
+  display_name: !binary |
+    44Of44O844OG44Kj44Oz44Kw
+
+  deleted_at: 
+  start_at: 2008-01-13 00:00:00 +09:00
+  id: 3
+  note: ""
+  library_id: 2
+  created_at: 2008-01-13 02:51:10.642395 +09:00
+event_00004: 
+  updated_at: 2008-02-05 15:43:42.617670 +09:00
+  event_category_id: 4
+  end_at: 2008-02-06 00:00:00 +09:00
+  name: !binary |
+    44OG44K544OI
+
+  display_name: !binary |
+    44OG44K544OI
+
+  deleted_at: 
+  start_at: 2008-02-05 00:00:00 +09:00
+  id: 4
+  note: !binary |
+    44Gq44KT44Go44GL44GL44KT44Go44GL
+
+  library_id: 3
+  created_at: 2008-02-05 15:43:42.617670 +09:00
+event_00005: 
+  updated_at: 2008-02-05 20:41:50.533164 +09:00
+  event_category_id: 1
+  end_at: 2008-02-08 00:00:00 +09:00
+  name: test
+  display_name: test
+  deleted_at: 
+  start_at: 2008-02-05 00:00:00 +09:00
+  id: 5
+  note: ""
+  library_id: 2
+  created_at: 2008-02-05 20:41:50.533164 +09:00
+event_00006: 
+  updated_at: 2008-02-05 23:52:06.315285 +09:00
+  event_category_id: 2
+  end_at: 2008-02-08 00:00:00 +09:00
+  name: !binary |
+    44Gq44KT44Go44GL44GL44KT44Go44GL
+
+  display_name: !binary |
+    44Gq44KT44Go44GL44GL44KT44Go44GL
+
+  deleted_at: 
+  start_at: 2008-02-05 00:00:00 +09:00
+  id: 6
+  note: ""
+  library_id: 2
+  created_at: 2008-02-05 20:50:26.651371 +09:00
+event_00007: 
+  updated_at: 2008-02-05 21:00:53.926050 +09:00
+  event_category_id: 1
+  end_at: 2008-02-08 00:00:00 +09:00
+  name: test
+  display_name: test
+  deleted_at: 
+  start_at: 2008-02-05 00:00:00 +09:00
+  id: 7
+  note: test
+  library_id: 2
+  created_at: 2008-02-05 21:00:53.926050 +09:00
+event_00008: 
+  updated_at: 2008-02-05 21:00:53.926050 +09:00
+  event_category_id: 1
+  end_at: 2008-02-05 15:00:00 +09:00
+  name: test
+  display_name: test
+  deleted_at: 
+  start_at: 2008-02-05 15:00:00 +09:00
+  id: 8
+  note: test
+  library_id: 2
+  created_at: 2008-02-05 21:00:53.926050 +09:00
+
+# == Schema Information
+#
+# Table name: events
+#
+#  id                :integer         not null, primary key
+#  library_id        :integer         default(1), not null
+#  event_category_id :integer         default(1), not null
+#  name              :string(255)
+#  note              :text
+#  start_at          :datetime
+#  end_at            :datetime
+#  all_day           :boolean         default(FALSE), not null
+#  deleted_at        :datetime
+#  created_at        :datetime
+#  updated_at        :datetime
+#  display_name      :text
+#
+