RubyGems - enju_flower - Versions diffs - 0.1.0.pre11 → 0.1.0.pre12 - Mend

enju_flower 0.1.0.pre11 → 0.1.0.pre12

Files changed (110) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4b52cdc8fca8a48663401321679b9dc056cb147
-  data.tar.gz: 6a6bee89d5232c1c30c54d7f7ec7ae6378c7d116
+  metadata.gz: 7f015a77e10d34c4504527bd9308a867f00b66b0
+  data.tar.gz: 0614fc761afb6b3b8451732664ca5772afb3e39b
 SHA512:
-  metadata.gz: 345cb18cc2600ddbb6948e30a7584e5cf88b8d3b56854b103e09c80da4546ebdf30e6cae6bbf449061410c016f8670ff9c9747dd669f1f584cb08de1fca093e1
-  data.tar.gz: 80154f6b4b70e6c1c08b9fabd019df3324c38b53f53a52eae12f7cacf9014490f26f3f71b1d5bcb14c2a9ba2b153b1fb4ec99438a78dfc71e5e7bcf0d2d84715
+  metadata.gz: 40eee03f3a20cf56eeb0deebbbde2720a459497d34bef2d0bf3bf6688bb0b3fa88bd0eadd3aaaa381f31a90d2b6637b173febed254f3eabc459c58445aeb6db1
+  data.tar.gz: ed3b4c55344614cea42755ebe3ddf52955d5c09294ab9502010470543d5af84990001b891333fd370013320409ab5b04541b91fa3731c89374dddcfdbb42c00d

data/app/views/layouts/patrons.html.erb CHANGED Viewed

@@ -5,8 +5,8 @@
   <title><%= title(controller.controller_name) %></title>
   <%= render 'page/include' %>
   <%- if controller.action_name == 'index' -%>
-    <%= auto_discovery_link_tag(:rss, url_for(params.merge(:format => 'rss', :page => nil, :commit => nil, :only_path => true)), :title => (t('patron.library_group_patron', :library_group_name => @library_group.display_name.localize) + " (RSS)")) %>
-    <%= auto_discovery_link_tag(:atom, url_for(params.merge(:format => 'atom', :page => nil, :commit => nil, :only_path => true)), :title => (t('patron.library_group_patron', :library_group_name => @library_group.display_name.localize) + " (Atom)")) %>
+    <%= auto_discovery_link_tag(:rss, url_for(params.merge(:format => 'rss', :page => nil, :commit => nil, :only_path => true)), :title => (t('agent.library_group_agent', :library_group_name => @library_group.display_name.localize) + " (RSS)")) %>
+    <%= auto_discovery_link_tag(:atom, url_for(params.merge(:format => 'atom', :page => nil, :commit => nil, :only_path => true)), :title => (t('agent.library_group_agent', :library_group_name => @library_group.display_name.localize) + " (Atom)")) %>
   <%- end -%>
 </head>
 <body>

data/app/views/manifestations/_index_form_contributor.html.erb CHANGED Viewed

@@ -1,5 +1,5 @@
 <div class="search_form">
-<%= form_for :manifestations, :url => contributor_manifestations_path(@index_patron[:contributor]), :html => {:method => 'get'} do -%>
+<%= form_for :manifestations, :url => contributor_manifestations_path(@index_agent[:contributor]), :html => {:method => 'get'} do -%>
   <p>
     <%= label_tag :search_form_top, t('page.search_term') -%>:
     <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>

data/app/views/manifestations/_index_form_creator.html.erb CHANGED Viewed

@@ -1,5 +1,5 @@
 <div class="search_form">
-<%= form_for :manifestations, :url => creator_manifestations_path(@index_patron[:creator]), :html => {:method => 'get'} do -%>
+<%= form_for :manifestations, :url => creator_manifestations_path(@index_agent[:creator]), :html => {:method => 'get'} do -%>
   <p>
     <%= label_tag :search_form_top, t('page.search_term') -%>:
     <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>

data/app/views/manifestations/_index_form_publisher.html.erb CHANGED Viewed

@@ -1,5 +1,5 @@
 <div class="search_form">
-<%= form_for :manifestations, :url => publisher_manifestations_path(@index_patron[:publisher]), :html => {:method => 'get'} do -%>
+<%= form_for :manifestations, :url => publisher_manifestations_path(@index_agent[:publisher]), :html => {:method => 'get'} do -%>
   <p>
     <%= label_tag :search_form_top, t('page.search_term') -%>:
     <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>

data/app/views/manifestations/_manifestation_list.html.erb CHANGED Viewed

@@ -6,9 +6,9 @@
           <%= link_to manifestation.original_title, manifestation -%>
           <%= form_icon(manifestation.carrier_type) -%>
           <%= link_to image_tag('icons/world_go.png', :size => '16x16', :alt => ('Web')), manifestation.access_address if manifestation.access_address? -%>
-          <%= patrons_list(manifestation.creators.readable_by(current_user)) -%>
-          <%= patrons_list(manifestation.contributors.readable_by(current_user)) -%>
-          <%= patrons_list(manifestation.publishers.readable_by(current_user)) -%>
+          <%= agents_list(manifestation.creators.readable_by(current_user)) -%>
+          <%= agents_list(manifestation.contributors.readable_by(current_user)) -%>
+          <%= agents_list(manifestation.publishers.readable_by(current_user)) -%>
           <%- if manifestation.pub_date? -%>
             (<%= manifestation.pub_date -%>)
           <%- end -%>
@@ -20,9 +20,9 @@
           <%= link_to manifestation.original_title, manifestation -%>
           <%= form_icon(manifestation.carrier_type) -%>
           <%= link_to image_tag('icons/world_go.png', :size => '16x16', :alt => ('Web')), manifestation.access_address if manifestation.access_address? -%>
-          <%= patrons_list(manifestation.creators.readable_by(current_user)) -%>
-          <%= patrons_list(manifestation.contributors.readable_by(current_user)) -%>
-          <%= patrons_list(manifestation.publishers.readable_by(current_user)) -%>
+          <%= agents_list(manifestation.creators.readable_by(current_user)) -%>
+          <%= agents_list(manifestation.contributors.readable_by(current_user)) -%>
+          <%= agents_list(manifestation.publishers.readable_by(current_user)) -%>
           <%- if manifestation.pub_date? -%>
             (<%= manifestation.pub_date -%>)
           <%- end -%>

data/app/views/manifestations/_show_creators.html.erb CHANGED Viewed

@@ -1,17 +1,17 @@
   <%- if params[:mode] == 'show_all_creators' -%>
-    <%= patrons_list(manifestation.creators.readable_by(current_user)) %>
+    <%= agents_list(manifestation.creators.readable_by(current_user)) %>
     <%- if manifestation.creators.readable_by(current_user).size > 5 -%>
       (<a href="#" onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#creator_list_<%= manifestation.id %>').html(request);}, type:'get', url:'<%= manifestation_path(manifestation, :index_num => manifestation.id, :mode => 'show_creators') %>'}); return false;"><%= t('page.hide') %></a>)
     <%- end -%>
   <%- else -%>
-    <%= patrons_list(manifestation.creators.readable_by(current_user)[0..2]) %>
+    <%= agents_list(manifestation.creators.readable_by(current_user)[0..2]) %>
     <%- if manifestation.creators.readable_by(current_user).size > 5 -%>
       (<a href="#" onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#creator_list_<%= manifestation.id %>').html(request);}, type:'get', url:'<%= manifestation_path(manifestation, :index_num => manifestation.id, :mode => 'show_all_creators') %>'}); return false;"><%= t('page.show_all') %></a>)
     <%- end -%>
   <%- end -%>
-  <%= patrons_list(manifestation.contributors.readable_by(current_user)) %>
-  <%= patrons_list(manifestation.publishers.readable_by(current_user)) %>
+  <%= agents_list(manifestation.contributors.readable_by(current_user)) %>
+  <%= agents_list(manifestation.publishers.readable_by(current_user)) %>
   <%- if manifestation.pub_date.present? -%>
     (<%= manifestation.pub_date -%>)
   <%- end -%>

data/app/views/manifestations/_show_creators.mobile.erb CHANGED Viewed

@@ -1,17 +1,17 @@
   <%- if params[:mode] == 'show_all_creators' -%>
-    <%= patrons_list(manifestation.creators.readable_by(current_user)) %>
+    <%= agents_list(manifestation.creators.readable_by(current_user)) %>
     <%- if manifestation.creators.readable_by(current_user).size > 5 -%>
       (<a href="#" onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#creator_list_<%= manifestation.id %>').html(request);}, type:'get', url:'<%= manifestation_path(manifestation, :index_num => manifestation.id, :mode => 'show_creators') %>'}); return false;"><%= t('page.hide') %></a>)
     <%- end -%>
   <%- else -%>
-    <%= patrons_list(manifestation.creators.readable_by(current_user)[0..2]) %>
+    <%= agents_list(manifestation.creators.readable_by(current_user)[0..2]) %>
     <%- if manifestation.creators.readable_by(current_user).size > 5 -%>
       (<a href="#" onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#creator_list_<%= manifestation.id %>').html(request);}, type:'get', url:'<%= manifestation_path(manifestation, :index_num => manifestation.id, :mode => 'show_all_creators') %>'}); return false;"><%= t('page.show_all') %></a>)
     <%- end -%>
   <%- end -%>
-  <%= patrons_list(manifestation.contributors.readable_by(current_user)) %>
-  <%= patrons_list(manifestation.publishers.readable_by(current_user)) %>
+  <%= agents_list(manifestation.contributors.readable_by(current_user)) %>
+  <%= agents_list(manifestation.publishers.readable_by(current_user)) %>
   <%- if manifestation.pub_date.present? -%>
     (<%= manifestation.pub_date -%>)
   <%- end -%>

data/app/views/manifestations/_title.html.erb CHANGED Viewed

@@ -7,13 +7,13 @@
   <p>
     <%= manifestation.statement_of_responsibility %><br />
     <%- unless manifestation.creators.readable_by(current_user).empty? -%>
-      <%= t('patron.creator') -%>: <%= patrons_list(manifestation.creators.readable_by(current_user), :itemprop => 'author') -%>
+      <%= t('agent.creator') -%>: <%= agents_list(manifestation.creators.readable_by(current_user), :itemprop => 'author') -%>
     <%- end -%>
     <%- unless manifestation.contributors.readable_by(current_user).empty? -%>
-      <%= t('patron.contributor') -%>: <%= patrons_list(manifestation.contributors.readable_by(current_user), :itemprop => 'editor') -%>
+      <%= t('agent.contributor') -%>: <%= agents_list(manifestation.contributors.readable_by(current_user), :itemprop => 'editor') -%>
     <%- end -%>
     <%- unless manifestation.publishers.readable_by(current_user).empty? -%>
-      <%= t('patron.publisher') -%>: <%= patrons_list(manifestation.publishers.readable_by(current_user), :itemprop => 'publisher') -%>
+      <%= t('agent.publisher') -%>: <%= agents_list(manifestation.publishers.readable_by(current_user), :itemprop => 'publisher') -%>
     <% end %>
     <%- if manifestation.date_of_publication? -%>
       <meta itemprop="publishDate" content="<%= manifestation.date_of_publication.iso8601 %>" />

data/app/views/manifestations/_title.mobile.erb CHANGED Viewed

@@ -7,13 +7,13 @@
   <p>
     <%= manifestation.statement_of_responsibility %><br />
     <%- unless manifestation.creators.readable_by(current_user).empty? -%>
-      <%= t('patron.creator') -%>: <%= patrons_list(manifestation.creators.readable_by(current_user), :itemprop => 'author') -%>
+      <%= t('agent.creator') -%>: <%= agents_list(manifestation.creators.readable_by(current_user), :itemprop => 'author') -%>
     <%- end -%>
     <%- unless manifestation.contributors.readable_by(current_user).empty? -%>
-      <%= t('patron.contributor') -%>: <%= patrons_list(manifestation.contributors.readable_by(current_user), :itemprop => 'editor') -%>
+      <%= t('agent.contributor') -%>: <%= agents_list(manifestation.contributors.readable_by(current_user), :itemprop => 'editor') -%>
     <%- end -%>
     <%- unless manifestation.publishers.readable_by(current_user).empty? -%>
-      <%= t('patron.publisher') -%>: <%= patrons_list(manifestation.publishers.readable_by(current_user), :itemprop => 'publisher') -%>
+      <%= t('agent.publisher') -%>: <%= agents_list(manifestation.publishers.readable_by(current_user), :itemprop => 'publisher') -%>
     <% end %>
     <%- if manifestation.date_of_publication? -%>
       <meta itemprop="publishDate" content="<%= manifestation.date_of_publication.iso8601 %>" />

data/app/views/manifestations/index.atom.builder CHANGED Viewed

@@ -9,9 +9,9 @@ atom_feed(:url => manifestations_url(:format => :atom)) do |feed|
         entry.content(manifestation.tags.join(' '), :type => 'html')
       end
-      manifestation.creators.readable_by(current_user).each do |patron|
+      manifestation.creators.readable_by(current_user).each do |agent|
         entry.author do |author|
-          author.name(patron.full_name)
+          author.name(agent.full_name)
         end
       end
     end

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

@@ -4,11 +4,11 @@
   <%= render 'manifestations/title', :manifestation => @manifestation if @manifestation -%>
   <% case %>
-  <% when @index_patron[:creator] %>
+  <% when @index_agent[:creator] %>
     <%= render 'index_form_creator' %>
-  <% when @index_patron[:contributor] %>
+  <% when @index_agent[:contributor] %>
     <%= render 'index_form_contributor' %>
-  <% when @index_patron[:publisher] %>
+  <% when @index_agent[:publisher] %>
     <%= render 'index_form_publisher' %>
   <% when @manifestation %>
     <%= render 'index_form_manifestation' %>

data/app/views/manifestations/index.opds.builder CHANGED Viewed

@@ -14,9 +14,9 @@ atom_feed(:url => manifestations_url(:format => :atom),
         entry.content(manifestation.tags.join(' '), :type => 'html')
       end
-      manifestation.creators.readable_by(current_user).each do |patron|
+      manifestation.creators.readable_by(current_user).each do |agent|
         entry.author do |author|
-          author.name(patron.full_name)
+          author.name(agent.full_name)
         end
       end
     end

data/app/views/manifestations/index.sru.builder CHANGED Viewed

@@ -71,14 +71,14 @@ def get_record(manifestation)
     'xsi:schemaLocation' => "info:srw/schema/1/dc-v1.1 http://www.loc.gov/standards/sru/dc-schema.xsd" do
     cache([:manifestation => manifestation.id, :fragment => 'index_sru', :role => current_user_role_name, :locale => @locale]) do
       xml.tag! 'dc:title', manifestation.original_title
-      manifestation.creators.readable_by(current_user).each do |patron|
-        xml.tag! 'dc:creator', patron.full_name
+      manifestation.creators.readable_by(current_user).each do |agent|
+        xml.tag! 'dc:creator', agent.full_name
       end
-      manifestation.contributors.each do |patron|
-        xml.tag! 'dc:contributor', patron.full_name
+      manifestation.contributors.each do |agent|
+        xml.tag! 'dc:contributor', agent.full_name
       end
-      manifestation.publishers.each do |patron|
-        xml.tag! 'dc:publisher', patron.full_name
+      manifestation.publishers.each do |agent|
+        xml.tag! 'dc:publisher', agent.full_name
       end
       if defined?(EnjuSubject)
         manifestation.subjects.each do |subject|

data/lib/enju_flower/version.rb CHANGED Viewed

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

data/spec/controllers/manifestations_controller_spec.rb CHANGED Viewed

@@ -121,7 +121,7 @@ describe ManifestationsController do
       it "should get index with publisher_id" do
         get :index, :publisher_id => 1
         response.should be_success
-        assigns(:manifestations).collect(&:id).should eq Patron.find(1).manifestations.order('created_at DESC').collect(&:id)
+        assigns(:manifestations).collect(&:id).should eq Agent.find(1).manifestations.order('created_at DESC').collect(&:id)
       end
       it "should get index with query" do
@@ -188,9 +188,9 @@ describe ManifestationsController do
         assigns(:manifestation).should eq(Manifestation.find(1))
       end
-      it "should show manifestation with patron who does not produce it" do
-        get :show, :id => 3, :patron_id => 3
-        assigns(:manifestation).should eq assigns(:patron).manifestations.find(3)
+      it "should show manifestation with agent who does not produce it" do
+        get :show, :id => 3, :agent_id => 3
+        assigns(:manifestation).should eq assigns(:agent).manifestations.find(3)
         response.should be_success
       end
     end
@@ -209,7 +209,7 @@ describe ManifestationsController do
       end
       #it "should show myself" do
-      #  get :show, :id => users(:user1).patron
+      #  get :show, :id => users(:user1).agent
       #  response.should be_success
       #end
     end

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

@@ -26,10 +26,10 @@
           ManifestationRelationship,
           ManifestationRelationshipType,
           Own,
-          Patron,
-          PatronImportFile,
-          PatronRelationship,
-          PatronRelationshipType,
+          Agent,
+          AgentImportFile,
+          AgentRelationship,
+          AgentRelationshipType,
           PictureFile,
           Produce,
           ProduceType,
@@ -47,7 +47,7 @@
           Language,
           License,
           MediumOfPerformance,
-          PatronType,
+          AgentType,
           RequestStatusType,
           RequestType
         ] if LibraryGroup.site_config.network_access_allowed?(ip_address)
@@ -61,8 +61,8 @@
           Language,
           License,
           MediumOfPerformance,
-          PatronImportResult,
-          PatronType,
+          AgentImportResult,
+          AgentType,
           RequestStatusType,
           RequestType,
           ResourceImportResult
@@ -74,12 +74,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,
@@ -88,8 +88,8 @@
           ImportRequest,
           ManifestationRelationship,
           Own,
-          PatronImportFile,
-          PatronRelationship,
+          AgentImportFile,
+          AgentRelationship,
           PictureFile,
           Produce,
           Realize,
@@ -106,9 +106,9 @@
           Language,
           License,
           ManifestationRelationshipType,
-          PatronImportResult,
-          PatronRelationshipType,
-          PatronType,
+          AgentImportResult,
+          AgentRelationshipType,
+          AgentType,
           RequestStatusType,
           RequestType,
           ResourceImportResult,
@@ -123,15 +123,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
@@ -157,8 +157,8 @@
           ManifestationRelationshipType,
           MediumOfPerformance,
           Own,
-          PatronRelationship,
-          PatronRelationshipType,
+          AgentRelationship,
+          AgentRelationshipType,
           Produce,
           Realize,
           SeriesStatement
@@ -168,9 +168,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,
@@ -188,8 +188,8 @@
           ManifestationRelationshipType,
           MediumOfPerformance,
           Own,
-          PatronRelationship,
-          PatronRelationshipType,
+          AgentRelationship,
+          AgentRelationshipType,
           PictureFile,
           Produce,
           Realize,

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

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

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

@@ -1,102 +1,8 @@
+# -*- encoding: utf-8 -*-
 class User < ActiveRecord::Base
-  # Include default devise modules. Others available are:
-  # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
-  devise :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :trackable, :validatable
+  devise :database_authenticatable, #:registerable,
+    :recoverable, :rememberable, :trackable, #, :validatable
+    :lockable, :lock_strategy => :none, :unlock_strategy => :none
-  # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation, :remember_me
-  has_one :patron
-  has_one :user_has_role
-  has_one :role, :through => :user_has_role
-  belongs_to :user_group
-  belongs_to :required_role, :class_name => 'Role', :foreign_key => 'required_role_id'
-  has_many :checkouts, :dependent => :nullify
-  has_many :reserves, :dependent => :destroy
-  has_many :reserved_manifestations, :through => :reserves, :source => :manifestation
-  has_many :checkout_stat_has_users
-  has_many :user_checkout_stats, :through => :checkout_stat_has_users
-  has_many :reserve_stat_has_users
-  has_many :user_reserve_stats, :through => :reserve_stat_has_users
-  has_many :baskets, :dependent => :destroy
-  belongs_to :library
-  before_destroy :check_item_before_destroy
-  extend FriendlyId
-  friendly_id :username
-  def check_item_before_destroy
-    # TODO: 貸出記録を残す場合
-    if checkouts.size > 0
-      raise 'This user has items still checked out.'
-    end
-  end
-  def reset_checkout_icalendar_token
-    self.checkout_icalendar_token = Devise.friendly_token
-  end
-  def delete_checkout_icalendar_token
-    self.checkout_icalendar_token = nil
-  end
-  def checked_item_count
-    checkout_count = {}
-    CheckoutType.all.each do |checkout_type|
-      # 資料種別ごとの貸出中の冊数を計算
-      checkout_count[:"#{checkout_type.name}"] = self.checkouts.count_by_sql(["
-        SELECT count(item_id) FROM checkouts
-          WHERE item_id IN (
-            SELECT id FROM items
-              WHERE checkout_type_id = ?
-          )
-          AND user_id = ? AND checkin_id IS NULL", checkout_type.id, self.id]
-      )
-    end
-    return checkout_count
-  end
-  def reached_reservation_limit?(manifestation)
-    return true if self.user_group.user_group_has_checkout_types.available_for_carrier_type(manifestation.carrier_type).where(:user_group_id => self.user_group.id).collect(&:reservation_limit).max.to_i <= self.reserves.waiting.size
-    false
-  end
-  def has_role?(role_in_question)
-    return false unless role
-    return true if role.name == role_in_question
-    case role.name
-    when 'Administrator'
-      return true
-    when 'Librarian'
-      return true if role_in_question == 'User'
-    else
-      false
-    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
-  def patron
-    LocalPatron.new(self)
-  end
-  def full_name
-    username
-  end
+  enju_leaf_user_model
 end

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

@@ -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/development.sqlite3 CHANGED Viewed

Binary file

data/spec/dummy/db/migrate/{001_create_patrons.rb → 001_create_agents.rb} RENAMED Viewed

@@ -1,6 +1,6 @@
-class CreatePatrons < ActiveRecord::Migration
+class CreateAgents < ActiveRecord::Migration
   def change
-    create_table :patrons do |t|
+    create_table :agents do |t|
       t.integer :user_id
       t.string :last_name
       t.string :middle_name
@@ -35,7 +35,7 @@ class CreatePatrons < ActiveRecord::Migration
       t.datetime :date_of_death
       t.integer :language_id, :default => 1, :null => false
       t.integer :country_id, :default => 1, :null => false
-      t.integer :patron_type_id, :default => 1, :null => false
+      t.integer :agent_type_id, :default => 1, :null => false
       t.integer :lock_version, :default => 0, :null => false
       t.text :note
       t.integer :required_role_id, :default => 1, :null => false
@@ -44,10 +44,10 @@ class CreatePatrons < ActiveRecord::Migration
       t.text :email
       t.text :url
     end
-    add_index :patrons, :user_id, :unique => true
-    add_index :patrons, :language_id
-    add_index :patrons, :country_id
-    add_index :patrons, :required_role_id
-    add_index :patrons, :full_name
+    add_index :agents, :user_id, :unique => true
+    add_index :agents, :language_id
+    add_index :agents, :country_id
+    add_index :agents, :required_role_id
+    add_index :agents, :full_name
   end
 end

data/spec/dummy/db/migrate/012_create_owns.rb CHANGED Viewed

@@ -1,12 +1,12 @@
 class CreateOwns < ActiveRecord::Migration
   def change
     create_table :owns do |t|
-      t.references :patron, :null => false
+      t.references :agent, :null => false
       t.references :item, :null => false
       t.integer :position
       t.timestamps
     end
-    add_index :owns, :patron_id
+    add_index :owns, :agent_id
     add_index :owns, :item_id
   end
 end

data/spec/dummy/db/migrate/015_create_creates.rb CHANGED Viewed

@@ -1,12 +1,12 @@
 class CreateCreates < ActiveRecord::Migration
   def change
     create_table :creates do |t|
-      t.references :patron, :null => false
+      t.references :agent, :null => false
       t.references :work, :null => false
       t.integer :position
       t.timestamps
     end
-    add_index :creates, :patron_id
+    add_index :creates, :agent_id
     add_index :creates, :work_id
   end
 end

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

@@ -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/047_create_produces.rb CHANGED Viewed

@@ -1,12 +1,12 @@
 class CreateProduces < ActiveRecord::Migration
   def change
     create_table :produces do |t|
-      t.references :patron, :null => false
+      t.references :agent, :null => false
       t.references :manifestation, :null => false
       t.integer :position
       t.timestamps
     end
-    add_index :produces, :patron_id
+    add_index :produces, :agent_id
     add_index :produces, :manifestation_id
   end
 end

data/spec/dummy/db/migrate/125_create_donates.rb CHANGED Viewed

@@ -1,12 +1,12 @@
 class CreateDonates < ActiveRecord::Migration
   def change
     create_table :donates do |t|
-      t.integer :patron_id, :null => false
+      t.integer :agent_id, :null => false
       t.integer :item_id, :null => false
       t.timestamps
     end
-    add_index :donates, :patron_id
+    add_index :donates, :agent_id
     add_index :donates, :item_id
   end
 end