enju_leaf 1.1.0.rc17 → 1.1.0.rc18

data/spec/controllers/user_import_files_controller_spec.rb

@@ -46,7 +46,7 @@ describe UserImportFilesController do
       login_fixture_admin
 
       it "assigns the requested user_import_file as @user_import_file" do
-        get :show, :id => user_import_files(:two).id
+        get :show, id: user_import_files(:two).id
         assigns(:user_import_file).should eq(user_import_files(:two))
         expect(response).to be_success
       end
@@ -56,7 +56,7 @@ describe UserImportFilesController do
       login_fixture_librarian
 
       it "assigns the requested user_import_file as @user_import_file" do
-        get :show, :id => user_import_files(:two).id
+        get :show, id: user_import_files(:two).id
         assigns(:user_import_file).should eq(user_import_files(:two))
         expect(response).to be_success
       end
@@ -66,7 +66,7 @@ describe UserImportFilesController do
       login_fixture_user
 
       it "assigns the requested user_import_file as @user_import_file" do
-        get :show, :id => user_import_files(:two).id
+        get :show, id: user_import_files(:two).id
         assigns(:user_import_file).should eq(user_import_files(:two))
         expect(response).to be_forbidden
       end
@@ -74,7 +74,7 @@ describe UserImportFilesController do
 
     describe "When not logged in" do
       it "assigns the requested user_import_file as @user_import_file" do
-        get :show, :id => user_import_files(:two).id
+        get :show, id: user_import_files(:two).id
         assigns(:user_import_file).should eq(user_import_files(:two))
         expect(response).to redirect_to(new_user_session_url)
       end
@@ -168,7 +168,7 @@ describe UserImportFilesController do
 
       it "assigns the requested user_import_file as @user_import_file" do
         user_import_file = user_import_files(:one)
-        get :edit, :id => user_import_file.id
+        get :edit, id: user_import_file.id
         assigns(:user_import_file).should eq(user_import_file)
       end
     end
@@ -178,7 +178,7 @@ describe UserImportFilesController do
 
       it "assigns the requested user_import_file as @user_import_file" do
         user_import_file = user_import_files(:one)
-        get :edit, :id => user_import_file.id
+        get :edit, id: user_import_file.id
         assigns(:user_import_file).should eq(user_import_file)
       end
     end
@@ -188,7 +188,7 @@ describe UserImportFilesController do
 
       it "assigns the requested user_import_file as @user_import_file" do
         user_import_file = user_import_files(:one)
-        get :edit, :id => user_import_file.id
+        get :edit, id: user_import_file.id
         expect(response).to be_forbidden
       end
     end
@@ -196,7 +196,7 @@ describe UserImportFilesController do
     describe "When not logged in" do
       it "should not assign the requested user_import_file as @user_import_file" do
         user_import_file = user_import_files(:one)
-        get :edit, :id => user_import_file.id
+        get :edit, id: user_import_file.id
         expect(response).to redirect_to(new_user_session_url)
       end
     end
@@ -208,7 +208,7 @@ describe UserImportFilesController do
 
       it "should update user_import_file" do
         post :create, :user_import_file => {:user_import => fixture_file_upload("/../../examples/user_import_file_sample.tsv", 'text/csv') }
-        put :update, :id => assigns(:user_import_file).id, :user_import_file => { :note => 'test' }
+        put :update, id: assigns(:user_import_file).id, :user_import_file => { :note => 'test' }
         expect(response).to redirect_to user_import_file_url(assigns(:user_import_file))
       end
     end
@@ -218,7 +218,7 @@ describe UserImportFilesController do
 
       it "should update user_import_file" do
         post :create, :user_import_file => {:user_import => fixture_file_upload("/../../examples/user_import_file_sample.tsv", 'text/csv') }
-        put :update, :id => assigns(:user_import_file).id, :user_import_file => { :note => 'test' }
+        put :update, id: assigns(:user_import_file).id, :user_import_file => { :note => 'test' }
         expect(response).to redirect_to user_import_file_url(assigns(:user_import_file))
       end
     end
@@ -227,14 +227,14 @@ describe UserImportFilesController do
       login_fixture_user
 
       it "should not update user_import_file" do
-        put :update, :id => user_import_files(:two).id, :user_import_file => { }
+        put :update, id: user_import_files(:two).id, :user_import_file => { }
         expect(response).to be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "should not update user_import_file" do
-        put :update, :id => user_import_files(:two).id, :user_import_file => { }
+        put :update, id: user_import_files(:two).id, :user_import_file => { }
         expect(response).to redirect_to new_user_session_url
       end
     end
@@ -249,11 +249,11 @@ describe UserImportFilesController do
       login_fixture_admin
 
       it "destroys the requested user_import_file" do
-        delete :destroy, :id => @user_import_file.id
+        delete :destroy, id: @user_import_file.id
       end
 
       it "redirects to the user_import_files list" do
-        delete :destroy, :id => @user_import_file.id
+        delete :destroy, id: @user_import_file.id
         expect(response).to redirect_to(user_import_files_url)
       end
     end
@@ -262,11 +262,11 @@ describe UserImportFilesController do
       login_fixture_librarian
 
       it "destroys the requested user_import_file" do
-        delete :destroy, :id => @user_import_file.id
+        delete :destroy, id: @user_import_file.id
       end
 
       it "redirects to the user_import_files list" do
-        delete :destroy, :id => @user_import_file.id
+        delete :destroy, id: @user_import_file.id
         expect(response).to redirect_to(user_import_files_url)
       end
     end
@@ -275,22 +275,22 @@ describe UserImportFilesController do
       login_fixture_user
 
       it "destroys the requested user_import_file" do
-        delete :destroy, :id => @user_import_file.id
+        delete :destroy, id: @user_import_file.id
       end
 
       it "should be forbidden" do
-        delete :destroy, :id => @user_import_file.id
+        delete :destroy, id: @user_import_file.id
         expect(response).to be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "destroys the requested user_import_file" do
-        delete :destroy, :id => @user_import_file.id
+        delete :destroy, id: @user_import_file.id
       end
 
       it "should be forbidden" do
-        delete :destroy, :id => @user_import_file.id
+        delete :destroy, id: @user_import_file.id
         expect(response).to redirect_to(new_user_session_url)
       end
     end

data/spec/controllers/user_import_results_controller_spec.rb

@@ -47,7 +47,7 @@ describe UserImportResultsController do
       login_fixture_admin
 
       it "assigns the requested user_import_result as @user_import_result" do
-        get :show, :id => 1
+        get :show, id: 1
         assigns(:user_import_result).should eq(UserImportResult.find(1))
       end
     end
@@ -56,7 +56,7 @@ describe UserImportResultsController do
       login_fixture_librarian
 
       it "assigns the requested user_import_result as @user_import_result" do
-        get :show, :id => 1
+        get :show, id: 1
         assigns(:user_import_result).should eq(UserImportResult.find(1))
       end
     end
@@ -65,14 +65,14 @@ describe UserImportResultsController do
       login_fixture_user
 
       it "assigns the requested user_import_result as @user_import_result" do
-        get :show, :id => 1
+        get :show, id: 1
         assigns(:user_import_result).should eq(UserImportResult.find(1))
       end
     end
 
     describe "When not logged in" do
       it "assigns the requested user_import_result as @user_import_result" do
-        get :show, :id => 1
+        get :show, id: 1
         assigns(:user_import_result).should eq(UserImportResult.find(1))
         response.should redirect_to(new_user_session_url)
       end
@@ -88,11 +88,11 @@ describe UserImportResultsController do
       login_fixture_admin
 
       it "destroys the requested user_import_result" do
-        delete :destroy, :id => @user_import_result.id
+        delete :destroy, id: @user_import_result.id
       end
 
       it "should be forbidden" do
-        delete :destroy, :id => @user_import_result.id
+        delete :destroy, id: @user_import_result.id
         response.should be_forbidden
       end
     end
@@ -101,11 +101,11 @@ describe UserImportResultsController do
       login_fixture_librarian
 
       it "destroys the requested user_import_result" do
-        delete :destroy, :id => @user_import_result.id
+        delete :destroy, id: @user_import_result.id
       end
 
       it "should be forbidden" do
-        delete :destroy, :id => @user_import_result.id
+        delete :destroy, id: @user_import_result.id
         response.should be_forbidden
       end
     end
@@ -114,22 +114,22 @@ describe UserImportResultsController do
       login_fixture_user
 
       it "destroys the requested user_import_result" do
-        delete :destroy, :id => @user_import_result.id
+        delete :destroy, id: @user_import_result.id
       end
 
       it "should be forbidden" do
-        delete :destroy, :id => @user_import_result.id
+        delete :destroy, id: @user_import_result.id
         response.should be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "destroys the requested user_import_result" do
-        delete :destroy, :id => @user_import_result.id
+        delete :destroy, id: @user_import_result.id
       end
 
       it "should be forbidden" do
-        delete :destroy, :id => @user_import_result.id
+        delete :destroy, id: @user_import_result.id
         response.should redirect_to(new_user_session_url)
       end
     end

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

@@ -6,6 +6,6 @@ class ApplicationController < ActionController::Base
 
   mobylette_config do |config|
     config[:skip_xhr_requests] = false
-    config[:skip_user_agents] = Setting.enju.skip_mobile_agents.map{|a| a.to_sym}
+    #config[:skip_user_agents] = Setting.enju.skip_mobile_agents.map{|a| a.to_sym}
   end
 end

data/spec/dummy/config/initializers/devise.rb

@@ -1,7 +1,7 @@
 # Use this hook to configure devise mailer, warden hooks and so forth.
 # Many of these configuration options can be set straight in your model.
 Devise.setup do |config|
-	config.secret_key = '26b7bfc7bcd8f89699a39fe40f3e79ee90ea191376cbecda2779eb21b51d0d9a5016e4685166b5628c8c3d020c3fe6b6a833df27a54cb6e6bfce6d19afb0c566'
+  config.secret_key = '26b7bfc7bcd8f89699a39fe40f3e79ee90ea191376cbecda2779eb21b51d0d9a5016e4685166b5628c8c3d020c3fe6b6a833df27a54cb6e6bfce6d19afb0c566'
 
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,

data/spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddSettingsToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_column :library_groups, :settings, :text
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20141014065831) do
+ActiveRecord::Schema.define(version: 20150506105356) do
 
   create_table "accepts", force: :cascade do |t|
     t.integer  "basket_id"
@@ -650,6 +650,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.text     "admin_networks"
     t.boolean  "allow_bookmark_external_url", default: false,                    null: false
     t.string   "url",                         default: "http://localhost:3000/"
+    t.text     "settings"
   end
 
   add_index "library_groups", ["short_name"], name: "index_library_groups_on_short_name"
@@ -1435,6 +1436,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.text     "body"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.text     "error_message"
   end
 
   create_table "user_reserve_stat_transitions", force: :cascade do |t|

data/spec/factories/user.rb

@@ -7,7 +7,7 @@ FactoryGirl.define do
     f.password_confirmation 'adminpassword'
     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})
+      user_has_role.assign_attributes({user_id: user.id, role_id: Role.find_by_name('Administrator').id})
       user_has_role.save
       user.reload
     end
@@ -21,7 +21,7 @@ FactoryGirl.define do
     f.password_confirmation 'librarianpassword'
     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})
+      user_has_role.assign_attributes({user_id: user.id, role_id: Role.find_by_name('Librarian').id})
       user_has_role.save
       user.reload
     end
@@ -35,12 +35,12 @@ FactoryGirl.define do
     f.password_confirmation 'userpassword'
     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})
+      user_has_role.assign_attributes({user_id: user.id, role_id: Role.find_by_name('User').id})
       user_has_role.save
       user.reload
     end
   end
 
-  factory :invalid_user, :class => User do |f|
+  factory :invalid_user, class: User do |f|
   end
 end

data/spec/fixtures/library_groups.yml

@@ -1,32 +1,37 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 one:
   id: 1
-  name: enju
-  display_name: Next-L Enju
-  short_name: Enju
+  name: unknown
+  display_name: unknown
+  short_name: unknown
   note: 
-  my_networks: 0.0.0.0/0
+  my_networks: "0.0.0.0/0\r\n\
+    ::/0"
   url: "http://localhost:3000/"
-
-
+  position: 1
+  login_banner: "*Next-L Enju*"
+  admin_networks: "0.0.0.0/0\r\n\
+    ::/0"
+  settings: <% if Rails::VERSION::MAJOR > 3 %>
+    "{\"max_number_of_results\":200,\"family_name_first\":true,\"book_jacket_source\":\"google\",\"screenshot_generator\":\"mozshot\"}"
+  <% else %>
+    "---\n:max_number_of_results: 200\n:family_name_first: true\n:book_jacket_source: \"google\"\n:screenshot_generator: \"mozshot\""
+  <% end %>
 # == Schema Information
 #
 # Table name: library_groups
 #
-#  id                          :integer         not null, primary key
-#  name                        :string(255)     not null
-#  display_name                :text
-#  short_name                  :string(255)     not null
-#  my_networks                 :text
-#  login_banner                :text
-#  note                        :text
-#  post_to_union_catalog       :boolean         default(FALSE), not null
-#  country_id                  :integer
-#  created_at                  :datetime
-#  updated_at                  :datetime
-#  admin_networks              :text
-#  allow_bookmark_external_url :boolean         default(FALSE), not null
-#  position                    :integer
-#  url                         :string(255)     default("http://localhost:3000/")
+#  id             :integer          not null, primary key
+#  name           :string(255)      not null
+#  display_name   :text
+#  short_name     :string(255)      not null
+#  my_networks    :text
+#  login_banner   :text
+#  note           :text
+#  country_id     :integer
+#  position       :integer
+#  created_at     :datetime         not null
+#  updated_at     :datetime         not null
+#  admin_networks :text
+#  url            :string(255)      default("http://localhost:3000/")
 #
-

data/spec/fixtures/profiles.yml

@@ -85,14 +85,19 @@ user4:
 #  user_id                  :integer
 #  user_group_id            :integer
 #  library_id               :integer
-#  locale                   :string(255)
-#  user_number              :string(255)
+#  locale                   :string
+#  user_number              :string
 #  full_name                :text
 #  note                     :text
 #  keyword_list             :text
 #  required_role_id         :integer
-#  created_at               :datetime         not null
-#  updated_at               :datetime         not null
-#  checkout_icalendar_token :string(255)
+#  created_at               :datetime
+#  updated_at               :datetime
+#  checkout_icalendar_token :string
 #  save_checkout_history    :boolean          default(FALSE), not null
+#  expired_at               :datetime
+#  save_search_history      :boolean
+#  share_bookmarks          :boolean
+#  full_name_transcription  :text
+#  date_of_birth            :datetime
 #

data/spec/fixtures/roles.yml

@@ -29,8 +29,8 @@ role_00004:
 # Table name: roles
 #
 #  id           :integer          not null, primary key
-#  name         :string(255)      not null
-#  display_name :string(255)
+#  name         :string           not null
+#  display_name :string
 #  note         :text
 #  created_at   :datetime
 #  updated_at   :datetime

data/spec/fixtures/user_export_files.yml

@@ -14,13 +14,12 @@ user_export_file_00003:
 #
 # Table name: user_export_files
 #
-#  id                       :integer          not null, primary key
-#  user_id                  :integer
-#  user_export_file_name    :string(255)
-#  user_export_content_type :string(255)
-#  user_export_file_size    :integer
-#  user_export_updated_at   :datetime
-#  executed_at              :datetime
-#  created_at               :datetime         not null
-#  updated_at               :datetime         not null
+#  id                   :integer          not null, primary key
+#  user_id              :integer
+#  executed_at          :datetime
+#  created_at           :datetime
+#  updated_at           :datetime
+#  user_export_id       :string
+#  user_export_size     :integer
+#  user_import_filename :string
 #