enju_event 0.1.17.pre18 → 0.1.17.pre19

data/spec/controllers/event_import_results_controller_spec.rb

@@ -6,9 +6,7 @@ describe EventImportResultsController do
 
   describe "GET index" do
     describe "When logged in as Administrator" do
-      before(:each) do
-        sign_in FactoryGirl.create(:admin)
-      end
+      login_fixture_admin
 
       it "assigns all event_import_results as @event_import_results" do
         get :index
@@ -17,9 +15,7 @@ describe EventImportResultsController do
     end
 
     describe "When logged in as Librarian" do
-      before(:each) do
-        sign_in FactoryGirl.create(:librarian)
-      end
+      login_fixture_librarian
 
       it "assigns all event_import_results as @event_import_results" do
         get :index
@@ -28,9 +24,7 @@ describe EventImportResultsController do
     end
 
     describe "When logged in as User" do
-      before(:each) do
-        sign_in FactoryGirl.create(:user)
-      end
+      login_fixture_user
 
       it "assigns empty as @event_import_results" do
         get :index
@@ -50,9 +44,7 @@ describe EventImportResultsController do
 
   describe "GET show" do
     describe "When logged in as Administrator" do
-      before(:each) do
-        sign_in FactoryGirl.create(:admin)
-      end
+      login_fixture_admin
 
       it "assigns the requested event_import_result as @event_import_result" do
         get :show, :id => 1
@@ -61,9 +53,7 @@ describe EventImportResultsController do
     end
 
     describe "When logged in as Librarian" do
-      before(:each) do
-        sign_in FactoryGirl.create(:librarian)
-      end
+      login_fixture_librarian
 
       it "assigns the requested event_import_result as @event_import_result" do
         get :show, :id => 1
@@ -72,9 +62,7 @@ describe EventImportResultsController do
     end
 
     describe "When logged in as User" do
-      before(:each) do
-        sign_in FactoryGirl.create(:user)
-      end
+      login_fixture_user
 
       it "assigns the requested event_import_result as @event_import_result" do
         get :show, :id => 1

data/spec/controllers/events_controller_spec.rb

@@ -13,9 +13,7 @@ describe EventsController do
     end
 
     describe "When logged in as Administrator" do
-      before(:each) do
-        sign_in FactoryGirl.create(:admin)
-      end
+      login_fixture_admin
 
       it "assigns all events as @events" do
         get :index
@@ -24,9 +22,7 @@ describe EventsController do
     end
 
     describe "When logged in as Librarian" do
-      before(:each) do
-        sign_in FactoryGirl.create(:librarian)
-      end
+      login_fixture_librarian
 
       it "assigns all events as @events" do
         get :index
@@ -35,9 +31,7 @@ describe EventsController do
     end
 
     describe "When logged in as User" do
-      before(:each) do
-        sign_in FactoryGirl.create(:user)
-      end
+      login_fixture_user
 
       it "assigns all events as @events" do
         get :index
@@ -89,9 +83,7 @@ describe EventsController do
 
   describe "GET show" do
     describe "When logged in as Administrator" do
-      before(:each) do
-        sign_in FactoryGirl.create(:admin)
-      end
+      login_fixture_admin
 
       it "assigns the requested event as @event" do
         event = FactoryGirl.create(:event)
@@ -101,9 +93,7 @@ describe EventsController do
     end
 
     describe "When logged in as Librarian" do
-      before(:each) do
-        sign_in FactoryGirl.create(:librarian)
-      end
+      login_fixture_librarian
 
       it "assigns the requested event as @event" do
         event = FactoryGirl.create(:event)
@@ -113,9 +103,7 @@ describe EventsController do
     end
 
     describe "When logged in as User" do
-      before(:each) do
-        sign_in FactoryGirl.create(:user)
-      end
+      login_fixture_user
 
       it "assigns the requested event as @event" do
         event = FactoryGirl.create(:event)
@@ -135,9 +123,7 @@ describe EventsController do
 
   describe "GET new" do
     describe "When logged in as Administrator" do
-      before(:each) do
-        sign_in FactoryGirl.create(:admin)
-      end
+      login_fixture_admin
 
       it "assigns the requested event as @event" do
         get :new
@@ -146,9 +132,7 @@ describe EventsController do
     end
 
     describe "When logged in as Librarian" do
-      before(:each) do
-        sign_in FactoryGirl.create(:librarian)
-      end
+      login_fixture_librarian
 
       it "should not assign the requested event as @event" do
         get :new
@@ -157,9 +141,7 @@ describe EventsController do
     end
 
     describe "When logged in as User" do
-      before(:each) do
-        sign_in FactoryGirl.create(:user)
-      end
+      login_fixture_user
 
       it "should not assign the requested event as @event" do
         get :new
@@ -179,9 +161,7 @@ describe EventsController do
 
   describe "GET edit" do
     describe "When logged in as Administrator" do
-      before(:each) do
-        sign_in FactoryGirl.create(:admin)
-      end
+      login_fixture_admin
 
       it "assigns the requested event as @event" do
         event = FactoryGirl.create(:event)
@@ -191,9 +171,7 @@ describe EventsController do
     end
 
     describe "When logged in as Librarian" do
-      before(:each) do
-        sign_in FactoryGirl.create(:librarian)
-      end
+      login_fixture_librarian
 
       it "assigns the requested event as @event" do
         event = FactoryGirl.create(:event)
@@ -202,9 +180,7 @@ describe EventsController do
     end
 
     describe "When logged in as User" do
-      before(:each) do
-        sign_in FactoryGirl.create(:user)
-      end
+      login_fixture_user
 
       it "assigns the requested event as @event" do
         event = FactoryGirl.create(:event)
@@ -229,9 +205,7 @@ describe EventsController do
     end
 
     describe "When logged in as Administrator" do
-      before(:each) do
-        sign_in FactoryGirl.create(:admin)
-      end
+      login_fixture_admin
 
       describe "with valid params" do
         it "assigns a newly created event as @event" do
@@ -259,9 +233,7 @@ describe EventsController do
     end
 
     describe "When logged in as Librarian" do
-      before(:each) do
-        sign_in FactoryGirl.create(:librarian)
-      end
+      login_fixture_librarian
 
       describe "with valid params" do
         it "assigns a newly created event as @event" do
@@ -289,9 +261,7 @@ describe EventsController do
     end
 
     describe "When logged in as User" do
-      before(:each) do
-        sign_in FactoryGirl.create(:user)
-      end
+      login_fixture_user
 
       describe "with valid params" do
         it "assigns a newly created event as @event" do
@@ -353,9 +323,7 @@ describe EventsController do
     end
 
     describe "When logged in as Administrator" do
-      before(:each) do
-        sign_in FactoryGirl.create(:admin)
-      end
+      login_fixture_admin
 
       describe "with valid params" do
         it "updates the requested event" do
@@ -377,9 +345,7 @@ describe EventsController do
     end
 
     describe "When logged in as Librarian" do
-      before(:each) do
-        sign_in FactoryGirl.create(:librarian)
-      end
+      login_fixture_librarian
 
       describe "with valid params" do
         it "updates the requested event" do
@@ -401,9 +367,7 @@ describe EventsController do
     end
 
     describe "When logged in as User" do
-      before(:each) do
-        sign_in FactoryGirl.create(:user)
-      end
+      login_fixture_user
 
       describe "with valid params" do
         it "updates the requested event" do
@@ -452,9 +416,7 @@ describe EventsController do
     end
 
     describe "When logged in as Administrator" do
-      before(:each) do
-        sign_in FactoryGirl.create(:admin)
-      end
+      login_fixture_admin
 
       it "destroys the requested event" do
         delete :destroy, :id => @event.id
@@ -467,9 +429,7 @@ describe EventsController do
     end
 
     describe "When logged in as Librarian" do
-      before(:each) do
-        sign_in FactoryGirl.create(:librarian)
-      end
+      login_fixture_librarian
 
       it "destroys the requested event" do
         delete :destroy, :id => @event.id
@@ -482,9 +442,7 @@ describe EventsController do
     end
 
     describe "When logged in as User" do
-      before(:each) do
-        sign_in FactoryGirl.create(:user)
-      end
+      login_fixture_user
 
       it "destroys the requested event" do
         delete :destroy, :id => @event.id

data/spec/controllers/participates_controller_spec.rb

@@ -11,7 +11,7 @@ describe ParticipatesController do
 
   describe "GET index" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns all participates as @participates" do
         get :index
@@ -20,7 +20,7 @@ describe ParticipatesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns all participates as @participates" do
         get :index
@@ -29,7 +29,7 @@ describe ParticipatesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns empty as @participates" do
         get :index
@@ -47,7 +47,7 @@ describe ParticipatesController do
 
   describe "GET show" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested participate as @participate" do
         participate = FactoryGirl.create(:participate)
@@ -57,7 +57,7 @@ describe ParticipatesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested participate as @participate" do
         participate = FactoryGirl.create(:participate)
@@ -67,7 +67,7 @@ describe ParticipatesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested participate as @participate" do
         participate = FactoryGirl.create(:participate)
@@ -87,7 +87,7 @@ describe ParticipatesController do
 
   describe "GET new" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested participate as @participate" do
         get :new
@@ -96,7 +96,7 @@ describe ParticipatesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested participate as @participate" do
         get :new
@@ -105,7 +105,7 @@ describe ParticipatesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "should not assign the requested participate as @participate" do
         get :new
@@ -125,7 +125,7 @@ describe ParticipatesController do
 
   describe "GET edit" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested participate as @participate" do
         participate = FactoryGirl.create(:participate)
@@ -135,7 +135,7 @@ describe ParticipatesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested participate as @participate" do
         participate = FactoryGirl.create(:participate)
@@ -145,7 +145,7 @@ describe ParticipatesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested participate as @participate" do
         participate = FactoryGirl.create(:participate)
@@ -170,7 +170,7 @@ describe ParticipatesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "assigns a newly created participate as @participate" do
@@ -198,7 +198,7 @@ describe ParticipatesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "assigns a newly created participate as @participate" do
@@ -226,7 +226,7 @@ describe ParticipatesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "assigns a newly created participate as @participate" do
@@ -288,7 +288,7 @@ describe ParticipatesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "updates the requested participate" do
@@ -315,7 +315,7 @@ describe ParticipatesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "updates the requested participate" do
@@ -343,7 +343,7 @@ describe ParticipatesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "updates the requested participate" do
@@ -392,7 +392,7 @@ describe ParticipatesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "destroys the requested participate" do
         delete :destroy, :id => @participate.id
@@ -405,7 +405,7 @@ describe ParticipatesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "destroys the requested participate" do
         delete :destroy, :id => @participate.id
@@ -418,7 +418,7 @@ describe ParticipatesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "destroys the requested participate" do
         delete :destroy, :id => @participate.id

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

@@ -1,2 +1,3 @@
 module ApplicationHelper
+  include EnjuLeaf::EnjuLeafHelper
 end

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

@@ -7,88 +7,6 @@ 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 :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
+  enju_leaf_user_model
+  enju_message_user_model
 end

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

@@ -2,9 +2,9 @@ Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # The test environment is used exclusively to run your application's
-  # test suite.  You never need to work with it otherwise.  Remember that
+  # test suite. You never need to work with it otherwise. Remember that
   # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs.  Don't rely on the data there!
+  # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
@@ -29,11 +29,11 @@ Dummy::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
+  # Raise exception on mass assignment protection for Active Record models
+  config.active_record.mass_assignment_sanitizer = :strict
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+
+  config.action_mailer.default_url_options = {:host => 'localhost:3000'}
 end

data/spec/dummy/db/migrate/001_create_agents.rb

@@ -40,7 +40,6 @@ class CreateAgents < ActiveRecord::Migration
       t.text :note
       t.integer :required_role_id, :default => 1, :null => false
       t.integer :required_score, :default => 0, :null => false
-      t.string :state
       t.text :email
       t.text :url
     end

data/spec/dummy/db/migrate/{20111201155456_devise_create_users.rb → 002_devise_create_users.rb}

@@ -13,7 +13,7 @@ class DeviseCreateUsers < ActiveRecord::Migration
       t.datetime :remember_created_at
 
       ## Trackable
-      t.integer  :sign_in_count, :default => 0, :null => false
+      t.integer  :sign_in_count, :default => 0
       t.datetime :current_sign_in_at
       t.datetime :last_sign_in_at
       t.string   :current_sign_in_ip
@@ -26,10 +26,13 @@ class DeviseCreateUsers < ActiveRecord::Migration
       # t.string   :unconfirmed_email # Only if using reconfirmable
 
       ## Lockable
-      # t.integer  :failed_attempts, :default => 0, :null => false # Only if lock strategy is :failed_attempts
+      # 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.timestamps
     end
@@ -38,5 +41,6 @@ class DeviseCreateUsers < ActiveRecord::Migration
     add_index :users, :reset_password_token, :unique => true
     # add_index :users, :confirmation_token,   :unique => true
     # add_index :users, :unlock_token,         :unique => true
+    # add_index :users, :authentication_token, :unique => true
   end
 end

data/spec/dummy/db/migrate/005_create_manifestations.rb

@@ -21,24 +21,24 @@ class CreateManifestations < ActiveRecord::Migration
       t.integer :depth
       t.integer :price # TODO: 通貨単位
       t.text :fulltext
-      t.string :volume_number_list
-      t.string :issue_number_list
-      t.string :serial_number_list
+      t.string :volume_number_string
+      t.string :issue_number_string
+      t.string :serial_number_string
       t.integer :edition
       t.text :note
       t.boolean :repository_content, :default => false, :null => false
       t.integer :lock_version, :default => 0, :null => false
       t.integer :required_role_id, :default => 1, :null => false
-      t.string :state
       t.integer :required_score, :default => 0, :null => false
       t.integer :frequency_id, :default => 1, :null => false
       t.boolean :subscription_master, :default => false, :null => false
     end
-    add_index :manifestations, :carrier_type_id
-    add_index :manifestations, :required_role_id
+    #add_index :manifestations, :carrier_type_id
+    #add_index :manifestations, :required_role_id
     add_index :manifestations, :access_address
-    add_index :manifestations, :frequency_id
+    #add_index :manifestations, :frequency_id
     add_index :manifestations, :manifestation_identifier
     add_index :manifestations, :updated_at
+    add_index :manifestations, :date_of_publication
   end
 end

data/spec/dummy/db/migrate/006_create_items.rb

@@ -1,7 +1,6 @@
 class CreateItems < ActiveRecord::Migration
   def change
     create_table :items do |t|
-      t.integer :manifestation_id
       t.string :call_number
       t.string :item_identifier
       t.timestamps
@@ -13,10 +12,8 @@ class CreateItems < ActiveRecord::Migration
       t.integer :price
       t.integer :lock_version, :default => 0, :null => false
       t.integer :required_role_id, :default => 1, :null => false
-      t.string :state
       t.integer :required_score, :default => 0, :null => false
     end
-    add_index :items, :manifestation_id
     add_index :items, :shelf_id
     add_index :items, :item_identifier
     add_index :items, :required_role_id