enju_question 0.1.0.pre8 → 0.1.0.pre9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e31cbc7615c7bb16fb90d7e06eed38637e7f10e2
-  data.tar.gz: 5d29e0de7481c561eb70d1d42a0a1ab8c938915d
+  metadata.gz: b7187a0a2ebbef688248050d34bf2c1a832b1a50
+  data.tar.gz: 7aad139e0eaa05284c87a33ac0e1021812a79c84
 SHA512:
-  metadata.gz: 9239634823a3bfa25ccb7c5b655320028924e9de7f258d9116063e74984008881225b720e3560ba06751904fe7d63c64331916654d349ecc1b7ed4019486189b
-  data.tar.gz: 59ba4de2bb7e1f99443085cbe0d12e92d499cc11d21b634cf14d6771f84d3eece23cc5ac04bc71ba61a4996c0bc101b6e16581245b7fadb64b24bb7994c8784f
+  metadata.gz: 9249b4aeb8a1251633d8645655ef5c3a63f0b365421d97fe2fd9f93edf1fda84ffa64f7de7c23bd5a63bb1b3c37855293950342a659e160caecd07042e9054bd
+  data.tar.gz: f36cbb87970d4847309cd608cc76e7de868d02f00e0c919bb0359cab524bd8d0a952016d911eef14f53d336a932807d0e144c9645f09549ca3cbc1a41d180605

data/lib/enju_question/version.rb

@@ -1,3 +1,3 @@
 module EnjuQuestion
-  VERSION = "0.1.0.pre8"
+  VERSION = "0.1.0.pre9"
 end

data/spec/controllers/answers_controller_spec.rb

@@ -145,8 +145,10 @@ describe AnswersController do
       end
 
       it "should not show missing answer" do
-        get :show, :id => 'missing', :user_id => users(:user1).username, :question_id => 1
-        response.should be_missing
+        lambda{
+          get :show, :id => 'missing', :user_id => users(:user1).username, :question_id => 1
+        }.should raise_error(ActiveRecord::RecordNotFound)
+        #response.should be_missing
       end
 
       it "should not show answer with other user's user_id" do
@@ -270,8 +272,10 @@ describe AnswersController do
       end
   
       it "should not edit missing answer" do
-        get :edit, :id => 100, :user_id => users(:user1).username, :question_id => 1
-        response.should be_missing
+        lambda{
+          get :edit, :id => 100, :user_id => users(:user1).username, :question_id => 1
+        }.should raise_error(ActiveRecord::RecordNotFound)
+        #response.should be_missing
       end
 
       it "should edit my answer" do
@@ -431,8 +435,10 @@ describe AnswersController do
       end
 
       it "should not update missing answer" do
-        put :update, :id => 'missing', :answer => { }, :user_id => users(:user1).username
-        response.should be_missing
+        lambda{
+          put :update, :id => 'missing', :answer => { }, :user_id => users(:user1).username
+        }.should raise_error(ActiveRecord::RecordNotFound)
+        #response.should be_missing
       end
   
       it "should not update other user's answer" do

data/spec/controllers/questions_controller_spec.rb

@@ -122,8 +122,10 @@ describe QuestionsController do
       end
 
       it "should not show missing question" do
-        get :show, :id => 'missing'
-        response.should be_missing
+        lambda{
+          get :show, :id => 'missing'
+        }.should raise_error(ActiveRecord::RecordNotFound)
+        #response.should be_missing
       end
 
       it "should show my question" do
@@ -227,8 +229,10 @@ describe QuestionsController do
       end
 
       it "should not edit missing question" do
-        get :edit, :id => 'missing'
-        response.should be_missing
+        lambda{
+          get :edit, :id => 'missing'
+        }.should raise_error(ActiveRecord::RecordNotFound)
+        #response.should be_missing
       end
   
       it "should edit my question" do
@@ -401,8 +405,10 @@ describe QuestionsController do
       end
 
       it "should not update missing question" do
-        put :update, :id => 'missing', :question => { }
-        response.should be_missing
+        lambda{
+          put :update, :id => 'missing', :question => { }
+        }.should raise_error(ActiveRecord::RecordNotFound)
+        #response.should be_missing
       end
     end
 
@@ -506,8 +512,10 @@ describe QuestionsController do
       end
 
       it "should not destroy missing question" do
-        delete :destroy, :id => 'missing'
-        response.should be_missing
+        lambda{
+          delete :destroy, :id => 'missing'
+        }.should raise_error(ActiveRecord::RecordNotFound)
+        #response.should be_missing
       end
     end
 

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

@@ -1,102 +1,7 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
 
-  rescue_from CanCan::AccessDenied, :with => :render_403
-  rescue_from ActiveRecord::RecordNotFound, :with => :render_404
-
-  before_filter :set_locale
-
+  enju_leaf
+  enju_library
   enju_question
-
-  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 set_locale
-    if params[:locale]
-      unless I18n.available_locales.include?(params[:locale].to_s.intern)
-        raise InvalidLocaleError
-      end
-    end
-    if user_signed_in?
-      locale = params[:locale] || session[:locale] || current_user.locale.try(:to_sym)
-    else
-      locale = params[:locale] || session[:locale]
-    end
-    if locale
-      I18n.locale = @locale = session[:locale] = locale.to_sym
-    else
-      I18n.locale = @locale = session[:locale] = I18n.default_locale
-    end
-  rescue InvalidLocaleError
-    @locale = I18n.default_locale
-  end
-
-  def not_found
-    raise ActiveRecord::RecordNotFound
-  end
-
-  def access_denied
-    raise CanCan::AccessDenied
-  end
-
-  def get_user
-    @user = User.where(:username => params[:user_id]).first if params[:user_id]
-  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
-
-  def store_location
-    if request.get? and request.format.try(:html?) and !request.xhr?
-      session[:user_return_to] = request.fullpath
-    end
-  end
-
-  def solr_commit
-    Sunspot.commit
-  end
-end
-
-class InvalidLocaleError < StandardError
 end

data/spec/dummy/config/application.rb

@@ -43,5 +43,4 @@ module Dummy
   end
 end
 
-require 'enju_biblio'
-require 'mobylette'
+require 'enju_leaf'

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/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/080_create_library_groups.rb

@@ -0,0 +1,18 @@
+class CreateLibraryGroups < ActiveRecord::Migration
+  def change
+    create_table :library_groups do |t|
+      t.string :name, :null => false
+      t.text :display_name
+      t.string :short_name, :null => false
+      t.string :email
+      t.text :my_networks
+      t.text :login_banner
+      t.text :note
+      t.integer :country_id
+      t.integer :position
+
+      t.timestamps
+    end
+    add_index :library_groups, :short_name
+  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/20100211105551_add_admin_networks_to_library_group.rb

@@ -0,0 +1,9 @@
+class AddAdminNetworksToLibraryGroup < ActiveRecord::Migration
+  def self.up
+    add_column :library_groups, :admin_networks, :text
+  end
+
+  def self.down
+    remove_column :library_groups, :admin_networks
+  end
+end

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/20110222073537_add_url_to_library_group.rb

@@ -0,0 +1,9 @@
+class AddUrlToLibraryGroup < ActiveRecord::Migration
+  def self.up
+    add_column :library_groups, :url, :string, :default => 'http://localhost:3000/'
+  end
+
+  def self.down
+    remove_column :library_groups, :url
+  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/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