enju_library 0.1.0.pre33 → 0.1.0.pre34

data/app/views/subscribes/show.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.subscribe')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.subscribe')) -%></h1>
 <div id='content_list'>
 <p id="notice"><%= notice %></p>
 

data/app/views/subscriptions/edit.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.subscription')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.subscription')) -%></h1>
 <div id="content_list">
 
 <%= form_for(@subscription) do |f| -%>
@@ -7,11 +7,11 @@
 
   <div class="field">
     <%= f.label :title -%><br />
-    <%= f.text_field :title, :class => 'resource_title' -%>
+    <%= f.text_field :title, class: 'resource_title' -%>
   </div>
   <div class="field">
     <%= f.label :note -%><br />
-    <%= f.text_area :note, :class => 'resource_textarea' -%>
+    <%= f.text_area :note, class: 'resource_textarea' -%>
   </div>
   <div class="actions">
     <%= f.submit %>

data/app/views/subscriptions/index.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.subscription')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.subscription')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
@@ -16,7 +16,7 @@
     <td>
       <% if can? :delete, subscription %>
         <%= link_to t('page.edit'), edit_subscription_path(subscription) -%>
-        <%= link_to t('page.destroy'), subscription, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+        <%= link_to t('page.destroy'), subscription, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <% end %>
     </td>
   </tr>
@@ -31,9 +31,9 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <%- if @work -%>
-      <li><%= link_to t('page.add', :model => t('activerecord.models.work')), subscriptions_path -%></li>
+      <li><%= link_to t('page.add', model: t('activerecord.models.work')), subscriptions_path -%></li>
     <%- else -%>
-      <li><%= link_to t('page.new', :model => t('activerecord.models.subscription')), new_subscription_path -%></li>
+      <li><%= link_to t('page.new', model: t('activerecord.models.subscription')), new_subscription_path -%></li>
     <%- end -%>
   </ul>
 </div>

data/app/views/subscriptions/new.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.subscription')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.subscription')) -%></h1>
 <div id="content_list">
 
 <%= form_for(@subscription) do |f| -%>
@@ -7,11 +7,11 @@
 
   <div class="field">
     <%= f.label :title -%><br />
-    <%= f.text_field :title, :class => 'resource_title' -%>
+    <%= f.text_field :title, class: 'resource_title' -%>
   </div>
   <div class="field">
     <%= f.label :note -%><br />
-    <%= f.text_area :note, :class => 'resource_textarea' -%>
+    <%= f.text_area :note, class: 'resource_textarea' -%>
   </div>
   <div class="actions">
     <%= f.submit %>

data/app/views/subscriptions/show.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.subscription')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.subscription')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 

data/config/locales/translation_ja.yml

@@ -3,7 +3,7 @@ ja:
     models:
       library: 図書館
       library_group: 図書館全体の設定
-      shelf: 本棚
+      shelf: 書棚
       accept: 検収
       budget_type: 予算種別
       bookstore: 書店

data/db/migrate/080_create_library_groups.rb

@@ -4,7 +4,6 @@ class CreateLibraryGroups < ActiveRecord::Migration
       t.string :name, :null => false
       t.text :display_name
       t.string :short_name, :null => false
-      t.string :email
       t.text :my_networks
       t.text :login_banner
       t.text :note

data/lib/enju_library/version.rb

@@ -1,3 +1,3 @@
 module EnjuLibrary
-  VERSION = "0.1.0.pre33"
+  VERSION = "0.1.0.pre34"
 end

data/lib/generators/enju_library/setup/templates/db/fixtures/request_status_types.yml

@@ -0,0 +1,37 @@
+--- 
+request_status_type_00001: 
+  name: Available For Pickup  
+  display_name: Available For Pickup
+  id: 1
+  position: 1
+  note: ""
+request_status_type_00002: 
+  name: Cannot Fulfill Request  
+  display_name: Cannot Fulfill Request
+  id: 2
+  position: 2
+  note: ""
+request_status_type_00003: 
+  name: Expired  
+  display_name: Expired
+  id: 3
+  position: 3
+  note: ""
+request_status_type_00004: 
+  name: In Process  
+  display_name: In Process
+  id: 4
+  position: 4
+  note: ""
+request_status_type_00005: 
+  name: Need to Accept Conditions  
+  display_name: Need to Accept Conditions
+  id: 5
+  position: 5
+  note: ""
+request_status_type_00006: 
+  name: Requested Via ILL  
+  display_name: Requested Via ILL
+  id: 6
+  position: 6
+  note: ""

data/lib/generators/enju_library/setup/templates/db/fixtures/request_types.yml

@@ -0,0 +1,29 @@
+--- 
+request_type_00001: 
+  name: Estimate  
+  display_name: Estimate
+  id: 1
+  position: 1
+  note: ""
+request_type_00002: 
+  name: Hold  
+  display_name: Hold
+  id: 2
+  position: 2
+  note: ""
+request_type_00003: 
+  name: Loan  
+  display_name: Loan
+  position: 3
+  note: ""
+request_type_00004: 
+  name: Non-Returnable Copy  
+  display_name: Non-Returnable Copy
+  position: 4
+  note: ""
+request_type_00005: 
+  name: Stack Retrieval  
+  display_name: Stack Retrieval
+  id: 5
+  position: 5
+  note: ""

data/spec/controllers/accepts_controller_spec.rb

@@ -160,7 +160,7 @@ describe AcceptsController do
         describe "When basket_id is specified" do
           it "redirects to the created accept" do
             post :create, :accept => @attrs, :basket_id => 9
-            response.should redirect_to(basket_accepts_url(assigns(:accept).basket))
+            response.should redirect_to(accepts_url(basket_id: assigns(:accept).basket.id))
             assigns(:accept).item.circulation_status.name.should eq 'Available On Shelf'
           end
         end

data/spec/controllers/baskets_controller_spec.rb

@@ -5,7 +5,7 @@ describe BasketsController do
 
   describe "GET index" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns all baskets as @baskets" do
         get :index, :user_id => users(:user1).username
@@ -20,7 +20,7 @@ describe BasketsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns all baskets as @baskets" do
         get :index, :user_id => users(:user1).username
@@ -30,7 +30,7 @@ describe BasketsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns all baskets as @baskets" do
         get :index, :user_id => users(:user1).username
@@ -50,7 +50,7 @@ describe BasketsController do
 
   describe "GET show" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested basket as @basket" do
         get :show, :id => 1, :user_id => users(:admin).username
@@ -59,7 +59,7 @@ describe BasketsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested basket as @basket" do
         get :show, :id => 1, :user_id => users(:admin).username
@@ -68,7 +68,7 @@ describe BasketsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested basket as @basket" do
         get :show, :id => 1, :user_id => users(:admin).username
@@ -88,7 +88,7 @@ describe BasketsController do
 
   describe "GET new" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested basket as @basket" do
         get :new
@@ -97,7 +97,7 @@ describe BasketsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested basket as @basket" do
         get :new
@@ -106,7 +106,7 @@ describe BasketsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "should not assign the requested basket as @basket" do
         get :new
@@ -126,7 +126,7 @@ describe BasketsController do
 
   describe "GET edit" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
       before(:each) do
         @basket = baskets(:basket_00001)
       end
@@ -138,7 +138,7 @@ describe BasketsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
       before(:each) do
         @basket = baskets(:basket_00001)
       end
@@ -150,7 +150,7 @@ describe BasketsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
       before(:each) do
         @basket = baskets(:basket_00001)
       end
@@ -177,16 +177,16 @@ describe BasketsController do
 
   describe "POST create" do
     before(:each) do
-      @attrs = {:user_number => users(:user1).user_number }
+      @attrs = {:user_number => users(:user1).profile.user_number }
       @invalid_attrs = {:user_number => 'invalid'}
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "assigns a newly created basket as @basket" do
-          post :create, :basket => {:user_number => users(:user1).user_number }
+          post :create, :basket => {:user_number => users(:user1).profile.user_number }
           assigns(:basket).should be_valid
         end
       end
@@ -207,11 +207,11 @@ describe BasketsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "assigns a newly created basket as @basket" do
-          post :create, :basket => {:user_number => users(:user1).user_number }
+          post :create, :basket => {:user_number => users(:user1).profile.user_number }
           assigns(:basket).should be_valid
         end
       end
@@ -231,7 +231,7 @@ describe BasketsController do
       end
 
       it "should not create basket when user is suspended" do
-        post :create, :basket => {:user_number => users(:user4).user_number }
+        post :create, :basket => {:user_number => users(:user4).profile.user_number }
         assigns(:basket).should_not be_valid
         assigns(:basket).errors["base"].include?(I18n.t('basket.this_account_is_suspended')).should be_truthy
         response.should be_success
@@ -251,9 +251,9 @@ describe BasketsController do
       end
 
       it "should create basket" do
-        post :create, :basket => {:user_number => users(:user1).user_number }
+        post :create, :basket => {:user_number => users(:user1).profile.user_number }
         assigns(:basket).should be_valid
-        response.should redirect_to new_basket_checked_item_url(assigns(:basket))
+        response.should redirect_to new_checked_item_url(basket_id: assigns(:basket).id)
       end
 
       it "should not create basket without user_number" do
@@ -264,22 +264,22 @@ describe BasketsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "assigns a newly created basket as @basket" do
-          post :create, :basket => {:user_number => users(:user1).user_number }
+          post :create, :basket => {:user_number => users(:user1).profile.user_number }
           assigns(:basket).should_not be_valid
         end
 
         it "should be forbidden" do
-          post :create, :basket => {:user_number => users(:user1).user_number }
+          post :create, :basket => {:user_number => users(:user1).profile.user_number }
           response.should be_forbidden
         end
       end
 
       it "should not create basket" do
-        post :create, :basket => {:user_number => users(:user1).user_number }
+        post :create, :basket => {:user_number => users(:user1).profile.user_number }
         response.should be_forbidden
       end
     end
@@ -307,7 +307,7 @@ describe BasketsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "updates the requested basket" do
@@ -317,7 +317,7 @@ describe BasketsController do
         it "assigns the requested basket as @basket" do
           put :update, :id => 8, :basket => @attrs
           assigns(:basket).checkouts.order('created_at DESC').first.item.circulation_status.name.should eq 'On Loan'
-          response.should redirect_to(user_checkouts_url(assigns(:basket).user))
+          response.should redirect_to(checkouts_url(user_id: assigns(:basket).user.username))
         end
       end
     end
@@ -333,12 +333,12 @@ describe BasketsController do
 
       it "should destroy basket without user_id" do
         delete :destroy, :id => 1, :basket => {:user_id => nil}, :user_id => users(:user1).username
-        response.should redirect_to user_checkouts_url(assigns(:basket).user)
+        response.should redirect_to(checkouts_url(user_id: assigns(:basket).user.username))
       end
 
       it "should destroy basket" do
         delete :destroy, :id => 1, :basket => { }, :user_id => users(:user1).username
-        response.should redirect_to user_checkouts_url(assigns(:basket).user)
+        response.should redirect_to(checkouts_url(user_id: assigns(:basket).user.username))
       end
     end
 
@@ -347,12 +347,12 @@ describe BasketsController do
 
       it "should destroy basket without user_id" do
         delete :destroy, :id => 1, :basket => {:user_id => nil}, :user_id => users(:user1).username
-        response.should redirect_to user_checkouts_url(assigns(:basket).user)
+        response.should redirect_to(checkouts_url(user_id: assigns(:basket).user.username))
       end
 
       it "should destroy basket" do
         delete :destroy, :id => 1, :basket => { }, :user_id => users(:user1).username
-        response.should redirect_to user_checkouts_url(assigns(:basket).user)
+        response.should redirect_to(checkouts_url(user_id: assigns(:basket).user.username))
       end
     end
 

data/spec/controllers/bookstores_controller_spec.rb

@@ -15,7 +15,7 @@ describe BookstoresController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns all bookstores as @bookstores" do
         get :index
@@ -24,7 +24,7 @@ describe BookstoresController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns all bookstores as @bookstores" do
         get :index
@@ -33,7 +33,7 @@ describe BookstoresController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns all bookstores as @bookstores" do
         get :index
@@ -57,7 +57,7 @@ describe BookstoresController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested bookstore as @bookstore" do
         get :show, :id => @bookstore.id
@@ -66,7 +66,7 @@ describe BookstoresController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested bookstore as @bookstore" do
         get :show, :id => @bookstore.id
@@ -75,7 +75,7 @@ describe BookstoresController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested bookstore as @bookstore" do
         get :show, :id => @bookstore.id
@@ -93,7 +93,7 @@ describe BookstoresController do
 
   describe "GET new" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested bookstore as @bookstore" do
         get :new
@@ -103,7 +103,7 @@ describe BookstoresController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "should not assign the requested bookstore as @bookstore" do
         get :new
@@ -113,7 +113,7 @@ describe BookstoresController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "should not assign the requested bookstore as @bookstore" do
         get :new
@@ -137,7 +137,7 @@ describe BookstoresController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested bookstore as @bookstore" do
         get :edit, :id => @bookstore.id
@@ -146,7 +146,7 @@ describe BookstoresController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested bookstore as @bookstore" do
         get :edit, :id => @bookstore.id
@@ -155,7 +155,7 @@ describe BookstoresController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested bookstore as @bookstore" do
         get :edit, :id => @bookstore.id
@@ -178,7 +178,7 @@ describe BookstoresController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "assigns a newly created bookstore as @bookstore" do
@@ -206,7 +206,7 @@ describe BookstoresController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "assigns a newly created bookstore as @bookstore" do
@@ -234,7 +234,7 @@ describe BookstoresController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "assigns a newly created bookstore as @bookstore" do
@@ -296,7 +296,7 @@ describe BookstoresController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "updates the requested bookstore" do
@@ -323,7 +323,7 @@ describe BookstoresController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "updates the requested bookstore" do
@@ -346,7 +346,7 @@ describe BookstoresController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "updates the requested bookstore" do
@@ -395,7 +395,7 @@ describe BookstoresController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "destroys the requested bookstore" do
         delete :destroy, :id => @bookstore.id
@@ -408,7 +408,7 @@ describe BookstoresController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "destroys the requested bookstore" do
         delete :destroy, :id => @bookstore.id
@@ -421,7 +421,7 @@ describe BookstoresController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "destroys the requested bookstore" do
         delete :destroy, :id => @bookstore.id