enju_biblio 0.1.0.pre22 → 0.1.0.pre23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 110e82e3513e0759085b4be6f4fc13103261b7b1
-  data.tar.gz: 0985130ae8accad84425cc3c6fdf8ba0d9963132
+  metadata.gz: 851b384f2c1744c595dfcbb4fd82bb8cd4d00576
+  data.tar.gz: 6bb9b6d4286ebff9e25fcd3afde173539ee3f713
 SHA512:
-  metadata.gz: ad635f15df3b55e5d794a04bdcf0fa8be3850342b4ef2a2ef6f066d07d5701563ae400af212468c0c574d7eefa968bff8345c357c8da3926cb217c6d82c4a47f
-  data.tar.gz: c83a06a6418f21538a2626e354ff6a3da19fa4173e3172371db74cdeaa50f779f2cec9c82e1ec4ef88129b75917fbe57f71228cece0dd7034e0591b4c8c55c83
+  metadata.gz: 4b6158f5e071dae93770850c337a636a6afdd32bcdc1104ce3fefc1c99cc98824ba6947e98ae6b4c3dc754dbf57b8073caa6b7f735a59bf2faab61f2fde29162
+  data.tar.gz: 52d1c943f40c811ad864a93981066d737e325f2cdd5576210aefa8e33102a2ed13f057451fba42f177ed0752119275909e038becbc436be01578dab1419a5567

data/app/controllers/items_controller.rb

@@ -133,7 +133,7 @@ class ItemsController < ApplicationController
     end
     @item = Item.new
     @item.shelf = @library.shelves.first
-    @item.manifestation_id = @manifestation.id if @manifestation
+    @item.manifestation_id = @manifestation.id
     if defined?(EnjuCirculation)
       @circulation_statuses = CirculationStatus.where(
         :name => [

data/app/controllers/manifestations_controller.rb

@@ -454,6 +454,9 @@ class ManifestationsController < ApplicationController
     end
     @original_manifestation = Manifestation.where(:id => params[:manifestation_id]).first
     @series_statement = @manifestation.series_statement unless @series_statement
+    if defined?(EnjuSubject)
+      @classification_types = ClassificationType.select(:display_name)
+    end
     if defined?(EnjuBookmark)
       if params[:mode] == 'tag_edit'
         @bookmark = current_user.bookmarks.where(:manifestation_id => @manifestation.id).first if @manifestation rescue nil

data/app/helpers/manifestations_helper.rb

@@ -1,4 +1,6 @@
 module ManifestationsHelper
+  include EnjuCirculation::ManifestationsHelper if defined?(EnjuCirculation)
+
   def resource_title(manifestation, action)
     string = LibraryGroup.site_config.display_name.localize.dup
     unless action == ('index' or 'new')
@@ -145,28 +147,4 @@ module ManifestationsHelper
       end
     end
   end
-
-  if defined?(EnjuCirculation)
-    def link_to_reservation(manifestation, reserve)
-      unless current_user
-        unless manifestation.items.for_checkout.empty?
-          link_to t('manifestation.reserve_this'), new_reserve_path(:manifestation_id => manifestation.id)
-        end
-      else
-        if current_user.has_role?('Librarian')
-          link_to t('manifestation.reserve_this'), new_reserve_path(:manifestation_id => manifestation.id)
-        else
-          if manifestation.is_checked_out_by?(current_user)
-            I18n.t('manifestation.currently_checked_out')
-          else
-            if manifestation.is_reserved_by?(current_user)
-              link_to t('manifestation.cancel_reservation'), reserve, :confirm => t('page.are_you_sure'), :method => :delete 
-            else
-              link_to t('manifestation.reserve_this'), new_reserve_path(:manifestation_id => manifestation.id)
-            end
-          end
-        end
-      end
-    end
-  end
 end

data/app/models/enju_biblio/ability.rb

@@ -0,0 +1,203 @@
+module EnjuBiblio
+  class Ability
+    include CanCan::Ability
+
+    def initialize(user, ip_address = nil)
+      case user.try(:role).try(:name)
+      when 'Administrator'
+        can [:read, :create, :update], CarrierType
+        can :destroy, CarrierType do |carrier_type|
+          true unless carrier_type.manifestations.exists?
+        end if LibraryGroup.site_config.network_access_allowed?(ip_address)
+        can [:read, :create, :update], Item
+        can :destroy, Item do |item|
+          item.deletable?
+        end
+        can [:read, :create, :update], Manifestation
+        can :destroy, Manifestation do |manifestation|
+          manifestation.items.empty? and !manifestation.periodical_master?
+        end
+        can :manage, [
+          Create,
+          CreateType,
+          Donate,
+          Exemplify,
+          ImportRequest,
+          ManifestationRelationship,
+          ManifestationRelationshipType,
+          Own,
+          Patron,
+          PatronImportFile,
+          PatronRelationship,
+          PatronRelationshipType,
+          PictureFile,
+          Produce,
+          ProduceType,
+          Realize,
+          RealizeType,
+          ResourceImportFile,
+          SeriesStatement,
+          SeriesStatementRelationship,
+          SeriesHasManifestation
+        ]
+        can :update, [
+          CarrierType,
+          ContentType,
+          Country,
+          Extent,
+          Frequency,
+          FormOfWork,
+          Language,
+          License,
+          MediumOfPerformance,
+          PatronType,
+          RequestStatusType,
+          RequestType
+        ] if LibraryGroup.site_config.network_access_allowed?(ip_address)
+        can :read, [
+          CarrierType,
+          ContentType,
+          Country,
+          Extent,
+          Frequency,
+          FormOfWork,
+          Language,
+          License,
+          MediumOfPerformance,
+          PatronImportResult,
+          PatronType,
+          RequestStatusType,
+          RequestType,
+          ResourceImportResult
+        ]
+      when 'Librarian'
+        can :manage, Item
+        can [:read, :create, :update], Manifestation
+        can :destroy, Manifestation do |manifestation|
+          manifestation.items.empty? and !manifestation.periodical_master?
+        end
+        can [:index, :create], Patron
+        can :show, Patron do |patron|
+          patron.required_role_id <= 3
+        end
+        can [:update, :destroy], Patron do |patron|
+          !patron.user.try(:has_role?, 'Librarian') and patron.required_role_id <= 3
+        end
+        can :manage, [
+          Create,
+          Donate,
+          Exemplify,
+          ImportRequest,
+          ManifestationRelationship,
+          Own,
+          PatronImportFile,
+          PatronRelationship,
+          PictureFile,
+          Produce,
+          Realize,
+          ResourceImportFile,
+          SeriesStatement,
+          SeriesStatementRelationship,
+          SeriesHasManifestation
+        ]
+        can :read, [
+          CarrierType,
+          ContentType,
+          Country,
+          Extent,
+          Frequency,
+          FormOfWork,
+          Language,
+          License,
+          ManifestationRelationshipType,
+          PatronImportResult,
+          PatronRelationshipType,
+          PatronType,
+          RequestStatusType,
+          RequestType,
+          ResourceImportResult,
+          MediumOfPerformance
+        ]
+      when 'User'
+        can :index, Item
+        can :show, Item do |item|
+          item.required_role_id <= 2
+        end
+        can [:read, :edit], Manifestation do |manifestation|
+          manifestation.required_role_id <= 2
+        end
+        can :index, Patron
+        can :update, Patron do |patron|
+          patron.user == user
+        end
+        can :show, Patron do |patron|
+          #if patron.user == user
+          #  true
+          #elsif patron.user != user
+            true if patron.required_role_id <= 2 #name == 'Administrator'
+          #end
+        end
+        can :index, PictureFile
+        can :show, PictureFile do |picture_file|
+          begin
+            true if picture_file.picture_attachable.required_role_id <= 2
+          rescue NoMethodError
+            true
+          end
+        end
+        can :read, [
+          CarrierType,
+          ContentType,
+          Country,
+          Create,
+          Exemplify,
+          Extent,
+          Frequency,
+          FormOfWork,
+          Language,
+          License,
+          ManifestationRelationship,
+          ManifestationRelationshipType,
+          MediumOfPerformance,
+          Own,
+          PatronRelationship,
+          PatronRelationshipType,
+          Produce,
+          Realize,
+          SeriesStatement,
+          SeriesHasManifestation
+        ]
+      else
+        can :index, Patron
+        can :show, Patron do |patron|
+          patron.required_role_id == 1 #name == 'Guest'
+        end
+        can :read, [
+          CarrierType,
+          ContentType,
+          Country,
+          Create,
+          Exemplify,
+          Extent,
+          Frequency,
+          FormOfWork,
+          Item,
+          Language,
+          License,
+          Manifestation,
+          ManifestationRelationship,
+          ManifestationRelationshipType,
+          MediumOfPerformance,
+          Own,
+          PatronRelationship,
+          PatronRelationshipType,
+          PictureFile,
+          Produce,
+          Realize,
+          SeriesStatement,
+          SeriesHasManifestation
+        ]
+      end
+    end
+  end
+end

data/app/models/item.rb

@@ -30,8 +30,6 @@ class Item < ActiveRecord::Base
   has_paper_trail
   normalize_attributes :item_identifier
 
-  #enju_export
-
   searchable do
     text :item_identifier, :note, :title, :creator, :contributor, :publisher
     string :item_identifier
@@ -46,42 +44,14 @@ class Item < ActiveRecord::Base
   end
 
   enju_circulation_item_model if defined?(EnjuCirculation)
+  enju_library_item_model if defined?(EnjuLibrary)
+  enju_question_item_model if defined?(EnjuQuestion)
+  enju_inventory_item_model if defined?(EnjuInventory)
+  enju_inter_library_loan_item_model if defined?(EnjuInterLibraryLoan)
+  #enju_export
 
   attr_accessor :library_id, :manifestation_id
 
-  if defined?(EnjuInventory)
-    has_many :inventories, :dependent => :destroy
-    has_many :inventory_files, :through => :inventories
-    searchable do
-      integer :inventory_file_ids, :multiple => true
-    end
-
-    def self.inventory_items(inventory_file, mode = 'not_on_shelf')
-      item_ids = Item.pluck(:id)
-      inventory_item_ids = inventory_file.items.pluck('items.id')
-      case mode
-      when 'not_on_shelf'
-        Item.where(:id => (item_ids - inventory_item_ids))
-      when 'not_in_catalog'
-        Item.where(:id => (inventory_item_ids - item_ids))
-      end
-    rescue
-      nil
-    end
-  end
-
-  if defined?(EnjuQuestion)
-    has_many :answer_has_items, :dependent => :destroy
-    has_many :answers, :through => :answer_has_items
-  end
-
-  if defined?(EnjuInterLibraryLoan)
-    has_many :inter_library_loans, :dependent => :destroy
-    def inter_library_loaned?
-      true if self.inter_library_loans.size > 0
-    end
-  end
-
   paginates_per 10
 
   def title
@@ -125,33 +95,6 @@ class Item < ActiveRecord::Base
       self.manifestation = Manifestation.find(manifestation_id)
     end
   end
-
-  if defined?(EnjuLibrary)
-    has_one :accept
-    scope :accepted_between, lambda{|from, to| includes(:accept).where('items.created_at BETWEEN ? AND ?', Time.zone.parse(from).beginning_of_day, Time.zone.parse(to).end_of_day)}
-
-    belongs_to :shelf, :counter_cache => true, :validate => true
-    validates_associated :shelf
-
-    searchable do
-      string :library do
-        shelf.library.name if shelf
-      end
-    end
-
-    def shelf_name
-      shelf.name
-    end
-
-    def hold?(library)
-      return true if self.shelf.library == library
-      false
-    end
-
-    def library_url
-      "#{LibraryGroup.site_config.url}libraries/#{self.shelf.library.name}"
-    end
-  end
 end
 
 # == Schema Information

data/app/models/manifestation.rb

@@ -193,6 +193,8 @@ class Manifestation < ActiveRecord::Base
   #enju_amazon
   enju_oai if defined?(EnjuOai)
   enju_nii_cinii_books if defined?(EnjuNii)
+  enju_question_manifestation_model if defined?(EnjuQuestion)
+  enju_bookmark_manifestation_model if defined?(EnjuBookmark)
   #enju_export
 
   has_paper_trail
@@ -467,53 +469,6 @@ class Manifestation < ActiveRecord::Base
     items.where(:shelf_id => Shelf.web.id).first
   end
 
-  if defined?(EnjuBookmark)
-    has_many :bookmarks, :include => :tags, :dependent => :destroy, :foreign_key => :manifestation_id
-    has_many :users, :through => :bookmarks
-
-    searchable do
-      string :tag, :multiple => true do
-        tags.collect(&:name)
-      end
-      text :tag do
-        tags.collect(&:name)
-      end
-    end
-
-    def bookmarked?(user)
-      return true if user.bookmarks.where(:url => url).first
-      false
-    end
-
-    def tags
-      if self.bookmarks.first
-        self.bookmarks.tag_counts
-      else
-        []
-      end
-    end
-  end
-
-  if defined?(EnjuQuestion)
-    def questions(options = {})
-      id = self.id
-      options = {:page => 1, :per_page => Question.default_per_page}.merge(options)
-      page = options[:page]
-      per_page = options[:per_page]
-      user = options[:user]
-      Question.search do
-        with(:manifestation_id).equal_to id
-        any_of do
-          unless user.try(:has_role?, 'Librarian')
-            with(:shared).equal_to true
-          #  with(:username).equal_to user.try(:username)
-          end
-        end
-        paginate :page => page, :per_page => per_page
-      end.results
-    end
-  end
-
   def set_patron_role_type(patron_lists, options = {:scope => :creator})
     patron_lists.each do |patron_list|
       name_and_role = patron_list[:full_name].split('||')

data/lib/enju_biblio/version.rb

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

data/spec/dummy/app/controllers/application_controller.rb

@@ -53,10 +53,6 @@ class ApplicationController < ActionController::Base
     Sunspot.commit
   end
 
-  def current_ability
-    @current_ability ||= Ability.new(current_user, request.remote_ip)
-  end
-
   def move_position(resource, direction, redirect = true)
     if ['higher', 'lower'].include?(direction)
       resource.send("move_#{direction}")

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

@@ -1,186 +1,202 @@
-class Ability
-  include CanCan::Ability
+#module EnjuBiblio
+  class Ability
+    include CanCan::Ability
 
-  def initialize(user, ip_addess = nil)
-    case user.try(:role).try(:name)
-    when 'Administrator'
-      can [:read, :update], ContentType
-      can [:read, :update], Country
-      can :manage, Create
-      can :manage, CreateType
-      can :manage, Donate
-      can :manage, Exemplify
-      can [:read, :update], Extent
-      can [:read, :update], Frequency
-      can [:read, :update], FormOfWork
-      can [:read, :create, :update], Item
-      can :destroy, Item do |item|
-        item.deletable?
-      end
-      can :manage, ImportRequest
-      can [:read, :update], Language
-      can [:read, :update], License
-      can [:read, :create, :update], Manifestation
-      can :destroy, Manifestation do |manifestation|
-        if defined?(EnjuCirculation)
-          manifestation.items.empty? and !manifestation.periodical_master? and !manifestation.is_reserved?
-        else
-          manifestation.items.empty? and !manifestation.periodical_master?
+    def initialize(user, ip_address = '0.0.0.0')
+      case user.try(:role).try(:name)
+      when 'Administrator'
+        can [:read, :create, :update], CarrierType
+        can :destroy, CarrierType do |carrier_type|
+          true unless carrier_type.manifestations.exists?
+        end if LibraryGroup.site_config.network_access_allowed?(ip_address)
+        can [:read, :create, :update], Item
+        can :destroy, Item do |item|
+          item.deletable?
         end
-      end
-      can [:read, :update], MediumOfPerformance
-      can :manage, Own
-      can [:read, :create, :update], Patron
-      can :destroy, Patron do |patron|
-        true
-      end
-      can :manage, CarrierType
-      can :manage, PatronImportFile
-      can :read, PatronImportResult
-      can :manage, PatronRelationship
-      can :manage, PatronRelationshipType
-      can [:read, :update], PatronType
-      can :manage, PictureFile
-      can :manage, Produce
-      can :manage, ProduceType
-      can :manage, ManifestationRelationship
-      can :manage, ManifestationRelationshipType
-      can :manage, Realize
-      can :manage, RealizeType
-      can :manage, ResourceImportFile
-      can :read, ResourceImportResult
-      can :manage, SeriesHasManifestation
-      can :manage, SeriesStatement
-      can :manage, SeriesStatementRelationship
-    when 'Librarian'
-      can [:read, :update], CarrierType
-      can :read, ContentType
-      can :read, Country
-      can :manage, Create
-      can :manage, Donate
-      can :manage, Exemplify
-      can :read, Extent
-      can :read, Frequency
-      can :read, FormOfWork
-      can :manage, ImportRequest
-      can [:read, :create, :update], Item
-      can :destroy, Item do |item|
-        if defined?(EnjuCirculation)
-          item.checkouts.not_returned.empty?
-        else
-          true
+        can [:read, :create, :update], Manifestation
+        can :destroy, Manifestation do |manifestation|
+          manifestation.items.empty? and !manifestation.periodical_master?
         end
-      end
-      can :read, Language
-      can :read, License
-      can [:read, :create, :update], Manifestation
-      can :destroy, Manifestation do |manifestation|
-        if defined?(EnjuCirculation)
-          manifestation.items.empty? and !manifestation.periodical_master? and !manifestation.is_reserved?
-        else
+        can :manage, [
+          Create,
+          CreateType,
+          Donate,
+          Exemplify,
+          ImportRequest,
+          ManifestationRelationship,
+          ManifestationRelationshipType,
+          Own,
+          Patron,
+          PatronImportFile,
+          PatronRelationship,
+          PatronRelationshipType,
+          PictureFile,
+          Produce,
+          ProduceType,
+          Realize,
+          RealizeType,
+          ResourceImportFile,
+          SeriesStatement,
+          SeriesStatementRelationship,
+          SeriesHasManifestation
+        ]
+        can :update, [
+          ContentType,
+          Country,
+          Extent,
+          Frequency,
+          FormOfWork,
+          Language,
+          License,
+          MediumOfPerformance,
+          PatronType,
+          RequestStatusType,
+          RequestType
+        ] if LibraryGroup.site_config.network_access_allowed?(ip_address)
+        can :read, [
+          CarrierType,
+          ContentType,
+          Country,
+          Extent,
+          Frequency,
+          FormOfWork,
+          Language,
+          License,
+          MediumOfPerformance,
+          PatronImportResult,
+          PatronType,
+          RequestStatusType,
+          RequestType,
+          ResourceImportResult
+        ]
+      when 'Librarian'
+        can :manage, Item
+        can [:read, :create, :update], Manifestation
+        can :destroy, Manifestation do |manifestation|
           manifestation.items.empty? and !manifestation.periodical_master?
         end
-      end
-      can :read, MediumOfPerformance
-      can :manage, Own
-      can [:index, :create], Patron
-      can [:show, :update, :destroy], Patron do |patron|
-        patron.required_role_id <= 3
-      end
-      can :manage, PatronImportFile
-      can :read, PatronImportResult
-      can :manage, PatronRelationship
-      can :read, PatronRelationshipType
-      can :read, PatronType
-      can :manage, PictureFile
-      can :manage, Produce
-      can :manage, ManifestationRelationship
-      can :read, ManifestationRelationshipType
-      can :manage, Realize
-      can :manage, ResourceImportFile
-      can :read, ResourceImportResult
-      can :manage, SeriesHasManifestation
-      can :manage, SeriesStatement
-      can :manage, SeriesStatementRelationship
-    when 'User'
-      can :read, CarrierType
-      can :read, ContentType
-      can :read, Country
-      can :read, Create
-      can :read, Exemplify
-      can :read, Extent
-      can :read, Frequency
-      can :read, FormOfWork
-      can :index, Item
-      can :show, Item do |item|
-        item.required_role_id <= 2
-      end
-      can :read, Language
-      can :read, License
-      can [:read, :edit], Manifestation do |manifestation|
-        manifestation.required_role_id <= 2
-      end
-      can :read, ManifestationRelationship
-      can :read, ManifestationRelationshipType
-      can :read, MediumOfPerformance
-      can :read, Own
-      can :index, Patron
-      can :show, Patron do |patron|
-        true if patron.required_role_id <= 2
-      end
-      can :read, PatronRelationship
-      can :read, PatronRelationshipType
-      can :index, PictureFile
-      can :show, PictureFile do |picture_file|
-        begin
-          true if picture_file.picture_attachable.required_role_id <= 2
-        rescue NoMethodError
-          true
+        can [:index, :create], Patron
+        can :show, Patron do |patron|
+          patron.required_role_id <= 3
         end
-      end
-      can :show, User
-      can :read, Produce
-      can :read, Realize
-      can :read, SeriesHasManifestation
-      can :read, SeriesStatement
-    else
-      can :read, CarrierType
-      can :read, ContentType
-      can :read, Country
-      can :read, Create
-      can :read, Exemplify
-      can :read, Extent
-      can :read, Frequency
-      can :read, FormOfWork
-      can :read, Item
-      can :read, Language
-      can :read, License
-      can :read, Manifestation do |manifestation|
-        manifestation.required_role_id <= 1
-      end
-      can :read, ManifestationRelationship
-      can :read, ManifestationRelationshipType
-      can :read, MediumOfPerformance
-      can :read, Own
-      can :index, Patron
-      can :show, Patron do |patron|
-        true if patron.required_role_id <= 1
-      end
-      can :read, PatronRelationship
-      can :read, PatronRelationshipType
-      can :index, PictureFile
-      can :show, PictureFile do |picture_file|
-        begin
-          true if picture_file.picture_attachable.required_role_id <= 2
-        rescue NoMethodError
-          true
+        can [:update, :destroy], Patron do |patron|
+          !patron.user.try(:has_role?, 'Librarian') and patron.required_role_id <= 3
+        end
+        can :manage, [
+          Create,
+          Donate,
+          Exemplify,
+          ImportRequest,
+          ManifestationRelationship,
+          Own,
+          PatronImportFile,
+          PatronRelationship,
+          PictureFile,
+          Produce,
+          Realize,
+          ResourceImportFile,
+          SeriesStatement,
+          SeriesStatementRelationship,
+          SeriesHasManifestation
+        ]
+        can :read, [
+          CarrierType,
+          ContentType,
+          Country,
+          Extent,
+          Frequency,
+          FormOfWork,
+          Language,
+          License,
+          ManifestationRelationshipType,
+          PatronImportResult,
+          PatronRelationshipType,
+          PatronType,
+          RequestStatusType,
+          RequestType,
+          ResourceImportResult,
+          MediumOfPerformance
+        ]
+      when 'User'
+        can :index, Item
+        can :show, Item do |item|
+          item.required_role_id <= 2
+        end
+        can [:read, :edit], Manifestation do |manifestation|
+          manifestation.required_role_id <= 2
+        end
+        can :index, Patron
+        can :update, Patron do |patron|
+          patron.user == user
+        end
+        can :show, Patron do |patron|
+          #if patron.user == user
+          #  true
+          #elsif patron.user != user
+            true if patron.required_role_id <= 2 #name == 'Administrator'
+          #end
+        end
+        can :index, PictureFile
+        can :show, PictureFile do |picture_file|
+          begin
+            true if picture_file.picture_attachable.required_role_id <= 2
+          rescue NoMethodError
+            true
+          end
+        end
+        can :read, [
+          CarrierType,
+          ContentType,
+          Country,
+          Create,
+          Exemplify,
+          Extent,
+          Frequency,
+          FormOfWork,
+          Language,
+          License,
+          ManifestationRelationship,
+          ManifestationRelationshipType,
+          MediumOfPerformance,
+          Own,
+          PatronRelationship,
+          PatronRelationshipType,
+          Produce,
+          Realize,
+          SeriesStatement,
+          SeriesHasManifestation
+        ]
+      else
+        can :index, Patron
+        can :show, Patron do |patron|
+          patron.required_role_id == 1 #name == 'Guest'
         end
+        can :read, [
+          CarrierType,
+          ContentType,
+          Country,
+          Create,
+          Exemplify,
+          Extent,
+          Frequency,
+          FormOfWork,
+          Item,
+          Language,
+          License,
+          Manifestation,
+          ManifestationRelationship,
+          ManifestationRelationshipType,
+          MediumOfPerformance,
+          Own,
+          PatronRelationship,
+          PatronRelationshipType,
+          PictureFile,
+          Produce,
+          Realize,
+          SeriesStatement,
+          SeriesHasManifestation
+        ]
       end
-      can :show, User
-      can :read, Produce
-      can :read, Realize
-      can :read, SeriesHasManifestation
-      can :read, SeriesStatement
     end
   end
-end
+#end

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

@@ -76,21 +76,8 @@ class User < ActiveRecord::Base
     end
   end
 
-  if defined?(EnjuMessage)
-    has_many :sent_messages, :foreign_key => 'sender_id', :class_name => 'Message'
-    has_many :received_messages, :foreign_key => 'receiver_id', :class_name => 'Message'
-
-    def send_message(status, options = {})
-      MessageRequest.transaction do
-        request = MessageRequest.new
-        request.sender = User.find(1)
-        request.receiver = self
-        request.message_template = MessageTemplate.localized_template(status, self.locale)
-        request.save_message_body(options)
-        request.sm_send_message!
-      end
-    end
-  end
+  enju_bookmark_user_model if defined?(EnjuBookmark)
+  enju_message_user_model if defined?(EnjuBookmark)
 
   def patron
     LocalPatron.new(self)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_biblio
 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-03-06 00:00:00.000000000 Z
+date: 2013-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.13.rc1
+        version: 3.2.13.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.13.rc1
+        version: 3.2.13.rc2
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -324,42 +324,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre11
+        version: 0.1.0.pre12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre11
+        version: 0.1.0.pre12
 - !ruby/object:Gem::Dependency
   name: enju_inventory
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.11.pre5
+        version: 0.1.11.pre6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.11.pre5
+        version: 0.1.11.pre6
 - !ruby/object:Gem::Dependency
   name: enju_bookmark
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.2.pre7
+        version: 0.1.2.pre8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.2.pre7
+        version: 0.1.2.pre8
 - !ruby/object:Gem::Dependency
   name: enju_event
   requirement: !ruby/object:Gem::Requirement
@@ -422,14 +422,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre12
+        version: 0.1.0.pre14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre12
+        version: 0.1.0.pre14
 - !ruby/object:Gem::Dependency
   name: enju_oai
   requirement: !ruby/object:Gem::Requirement
@@ -539,6 +539,7 @@ files:
 - app/models/create.rb
 - app/models/create_type.rb
 - app/models/donate.rb
+- app/models/enju_biblio/ability.rb
 - app/models/exemplify.rb
 - app/models/extent.rb
 - app/models/form_of_work.rb
@@ -1141,37 +1142,12 @@ 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/_tu.fdt
-- spec/dummy/solr/data/test/index/_tu.fdx
-- spec/dummy/solr/data/test/index/_tu.fnm
-- spec/dummy/solr/data/test/index/_tu.frq
-- spec/dummy/solr/data/test/index/_tu.nrm
-- spec/dummy/solr/data/test/index/_tu.prx
-- spec/dummy/solr/data/test/index/_tu.tii
-- spec/dummy/solr/data/test/index/_tu.tis
-- spec/dummy/solr/data/test/index/_tv.fdt
-- spec/dummy/solr/data/test/index/_tv.fdx
-- spec/dummy/solr/data/test/index/_tv.fnm
-- spec/dummy/solr/data/test/index/_tv.frq
-- spec/dummy/solr/data/test/index/_tv.nrm
-- spec/dummy/solr/data/test/index/_tv.prx
-- spec/dummy/solr/data/test/index/_tv.tii
-- spec/dummy/solr/data/test/index/_tv.tis
-- spec/dummy/solr/data/test/index/_tw.fdt
-- spec/dummy/solr/data/test/index/_tw.fdx
-- spec/dummy/solr/data/test/index/_tw.fnm
-- spec/dummy/solr/data/test/index/_tw.frq
-- spec/dummy/solr/data/test/index/_tw.nrm
-- spec/dummy/solr/data/test/index/_tw.prx
-- spec/dummy/solr/data/test/index/_tw.tii
-- spec/dummy/solr/data/test/index/_tw.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_16t
+- spec/dummy/solr/data/test/index/segments_36o
 - 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/dummy/tmp/cache/ACB/B20/manifestation_search_total
 - spec/factories/basket.rb
 - spec/factories/carrier_type.rb
 - spec/factories/content_type.rb
@@ -1599,37 +1575,12 @@ 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/_tu.fdt
-- spec/dummy/solr/data/test/index/_tu.fdx
-- spec/dummy/solr/data/test/index/_tu.fnm
-- spec/dummy/solr/data/test/index/_tu.frq
-- spec/dummy/solr/data/test/index/_tu.nrm
-- spec/dummy/solr/data/test/index/_tu.prx
-- spec/dummy/solr/data/test/index/_tu.tii
-- spec/dummy/solr/data/test/index/_tu.tis
-- spec/dummy/solr/data/test/index/_tv.fdt
-- spec/dummy/solr/data/test/index/_tv.fdx
-- spec/dummy/solr/data/test/index/_tv.fnm
-- spec/dummy/solr/data/test/index/_tv.frq
-- spec/dummy/solr/data/test/index/_tv.nrm
-- spec/dummy/solr/data/test/index/_tv.prx
-- spec/dummy/solr/data/test/index/_tv.tii
-- spec/dummy/solr/data/test/index/_tv.tis
-- spec/dummy/solr/data/test/index/_tw.fdt
-- spec/dummy/solr/data/test/index/_tw.fdx
-- spec/dummy/solr/data/test/index/_tw.fnm
-- spec/dummy/solr/data/test/index/_tw.frq
-- spec/dummy/solr/data/test/index/_tw.nrm
-- spec/dummy/solr/data/test/index/_tw.prx
-- spec/dummy/solr/data/test/index/_tw.tii
-- spec/dummy/solr/data/test/index/_tw.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_16t
+- spec/dummy/solr/data/test/index/segments_36o
 - 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/dummy/tmp/cache/ACB/B20/manifestation_search_total
 - spec/factories/basket.rb
 - spec/factories/carrier_type.rb
 - spec/factories/content_type.rb

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

@@ -1,7 +0,0 @@
-����+idtype
-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reservable_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/_tu.nrm

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

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

@@ -1,7 +0,0 @@
-����+idtype
-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reservable_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/_tv.nrm

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

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

@@ -1,8 +0,0 @@
-����3idtype
-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reservable_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/_tw.nrm

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

data/spec/dummy/tmp/cache/ACB/B20/manifestation_search_total

@@ -1,2 +0,0 @@
-o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1362472376.395749:@value"
-i