enju_leaf 1.1.0.rc18 → 1.1.0.rc19

data/spec/controllers/my_accounts_controller_spec.rb

@@ -125,12 +125,12 @@ describe MyAccountsController do
         end
       end
 
-      describe "with invalid password params" do
-        it "assigns the requested user as @user" do
-          put :update, profile: @invalid_passwd_attrs
-          expect(assigns(:profile).errors).not_to be_blank
-        end
-      end
+      #describe "with invalid password params" do
+      #  it "assigns the requested user as @user" do
+      #    put :update, profile: @invalid_passwd_attrs
+      #    expect(assigns(:profile).errors).not_to be_blank
+      #  end
+      #end
     end
 
     describe "When logged in as Librarian" do

data/spec/controllers/page_controller_spec.rb

@@ -58,8 +58,8 @@ describe PageController do
         expect(response).to be_success
       end
 
-      it "should get msie_acceralator" do
-        get :msie_acceralator, format: :xml
+      it "should get msie_accelerator" do
+        get :msie_accelerator, format: :xml
         expect(response).to be_success
       end
 

data/spec/dummy/db/schema.rb

@@ -498,6 +498,19 @@ ActiveRecord::Schema.define(version: 20150506105356) do
   add_index "identifiers", ["body", "identifier_type_id"], name: "index_identifiers_on_body_and_identifier_type_id"
   add_index "identifiers", ["manifestation_id"], name: "index_identifiers_on_manifestation_id"
 
+  create_table "identities", force: :cascade do |t|
+    t.string   "name"
+    t.string   "email"
+    t.string   "password_digest"
+    t.integer  "profile_id"
+    t.datetime "created_at",      null: false
+    t.datetime "updated_at",      null: false
+  end
+
+  add_index "identities", ["email"], name: "index_identities_on_email"
+  add_index "identities", ["name"], name: "index_identities_on_name"
+  add_index "identities", ["profile_id"], name: "index_identities_on_profile_id"
+
   create_table "import_request_transitions", force: :cascade do |t|
     t.string   "to_state"
     t.text     "metadata",          default: "{}"
@@ -1418,7 +1431,7 @@ ActiveRecord::Schema.define(version: 20150506105356) do
     t.datetime "executed_at"
     t.string   "user_import_file_name"
     t.string   "user_import_content_type"
-    t.string   "user_import_file_size"
+    t.integer  "user_import_file_size"
     t.datetime "user_import_updated_at"
     t.string   "user_import_fingerprint"
     t.string   "edit_mode"

data/spec/factories/user.rb

@@ -2,7 +2,6 @@ FactoryGirl.define do
   factory :admin, :class => User do |f|
     f.sequence(:username){|n| "admin_#{n}"}
     f.sequence(:email){|n| "admin_#{n}@example.jp"}
-    f.email_confirmation{|u| u.email}
     f.password 'adminpassword'
     f.password_confirmation 'adminpassword'
     f.after(:create) do |user|
@@ -16,7 +15,6 @@ FactoryGirl.define do
   factory :librarian, :class => User do |f|
     f.sequence(:username){|n| "librarian_#{n}"}
     f.sequence(:email){|n| "librarian_#{n}@example.jp"}
-    f.email_confirmation{|u| u.email}
     f.password 'librarianpassword'
     f.password_confirmation 'librarianpassword'
     f.after(:create) do |user|
@@ -30,7 +28,6 @@ FactoryGirl.define do
   factory :user, :class => User do |f|
     f.sequence(:username){|n| "user_#{n}"}
     f.sequence(:email){|n| "user_#{n}@example.jp"}
-    f.email_confirmation{|u| u.email}
     f.password 'userpassword'
     f.password_confirmation 'userpassword'
     f.after(:create) do |user|

data/spec/fixtures/library_groups.yml

@@ -17,6 +17,7 @@ one:
   <% 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

data/spec/models/user_import_file_spec.rb

@@ -73,7 +73,7 @@ describe UserImportFile do
       @file.executed_at.should be_truthy
 
       @file.reload
-      @file.error_message.should eq "The follwing column(s) were ignored: invalid"
+      @file.error_message.should eq "The following column(s) were ignored: invalid"
     end
 
     it "should send message when import is completed" do

data/spec/models/user_spec.rb

@@ -73,13 +73,6 @@ describe User do
     user.errors[:email].should be_empty
   end
 
-  it "should not require email on create if an operator is set" do
-    user = FactoryGirl.build(:user, :email => '')
-    user.operator = FactoryGirl.create(:admin)
-    user.save
-    user.errors[:email].should be_empty
-  end
-
   it "should reset password" do
     users(:user1).password = 'new password'
     users(:user1).password_confirmation = 'new password'
@@ -126,16 +119,6 @@ describe User do
   end
 
   if defined?(EnjuCirculation)
-    it "should reset checkout_icalendar_token" do
-      users(:user1).reset_checkout_icalendar_token
-      users(:user1).checkout_icalendar_token.should be_truthy
-    end
-
-    it "should delete checkout_icalendar_token" do
-      users(:user1).delete_checkout_icalendar_token
-      users(:user1).checkout_icalendar_token.should be_nil
-    end
-
     it "should get checked_item_count" do
       count = users(:user1).checked_item_count
       count.should eq({:book=>2, :serial=>1, :cd=>0})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_leaf
 version: !ruby/object:Gem::Version
-  version: 1.1.0.rc18
+  version: 1.1.0.rc19
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-09 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.21
+        version: 3.2.22
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.21
+        version: 3.2.22
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -36,42 +36,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre65
+        version: 0.1.0.pre66
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre65
+        version: 0.1.0.pre66
 - !ruby/object:Gem::Dependency
   name: enju_library
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre40
+        version: 0.1.0.pre41
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre40
+        version: 0.1.0.pre41
 - !ruby/object:Gem::Dependency
   name: enju_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre17
+        version: 0.1.0.pre18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre17
+        version: 0.1.0.pre18
 - !ruby/object:Gem::Dependency
   name: friendly_id
   requirement: !ruby/object:Gem::Requirement
@@ -120,14 +120,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
@@ -442,14 +442,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2.pre21
+        version: 0.1.2.pre22
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2.pre21
+        version: 0.1.2.pre22
 - !ruby/object:Gem::Dependency
   name: enju_search_log
   requirement: !ruby/object:Gem::Requirement
@@ -693,6 +693,7 @@ files:
 - app/helpers/page_helper.rb
 - app/mailers/notifier.rb
 - app/models/enju_leaf/ability.rb
+- app/models/identity.rb
 - app/models/profile.rb
 - app/models/role.rb
 - app/models/user_export_file.rb
@@ -737,10 +738,12 @@ files:
 - app/views/layouts/devise/sessions.html.erb
 - app/views/layouts/devise/sessions.mobile.erb
 - app/views/my_accounts/_edit_credential.html.erb
+- app/views/my_accounts/_edit_credential.html.slim
 - app/views/my_accounts/_form.html.erb
 - app/views/my_accounts/_show.html.erb
 - app/views/my_accounts/edit.html.erb
 - app/views/my_accounts/show.html.erb
+- app/views/my_accounts/show.html.slim
 - app/views/my_accounts/show.mobile.erb
 - app/views/page/403.html.erb
 - app/views/page/403.mobile.erb
@@ -751,6 +754,7 @@ files:
 - app/views/page/500.html.erb
 - app/views/page/500.mobile.erb
 - app/views/page/500.xml.erb
+- app/views/page/500_nosolr.html.erb
 - app/views/page/_add.html.erb
 - app/views/page/_footer.html.erb
 - app/views/page/_footer.mobile.erb
@@ -762,7 +766,7 @@ files:
 - app/views/page/_login.html.erb
 - app/views/page/_menu.html.erb
 - app/views/page/_mobile.mobile.erb
-- app/views/page/_msie_acceralator.html.erb
+- app/views/page/_msie_accelerator.html.erb
 - app/views/page/_portlets.html.erb
 - app/views/page/_position.html.erb
 - app/views/page/_required_field.html.erb
@@ -772,18 +776,21 @@ files:
 - app/views/page/about.en.html.erb
 - app/views/page/about.ja.html.erb
 - app/views/page/add_on.html.erb
+- app/views/page/add_on.html.slim
 - app/views/page/advanced_search.html.erb
 - app/views/page/configuration.html.erb
 - app/views/page/export.html.erb
 - app/views/page/import.html.erb
 - app/views/page/index.html.erb
 - app/views/page/index.mobile.erb
-- app/views/page/msie_acceralator.builder
+- app/views/page/msie_accelerator.builder
 - app/views/page/opensearch.xml.builder
 - app/views/page/statistics.html.erb
 - app/views/page/system_information.html.erb
 - app/views/profiles/_edit_credential.html.erb
+- app/views/profiles/_edit_credential.html.slim
 - app/views/profiles/_edit_profile.html.erb
+- app/views/profiles/_edit_profile.html.slim
 - app/views/profiles/_form.html.erb
 - app/views/profiles/_show.html.erb
 - app/views/profiles/edit.html.erb
@@ -809,7 +816,9 @@ files:
 - app/views/user_import_files/_form.html.erb
 - app/views/user_import_files/edit.html.erb
 - app/views/user_import_files/index.html.erb
+- app/views/user_import_files/index.html.slim
 - app/views/user_import_files/new.html.erb
+- app/views/user_import_files/new.html.slim
 - app/views/user_import_files/show.html.erb
 - app/views/user_import_results/_form.html.erb
 - app/views/user_import_results/index.html.erb
@@ -851,6 +860,7 @@ files:
 - db/migrate/20140811031145_add_expired_at_to_profile.rb
 - db/migrate/20141003181336_add_full_name_transcription_to_profile.rb
 - db/migrate/20141003182825_add_date_of_birth_to_profile.rb
+- db/migrate/20150421023923_create_identities.rb
 - db/migrate/20150506105356_add_error_message_to_user_import_result.rb
 - lib/enju_leaf.rb
 - lib/enju_leaf/calculate_stat.rb
@@ -869,21 +879,13 @@ files:
 - lib/generators/enju_leaf/quick_install/quick_install_generator.rb
 - lib/generators/enju_leaf/setup/setup_generator.rb
 - lib/generators/enju_leaf/setup/templates/Procfile
-- lib/generators/enju_leaf/setup/templates/config/resque.yml
+- lib/generators/enju_leaf/setup/templates/config/initializers/resque.rb
 - lib/generators/enju_leaf/setup/templates/config/schedule.rb
 - lib/generators/enju_leaf/setup/templates/db/fixtures/roles.yml
 - lib/generators/enju_leaf/setup/templates/db/fixtures/user_groups.yml
 - lib/generators/enju_leaf/setup/templates/db/seeds.rb
-- lib/generators/enju_leaf/setup/templates/solr/conf/admin-extra.html
-- lib/generators/enju_leaf/setup/templates/solr/conf/elevate.xml
-- lib/generators/enju_leaf/setup/templates/solr/conf/mapping-ISOLatin1Accent.txt
-- lib/generators/enju_leaf/setup/templates/solr/conf/protwords.txt
 - lib/generators/enju_leaf/setup/templates/solr/conf/schema.xml
-- lib/generators/enju_leaf/setup/templates/solr/conf/scripts.conf
 - lib/generators/enju_leaf/setup/templates/solr/conf/solrconfig.xml
-- lib/generators/enju_leaf/setup/templates/solr/conf/spellings.txt
-- lib/generators/enju_leaf/setup/templates/solr/conf/stopwords.txt
-- lib/generators/enju_leaf/setup/templates/solr/conf/synonyms.txt
 - lib/plugins.rb
 - lib/plugins/ext.rb
 - lib/plugins/ext/sunspot.rb

data/lib/generators/enju_leaf/setup/templates/config/resque.yml

@@ -1,3 +0,0 @@
-development: localhost:6379
-test: localhost:6379
-production: localhost:6379

data/lib/generators/enju_leaf/setup/templates/solr/conf/admin-extra.html

@@ -1,31 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- The content of this page will be statically included into the top
-of the admin page.  Uncomment this as an example to see there the content
-will show up.
-
-<hr>
-<i>This line will appear before the first table</i>
-<tr>
-<td colspan="2">
-This row will be appended to the end of the first table
-</td>
-</tr>
-<hr>
-
--->

data/lib/generators/enju_leaf/setup/templates/solr/conf/elevate.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- If this file is found in the config directory, it will only be
-     loaded once at startup.  If it is found in Solr's data
-     directory, it will be re-loaded every commit.
--->
-
-<elevate>
- <query text="foo bar">
-  <doc id="1" />
-  <doc id="2" />
-  <doc id="3" />
- </query>
- 
- <query text="ipod">
-   <doc id="MA147LL/A" />  <!-- put the actual ipod at the top -->
-   <doc id="IW-02" exclude="true" /> <!-- exclude this cable -->
- </query>
- 
-</elevate>

data/lib/generators/enju_leaf/setup/templates/solr/conf/mapping-ISOLatin1Accent.txt

@@ -1,246 +0,0 @@
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Syntax:
-#   "source" => "target"
-#     "source".length() > 0 (source cannot be empty.)
-#     "target".length() >= 0 (target can be empty.)
-
-# example:
-#   "À" => "A"
-#   "\u00C0" => "A"
-#   "\u00C0" => "\u0041"
-#   "ß" => "ss"
-#   "\t" => " "
-#   "\n" => ""
-
-# À => A
-"\u00C0" => "A"
-
-# Á => A
-"\u00C1" => "A"
-
-# Â => A
-"\u00C2" => "A"
-
-# Ã => A
-"\u00C3" => "A"
-
-# Ä => A
-"\u00C4" => "A"
-
-# Å => A
-"\u00C5" => "A"
-
-# Æ => AE
-"\u00C6" => "AE"
-
-# Ç => C
-"\u00C7" => "C"
-
-# È => E
-"\u00C8" => "E"
-
-# É => E
-"\u00C9" => "E"
-
-# Ê => E
-"\u00CA" => "E"
-
-# Ë => E
-"\u00CB" => "E"
-
-# Ì => I
-"\u00CC" => "I"
-
-# Í => I
-"\u00CD" => "I"
-
-# Î => I
-"\u00CE" => "I"
-
-# Ï => I
-"\u00CF" => "I"
-
-# IJ => IJ
-"\u0132" => "IJ"
-
-# Ð => D
-"\u00D0" => "D"
-
-# Ñ => N
-"\u00D1" => "N"
-
-# Ò => O
-"\u00D2" => "O"
-
-# Ó => O
-"\u00D3" => "O"
-
-# Ô => O
-"\u00D4" => "O"
-
-# Õ => O
-"\u00D5" => "O"
-
-# Ö => O
-"\u00D6" => "O"
-
-# Ø => O
-"\u00D8" => "O"
-
-# Π=> OE
-"\u0152" => "OE"
-
-# Þ
-"\u00DE" => "TH"
-
-# Ù => U
-"\u00D9" => "U"
-
-# Ú => U
-"\u00DA" => "U"
-
-# Û => U
-"\u00DB" => "U"
-
-# Ü => U
-"\u00DC" => "U"
-
-# Ý => Y
-"\u00DD" => "Y"
-
-# Ÿ => Y
-"\u0178" => "Y"
-
-# à => a
-"\u00E0" => "a"
-
-# á => a
-"\u00E1" => "a"
-
-# â => a
-"\u00E2" => "a"
-
-# ã => a
-"\u00E3" => "a"
-
-# ä => a
-"\u00E4" => "a"
-
-# å => a
-"\u00E5" => "a"
-
-# æ => ae
-"\u00E6" => "ae"
-
-# ç => c
-"\u00E7" => "c"
-
-# è => e
-"\u00E8" => "e"
-
-# é => e
-"\u00E9" => "e"
-
-# ê => e
-"\u00EA" => "e"
-
-# ë => e
-"\u00EB" => "e"
-
-# ì => i
-"\u00EC" => "i"
-
-# í => i
-"\u00ED" => "i"
-
-# î => i
-"\u00EE" => "i"
-
-# ï => i
-"\u00EF" => "i"
-
-# ij => ij
-"\u0133" => "ij"
-
-# ð => d
-"\u00F0" => "d"
-
-# ñ => n
-"\u00F1" => "n"
-
-# ò => o
-"\u00F2" => "o"
-
-# ó => o
-"\u00F3" => "o"
-
-# ô => o
-"\u00F4" => "o"
-
-# õ => o
-"\u00F5" => "o"
-
-# ö => o
-"\u00F6" => "o"
-
-# ø => o
-"\u00F8" => "o"
-
-# œ => oe
-"\u0153" => "oe"
-
-# ß => ss
-"\u00DF" => "ss"
-
-# þ => th
-"\u00FE" => "th"
-
-# ù => u
-"\u00F9" => "u"
-
-# ú => u
-"\u00FA" => "u"
-
-# û => u
-"\u00FB" => "u"
-
-# ü => u
-"\u00FC" => "u"
-
-# ý => y
-"\u00FD" => "y"
-
-# ÿ => y
-"\u00FF" => "y"
-
-# ff => ff
-"\uFB00" => "ff"
-
-# fi => fi
-"\uFB01" => "fi"
-
-# fl => fl
-"\uFB02" => "fl"
-
-# ffi => ffi
-"\uFB03" => "ffi"
-
-# ffl => ffl
-"\uFB04" => "ffl"
-
-# ſt => ft
-"\uFB05" => "ft"
-
-# st => st
-"\uFB06" => "st"

data/lib/generators/enju_leaf/setup/templates/solr/conf/protwords.txt

@@ -1,21 +0,0 @@
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#-----------------------------------------------------------------------
-# Use a protected word file to protect against the stemmer reducing two
-# unrelated words to the same base word.
-
-# Some non-words that normally won't be encountered,
-# just to test that they won't be stemmed.
-dontstems
-zwhacky
-