enju_biblio 0.1.0.pre42 → 0.1.0.pre43

data/spec/controllers/owns_controller_spec.rb

@@ -184,7 +184,7 @@ describe OwnsController do
           assigns(:own).should be_valid
         end
 
-        it "redirects to the created patron" do
+        it "redirects to the created agent" do
           post :create, :own => @attrs
           response.should redirect_to(assigns(:own))
         end
@@ -212,7 +212,7 @@ describe OwnsController do
           assigns(:own).should be_valid
         end
 
-        it "redirects to the created patron" do
+        it "redirects to the created agent" do
           post :create, :own => @attrs
           response.should redirect_to(assigns(:own))
         end

data/spec/controllers/resource_import_files_controller_spec.rb

@@ -128,7 +128,7 @@ describe ResourceImportFilesController do
         sign_in @user
       end
 
-      it "should create patron_import_file" do
+      it "should create agent_import_file" do
         post :create, :resource_import_file => {:resource_import => fixture_file_upload("/../../examples/resource_import_file_sample1.tsv", 'text/csv') }
         assigns(:resource_import_file).should be_valid
         assigns(:resource_import_file).user.username.should eq @user.username

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

@@ -1,226 +1,9 @@
 # Methods added to this helper will be available to all templates in the application.
 module ApplicationHelper
-  include PictureFilesHelper if defined?(EnjuLibrary)
-  include EnjuManifestationViewer::ManifestationViewerHelper if defined?(EnjuManifestationViewer)
-
-  def form_icon(carrier_type)
-    case carrier_type.name
-    when 'print'
-      image_tag('icons/book.png', :size => '16x16', :alt => carrier_type.display_name.localize)
-    when 'CD'
-      image_tag('icons/cd.png', :size => '16x16', :alt => carrier_type.display_name.localize)
-    when 'DVD'
-      image_tag('icons/dvd.png', :size => '16x16', :alt => carrier_type.display_name.localize)
-    when 'file'
-      image_tag('icons/monitor.png', :size => '16x16', :alt => carrier_type.display_name.localize)
-    else
-      image_tag('icons/help.png', :size => '16x16', :alt => t('page.unknown'))
-    end
-  rescue NoMethodError
-    image_tag('icons/help.png', :size => '16x16', :alt => t('page.unknown'))
-  end
-
-  def content_type_icon(content_type)
-    case content_type.name
-    when 'text'
-      image_tag('icons/page_white_text.png', :size => '16x16', :alt => content_type.display_name.localize)
-    when 'picture'
-      image_tag('icons/picture.png', :size => '16x16', :alt => content_type.display_name.localize)
-    when 'sound'
-      image_tag('icons/sound.png', :size => '16x16', :alt => content_type.display_name.localize)
-    when 'video'
-      image_tag('icons/film.png', :size => '16x16', :alt => content_type.display_name.localize)
-    else
-      image_tag('icons/help.png', :size => '16x16', :alt => t('page.unknown'))
-    end
-  rescue NoMethodError
-    image_tag('icons/help.png', :size => '16x16', :alt => t('page.unknown'))
-  end
-
-  def patron_type_icon(patron_type)
-    case patron_type
-    when 'Person'
-      image_tag('icons/user.png', :size => '16x16', :alt => 'Person')
-    when 'CorporateBody'
-      image_tag('icons/group.png', :size => '16x16', :alt => 'CorporateBody')
-    else
-      image_tag('icons/help.png', :size => '16x16', :alt => t('page.unknown'))
-    end
-  end
-
-  def link_to_tag(tag)
-    link_to tag, manifestations_path(:tag => tag.name)
-  end
-
-  def render_tag_cloud(tags, options = {})
-    return nil if tags.nil?
-    # TODO: add options to specify different limits and sorts
-    #tags = Tag.all(:limit => 100, :order => 'taggings_count DESC').sort_by(&:name)
-
-    # TODO: add option to specify which classes you want and overide this if you want?
-    classes = %w(popular v-popular vv-popular vvv-popular vvvv-popular)
-
-    max, min = 0, 0
-    tags.each do |tag|
-      #if options[:max] or options[:min]
-      #  max = options[:max].to_i
-      #  min = options[:min].to_i
-      #end
-      max = tag.taggings.size if tag.taggings.size > max
-      min = tag.taggings.size if tag.taggings.size < min
-    end
-    divisor = ((max - min).div(classes.size)) + 1
-
-    content_tag :div, :class => "hTagcloud" do
-      content_tag :ul, :class => "popularity" do
-        tags.each do |tag|
-          content_tag :li do
-            link_to(tag.name, manifestations_path(:tag => tag.name), :class => classes[(tag.taggings.size - min).div(divisor)])
-          end
-        end
-      end
-    end
-  end
-
-  def patrons_list(patrons = [], options = {})
-    return nil if patrons.blank?
-    patrons_list = []
-    if options[:nolink]
-      patrons_list = patrons.map{|patron| patron.full_name}
-    else
-      patrons_list = patrons.map{|patron| link_to(patron.full_name, patron, options)}
-    end
-    patrons_list.join(" ").html_safe
-  end
-
-  def book_jacket(manifestation)
-    if manifestation.picture_files.exists?
-      link = ''
-      manifestation.picture_files.each_with_index do |picture_file, i|
-        if i == 0
-          link += link_to(show_image(picture_file, :size => :thumb), picture_file_path(picture_file, :format => :download), :rel => "manifestation_#{manifestation.id}")
-        else
-          link += content_tag :span, :style => "display: none" do
-            link_to(show_image(picture_file, :size => :thumb), picture_file_path(picture_file, :format => :download), :rel => "manifestation_#{manifestation.id}")
-          end
-        end
-      end
-      return link.html_safe
-    else
-      link = book_jacket_tag(manifestation)
-      unless link
-        link = screenshot_tag(manifestation)
-      end
-    end
-
-    unless link
-      link = link_to image_tag('unknown_resource.png', :width => '100', :height => '100', :alt => '*', :itemprop => 'image'), manifestation
-    end
-    link
-  end
-
-  def database_adapter
-    case ActiveRecord::Base.configurations["#{Rails.env}"]['adapter']
-    when 'postgresql'
-      link_to 'PostgreSQL', 'http://www.postgresql.org/'
-    when 'jdbcpostgresql'
-      link_to 'PostgreSQL', 'http://www.postgresql.org/'
-    when 'mysql'
-      link_to 'MySQL', 'http://www.mysql.org/'
-    when 'jdbcmysql'
-      link_to 'MySQL', 'http://www.mysql.org/'
-    when 'sqlite3'
-      link_to 'SQLite', 'http://www.sqlite.org/'
-    when 'jdbcsqlite3'
-      link_to 'SQLite', 'http://www.sqlite.org/'
-    end
-  end
-
-  def title_action_name
-    case controller.action_name
-    when 'index'
-      t('title.index')
-    when 'show'
-      t('title.show')
-    when 'new'
-      t('title.new')
-    when 'edit'
-      t('title.edit')
-    end
-  end
-
-  def link_to_wikipedia(string)
-    link_to "Wikipedia", "http://#{I18n.locale}.wikipedia.org/wiki/#{URI.escape(string)}"
-  end
-
-  def locale_display_name(locale)
-    Language.where(:iso_639_1 => locale).first.display_name
-  end
-
-  def locale_native_name(locale)
-    Language.where(:iso_639_1 => locale).first.native_name
-  end
-
-  def move_position(object)
-    render :partial => 'page/position', :locals => {:object => object}
-  end
-
-  def localized_state(state)
-    case state
-    when 'pending'
-      t('state.pending')
-    when 'canceled'
-      t('state.canceled')
-    when 'started'
-      t('state.started')
-    when 'failed'
-      t('state.failed')
-    when 'completed'
-      t('state.completed')
-    else
-      state
-    end
-  end
-
-  def localized_boolean(bool)
-    case bool.to_s
-    when nil
-    when "true"
-      t('page.boolean.true')
-    when "false"
-      t('page.boolean.false')
-    end
-  end
-
-  def current_user_role_name
-    current_user.try(:role).try(:name) || 'Guest'
-  end
-
-  def title(controller_name)
-    string = ''
-    unless ['page', 'routing_error', 'my_accounts'].include?(controller_name)
-      string << t("activerecord.models.#{controller_name.singularize}") + ' - '
-    end
-    if controller_name == 'routing_error'
-      string << t("page.routing_error") + ' - '
-    end
-    string << LibraryGroup.system_name + ' - Next-L Enju Leaf'
-    string.html_safe
-  end
-
-  def back_to_index(options = {})
-    if options == nil
-      options = {}
-    else
-      options.reject!{|key, value| value.blank?}
-      options.delete(:page) if options[:page].to_i == 1
-    end
-    unless controller_name == 'test'
-      link_to t('page.listing', :model => t("activerecord.models.#{controller_name.singularize}")), url_for(params.merge(:controller => controller_name, :action => :index, :id => nil, :only_path => true).merge(options))
-    end
-  end
-
-  def set_focus_on_search_form
-    javascript_tag("$('#search_form').focus()") if @query.blank?
+  include EnjuLeaf::EnjuLeafHelper
+  include EnjuBiblio::BiblioHelper if defined?(EnjuBiblio)
+  if defined?(EnjuManifestationViewer)
+    include EnjuManifestationViewer::BookJacketHelper
+    include EnjuManifestationViewer::ManifestationViewerHelper
   end
 end

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

@@ -31,10 +31,10 @@
           ManifestationRelationship,
           ManifestationRelationshipType,
           Own,
-          Patron,
-          PatronImportFile,
-          PatronRelationship,
-          PatronRelationshipType,
+          Agent,
+          AgentImportFile,
+          AgentRelationship,
+          AgentRelationshipType,
           PictureFile,
           Produce,
           ProduceType,
@@ -52,7 +52,7 @@
           Language,
           License,
           MediumOfPerformance,
-          PatronType,
+          AgentType,
           RequestStatusType,
           RequestType
         ] if LibraryGroup.site_config.network_access_allowed?(ip_address)
@@ -67,8 +67,8 @@
           Language,
           License,
           MediumOfPerformance,
-          PatronImportResult,
-          PatronType,
+          AgentImportResult,
+          AgentType,
           RequestStatusType,
           RequestType,
           ResourceImportResult
@@ -80,12 +80,12 @@
         can [:destroy, :delete], Manifestation do |manifestation|
           manifestation.items.empty? and !manifestation.series_master?
         end
-        can [:index, :create], Patron
-        can :show, Patron do |patron|
-          patron.required_role_id <= 3
+        can [:index, :create], Agent
+        can :show, Agent do |agent|
+          agent.required_role_id <= 3
         end
-        can [:update, :destroy, :delete], Patron do |patron|
-          !patron.user.try(:has_role?, 'Librarian') and patron.required_role_id <= 3
+        can [:update, :destroy, :delete], Agent do |agent|
+          !agent.user.try(:has_role?, 'Librarian') and agent.required_role_id <= 3
         end
         can :manage, [
           Create,
@@ -95,8 +95,8 @@
           ImportRequest,
           ManifestationRelationship,
           Own,
-          PatronImportFile,
-          PatronRelationship,
+          AgentImportFile,
+          AgentRelationship,
           PictureFile,
           Produce,
           Realize,
@@ -114,9 +114,9 @@
           Language,
           License,
           ManifestationRelationshipType,
-          PatronImportResult,
-          PatronRelationshipType,
-          PatronType,
+          AgentImportResult,
+          AgentRelationshipType,
+          AgentType,
           RequestStatusType,
           RequestType,
           ResourceImportResult,
@@ -131,15 +131,15 @@
         can [:show, :edit], Manifestation do |manifestation|
           manifestation.required_role_id <= 2
         end
-        can :index, Patron
-        can :update, Patron do |patron|
-          patron.user == user
+        can :index, Agent
+        can :update, Agent do |agent|
+          agent.user == user
         end
-        can :show, Patron do |patron|
-          #if patron.user == user
+        can :show, Agent do |agent|
+          #if agent.user == user
           #  true
-          #elsif patron.user != user
-            true if patron.required_role_id <= 2 #name == 'Administrator'
+          #elsif agent.user != user
+            true if agent.required_role_id <= 2 #name == 'Administrator'
           #end
         end
         can :index, PictureFile
@@ -167,8 +167,8 @@
           ManifestationRelationshipType,
           MediumOfPerformance,
           Own,
-          PatronRelationship,
-          PatronRelationshipType,
+          AgentRelationship,
+          AgentRelationshipType,
           Produce,
           Realize,
           SeriesStatement
@@ -178,9 +178,9 @@
         can :show, Manifestation do |manifestation|
           manifestation.required_role_id == 1
         end
-        can :index, Patron
-        can :show, Patron do |patron|
-          patron.required_role_id == 1 #name == 'Guest'
+        can :index, Agent
+        can :show, Agent do |agent|
+          agent.required_role_id == 1 #name == 'Guest'
         end
         can :read, [
           CarrierType,
@@ -200,8 +200,8 @@
           ManifestationRelationshipType,
           MediumOfPerformance,
           Own,
-          PatronRelationship,
-          PatronRelationshipType,
+          AgentRelationship,
+          AgentRelationshipType,
           PictureFile,
           Produce,
           Realize,

data/spec/dummy/app/models/{local_patron.rb → local_agent.rb}

@@ -1,4 +1,4 @@
-class LocalPatron
+class LocalAgent
   include ActiveModel::Validations
   include ActiveModel::Conversion
   extend ActiveModel::Naming

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

@@ -7,7 +7,7 @@ class User < ActiveRecord::Base
   # Setup accessible (or protected) attributes for your model
   attr_accessible :email, :password, :password_confirmation, :remember_me
 
-  has_one :patron
+  #has_one :agent
   has_one :user_has_role
   has_one :role, :through => :user_has_role
   belongs_to :user_group
@@ -79,8 +79,8 @@ class User < ActiveRecord::Base
   enju_bookmark_user_model if defined?(EnjuBookmark)
   enju_message_user_model if defined?(EnjuBookmark)
 
-  def patron
-    LocalPatron.new(self)
+  def agent
+    LocalAgent.new(self)
   end
 
   def full_name

data/spec/dummy/config/application.rb

@@ -64,4 +64,3 @@ require 'enju_export'
 require 'enju_ndl'
 require 'enju_subject'
 require 'mobylette'
-require 'plugins'

data/spec/dummy/config/environments/test.rb

@@ -1,4 +1,5 @@
 Dummy::Application.configure do
+  config.action_mailer.default_url_options = {:host => 'localhost:3000'}
   # Settings specified here will take precedence over those in config/application.rb
 
   # The test environment is used exclusively to run your application's

data/spec/dummy/db/migrate/035_create_reserves.rb

@@ -11,7 +11,7 @@ class CreateReserves < ActiveRecord::Migration
       t.datetime :expired_at
       t.datetime :deleted_at
       t.string :state
-      t.boolean :expiration_notice_to_patron, :default => false
+      t.boolean :expiration_notice_to_agent, :default => false
       t.boolean :expiration_notice_to_library, :default => false
     end
 

data/spec/dummy/db/migrate/20090519203307_create_participates.rb

@@ -1,14 +1,14 @@
 class CreateParticipates < ActiveRecord::Migration
   def self.up
     create_table :participates do |t|
-      t.integer :patron_id, :null => false
+      t.integer :agent_id, :null => false
       t.integer :event_id, :null => false
       t.integer :position
 
       t.timestamps
     end
     add_index :participates, :event_id
-    add_index :participates, :patron_id
+    add_index :participates, :agent_id
   end
 
   def self.down