enju_library 0.1.0.pre33 → 0.1.0.pre34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd5f2a84f8de884044cc92ccf75b5b256eb4f9a1
-  data.tar.gz: 1fa77d84c76d38bedd20edb2cc23b9c7273006a4
+  metadata.gz: 29978eed453931a7389deced51c7d5faefc36b5b
+  data.tar.gz: bcf7cd57d779511d2d2005ee713164d66b4a6ad0
 SHA512:
-  metadata.gz: 4547dfa9384a1876c44ac8121e6c96e3d85d2da70105d55c1587ecbad4773d248ed398c1bf1443ca32e3a927886e6faabc1815a5b9ffca0a18577c602d794e73
-  data.tar.gz: b4b6cdf0b15841f6831dc7d25324dcc9e49ed894bfeb87afeb4b221faa800c5f806b5ef8eaa8c6ef55ba1ec8fb9275258aaa30ece53b87f11800c193ffacddc1
+  metadata.gz: c91faabec4565a8b9e741083848401378b5ee39a07867e999f250e2fc2f543ecdc8008bd385efa165bd1dbb1912b5f2b88b56a1644fd485cc983adbd73226e13
+  data.tar.gz: 22b6b9a889175cd7d4fa9fb5ee65d8cdc58d390354dc16bec7561c0d431e1113c5634171af8a72d600730e51ee2360ee1503a1aa9539ea43f7e2bbecabaeb0da

data/app/controllers/accepts_controller.rb

@@ -1,13 +1,13 @@
 class AcceptsController < InheritedResources::Base
-  load_and_authorize_resource :except => :index
-  authorize_resource :only => :index
+  load_and_authorize_resource except: :index
+  authorize_resource only: :index
   respond_to :html, :json
-  before_filter :get_basket, :only => [:index, :create]
+  before_filter :get_basket, only: [:index, :create]
 
   # GET /accepts
   # GET /accepts.json
   def index
-    if params[:format] == 'csv'
+    if params[:format] == 'txt'
       @accepts = Accept.order('accepts.created_at DESC').page(params[:page]).per(65534)
     else
       if params[:accept]
@@ -28,9 +28,9 @@ class AcceptsController < InheritedResources::Base
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @accepts }
+      format.json { render json: @accepts }
       format.js { @accept = Accept.new }
-      format.csv
+      format.txt
     end
   end
 
@@ -45,7 +45,7 @@ class AcceptsController < InheritedResources::Base
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @accept }
+      format.json { render json: @accept }
     end
   end
 
@@ -68,15 +68,15 @@ class AcceptsController < InheritedResources::Base
 
     respond_to do |format|
       if @accept.save
-        flash[:message] << t('accept.successfully_accepted', :model => t('activerecord.models.accept'))
-        format.html { redirect_to basket_accepts_url(@basket) }
-        format.json { render :json => @accept, :status => :created, :location => @accept }
-        format.js { redirect_to basket_accepts_url(@basket, :format => :js) }
+        flash[:message] << t('accept.successfully_accepted', model:  t('activerecord.models.accept'))
+        format.html { redirect_to accepts_url(basket_id: @basket.id) }
+        format.json { render json: @accept, status: :created, location:  @accept }
+        format.js { redirect_to accepts_url(basket_id: @basket.id, format: :js) }
       else
         @accepts = @basket.accepts.page(params[:page])
-        format.html { render :action => "index" }
-        format.json { render :json => @accept.errors, :status => :unprocessable_entity }
-        format.js { render :action => "index" }
+        format.html { render action: "index" }
+        format.json { render json: @accept.errors, status: :unprocessable_entity }
+        format.js { render action: "index" }
       end
     end
   end

data/app/controllers/baskets_controller.rb

@@ -1,8 +1,5 @@
 class BasketsController < ApplicationController
   load_and_authorize_resource
-  if defined?(EnjuCirculation)
-    cache_sweeper :circulation_sweeper, :only => [:create, :update, :destroy]
-  end
 
   # GET /baskets
   # GET /baskets.json
@@ -16,7 +13,7 @@ class BasketsController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @baskets }
+      format.json { render json: @baskets }
     end
   end
 
@@ -25,7 +22,7 @@ class BasketsController < ApplicationController
   def show
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @basket }
+      format.json { render json: @basket }
     end
   end
 
@@ -37,7 +34,7 @@ class BasketsController < ApplicationController
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @basket }
+      format.json { render json: @basket }
     end
   end
 
@@ -49,20 +46,18 @@ class BasketsController < ApplicationController
   # POST /baskets.json
   def create
     @basket = Basket.new(params[:basket])
-    @user = User.where(:user_number => @basket.user_number).first if @basket.user_number
+    @user = Profile.where(user_number: @basket.user_number).first.try(:user) if @basket.user_number.present?
     if @user
-      if @user.user_number?
-        @basket.user = @user
-      end
+      @basket.user = @user
     end
 
     respond_to do |format|
       if @basket.save
-        format.html { redirect_to new_basket_checked_item_url(@basket), :notice => t('controller.successfully_created', :model => t('activerecord.models.basket')) }
-        format.json { render :json => @basket, :status => :created, :location => @basket }
+        format.html { redirect_to new_checked_item_url(basket_id: @basket.id), notice:  t('controller.successfully_created', model:  t('activerecord.models.basket')) }
+        format.json { render json: @basket, status: :created, location:  @basket }
       else
-        format.html { render :action => "new" }
-        format.json { render :json => @basket.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @basket.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -73,13 +68,13 @@ class BasketsController < ApplicationController
     librarian = current_user
     begin
       unless @basket.basket_checkout(librarian)
-        redirect_to new_basket_checked_item_url(@basket)
+        redirect_to new_checked_item_url(basket_id: @basket.id)
         return
       end
     rescue ActiveRecord::RecordInvalid
       flash[:message] = t('checked_item.already_checked_out_try_again')
       @basket.checked_items.delete_all
-      redirect_to new_basket_checked_item_url(@basket)
+      redirect_to new_checked_item_url(basket_id: @basket.id)
       return
     end
 
@@ -87,11 +82,11 @@ class BasketsController < ApplicationController
       #if @basket.update_attributes({})
       if @basket.save(:validate => false)
         # 貸出完了時
-        format.html { redirect_to user_checkouts_url(@basket.user), :notice => t('basket.checkout_completed') }
+        format.html { redirect_to checkouts_url(user_id: @basket.user.username), notice:  t('basket.checkout_completed') }
         format.json { head :no_content }
       else
-        format.html { redirect_to basket_checked_items_url(@basket) }
-        format.json { render :json => @basket.errors, :status => :unprocessable_entity }
+        format.html { redirect_to checked_items_url(basket_id: @basket.id) }
+        format.json { render json: @basket.errors, status: :unprocessable_entity }
       end
     end
 
@@ -103,8 +98,7 @@ class BasketsController < ApplicationController
     @basket.destroy
 
     respond_to do |format|
-      #format.html { redirect_to(user_baskets_url(@user)) }
-      format.html { redirect_to user_checkouts_url(@basket.user) }
+      format.html { redirect_to checkouts_url(user_id: @basket.user.username) }
       format.json { head :no_content }
     end
   end

data/app/controllers/libraries_controller.rb

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 class LibrariesController < ApplicationController
   load_and_authorize_resource
-  after_filter :solr_commit, :only => [:create, :update, :destroy]
+  after_filter :solr_commit, only: [:create, :update, :destroy]
 
   # GET /libraries
   # GET /libraries.json
@@ -16,7 +16,7 @@ class LibrariesController < ApplicationController
     query = @query = params[:query].to_s.strip
     page = params[:page] || 1
 
-    @libraries = Library.search(:include => [:shelves]) do
+    @libraries = Library.search(include: [:shelves]) do
       fulltext query if query.present?
       paginate :page => page.to_i, :per_page => Library.default_per_page
       order_by sort[:sort_by], sort[:order]
@@ -24,7 +24,7 @@ class LibrariesController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @libraries }
+      format.json { render json: @libraries }
     end
   end
 
@@ -45,7 +45,7 @@ class LibrariesController < ApplicationController
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @library }
+      format.json { render json: @library }
       format.js
     end
   end
@@ -58,7 +58,7 @@ class LibrariesController < ApplicationController
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @library }
+      format.json { render json: @library }
     end
   end
 
@@ -74,12 +74,12 @@ class LibrariesController < ApplicationController
 
     respond_to do |format|
       if @library.save
-        format.html { redirect_to @library, :notice => t('controller.successfully_created', :model => t('activerecord.models.library')) }
-        format.json { render :json => @library, :status => :created }
+        format.html { redirect_to @library, notice:  t('controller.successfully_created', model:  t('activerecord.models.library')) }
+        format.json { render json: @library, status: :created }
       else
         prepare_options
-        format.html { render :action => "new" }
-        format.json { render :json => @library.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @library.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -94,13 +94,13 @@ class LibrariesController < ApplicationController
 
     respond_to do |format|
       if @library.update_attributes(params[:library])
-        format.html { redirect_to @library, :notice => t('controller.successfully_updated', :model => t('activerecord.models.library')) }
+        format.html { redirect_to @library, notice:  t('controller.successfully_updated', model:  t('activerecord.models.library')) }
         format.json { head :no_content }
       else
         @library.name = @library.name_was
         prepare_options
-        format.html { render :action => "edit" }
-        format.json { render :json => @library.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @library.errors, status: :unprocessable_entity }
       end
     end
   end

data/app/controllers/library_groups_controller.rb

@@ -1,7 +1,6 @@
 # -*- encoding: utf-8 -*-
 class LibraryGroupsController < ApplicationController
   load_and_authorize_resource
-  cache_sweeper :library_group_sweeper, :only => [:update]
 
   # GET /library_groups
   # GET /library_groups.json
@@ -10,7 +9,7 @@ class LibraryGroupsController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @library_groups }
+      format.json { render json: @library_groups }
     end
   end
 
@@ -19,7 +18,7 @@ class LibraryGroupsController < ApplicationController
   def show
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @library_group }
+      format.json { render json: @library_group }
     end
   end
 
@@ -34,12 +33,12 @@ class LibraryGroupsController < ApplicationController
     respond_to do |format|
       if @library_group.update_attributes(params[:library_group])
         expire_page '/page/opensearch'
-        format.html { redirect_to @library_group, :notice => t('controller.successfully_updated', :model => t('activerecord.models.library_group')) }
+        format.html { redirect_to @library_group, notice:  t('controller.successfully_updated', model:  t('activerecord.models.library_group')) }
         format.json { head :no_content }
       else
         @countries = Country.all
-        format.html { render :action => "edit" }
-        format.json { render :json => @library_group.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @library_group.errors, status: :unprocessable_entity }
       end
     end
   end

data/app/controllers/shelves_controller.rb

@@ -1,7 +1,7 @@
 class ShelvesController < ApplicationController
   load_and_authorize_resource
   before_filter :get_library
-  before_filter :get_libraries, :only => [:new, :edit, :create, :update]
+  before_filter :get_libraries, only: [:new, :edit, :create, :update]
 
   # GET /shelves
   # GET /shelves.json
@@ -12,7 +12,7 @@ class ShelvesController < ApplicationController
       else
         @shelves = Shelf.real
       end
-      render :partial => 'select_form'
+      render partial: 'select_form'
       return
     else
       sort = {:sort_by => 'name', :order => 'asc'}
@@ -26,7 +26,7 @@ class ShelvesController < ApplicationController
       page = params[:page] || 1
       library = @library if @library
 
-      search = Shelf.search(:include => [:library]) do
+      search = Shelf.search(include: [:library]) do
         fulltext query if query.present?
         paginate :page => page.to_i, :per_page => Shelf.default_per_page
         if library
@@ -43,18 +43,18 @@ class ShelvesController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @shelves }
+      format.json { render json: @shelves }
     end
   end
 
   # GET /shelves/1
   # GET /shelves/1.json
   def show
-    @shelf = Shelf.find(params[:id], :include => :library)
+    @shelf = Shelf.find(params[:id], include: :library)
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @shelf }
+      format.json { render json: @shelf }
       format.mobile
     end
   end
@@ -62,20 +62,20 @@ class ShelvesController < ApplicationController
   # GET /shelves/new
   # GET /shelves/new.json
   def new
-    @library = Library.web if @library.nil?
     @shelf = Shelf.new
+    @library = current_user.profile.library unless @library
     @shelf.library = @library
     #@shelf.user = current_user
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @shelf }
+      format.json { render json: @shelf }
     end
   end
 
   # GET /shelves/1/edit
   def edit
-    @shelf = Shelf.find(params[:id], :include => :library)
+    @shelf = Shelf.find(params[:id], include: :library)
   end
 
   # POST /shelves
@@ -90,12 +90,12 @@ class ShelvesController < ApplicationController
 
     respond_to do |format|
       if @shelf.save
-        format.html { redirect_to @shelf, :notice => t('controller.successfully_created', :model => t('activerecord.models.shelf')) }
-        format.json { render :json => @shelf, :status => :created, :location => @shelf }
+        format.html { redirect_to @shelf, notice:  t('controller.successfully_created', model:  t('activerecord.models.shelf')) }
+        format.json { render json: @shelf, status: :created, location:  @shelf }
       else
         @library = Library.first if @shelf.library.nil?
-        format.html { render :action => "new" }
-        format.json { render :json => @shelf.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @shelf.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -107,18 +107,18 @@ class ShelvesController < ApplicationController
 
     if params[:move]
       move_position(@shelf, params[:move], false)
-      redirect_to library_shelves_url(@shelf.library)
+      redirect_to shelves_url(library_id: @shelf.library_id)
       return
     end
 
     respond_to do |format|
       if @shelf.update_attributes(params[:shelf])
-        format.html { redirect_to @shelf, :notice => t('controller.successfully_updated', :model => t('activerecord.models.shelf')) }
+        format.html { redirect_to @shelf, notice:  t('controller.successfully_updated', model:  t('activerecord.models.shelf')) }
         format.json { head :no_content }
       else
         @library = Library.first if @library.nil?
-        format.html { render :action => "edit" }
-        format.json { render :json => @shelf.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @shelf.errors, status: :unprocessable_entity }
       end
     end
   end

data/app/controllers/subscribes_controller.rb

@@ -9,7 +9,7 @@ class SubscribesController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @subscribes }
+      format.json { render json: @subscribes }
     end
   end
 
@@ -18,7 +18,7 @@ class SubscribesController < ApplicationController
   def show
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @subscribe }
+      format.json { render json: @subscribe }
     end
   end
 
@@ -31,7 +31,7 @@ class SubscribesController < ApplicationController
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @subscribe }
+      format.json { render json: @subscribe }
     end
   end
 
@@ -46,11 +46,11 @@ class SubscribesController < ApplicationController
 
     respond_to do |format|
       if @subscribe.save
-        format.html { redirect_to @subscribe, :notice => t('controller.successfully_created', :model => t('activerecord.models.subscribe')) }
-        format.json { render :json => @subscribe, :status => :created, :location => @subscribe }
+        format.html { redirect_to @subscribe, notice:  t('controller.successfully_created', model:  t('activerecord.models.subscribe')) }
+        format.json { render json: @subscribe, status: :created, location:  @subscribe }
       else
-        format.html { render :action => "new" }
-        format.json { render :json => @subscribe.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @subscribe.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -60,11 +60,11 @@ class SubscribesController < ApplicationController
   def update
     respond_to do |format|
       if @subscribe.update_attributes(params[:subscribe])
-        format.html { redirect_to @subscribe, :notice => t('controller.successfully_updated', :model => t('activerecord.models.subscribe')) }
+        format.html { redirect_to @subscribe, notice:  t('controller.successfully_updated', model:  t('activerecord.models.subscribe')) }
         format.json { head :no_content }
       else
-        format.html { render :action => "edit" }
-        format.json { render :json => @subscribe.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @subscribe.errors, status: :unprocessable_entity }
       end
     end
   end