enju_circulation 0.0.43 → 0.0.45

data/spec/controllers/item_has_use_restrictions_controller_spec.rb

@@ -32,7 +32,7 @@ describe ItemHasUseRestrictionsController do
       end
     end
 
-    describe "When logged in as Subject" do
+    describe "When logged in as User" do
       login_user
 
       it "assigns all item_has_use_restrictions as @item_has_use_restrictions" do
@@ -72,7 +72,7 @@ describe ItemHasUseRestrictionsController do
       end
     end
 
-    describe "When logged in as Subject" do
+    describe "When logged in as User" do
       login_user
 
       it "assigns the requested item_has_use_restriction as @item_has_use_restriction" do
@@ -112,7 +112,7 @@ describe ItemHasUseRestrictionsController do
       end
     end
 
-    describe "When logged in as Subject" do
+    describe "When logged in as User" do
       login_user
 
       it "should not assign the requested item_has_use_restriction as @item_has_use_restriction" do
@@ -152,7 +152,7 @@ describe ItemHasUseRestrictionsController do
       end
     end
 
-    describe "When logged in as Subject" do
+    describe "When logged in as User" do
       login_user
 
       it "assigns the requested item_has_use_restriction as @item_has_use_restriction" do
@@ -211,7 +211,7 @@ describe ItemHasUseRestrictionsController do
       describe "with valid params" do
         it "assigns a newly created item_has_use_restriction as @item_has_use_restriction" do
           post :create, :item_has_use_restriction => @attrs
-          assigns(:item_has_use_restriction).should be_valid
+          assigns(:item_has_use_restriction).should_not be_valid
         end
 
         it "should be forbidden" do
@@ -233,13 +233,13 @@ describe ItemHasUseRestrictionsController do
       end
     end
 
-    describe "When logged in as Subject" do
+    describe "When logged in as User" do
       login_user
 
       describe "with valid params" do
         it "assigns a newly created item_has_use_restriction as @item_has_use_restriction" do
           post :create, :item_has_use_restriction => @attrs
-          assigns(:item_has_use_restriction).should be_valid
+          assigns(:item_has_use_restriction).should_not be_valid
         end
 
         it "should be forbidden" do
@@ -265,7 +265,7 @@ describe ItemHasUseRestrictionsController do
       describe "with valid params" do
         it "assigns a newly created item_has_use_restriction as @item_has_use_restriction" do
           post :create, :item_has_use_restriction => @attrs
-          assigns(:item_has_use_restriction).should be_valid
+          assigns(:item_has_use_restriction).should_not be_valid
         end
 
         it "should be forbidden" do
@@ -345,7 +345,7 @@ describe ItemHasUseRestrictionsController do
       end
     end
 
-    describe "When logged in as Subject" do
+    describe "When logged in as User" do
       login_user
 
       describe "with valid params" do
@@ -420,7 +420,7 @@ describe ItemHasUseRestrictionsController do
       end
     end
 
-    describe "When logged in as Subject" do
+    describe "When logged in as User" do
       login_user
 
       it "destroys the requested item_has_use_restriction" do

data/spec/controllers/reserve_stat_has_manifestations_controller_spec.rb

@@ -26,7 +26,7 @@ describe ReserveStatHasManifestationsController do
       end
     end
 
-    describe "When logged in as Manifestation" do
+    describe "When logged in as User" do
       login_user
 
       it "assigns all reserve_stat_has_manifestations as @reserve_stat_has_manifestations" do
@@ -66,7 +66,7 @@ describe ReserveStatHasManifestationsController do
       end
     end
 
-    describe "When logged in as Manifestation" do
+    describe "When logged in as User" do
       login_user
 
       it "assigns the requested reserve_stat_has_manifestation as @reserve_stat_has_manifestation" do
@@ -106,7 +106,7 @@ describe ReserveStatHasManifestationsController do
       end
     end
 
-    describe "When logged in as Manifestation" do
+    describe "When logged in as User" do
       login_user
 
       it "should not assign the requested reserve_stat_has_manifestation as @reserve_stat_has_manifestation" do
@@ -146,7 +146,7 @@ describe ReserveStatHasManifestationsController do
       end
     end
 
-    describe "When logged in as Manifestation" do
+    describe "When logged in as User" do
       login_user
 
       it "assigns the requested reserve_stat_has_manifestation as @reserve_stat_has_manifestation" do
@@ -205,7 +205,7 @@ describe ReserveStatHasManifestationsController do
       describe "with valid params" do
         it "assigns a newly created reserve_stat_has_manifestation as @reserve_stat_has_manifestation" do
           post :create, :reserve_stat_has_manifestation => @attrs
-          assigns(:reserve_stat_has_manifestation).should be_valid
+          assigns(:reserve_stat_has_manifestation).should_not be_valid
         end
 
         it "should be forbidden" do
@@ -227,13 +227,13 @@ describe ReserveStatHasManifestationsController do
       end
     end
 
-    describe "When logged in as Manifestation" do
+    describe "When logged in as User" do
       login_user
 
       describe "with valid params" do
         it "assigns a newly created reserve_stat_has_manifestation as @reserve_stat_has_manifestation" do
           post :create, :reserve_stat_has_manifestation => @attrs
-          assigns(:reserve_stat_has_manifestation).should be_valid
+          assigns(:reserve_stat_has_manifestation).should_not be_valid
         end
 
         it "should be forbidden" do
@@ -259,7 +259,7 @@ describe ReserveStatHasManifestationsController do
       describe "with valid params" do
         it "assigns a newly created reserve_stat_has_manifestation as @reserve_stat_has_manifestation" do
           post :create, :reserve_stat_has_manifestation => @attrs
-          assigns(:reserve_stat_has_manifestation).should be_valid
+          assigns(:reserve_stat_has_manifestation).should_not be_valid
         end
 
         it "should be forbidden" do
@@ -339,7 +339,7 @@ describe ReserveStatHasManifestationsController do
       end
     end
 
-    describe "When logged in as Manifestation" do
+    describe "When logged in as User" do
       login_user
 
       describe "with valid params" do
@@ -414,7 +414,7 @@ describe ReserveStatHasManifestationsController do
       end
     end
 
-    describe "When logged in as Manifestation" do
+    describe "When logged in as User" do
       login_user
 
       it "destroys the requested reserve_stat_has_manifestation" do

data/spec/controllers/reserve_stat_has_users_controller_spec.rb

@@ -205,7 +205,7 @@ describe ReserveStatHasUsersController do
       describe "with valid params" do
         it "assigns a newly created reserve_stat_has_user as @reserve_stat_has_user" do
           post :create, :reserve_stat_has_user => @attrs
-          assigns(:reserve_stat_has_user).should be_valid
+          assigns(:reserve_stat_has_user).should_not be_valid
         end
 
         it "should be forbidden" do
@@ -233,7 +233,7 @@ describe ReserveStatHasUsersController do
       describe "with valid params" do
         it "assigns a newly created reserve_stat_has_user as @reserve_stat_has_user" do
           post :create, :reserve_stat_has_user => @attrs
-          assigns(:reserve_stat_has_user).should be_valid
+          assigns(:reserve_stat_has_user).should_not be_valid
         end
 
         it "should be forbidden" do
@@ -259,7 +259,7 @@ describe ReserveStatHasUsersController do
       describe "with valid params" do
         it "assigns a newly created reserve_stat_has_user as @reserve_stat_has_user" do
           post :create, :reserve_stat_has_user => @attrs
-          assigns(:reserve_stat_has_user).should be_valid
+          assigns(:reserve_stat_has_user).should_not be_valid
         end
 
         it "should be forbidden" do

data/spec/controllers/reserves_controller_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe ReservesController do
   fixtures :all
 
-  describe "GET index" do
+  describe "GET index", :solr => true do
     describe "When logged in as Administrator" do
       login_fixture_admin
 

data/spec/controllers/use_restrictions_controller_spec.rb

@@ -183,7 +183,7 @@ describe UseRestrictionsController do
       describe "with valid params" do
         it "assigns a newly created use_restriction as @use_restriction" do
           post :create, :use_restriction => @attrs
-          assigns(:use_restriction).should_not be_valid
+          assigns(:use_restriction).should be_valid
         end
 
         it "redirects to the created patron" do
@@ -211,7 +211,7 @@ describe UseRestrictionsController do
       describe "with valid params" do
         it "assigns a newly created use_restriction as @use_restriction" do
           post :create, :use_restriction => @attrs
-          assigns(:use_restriction).should_not be_valid
+          assigns(:use_restriction).should be_valid
         end
 
         it "should be forbidden" do
@@ -239,7 +239,7 @@ describe UseRestrictionsController do
       describe "with valid params" do
         it "assigns a newly created use_restriction as @use_restriction" do
           post :create, :use_restriction => @attrs
-          assigns(:use_restriction).should_not be_valid
+          assigns(:use_restriction).should be_valid
         end
 
         it "should be forbidden" do
@@ -265,7 +265,7 @@ describe UseRestrictionsController do
       describe "with valid params" do
         it "assigns a newly created use_restriction as @use_restriction" do
           post :create, :use_restriction => @attrs
-          assigns(:use_restriction).should_not be_valid
+          assigns(:use_restriction).should be_valid
         end
 
         it "should be forbidden" do

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

@@ -10,7 +10,6 @@ class Basket < ActiveRecord::Base
   validates_presence_of :user, :on => :create
   validate :check_suspended
 
-  attr_protected :user_id
   attr_accessor :user_number
 
   def check_suspended
@@ -36,7 +35,11 @@ class Basket < ActiveRecord::Base
       return nil if checked_items.size == 0
       Item.transaction do
         self.checked_items.each do |checked_item|
-          checkout = self.user.checkouts.new(:librarian_id => librarian.id, :item_id => checked_item.item.id, :basket_id => id, :due_date => checked_item.due_date)
+          checkout = self.user.checkouts.new
+          checkout.librarian = librarian
+          checkout.item = checked_item.item
+          checkout.basket = self
+          checkout.due_date = checked_item.due_date
           checked_item.item.checkout!(user)
           checkout.save!
         end

data/spec/dummy/solr/conf/admin-extra.html

@@ -0,0 +1,31 @@
+<!--
+ 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/spec/dummy/solr/conf/elevate.xml

@@ -0,0 +1,36 @@
+<?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/spec/dummy/solr/conf/mapping-ISOLatin1Accent.txt

@@ -0,0 +1,246 @@
+# 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"