enju_biblio 0.1.0.pre30 → 0.1.0.pre31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10a42fa95b934a0fdcb3807606c9726178abeb6a
-  data.tar.gz: 21f455d947a94a195883b8aa6df638f964bd3623
+  metadata.gz: d487618cb4357715c2a4a48863b1bc10e3563f9c
+  data.tar.gz: cba332f46b3fb31769c2fb8a82d19e88f5ac96fa
 SHA512:
-  metadata.gz: d98d7df7bd014cda1d544c10e81fa8124dc69aec8f44ed731091e843a12b3aecc4dec9e226a10a00b4d61a34ec286efffcfc8856e0ab2fb5ac6d755e03cdc0d2
-  data.tar.gz: 9947c867a00f3417c6546954ffcaaaafe888748607960858560c732fca9c595ec4ec848c309f44fe1fa9e2aa3776c1990b06f077a6d96267f98ef0480e3144e5
+  metadata.gz: 60e63ba39f2ebe775709e251f325906f7b7cf498493f547930c40470fba05c3ddcfb7cf8ee5e20cfee3df7a27c38c1fd9dc50535f43f4acbc86afbf94cdcb5bf
+  data.tar.gz: 5a423bef566fb080bc43407901fe4f812f46ef4519adbe14b3d9a173420c68aa78948efe48c6f1b40c7e3407f041990d9de7a198ef59b631e1c0304e70ca4dc4

data/app/controllers/items_controller.rb

@@ -83,6 +83,27 @@ class ItemsController < ApplicationController
         with(:required_role_id).less_than_or_equal_to role.id
       end
 
+      if params[:acquired_from].present?
+        begin
+          acquired_from = Time.zone.parse(params[:acquired_from]).beginning_of_day
+          @acquired_from = acquired_from.strftime('%Y-%m-%d')
+        rescue ArgumentError
+        rescue NoMethodError
+        end
+      end
+      if params[:acquired_to].present?
+        begin
+          acquired_to = @acquired_to = Time.zone.parse(params[:acquired_to]).end_of_day
+          @acquired_to = acquired_to.strftime('%Y-%m-%d')
+        rescue ArgumentError
+        rescue NoMethodError
+        end
+      end
+      search.build do
+        with(:acquired_at).greater_than_or_equal_to acquired_from.beginning_of_day if acquired_from
+        with(:acquired_at).less_than acquired_to.tomorrow.beginning_of_day if acquired_to
+      end
+
       page = params[:page] || 1
       search.query.paginate(page.to_i, per_page)
       @items = search.execute!.results

data/app/helpers/manifestations_helper.rb

@@ -71,10 +71,10 @@ module ManifestationsHelper
     current = true if languages.include?(language.name)
     if current
       content_tag :strong do
-        link_to("#{language.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(:page => nil, :language => language.name, :carrier_type => nil, :view => nil, :only_path => true)))
+        link_to("#{language.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(:page => nil, :language => language.name, :view => nil, :only_path => true)))
       end
     else
-      link_to("#{language.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(:page => nil, :language => language.name, :carrier_type => nil, :view => nil, :only_path => true)))
+      link_to("#{language.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(:page => nil, :language => language.name, :view => nil, :only_path => true)))
     end
   end
 

data/app/models/item.rb

@@ -47,6 +47,7 @@ class Item < ActiveRecord::Base
     integer :patron_ids, :multiple => true
     time :created_at
     time :updated_at
+    time :acquired_at
   end
 
   attr_accessor :library_id, :manifestation_id

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

@@ -12,6 +12,10 @@
     <%= hidden_field_tag :manifestation_id, @manifestation.id if @manifestation -%>
     <%= submit_tag t('page.search') -%>
     <%= set_focus_on_search_form -%>
+    <br />
+    <%= t('activerecord.attributes.item.acquired_at') %>:
+    <%= text_field_tag 'acquired_from', @acquired_from, {:class => 'date_field', :placeholder => "#{t('page.example')}: 2012-04-12"} -%>
+    <%= t('advanced_search.from_to') %> <%= text_field_tag 'acquired_to', @acquired_to, {:class => 'date_field', :placeholder => "#{t('page.example')}: 2012-05-11"} -%>
   </p>
 <%- end -%>
 </div>

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

@@ -34,11 +34,9 @@
   <p>
     <strong><%= t('activerecord.models.circulation_status') -%>:</strong>
     <%= link_to @item.circulation_status.display_name.localize, @item.circulation_status -%>
-    <%- if user_signed_in? -%>
-      <%- if current_user.has_role?('Librarian') -%>
-       <%- unless @item.checkouts.not_returned.blank? -%>
-          (<%= link_to t('item.current_checkout'), checkout_path(@item.checkouts.not_returned.first) -%>)
-        <%- end -%>
+    <%- if current_user.try(:has_role?, 'Librarian') -%>
+     <%- unless @item.checkouts.not_returned.blank? -%>
+        (<%= link_to t('item.current_checkout'), @item.checkouts.not_returned.first -%>)
       <%- end -%>
     <%- end -%>
   </p>
@@ -88,17 +86,6 @@
   <%= localized_boolean(@item.include_supplements) -%>
 </p>
 
-<!--
-<%- if can? :update, @item -%>
-  <p>
-    <strong><%= t('item.donor') -%>:</strong>
-    <%- @item.donors.each do |patron| -%>
-      <%= link_to patron.full_name, patron -%>
-    <%- end -%>
-  </p>
-<%- end -%>
--->
-
 <p>
   <strong><%= t('activerecord.attributes.item.acquired_at') -%>:</strong>
   <%= l(@item.acquired_at, :format => :only_date) if @item.acquired_at -%>

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/db/migrate/006_create_items.rb

@@ -4,8 +4,6 @@ class CreateItems < ActiveRecord::Migration
       #t.integer :manifestation_id
       t.string :call_number
       t.string :item_identifier
-      t.integer :circulation_status_id, :default => 5, :null => false
-      t.integer :checkout_type_id, :default => 1, :null => false
       t.timestamps
       t.datetime :deleted_at
       t.integer :shelf_id, :default => 1, :null => false
@@ -19,8 +17,6 @@ class CreateItems < ActiveRecord::Migration
       t.integer :required_score, :default => 0, :null => false
     end
     #add_index :items, :manifestation_id
-    add_index :items, :circulation_status_id
-    add_index :items, :checkout_type_id
     add_index :items, :shelf_id
     add_index :items, :item_identifier
     add_index :items, :required_role_id

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.1.0.pre30"
+  VERSION = "0.1.0.pre31"
 end

data/spec/dummy/app/helpers/application_helper.rb

@@ -1,7 +1,6 @@
 # Methods added to this helper will be available to all templates in the application.
 module ApplicationHelper
   include PictureFilesHelper if defined?(EnjuLibrary)
-  include EnjuBookJacket::BookJacketHelper if defined?(EnjuBookJacket)
   include EnjuManifestationViewer::ManifestationViewerHelper if defined?(EnjuManifestationViewer)
 
   def form_icon(carrier_type)

data/spec/dummy/config/application.rb

@@ -60,7 +60,6 @@ require 'enju_inventory'
 require 'enju_bookmark'
 require 'enju_event'
 require 'enju_manifestation_viewer'
-require 'enju_book_jacket'
 require 'enju_export'
 require 'enju_oai'
 require 'enju_ndl'

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/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130304015019) do
+ActiveRecord::Schema.define(:version => 20130416054135) do
 
   create_table "baskets", :force => true do |t|
     t.integer  "user_id"
@@ -412,8 +412,6 @@ ActiveRecord::Schema.define(:version => 20130304015019) do
   create_table "items", :force => true do |t|
     t.string   "call_number"
     t.string   "item_identifier"
-    t.integer  "circulation_status_id", :default => 5,     :null => false
-    t.integer  "checkout_type_id",      :default => 1,     :null => false
     t.datetime "created_at",                               :null => false
     t.datetime "updated_at",                               :null => false
     t.datetime "deleted_at"
@@ -429,6 +427,8 @@ ActiveRecord::Schema.define(:version => 20130304015019) do
     t.datetime "acquired_at"
     t.integer  "bookstore_id"
     t.integer  "budget_type_id"
+    t.integer  "circulation_status_id", :default => 5,     :null => false
+    t.integer  "checkout_type_id",      :default => 1,     :null => false
   end
 
   add_index "items", ["bookstore_id"], :name => "index_items_on_bookstore_id"

data/spec/dummy/solr/data/test/index/_4ay.fnm

@@ -0,0 +1,7 @@
+����+idtype
+class_namereservable_btitle_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

data/spec/dummy/solr/data/test/index/_4ay.nrm

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

data/spec/dummy/solr/data/test/index/_4az.fnm

@@ -0,0 +1,7 @@
+����+idtype
+class_namereservable_btitle_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

data/spec/dummy/solr/data/test/index/_4az.nrm

@@ -0,0 +1 @@
+NRM�xuuwuyutxxvxvxwtyvxwxxxvvtwwxvytwxwrwvxxyxuyxyuysx||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||xuuwuyutxxvxvxwtyvxwxxxvvtwwxvytwxwrwvxxyxuyxyuysx||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||

data/spec/dummy/solr/data/test/index/_4b0.fnm

@@ -0,0 +1,8 @@
+����3idtype
+class_namereservable_btitle_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_dmissn_sm	issn_text
volume_number_iissue_number_iserial_number_iatitle_text
date_of_publication_d
+pub_year_i

data/spec/dummy/solr/data/test/index/_4b0.nrm

@@ -0,0 +1 @@
+NRM�vruwvvuur|xutttttwwuuuuuuxx||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||xtt|uuutt||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||vruwvvuur|xu||tttwwuuuuuuxx|||||y|||��|||||||���������||||||||||||xw|||||||||||||||||||||||||y||||||||||||||||||||||||||tt|||||||||||||

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_biblio
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre30
+  version: 0.1.0.pre31
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_core
@@ -282,14 +282,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre17
+        version: 0.1.0.pre20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre17
+        version: 0.1.0.pre20
 - !ruby/object:Gem::Dependency
   name: enju_subject
   requirement: !ruby/object:Gem::Requirement
@@ -338,30 +338,16 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.17.pre10
+        version: 0.1.17.pre11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.17.pre10
+        version: 0.1.17.pre11
 - !ruby/object:Gem::Dependency
   name: enju_manifestation_viewer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.0.pre5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.0.pre5
-- !ruby/object:Gem::Dependency
-  name: enju_book_jacket
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
@@ -394,14 +380,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre19
+        version: 0.1.0.pre20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre19
+        version: 0.1.0.pre20
 - !ruby/object:Gem::Dependency
   name: enju_oai
   requirement: !ruby/object:Gem::Requirement
@@ -941,7 +927,6 @@ files:
 - lib/generators/enju_biblio/setup/templates/db/fixtures/request_status_types.yml
 - lib/generators/enju_biblio/setup/templates/db/fixtures/request_types.yml
 - lib/generators/enju_biblio/setup/USAGE
-- lib/generators/enju_biblio/views_generator.rb
 - lib/tasks/enju_biblio_tasks.rake
 - MIT-LICENSE
 - Rakefile
@@ -1101,6 +1086,7 @@ files:
 - spec/dummy/db/migrate/20130303104849_add_state_index_to_reserve.rb
 - spec/dummy/db/migrate/20130303124821_add_retained_at_to_reserve.rb
 - spec/dummy/db/migrate/20130304015019_add_postponed_at_to_reserve.rb
+- spec/dummy/db/migrate/20130416054135_add_circulation_status_id_to_item.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/lib/plugins/ext/event-calendar.rb
@@ -1144,11 +1130,34 @@ 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/_4ay.fdt
+- spec/dummy/solr/data/test/index/_4ay.fdx
+- spec/dummy/solr/data/test/index/_4ay.fnm
+- spec/dummy/solr/data/test/index/_4ay.frq
+- spec/dummy/solr/data/test/index/_4ay.nrm
+- spec/dummy/solr/data/test/index/_4ay.prx
+- spec/dummy/solr/data/test/index/_4ay.tii
+- spec/dummy/solr/data/test/index/_4ay.tis
+- spec/dummy/solr/data/test/index/_4az.fdt
+- spec/dummy/solr/data/test/index/_4az.fdx
+- spec/dummy/solr/data/test/index/_4az.fnm
+- spec/dummy/solr/data/test/index/_4az.frq
+- spec/dummy/solr/data/test/index/_4az.nrm
+- spec/dummy/solr/data/test/index/_4az.prx
+- spec/dummy/solr/data/test/index/_4az.tii
+- spec/dummy/solr/data/test/index/_4az.tis
+- spec/dummy/solr/data/test/index/_4b0.fdt
+- spec/dummy/solr/data/test/index/_4b0.fdx
+- spec/dummy/solr/data/test/index/_4b0.fnm
+- spec/dummy/solr/data/test/index/_4b0.frq
+- spec/dummy/solr/data/test/index/_4b0.nrm
+- spec/dummy/solr/data/test/index/_4b0.prx
+- spec/dummy/solr/data/test/index/_4b0.tii
+- spec/dummy/solr/data/test/index/_4b0.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_5yb
+- spec/dummy/solr/data/test/index/segments_6d6
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
-- spec/dummy/tmp/cache/4AD/470/country_all
 - spec/dummy/tmp/cache/4F7/F90/default_role
 - spec/dummy/tmp/cache/6E4/420/search_engine_all
 - spec/factories/basket.rb
@@ -1535,6 +1544,7 @@ test_files:
 - spec/dummy/db/migrate/20130303104849_add_state_index_to_reserve.rb
 - spec/dummy/db/migrate/20130303124821_add_retained_at_to_reserve.rb
 - spec/dummy/db/migrate/20130304015019_add_postponed_at_to_reserve.rb
+- spec/dummy/db/migrate/20130416054135_add_circulation_status_id_to_item.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/lib/plugins/ext/event-calendar.rb
@@ -1578,11 +1588,34 @@ 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/_4ay.fdt
+- spec/dummy/solr/data/test/index/_4ay.fdx
+- spec/dummy/solr/data/test/index/_4ay.fnm
+- spec/dummy/solr/data/test/index/_4ay.frq
+- spec/dummy/solr/data/test/index/_4ay.nrm
+- spec/dummy/solr/data/test/index/_4ay.prx
+- spec/dummy/solr/data/test/index/_4ay.tii
+- spec/dummy/solr/data/test/index/_4ay.tis
+- spec/dummy/solr/data/test/index/_4az.fdt
+- spec/dummy/solr/data/test/index/_4az.fdx
+- spec/dummy/solr/data/test/index/_4az.fnm
+- spec/dummy/solr/data/test/index/_4az.frq
+- spec/dummy/solr/data/test/index/_4az.nrm
+- spec/dummy/solr/data/test/index/_4az.prx
+- spec/dummy/solr/data/test/index/_4az.tii
+- spec/dummy/solr/data/test/index/_4az.tis
+- spec/dummy/solr/data/test/index/_4b0.fdt
+- spec/dummy/solr/data/test/index/_4b0.fdx
+- spec/dummy/solr/data/test/index/_4b0.fnm
+- spec/dummy/solr/data/test/index/_4b0.frq
+- spec/dummy/solr/data/test/index/_4b0.nrm
+- spec/dummy/solr/data/test/index/_4b0.prx
+- spec/dummy/solr/data/test/index/_4b0.tii
+- spec/dummy/solr/data/test/index/_4b0.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_5yb
+- spec/dummy/solr/data/test/index/segments_6d6
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
-- spec/dummy/tmp/cache/4AD/470/country_all
 - spec/dummy/tmp/cache/4F7/F90/default_role
 - spec/dummy/tmp/cache/6E4/420/search_engine_all
 - spec/factories/basket.rb

data/lib/generators/enju_biblio/views_generator.rb

@@ -1,52 +0,0 @@
-module EnjuBiblio
-  module Generators
-    class ViewsGenerator < Rails::Generators::Base
-      source_root File.expand_path('../../../../app/views', __FILE__)
-
-      def copy_files
-        directories = %w(
-          accepts
-          carrier_types
-          content_types
-          countries
-          create_types
-          creates
-          donates
-          exemplifies
-          extents
-          form_of_works
-          frequencies
-          import_requests
-          items
-          languages
-          licenses
-          manifestation_relationship_types
-          manifestation_relationships
-          manifestations
-          medium_of_performances
-          owns
-          patron_import_files
-          patron_import_results
-          patron_relationship_types
-          patron_relationships
-          patron_types
-          patrons
-          picture_files
-          produce_types
-          produces
-          realize_types
-          realizes
-          resource_import_files
-          resource_import_results
-          series_has_manifestations
-          series_statement_relationships
-          series_statements
-        )
-
-        directories.each do |dir|
-          directory dir, "app/views/#{dir}"
-        end
-      end
-    end
-  end
-end