enju_news 0.1.0.pre5 → 0.1.0.pre6

data/spec/dummy/db/migrate/{20111201163718_create_user_has_roles.rb → 20100606065209_create_user_has_roles.rb}

@@ -6,5 +6,7 @@ class CreateUserHasRoles < ActiveRecord::Migration
 
       t.timestamps
     end
+    add_index :user_has_roles, :user_id
+    add_index :user_has_roles, :role_id
   end
 end

data/spec/dummy/db/migrate/20110318183304_add_valid_period_for_new_user_to_user_group.rb

@@ -2,12 +2,10 @@ class AddValidPeriodForNewUserToUserGroup < ActiveRecord::Migration
   def self.up
     add_column :user_groups, :valid_period_for_new_user, :integer, :default => 0, :null => false
     add_column :user_groups, :expired_at, :timestamp
-    remove_column :library_groups, :valid_period_for_new_user
   end
 
   def self.down
     remove_column :user_groups, :valid_period_for_new_user
     remove_column :user_groups, :expired_at
-    add_column :library_groups, :valid_period_for_new_user, :integer, :default => 0, :null => false
   end
 end

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

@@ -1,26 +1,16 @@
 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, :failed_attempts, :integer, :default => 0
     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

data/spec/dummy/db/migrate/20140110122216_create_user_import_files.rb

@@ -0,0 +1,18 @@
+class CreateUserImportFiles < ActiveRecord::Migration
+  def change
+    create_table :user_import_files do |t|
+      t.integer :user_id
+      t.text :note
+      t.datetime :executed_at
+      t.string :user_import_file_name
+      t.string :user_import_content_type
+      t.string :user_import_file_size
+      t.datetime :user_import_updated_at
+      t.string :user_import_fingerprint
+      t.string :edit_mode
+      t.text :error_message
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20140110131010_create_user_import_results.rb

@@ -0,0 +1,11 @@
+class CreateUserImportResults < ActiveRecord::Migration
+  def change
+    create_table :user_import_results do |t|
+      t.integer :user_import_file_id
+      t.integer :user_id
+      t.text :body
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20140122054321_create_profiles.rb

@@ -0,0 +1,20 @@
+class CreateProfiles < ActiveRecord::Migration
+  def change
+    create_table :profiles do |t|
+      t.integer :user_id
+      t.integer :user_group_id
+      t.integer :library_id
+      t.string :locale
+      t.string :user_number
+      t.text :full_name
+      t.text :note
+      t.text :keyword_list
+      t.integer :required_role_id
+
+      t.timestamps
+    end
+
+    add_index :profiles, :user_id
+    add_index :profiles, :user_number, :unique => true
+  end
+end

data/spec/dummy/db/migrate/20140524074813_create_user_import_file_transitions.rb

@@ -0,0 +1,14 @@
+class CreateUserImportFileTransitions < ActiveRecord::Migration
+  def change
+    create_table :user_import_file_transitions do |t|
+      t.string :to_state
+      t.text :metadata, default: "{}"
+      t.integer :sort_key
+      t.integer :user_import_file_id
+      t.timestamps
+    end
+
+    add_index :user_import_file_transitions, :user_import_file_id
+    add_index :user_import_file_transitions, [:sort_key, :user_import_file_id], unique: true, name: "index_user_import_file_transitions_on_sort_key_and_file_id"
+  end
+end

data/spec/dummy/db/migrate/20140610123439_drop_email_unique_constraint_enju_leaf_rc10.rb

@@ -0,0 +1,11 @@
+class DropEmailUniqueConstraintEnjuLeafRc10 < ActiveRecord::Migration
+  def up
+    remove_index :users, :email
+    add_index :users, :email
+  end
+
+  def down
+    remove_index :users, :email
+    add_index :users, :email, unique: true
+  end
+end

data/spec/dummy/db/migrate/20140628072217_add_user_encoding_to_user_import_file.rb

@@ -0,0 +1,5 @@
+class AddUserEncodingToUserImportFile < ActiveRecord::Migration
+  def change
+    add_column :user_import_files, :user_encoding, :string
+  end
+end

data/spec/dummy/db/migrate/20140709113413_create_user_export_files.rb

@@ -0,0 +1,11 @@
+class CreateUserExportFiles < ActiveRecord::Migration
+  def change
+    create_table :user_export_files do |t|
+      t.integer :user_id
+      t.attachment :user_export
+      t.datetime :executed_at
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20140709113905_create_user_export_file_transitions.rb

@@ -0,0 +1,14 @@
+class CreateUserExportFileTransitions < ActiveRecord::Migration
+  def change
+    create_table :user_export_file_transitions do |t|
+      t.string :to_state
+      t.text :metadata, default: "{}"
+      t.integer :sort_key
+      t.integer :user_export_file_id
+      t.timestamps
+    end
+
+    add_index :user_export_file_transitions, :user_export_file_id, name: "index_user_export_file_transitions_on_file_id"
+    add_index :user_export_file_transitions, [:sort_key, :user_export_file_id], unique: true, name: "index_user_export_file_transitions_on_sort_key_and_file_id"
+  end
+end

data/spec/dummy/db/migrate/20140720170714_add_default_library_id_to_user_import_file.rb

@@ -0,0 +1,5 @@
+class AddDefaultLibraryIdToUserImportFile < ActiveRecord::Migration
+  def change
+    add_column :user_import_files, :default_library_id, :integer
+  end
+end

data/spec/dummy/db/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb

@@ -0,0 +1,5 @@
+class AddDefaultUserGroupIdToUserImportFile < ActiveRecord::Migration
+  def change
+    add_column :user_import_files, :default_user_group_id, :integer
+  end
+end

data/spec/dummy/db/migrate/20140811031145_add_expired_at_to_profile.rb

@@ -0,0 +1,5 @@
+class AddExpiredAtToProfile < ActiveRecord::Migration
+  def change
+    add_column :profiles, :expired_at, :datetime
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130412083556) do
+ActiveRecord::Schema.define(:version => 20140811031145) do
 
   create_table "accepts", :force => true do |t|
     t.integer  "basket_id"
@@ -78,10 +78,10 @@ ActiveRecord::Schema.define(:version => 20130412083556) do
     t.datetime "created_at",                             :null => false
     t.datetime "updated_at",                             :null => false
     t.datetime "deleted_at"
+    t.text     "opening_hour"
     t.string   "isil"
     t.float    "latitude"
     t.float    "longitude"
-    t.text     "opening_hour"
   end
 
   add_index "libraries", ["library_group_id"], :name => "index_libraries_on_library_group_id"
@@ -91,17 +91,15 @@ ActiveRecord::Schema.define(:version => 20130412083556) do
     t.string   "name",                                                 :null => false
     t.text     "display_name"
     t.string   "short_name",                                           :null => false
-    t.string   "email"
     t.text     "my_networks"
-    t.boolean  "use_dsbl",       :default => false,                    :null => false
-    t.text     "dsbl_list"
     t.text     "login_banner"
     t.text     "note"
     t.integer  "country_id"
+    t.integer  "position"
     t.datetime "created_at",                                           :null => false
     t.datetime "updated_at",                                           :null => false
-    t.string   "url",            :default => "http://localhost:3000/"
     t.text     "admin_networks"
+    t.string   "url",            :default => "http://localhost:3000/"
   end
 
   add_index "library_groups", ["short_name"], :name => "index_library_groups_on_short_name"
@@ -133,6 +131,24 @@ ActiveRecord::Schema.define(:version => 20130412083556) do
 
   add_index "news_posts", ["user_id"], :name => "index_news_posts_on_user_id"
 
+  create_table "profiles", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "user_group_id"
+    t.integer  "library_id"
+    t.string   "locale"
+    t.string   "user_number"
+    t.text     "full_name"
+    t.text     "note"
+    t.text     "keyword_list"
+    t.integer  "required_role_id"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+    t.datetime "expired_at"
+  end
+
+  add_index "profiles", ["user_id"], :name => "index_profiles_on_user_id"
+  add_index "profiles", ["user_number"], :name => "index_profiles_on_user_number", :unique => true
+
   create_table "request_status_types", :force => true do |t|
     t.string   "name",         :null => false
     t.text     "display_name"
@@ -152,12 +168,13 @@ ActiveRecord::Schema.define(:version => 20130412083556) do
   end
 
   create_table "roles", :force => true do |t|
-    t.string   "name"
-    t.text     "display_name"
+    t.string   "name",                        :null => false
+    t.string   "display_name"
     t.text     "note"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "score",        :default => 0, :null => false
     t.integer  "position"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
   end
 
   create_table "search_engines", :force => true do |t|
@@ -215,9 +232,31 @@ ActiveRecord::Schema.define(:version => 20130412083556) do
   add_index "subscriptions", ["order_list_id"], :name => "index_subscriptions_on_order_list_id"
   add_index "subscriptions", ["user_id"], :name => "index_subscriptions_on_user_id"
 
+  create_table "user_export_file_transitions", :force => true do |t|
+    t.string   "to_state"
+    t.text     "metadata",            :default => "{}"
+    t.integer  "sort_key"
+    t.integer  "user_export_file_id"
+    t.datetime "created_at",                            :null => false
+    t.datetime "updated_at",                            :null => false
+  end
+
+  add_index "user_export_file_transitions", ["sort_key", "user_export_file_id"], :name => "index_user_export_file_transitions_on_sort_key_and_file_id", :unique => true
+  add_index "user_export_file_transitions", ["user_export_file_id"], :name => "index_user_export_file_transitions_on_file_id"
+
+  create_table "user_export_files", :force => true do |t|
+    t.integer  "user_id"
+    t.string   "user_export_file_name"
+    t.string   "user_export_content_type"
+    t.integer  "user_export_file_size"
+    t.datetime "user_export_updated_at"
+    t.datetime "executed_at"
+    t.datetime "created_at",               :null => false
+    t.datetime "updated_at",               :null => false
+  end
+
   create_table "user_groups", :force => true do |t|
     t.string   "name"
-    t.string   "string"
     t.text     "display_name"
     t.text     "note"
     t.integer  "position"
@@ -235,9 +274,48 @@ ActiveRecord::Schema.define(:version => 20130412083556) do
     t.datetime "updated_at", :null => false
   end
 
+  add_index "user_has_roles", ["role_id"], :name => "index_user_has_roles_on_role_id"
+  add_index "user_has_roles", ["user_id"], :name => "index_user_has_roles_on_user_id"
+
+  create_table "user_import_file_transitions", :force => true do |t|
+    t.string   "to_state"
+    t.text     "metadata",            :default => "{}"
+    t.integer  "sort_key"
+    t.integer  "user_import_file_id"
+    t.datetime "created_at",                            :null => false
+    t.datetime "updated_at",                            :null => false
+  end
+
+  add_index "user_import_file_transitions", ["sort_key", "user_import_file_id"], :name => "index_user_import_file_transitions_on_sort_key_and_file_id", :unique => true
+  add_index "user_import_file_transitions", ["user_import_file_id"], :name => "index_user_import_file_transitions_on_user_import_file_id"
+
+  create_table "user_import_files", :force => true do |t|
+    t.integer  "user_id"
+    t.text     "note"
+    t.datetime "executed_at"
+    t.string   "user_import_file_name"
+    t.string   "user_import_content_type"
+    t.string   "user_import_file_size"
+    t.datetime "user_import_updated_at"
+    t.string   "user_import_fingerprint"
+    t.string   "edit_mode"
+    t.text     "error_message"
+    t.datetime "created_at",               :null => false
+    t.datetime "updated_at",               :null => false
+    t.string   "user_encoding"
+    t.integer  "default_library_id"
+    t.integer  "default_user_group_id"
+  end
+
+  create_table "user_import_results", :force => true do |t|
+    t.integer  "user_import_file_id"
+    t.integer  "user_id"
+    t.text     "body"
+    t.datetime "created_at",          :null => false
+    t.datetime "updated_at",          :null => false
+  end
+
   create_table "users", :force => true do |t|
-    t.datetime "created_at",                             :null => false
-    t.datetime "updated_at",                             :null => false
     t.string   "email",                  :default => "", :null => false
     t.string   "encrypted_password",     :default => "", :null => false
     t.string   "reset_password_token"
@@ -248,18 +326,12 @@ ActiveRecord::Schema.define(:version => 20130412083556) do
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip"
     t.string   "last_sign_in_ip"
+    t.datetime "created_at",                             :null => false
+    t.datetime "updated_at",                             :null => false
     t.string   "username"
-    t.string   "user_number"
-    t.string   "state"
-    t.string   "locale"
     t.datetime "deleted_at"
     t.datetime "expired_at"
-    t.integer  "library_id",             :default => 1,  :null => false
-    t.integer  "required_role_id",       :default => 1,  :null => false
-    t.integer  "user_group_id",          :default => 1,  :null => false
-    t.text     "note"
-    t.text     "keyword_list"
-    t.integer  "failed_attempts"
+    t.integer  "failed_attempts",        :default => 0
     t.string   "unlock_token"
     t.datetime "locked_at"
     t.datetime "confirmed_at"
@@ -268,8 +340,6 @@ ActiveRecord::Schema.define(:version => 20130412083556) do
   add_index "users", ["email"], :name => "index_users_on_email"
   add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true
   add_index "users", ["unlock_token"], :name => "index_users_on_unlock_token", :unique => true
-  add_index "users", ["user_group_id"], :name => "index_users_on_user_group_id"
-  add_index "users", ["user_number"], :name => "index_users_on_user_number", :unique => true
   add_index "users", ["username"], :name => "index_users_on_username", :unique => true
 
   create_table "versions", :force => true do |t|

data/spec/factories/user.rb

@@ -3,12 +3,8 @@ FactoryGirl.define do
     f.sequence(:username){|n| "admin_#{n}"}
     f.sequence(:email){|n| "admin_#{n}@example.jp"}
     f.email_confirmation{|u| u.email}
-    f.library_id{FactoryGirl.create(:library).id}
     f.password 'adminpassword'
     f.password_confirmation 'adminpassword'
-    f.user_group_id{UserGroup.where(:name => 'User').first.id}
-    f.required_role_id{Role.find_by_name('User').id}
-    f.locale 'ja'
     f.after(:create) do |user|
       user_has_role = UserHasRole.new
       user_has_role.assign_attributes({:user_id => user.id, :role_id => Role.find_by_name('Administrator').id})
@@ -21,12 +17,8 @@ FactoryGirl.define do
     f.sequence(:username){|n| "librarian_#{n}"}
     f.sequence(:email){|n| "librarian_#{n}@example.jp"}
     f.email_confirmation{|u| u.email}
-    f.library_id{FactoryGirl.create(:library).id}
     f.password 'librarianpassword'
     f.password_confirmation 'librarianpassword'
-    f.user_group_id{UserGroup.where(:name => 'User').first.id}
-    f.required_role_id{Role.find_by_name('User').id}
-    f.locale 'ja'
     f.after(:create) do |user|
       user_has_role = UserHasRole.new
       user_has_role.assign_attributes({:user_id => user.id, :role_id => Role.find_by_name('Librarian').id})
@@ -39,13 +31,8 @@ FactoryGirl.define do
     f.sequence(:username){|n| "user_#{n}"}
     f.sequence(:email){|n| "user_#{n}@example.jp"}
     f.email_confirmation{|u| u.email}
-    f.library_id{FactoryGirl.create(:library).id}
     f.password 'userpassword'
     f.password_confirmation 'userpassword'
-    f.user_group_id{UserGroup.where(:name => 'not_specified').first.id}
-    f.required_role_id{Role.find_by_name('User').id}
-    f.locale 'ja'
-    f.sequence(:user_number){|n| "user_number_#{n}"}
     f.after(:create) do |user|
       user_has_role = UserHasRole.new
       user_has_role.assign_attributes({:user_id => user.id, :role_id => Role.find_by_name('User').id})

data/spec/fixtures/library_groups.yml

@@ -4,7 +4,6 @@ one:
   name: enju_library
   display_name: "<%= I18n.locale %>: Enju Library"
   short_name: enju
-  email: next-l@library.example.jp
   note: 
   my_networks: 0.0.0.0/0
   url: "http://localhost:3000/"
@@ -18,7 +17,6 @@ one:
 #  name                        :string(255)     not null
 #  display_name                :text
 #  short_name                  :string(255)     not null
-#  email                       :string(255)
 #  my_networks                 :text
 #  login_banner                :text
 #  note                        :text

data/spec/fixtures/users.yml

@@ -2,92 +2,50 @@
 admin: 
   updated_at: 2008-05-31 13:16:30.163731 +09:00
   encrypted_password: $2a$10$vHohD1WflnTIqAa8zMkF9evwAgIZRw3XuR4d3bi29M.jph/MB/AJi
-  user_group_id: 2
   id: 1
-  note: 
   username: admin
-  library_id: 2
   email: tanabe@kamata.lib.teu.ac.jp
   created_at: 2007-11-19 16:58:32.111941 +09:00
-  required_role_id: 4
-  user_number: "00001"
-  locale: "ja"
 librarian1: 
   updated_at: 2008-05-31 12:41:16.337474 +09:00
   encrypted_password: $2a$10$9O2VuTccN4gHq36ARg0QReSrb1D7WrBBhZZ759RM9moHbB0W5zCzS
-  user_group_id: 1
   id: 2
-  note: 
   username: librarian1
-  library_id: 1
   email: librarian1@kamata.lib.teu.ac.jp
   created_at: 2007-11-19 16:58:33.172441 +09:00
-  required_role_id: 1
-  user_number: "00002"
-  locale: "ja"
 user1: 
   updated_at: 2008-05-31 13:02:25.101261 +09:00
   encrypted_password: $2a$10$JthS59A0BNkDOoFpCXM0V.GhhffKaoWKbzpPahYp/vTFrOyM7h/uW
-  user_group_id: 1
   id: 3
-  note: 
   username: user1
-  library_id: 2
   email: user1@kamata.lib.teu.ac.jp
   created_at: 2007-11-19 16:58:34.637413 +09:00
-  required_role_id: 3
-  user_number: "00003"
-  locale: "ja"
 librarian2: 
   updated_at: 2008-05-31 12:42:23.340575 +09:00
   encrypted_password: $2a$10$YmmTGrYQ1Ir6oc7wXnp.GuNeO1eYLoP3sv8wMSIrTdaGw2BPwRrpS
-  user_group_id: 1
   id: 4
-  note: 
   username: librarian2
-  library_id: 2
   email: librarian2@library.example.jp
   created_at: 2008-01-18 12:24:04.222344 +09:00
-  required_role_id: 1
-  user_number: "00004"
-  locale: "ja"
 user2: 
   updated_at: 2008-05-31 12:42:44.711117 +09:00
   encrypted_password: $2a$10$i7UjJhLVrJM/J7qaTwW39OXw1NiwowUEbtNHVDV0sqMLjX9.UO9ca
-  user_group_id: 1
   id: 5
-  note: 
   username: user2
-  library_id: 1
   email: user2@library.example.jp
   created_at: 2008-01-18 13:29:06.922728 +09:00
-  required_role_id: 2
-#  user_number: '00005'
-  locale: "ja"
 user3: 
   updated_at: 2008-05-31 13:02:25.101261 +09:00
   encrypted_password: cc53de0c2d9a1a228daa9a673ec824473747e17507a6c3c4f7e5eff8821f531d4b9e23616b3ddc66fe17006b2298a556fbd567ac080e87f00f37eef8cee6c417
-  user_group_id: 1
   id: 6
-  note: 
   username: user3
-  library_id: 2
   email: user3@kamata.lib.teu.ac.jp
   created_at: 2007-11-19 16:58:34.637413 +09:00
-  required_role_id: 3
-  user_number: "00006"
-  locale: "ja"
 user4: 
   updated_at: 2008-05-31 13:02:25.101261 +09:00
   encrypted_password: cc53de0c2d9a1a228daa9a673ec824473747e17507a6c3c4f7e5eff8821f531d4b9e23616b3ddc66fe17006b2298a556fbd567ac080e87f00f37eef8cee6c417
-  user_group_id: 1
   id: 7
-  note: 
   username: user4
-  library_id: 2
   email: user4@kamata.lib.teu.ac.jp
   created_at: 2007-11-19 16:58:34.637413 +09:00
-  required_role_id: 3
-  user_number: "00007"
-  locale: "ja"
   locked_at: <%= 1.day.ago %>

data/spec/models/news_feed_spec.rb

@@ -4,28 +4,24 @@ require 'spec_helper'
 describe NewsFeed do
   fixtures :news_feeds
 
-  it "should expire cache" do
-    news_feeds(:news_feed_00001).expire_cache.should be_true
-  end
-
-  it "should expire fragment cache" do
-    news_feeds(:news_feed_00001).expire_fragment_cache.should be_true
-  end
-
   it "should get content", :vcr => true do
-    news_feeds(:news_feed_00001).content.should be_true
+    feed = news_feeds(:news_feed_00001)
+    feed.force_reload
+    feed.content.should be_truthy
   end
 
   it "should not get content if the feed is invalid", :vcr => true do
-    news_feeds(:news_feed_00002).content.should be_nil
+    feed = news_feeds(:news_feed_00002)
+    feed.force_reload
+    feed.content.should be_nil
   end
 
   it "should reload content", :vcr => true do
-    news_feeds(:news_feed_00001).force_reload.should be_true
+    news_feeds(:news_feed_00001).force_reload.should be_truthy
   end
 
   it "should fetch feeds", :vcr => true do
-    NewsFeed.fetch_feeds.should be_true
+    NewsFeed.fetch_feeds.should be_truthy
   end
 end
 

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'simplecov'
+SimpleCov.start 'rails'
+
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../dummy/config/environment", __FILE__)
@@ -40,6 +43,8 @@ RSpec.configure do |config|
     Sunspot.session = $original_sunspot_session
     Sunspot.remove_all!
   end
+
+  config.infer_spec_type_from_file_location!
 end
 
 FactoryGirl.definition_file_paths << "#{::Rails.root}/../../spec/factories"