enju_bookmark 0.1.2.pre11 → 0.1.2.pre12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c87c97c601bf0b9341820526c8b8bca43b11f05
-  data.tar.gz: ed5364b6ddf7e28c4bdda114da2ba46065cd6c18
+  metadata.gz: 90a1ecab7210db7ceb1ca8ba67c783244357025f
+  data.tar.gz: 6be75d37d73cbaf18ce9426b18f8617b06f567f2
 SHA512:
-  metadata.gz: b99d046233064b3f1a3dd084e93e34c2486e3726290fdc708157d021c75ed9629cd10376dbd5da5618d6fb60e3df7e2f91792c491c7d16f693cfd6817c2e2469
-  data.tar.gz: 97823e8c1b906964532f8795ce1582fa281e131d5f0721bfdd184ad008952bf51f68357949f9eb19036843793de884f1d91908af3d0b87b3ee78dcae2960d95b
+  metadata.gz: 377990ec2269ea54410af6721b8c3d848043a6358f7572f38b26a65193d3b3dc9fa160987ebd86696ad0e70fc6fe1db3621535703952a1ddf184f1f3c7537eef
+  data.tar.gz: 12d0128635a587316a0087a3f8f7c6aec7394bca3779b47c93e1a070e32aa3d97001699f515ddbcd7c467f17a9d145ccb722b2899485d2d0fd16958c50504bb1

data/app/views/bookmark_stats/show.csv.erb

@@ -1,4 +1,4 @@
 <%=h @bookmark_stat.start_date -%>,<%=h @bookmark_stat.end_date -%><%= "\n" -%>
 <%- @stats.each do |stat| -%>
-"<%=h stat.manifestation.original_title -%>","<%= manifestation_url(stat.manifestation) -%>","<%=h stat.bookmarks_count -%>"<%= "\n" -%>
+"<%=h stat.manifestation.original_title if stat.manifestation -%>","<%= manifestation_url(stat.manifestation) -%>","<%=h stat.bookmarks_count -%>"<%= "\n" -%>
 <%- end -%>

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

@@ -31,7 +31,7 @@
   <%- @stats.each do |stat| -%>
     <tr class="line<%= cycle("0", "1") -%>">
       <td>
-        <%= render 'manifestations/show_index', :manifestation => stat.manifestation -%>
+        <%= render 'manifestations/show_index', :manifestation => stat.manifestation if stat.manifestation -%>
       </td>
       <td><%= stat.bookmarks_count -%></td>
     </tr>

data/lib/enju_bookmark/version.rb

@@ -1,3 +1,3 @@
 module EnjuBookmark
-  VERSION = "0.1.2.pre11"
+  VERSION = "0.1.2.pre12"
 end

data/spec/controllers/bookmarks_controller_spec.rb

@@ -423,8 +423,10 @@ describe BookmarksController do
       end
 
       it "should not update missing bookmark" do
-        put :update, :id => 'missing', :bookmark => { }
-        response.should be_missing
+        lambda{
+          put :update, :id => 'missing', :bookmark => { }
+        }.should raise_error(ActiveRecord::RecordNotFound)
+        #response.should be_missing
       end
 
       it "should update bookmark without manifestation_id" do

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

@@ -1,76 +1,6 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
 
-  rescue_from CanCan::AccessDenied, :with => :render_403
-  rescue_from ActiveRecord::RecordNotFound, :with => :render_404
-
-  private
-  def render_403
-    return if performed?
-    if user_signed_in?
-      respond_to do |format|
-        format.html {render :template => 'page/403', :status => 403}
-        format.mobile {render :template => 'page/403', :status => 403}
-        format.xml {render :template => 'page/403', :status => 403}
-        format.json
-      end
-    else
-      respond_to do |format|
-        format.html {redirect_to new_user_session_url}
-        format.mobile {redirect_to new_user_session_url}
-        format.xml {render :template => 'page/403', :status => 403}
-        format.json
-      end
-    end
-  end
-
-  def render_404
-    return if performed?
-    respond_to do |format|
-      format.html {render :template => 'page/404', :status => 404}
-      format.mobile {render :template => 'page/404', :status => 404}
-      format.xml {render :template => 'page/404', :status => 404}
-      format.json
-    end
-  end
-
-  def not_found
-    raise ActiveRecord::RecordNotFound
-  end
-
-  def access_denied
-    raise CanCan::AccessDenied
-  end
-
-  def store_location
-    if request.get? and request.format.try(:html?) and !request.xhr?
-      session[:user_return_to] = request.fullpath
-    end
-  end
-
-  def get_user
-    @user = User.where(:username => params[:user_id]).first if params[:user_id]
-    #authorize! :show, @user if @user
-  end
-
-  def solr_commit
-    Sunspot.commit
-  end
-
-  def convert_charset
-    case params[:format]
-    when 'csv'
-      return unless Setting.csv_charset_conversion
-      # TODO: 他の言語
-      if @locale.to_sym == :ja
-        headers["Content-Type"] = "text/csv; charset=Shift_JIS"
-        response.body = NKF::nkf('-Ws', response.body)
-      end
-    when 'xml'
-      if @locale.to_sym == :ja
-        headers["Content-Type"] = "application/xml; charset=Shift_JIS"
-        response.body = NKF::nkf('-Ws', response.body)
-      end
-    end
-  end
+  enju_leaf
+  enju_library
 end

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

@@ -1,28 +1,9 @@
+# -*- 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
-
-  # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation, :remember_me
-
-  has_one :user_has_role
-  has_one :role, :through => :user_has_role
-  belongs_to :required_role, :class_name => 'Role', :foreign_key => 'required_role_id'
+  devise :database_authenticatable, #:registerable,
+    :recoverable, :rememberable, :trackable, #, :validatable
+    :lockable, :lock_strategy => :none, :unlock_strategy => :none
 
+  enju_leaf_user_model
   enju_bookmark_user_model
-
-  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
 end

data/spec/dummy/config/application.rb

@@ -43,6 +43,5 @@ module Dummy
   end
 end
 
-require 'enju_biblio'
-require 'enju_library'
-require 'mobylette'
+require 'enju_leaf'
+require 'enju_bookmark'

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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

data/spec/dummy/db/migrate/20080830154109_create_realizes.rb

@@ -1,13 +1,13 @@
 class CreateRealizes < ActiveRecord::Migration
   def change
     create_table :realizes do |t|
-      t.references :patron, :null => false
+      t.references :agent, :null => false
       t.references :expression, :null => false
       t.integer :position
 
       t.timestamps
     end
-    add_index :realizes, :patron_id
+    add_index :realizes, :agent_id
     add_index :realizes, :expression_id
   end
 end

data/spec/dummy/db/migrate/{20080905191442_create_patron_types.rb → 20080905191442_create_agent_types.rb}

@@ -1,6 +1,6 @@
-class CreatePatronTypes < ActiveRecord::Migration
+class CreateAgentTypes < ActiveRecord::Migration
   def change
-    create_table :patron_types do |t|
+    create_table :agent_types do |t|
       t.string :name, :null => false
       t.text :display_name
       t.text :note

data/spec/dummy/db/migrate/20081028083142_create_agent_import_files.rb

@@ -0,0 +1,22 @@
+class CreateAgentImportFiles < ActiveRecord::Migration
+  def change
+    create_table :agent_import_files do |t|
+      t.integer :parent_id
+      t.string :content_type
+      t.integer :size
+      t.integer :user_id
+      t.text :note
+      t.datetime :executed_at
+      t.string :state
+      t.string :agent_import_file_name
+      t.string :agent_import_content_type
+      t.integer :agent_import_file_size
+      t.datetime :agent_import_updated_at
+
+      t.timestamps
+    end
+    add_index :agent_import_files, :parent_id
+    add_index :agent_import_files, :user_id
+    add_index :agent_import_files, :state
+  end
+end

data/spec/dummy/db/migrate/{20090812151902_create_patron_relationship_types.rb → 20090812151902_create_agent_relationship_types.rb}

@@ -1,6 +1,6 @@
-class CreatePatronRelationshipTypes < ActiveRecord::Migration
+class CreateAgentRelationshipTypes < ActiveRecord::Migration
   def change
-    create_table :patron_relationship_types do |t|
+    create_table :agent_relationship_types do |t|
       t.string :name, :null => false
       t.text :display_name
       t.text :note

data/spec/dummy/db/migrate/20091012101112_add_dcndl_schema.rb

@@ -1,7 +1,7 @@
 class AddDcndlSchema < ActiveRecord::Migration
   def self.up
     add_column :manifestations, :title_alternative_transcription, :text
-    add_column :patrons, :full_name_alternative_transcription, :text
+    add_column :agents, :full_name_alternative_transcription, :text
     add_column :manifestations, :description, :text
     add_column :manifestations, :abstract, :text
     add_column :manifestations, :available_at, :timestamp
@@ -14,7 +14,7 @@ class AddDcndlSchema < ActiveRecord::Migration
 
   def self.down
     remove_column :manifestations, :title_alternative_transcription
-    remove_column :patrons, :full_name_alternative_transcription
+    remove_column :agents, :full_name_alternative_transcription
     remove_column :manifestations, :description
     remove_column :manifestations, :abstract
     remove_column :manifestations, :available_at

data/spec/dummy/db/migrate/20100606073747_create_agent_relationships.rb

@@ -0,0 +1,13 @@
+class CreateAgentRelationships < ActiveRecord::Migration
+  def change
+    create_table :agent_relationships do |t|
+      t.integer :parent_id
+      t.integer :child_id
+      t.integer :agent_relationship_type_id
+
+      t.timestamps
+    end
+    add_index :agent_relationships, :parent_id
+    add_index :agent_relationships, :child_id
+  end
+end

data/spec/dummy/db/migrate/20100814091104_add_position_to_agent_relationship.rb

@@ -0,0 +1,11 @@
+class AddPositionToAgentRelationship < ActiveRecord::Migration
+  def self.up
+    add_column :manifestation_relationships, :position, :integer
+    add_column :agent_relationships, :position, :integer
+  end
+
+  def self.down
+    remove_column :agent_relationships, :position
+    remove_column :manifestation_relationships, :position
+  end
+end

data/spec/dummy/db/migrate/20100925074559_create_agent_import_results.rb

@@ -0,0 +1,12 @@
+class CreateAgentImportResults < ActiveRecord::Migration
+  def change
+    create_table :agent_import_results do |t|
+      t.integer :agent_import_file_id
+      t.integer :agent_id
+      t.integer :user_id
+      t.text :body
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20110301121550_add_birth_date_and_death_date_to_agent.rb

@@ -0,0 +1,11 @@
+class AddBirthDateAndDeathDateToAgent < ActiveRecord::Migration
+  def self.up
+    add_column :agents, :birth_date, :string
+    add_column :agents, :death_date, :string
+  end
+
+  def self.down
+    remove_column :agents, :death_date
+    remove_column :agents, :birth_date
+  end
+end

data/spec/dummy/db/migrate/20111201155456_create_users.rb

@@ -1,11 +1,6 @@
 class CreateUsers < ActiveRecord::Migration
   def change
     create_table :users do |t|
-      t.integer :user_group_id
-      t.integer :required_role_id
-      t.string :username
-      t.text :note
-      t.string :locale
 
       t.timestamps
     end

data/spec/dummy/db/migrate/20111201155513_add_devise_to_users.rb

@@ -19,25 +19,20 @@ class AddDeviseToUsers < ActiveRecord::Migration
       t.string   :current_sign_in_ip
       t.string   :last_sign_in_ip
 
-      ## Encryptable
-      t.string :password_salt
-
       ## Confirmable
-      t.string   :confirmation_token
-      t.datetime :confirmed_at
+      # t.string   :confirmation_token
+      # t.datetime :confirmed_at
       t.datetime :confirmation_sent_at
       t.string   :unconfirmed_email # Only if using reconfirmable
 
       ## Lockable
-      t.integer  :failed_attempts, :default => 0 # Only if lock strategy is :failed_attempts
-      t.string   :unlock_token # Only if unlock strategy is :email or :both
-      t.datetime :locked_at
+      # t.integer  :failed_attempts, :default => 0 # Only if lock strategy is :failed_attempts
+      # t.string   :unlock_token # Only if unlock strategy is :email or :both
+      # t.datetime :locked_at
 
       # Token authenticatable
-      t.string :authentication_token
-
+      # t.string :authentication_token
 
-      t.datetime :deleted_at
     end
 
     add_index :users, :email #,                :unique => true

data/spec/dummy/db/migrate/20120413161403_add_fingerprint_to_agent_import_file.rb

@@ -0,0 +1,5 @@
+class AddFingerprintToAgentImportFile < ActiveRecord::Migration
+  def change
+    add_column :agent_import_files, :agent_import_fingerprint, :string
+  end
+end

data/spec/dummy/db/migrate/20120413170720_add_error_message_to_agent_import_file.rb

@@ -0,0 +1,5 @@
+class AddErrorMessageToAgentImportFile < ActiveRecord::Migration
+  def change
+    add_column :agent_import_files, :error_message, :text
+  end
+end

data/spec/dummy/db/migrate/20120511072422_add_agent_identifier_to_agent.rb

@@ -0,0 +1,6 @@
+class AddAgentIdentifierToAgent < ActiveRecord::Migration
+  def change
+    add_column :agents, :agent_identifier, :string
+    add_index :agents, :agent_identifier
+  end
+end

data/spec/dummy/db/migrate/20120602141129_add_edit_mode_to_agent_import_file.rb

@@ -0,0 +1,5 @@
+class AddEditModeToAgentImportFile < ActiveRecord::Migration
+  def change
+    add_column :agent_import_files, :edit_mode, :string
+  end
+end

data/spec/dummy/db/migrate/20130221154434_add_additional_attributes_to_user.rb

@@ -0,0 +1,26 @@
+class AddAdditionalAttributesToUser < ActiveRecord::Migration
+  def change
+    add_column :users, :username, :string
+    add_column :users, :user_number, :string
+    add_column :users, :state, :string
+    add_column :users, :locale, :string
+    add_column :users, :deleted_at, :datetime
+    add_column :users, :expired_at, :datetime
+    add_column :users, :library_id, :integer, :default => 1, :null => false
+    add_column :users, :required_role_id, :integer, :default => 1, :null => false
+    add_column :users, :user_group_id, :integer, :default => 1, :null => false
+    add_column :users, :note, :text
+    add_column :users, :keyword_list, :text
+
+    add_column :users, :failed_attempts, :integer
+    add_column :users, :unlock_token, :string
+    add_column :users, :locked_at, :datetime
+
+    add_column :users, :confirmed_at, :datetime
+
+    add_index :users, :username, :unique => true
+    add_index :users, :user_group_id
+    add_index :users, :user_number, :unique => true
+    add_index :users, :unlock_token,         :unique => true
+  end
+end