enju_library 0.1.0.pre39 → 0.1.0.pre40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0eb95937df49250022c8fa869d621a055aee64ea
-  data.tar.gz: f79f75f76a9c942e58080e518ff17ff9d7c77793
+  metadata.gz: 43ae415d2c7916d8d10576cb4e6f6e6ca35c4efc
+  data.tar.gz: 2c2cd4dcfc3dd1715278b4b441bb73d7422dc7d7
 SHA512:
-  metadata.gz: 3e57afb48c4d56db84dcafef4048723221436c416557e31ea6578add5b0c4b346d511e7ea6925f83d6166b3bbf8aef2653ed856e7101ee6fa6c652f0581faaac
-  data.tar.gz: f261b8c0a726b360341f520f6bfccf2817695870938eb703acf16f3092abdba96abbe433cd9d07d1b5c0bd106c49230bee4387c1759ecc6b9c79f5d6c2fc1850
+  metadata.gz: c8e071bad6eb78a01366fcaffd2c653185773b2d04b1e6b5d8b9c3fad6e12c9167dad62184fa1cdee1ecbf6c894f4d8a7421df2e1e8dfd5f7149581c574a3c0b
+  data.tar.gz: a105c67e432856dcb48cde413e792064f7b4623e11c22e5651d7b7c7ff4efe58dc8671d1502336d00993a23f87e94ae0d8fbce635e69f87b3c59ff23fcfc6a88

data/app/controllers/accepts_controller.rb

@@ -81,7 +81,7 @@ class AcceptsController < ApplicationController
 
     respond_to do |format|
       if @accept.save
-        flash[:message] << t('accept.successfully_accepted', model:  t('activerecord.models.accept'))
+        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) }
@@ -98,8 +98,8 @@ class AcceptsController < ApplicationController
   # PUT /accepts/1.json
   def update
     respond_to do |format|
-      if @accept.update_attributes(params[:accept])
-        format.html { redirect_to @accept, notice:  t('controller.successfully_updated', model:  t('activerecord.models.accept')) }
+      if @accept.update_attributes(accept_params)
+        format.html { redirect_to @accept, notice: t('controller.successfully_updated', model: t('activerecord.models.accept')) }
         format.json { head :no_content }
       else
         format.html { render action: "edit" }
@@ -118,4 +118,9 @@ class AcceptsController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def accept_params
+    params.require(:accept).permit(:item_identifier, :librarian_id, :item_id)
+  end
 end

data/app/controllers/baskets_controller.rb

@@ -45,7 +45,7 @@ class BasketsController < ApplicationController
   # POST /baskets
   # POST /baskets.json
   def create
-    @basket = Basket.new(params[:basket])
+    @basket = Basket.new(basket_params)
     @user = Profile.where(user_number: @basket.user_number).first.try(:user) if @basket.user_number.present?
     if @user
       @basket.user = @user
@@ -53,7 +53,7 @@ class BasketsController < ApplicationController
 
     respond_to do |format|
       if @basket.save
-        format.html { redirect_to new_checked_item_url(basket_id: @basket.id), notice:  t('controller.successfully_created', model:  t('activerecord.models.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" }
@@ -82,7 +82,7 @@ class BasketsController < ApplicationController
       #if @basket.update_attributes({})
       if @basket.save(:validate => false)
         # 貸出完了時
-        format.html { redirect_to checkouts_url(user_id: @basket.user.username), 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 checked_items_url(basket_id: @basket.id) }
@@ -102,4 +102,9 @@ class BasketsController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def basket_params
+    params.require(:basket).permit(:note, :user_number)
+  end
 end

data/app/controllers/bookstores_controller.rb

@@ -38,11 +38,11 @@ class BookstoresController < ApplicationController
   # POST /bookstores
   # POST /bookstores.json
   def create
-    @bookstore = Bookstore.new(params[:bookstore])
+    @bookstore = Bookstore.new(bookstore_params)
 
     respond_to do |format|
       if @bookstore.save
-        format.html { redirect_to @bookstore, notice:  t('controller.successfully_created', model:  t('activerecord.models.bookstore')) }
+        format.html { redirect_to @bookstore, notice: t('controller.successfully_created', model: t('activerecord.models.bookstore')) }
         format.json { render json: @bookstore, status: :created, location: @bookstore }
       else
         format.html { render action: "new" }
@@ -60,8 +60,8 @@ class BookstoresController < ApplicationController
     end
 
     respond_to do |format|
-      if @bookstore.update_attributes(params[:bookstore])
-        format.html { redirect_to @bookstore, notice:  t('controller.successfully_updated', model:  t('activerecord.models.bookstore')) }
+      if @bookstore.update_attributes(bookstore_params)
+        format.html { redirect_to @bookstore, notice: t('controller.successfully_updated', model: t('activerecord.models.bookstore')) }
         format.json { head :no_content }
       else
         format.html { render action: "edit" }
@@ -80,4 +80,12 @@ class BookstoresController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def bookstore_params
+    params.require(:bookstore).permit(
+      :name, :zip_code, :address, :note, :telephone_number,
+      :fax_number, :url
+    )
+  end
 end

data/app/controllers/budget_types_controller.rb

@@ -38,11 +38,11 @@ class BudgetTypesController < ApplicationController
   # POST /budget_types
   # POST /budget_types.json
   def create
-    @budget_type = BudgetType.new(params[:budget_type])
+    @budget_type = BudgetType.new(budget_type_params)
 
     respond_to do |format|
       if @budget_type.save
-        format.html { redirect_to @budget_type, notice:  t('controller.successfully_created', model:  t('activerecord.models.budget_type')) }
+        format.html { redirect_to @budget_type, notice: t('controller.successfully_created', model: t('activerecord.models.budget_type')) }
         format.json { render json: @budget_type, status: :created, location: @budget_type }
       else
         format.html { render action: "new" }
@@ -60,8 +60,8 @@ class BudgetTypesController < ApplicationController
     end
 
     respond_to do |format|
-      if @budget_type.update_attributes(params[:budget_type])
-        format.html { redirect_to @budget_type, notice:  t('controller.successfully_updated', model:  t('activerecord.models.budget_type')) }
+      if @budget_type.update_attributes(budget_type_params)
+        format.html { redirect_to @budget_type, notice: t('controller.successfully_updated', model: t('activerecord.models.budget_type')) }
         format.json { head :no_content }
       else
         format.html { render action: "edit" }
@@ -80,4 +80,11 @@ class BudgetTypesController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def budget_type_params
+    params.require(:budget_type).permit(
+      :name, :display_name, :note, :position
+    )
+  end
 end

data/app/controllers/libraries_controller.rb

@@ -70,11 +70,11 @@ class LibrariesController < ApplicationController
   # POST /libraries
   # POST /libraries.json
   def create
-    @library = Library.new(params[:library])
+    @library = Library.new(library_params)
 
     respond_to do |format|
       if @library.save
-        format.html { redirect_to @library, notice:  t('controller.successfully_created', model:  t('activerecord.models.library')) }
+        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
@@ -93,8 +93,8 @@ class LibrariesController < ApplicationController
     end
 
     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')) }
+      if @library.update_attributes(library_params)
+        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
@@ -117,6 +117,14 @@ class LibrariesController < ApplicationController
   end
 
   private
+  def library_params
+    params.require(:library).permit(
+      :name, :display_name, :short_display_name, :zip_code, :street,
+      :locality, :region, :telephone_number_1, :telephone_number_2, :fax_number,
+      :note, :call_number_rows, :call_number_delimiter, :library_group_id,
+      :country_id, :opening_hour, :isil, :position
+    )
+  end
 
   def prepare_options
     @library_groups = LibraryGroup.all

data/app/controllers/library_groups_controller.rb

@@ -31,8 +31,8 @@ class LibraryGroupsController < ApplicationController
   # PUT /library_groups/1.json
   def update
     respond_to do |format|
-      if @library_group.update_attributes(params[:library_group])
-        format.html { redirect_to @library_group, notice:  t('controller.successfully_updated', model:  t('activerecord.models.library_group')) }
+      if @library_group.update_attributes(library_group_params)
+        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
@@ -41,4 +41,16 @@ class LibraryGroupsController < ApplicationController
       end
     end
   end
+
+  private
+  def library_group_params
+    params.require(:library_group).permit(
+      :name, :display_name, :short_name, :my_networks,
+      :login_banner, :note, :country_id, :admin_networks, :url,
+      :allow_bookmark_external_url, # EnjuBookmark
+      {
+        :colors_attributes =>  [:id, :property, :code]
+      }
+    )
+  end
 end

data/app/controllers/request_status_types_controller.rb

@@ -38,11 +38,11 @@ class RequestStatusTypesController < ApplicationController
   # POST /request_status_types
   # POST /request_status_types.json
   def create
-    @request_status_type = RequestStatusType.new(params[:request_status_type])
+    @request_status_type = RequestStatusType.new(request_status_type_params)
 
     respond_to do |format|
       if @request_status_type.save
-        format.html { redirect_to @request_status_type, notice:  t('controller.successfully_created', model:  t('activerecord.models.request_status_type')) }
+        format.html { redirect_to @request_status_type, notice: t('controller.successfully_created', model: t('activerecord.models.request_status_type')) }
         format.json { render json: @request_status_type, status: :created, location: @request_status_type }
       else
         format.html { render action: "new" }
@@ -60,8 +60,8 @@ class RequestStatusTypesController < ApplicationController
     end
 
     respond_to do |format|
-      if @request_status_type.update_attributes(params[:request_status_type])
-        format.html { redirect_to @request_status_type, notice:  t('controller.successfully_updated', model:  t('activerecord.models.request_status_type')) }
+      if @request_status_type.update_attributes(request_status_type_params)
+        format.html { redirect_to @request_status_type, notice: t('controller.successfully_updated', model: t('activerecord.models.request_status_type')) }
         format.json { head :no_content }
       else
         format.html { render action: "edit" }
@@ -80,4 +80,9 @@ class RequestStatusTypesController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def request_status_type_params
+    params.require(:request_status_type).permit(:name, :display_name, :note)
+  end
 end

data/app/controllers/request_types_controller.rb

@@ -38,11 +38,11 @@ class RequestTypesController < ApplicationController
   # POST /request_types
   # POST /request_types.json
   def create
-    @request_type = RequestType.new(params[:request_type])
+    @request_type = RequestType.new(request_type_params)
 
     respond_to do |format|
       if @request_type.save
-        format.html { redirect_to @request_type, notice:  t('controller.successfully_created', model:  t('activerecord.models.request_type')) }
+        format.html { redirect_to @request_type, notice: t('controller.successfully_created', model: t('activerecord.models.request_type')) }
         format.json { render json: @request_type, status: :created, location: @request_type }
       else
         format.html { render action: "new" }
@@ -60,8 +60,8 @@ class RequestTypesController < ApplicationController
     end
 
     respond_to do |format|
-      if @request_type.update_attributes(params[:request_type])
-        format.html { redirect_to @request_type, notice:  t('controller.successfully_updated', model:  t('activerecord.models.request_type')) }
+      if @request_type.update_attributes(request_type_params)
+        format.html { redirect_to @request_type, notice: t('controller.successfully_updated', model: t('activerecord.models.request_type')) }
         format.json { head :no_content }
       else
         format.html { render action: "edit" }
@@ -80,4 +80,9 @@ class RequestTypesController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def request_type_params
+    params.require(:request_type).permit(:name, :display_name, :note)
+  end
 end

data/app/controllers/search_engines_controller.rb

@@ -38,11 +38,11 @@ class SearchEnginesController < ApplicationController
   # POST /search_engines
   # POST /search_engines.json
   def create
-    @search_engine = SearchEngine.new(params[:search_engine])
+    @search_engine = SearchEngine.new(search_engine_params)
 
     respond_to do |format|
       if @search_engine.save
-        format.html { redirect_to @search_engine, notice:  t('controller.successfully_created', model:  t('activerecord.models.search_engine')) }
+        format.html { redirect_to @search_engine, notice: t('controller.successfully_created', model: t('activerecord.models.search_engine')) }
         format.json { render json: @search_engine, status: :created, location: @search_engine }
       else
         format.html { render action: "new" }
@@ -60,8 +60,8 @@ class SearchEnginesController < ApplicationController
     end
 
     respond_to do |format|
-      if @search_engine.update_attributes(params[:search_engine])
-        format.html { redirect_to @search_engine, notice:  t('controller.successfully_updated', model:  t('activerecord.models.search_engine')) }
+      if @search_engine.update_attributes(search_engine_params)
+        format.html { redirect_to @search_engine, notice: t('controller.successfully_updated', model: t('activerecord.models.search_engine')) }
         format.json { head :no_content }
       else
         format.html { render action: "edit" }
@@ -80,4 +80,12 @@ class SearchEnginesController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def search_engine_params
+    params.require(:search_engine).permit(
+      :name, :display_name, :url, :base_url, :http_method,
+      :query_param, :additional_param, :note
+    )
+  end
 end

data/app/controllers/shelves_controller.rb

@@ -81,7 +81,7 @@ class ShelvesController < ApplicationController
   # POST /shelves
   # POST /shelves.json
   def create
-    @shelf = Shelf.new(params[:shelf])
+    @shelf = Shelf.new(shelf_params)
     if @library
       @shelf.library = @library
     else
@@ -90,7 +90,7 @@ 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.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?
@@ -112,8 +112,8 @@ class ShelvesController < ApplicationController
     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')) }
+      if @shelf.update_attributes(shelf_params)
+        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?
@@ -133,4 +133,11 @@ class ShelvesController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def shelf_params
+    params.require(:shelf).permit(
+      :name, :display_name, :note, :library_id, :closed
+    )
+  end
 end

data/app/controllers/subscribes_controller.rb

@@ -42,11 +42,11 @@ class SubscribesController < ApplicationController
   # POST /subscribes
   # POST /subscribes.json
   def create
-    @subscribe = Subscribe.new(params[:subscribe])
+    @subscribe = Subscribe.new(subscribe_params)
 
     respond_to do |format|
       if @subscribe.save
-        format.html { redirect_to @subscribe, notice:  t('controller.successfully_created', model:  t('activerecord.models.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" }
@@ -59,8 +59,8 @@ class SubscribesController < ApplicationController
   # PUT /subscribes/1.json
   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')) }
+      if @subscribe.update_attributes(subscribe_params)
+        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" }
@@ -79,4 +79,11 @@ class SubscribesController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def subscribe_params
+    params.require(:subscribe).permit(
+      :subscription_id, :work_id, :start_at, :end_at
+    )
+  end
 end

data/app/controllers/subscriptions_controller.rb

@@ -45,12 +45,12 @@ class SubscriptionsController < ApplicationController
   # POST /subscriptions
   # POST /subscriptions.json
   def create
-    @subscription = Subscription.new(params[:subscription])
+    @subscription = Subscription.new(subscription_params)
     @subscription.user = current_user
 
     respond_to do |format|
       if @subscription.save
-        format.html { redirect_to @subscription, notice:  t('controller.successfully_created', model:  t('activerecord.models.subscription')) }
+        format.html { redirect_to @subscription, notice: t('controller.successfully_created', model: t('activerecord.models.subscription')) }
         format.json { render json: @subscription, status: :created, location:  @subscription }
       else
         format.html { render action: "new" }
@@ -62,10 +62,10 @@ class SubscriptionsController < ApplicationController
   # PUT /subscriptions/1
   # PUT /subscriptions/1.json
   def update
-    @subscription.assign_attributes(params[:subscription])
+    @subscription.assign_attributes(subscription_params)
     respond_to do |format|
       if @subscription.save
-        format.html { redirect_to @subscription, notice:  t('controller.successfully_updated', model:  t('activerecord.models.subscription')) }
+        format.html { redirect_to @subscription, notice: t('controller.successfully_updated', model: t('activerecord.models.subscription')) }
         format.json { head :no_content }
       else
         format.html { render action: "edit" }
@@ -84,4 +84,11 @@ class SubscriptionsController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def subscription_params
+    params.require(:subscription).permit(
+      :title, :note, :order_list_id, :user_id
+    )
+  end
 end

data/app/models/accept.rb

@@ -1,5 +1,4 @@
 class Accept < ActiveRecord::Base
-  attr_accessible :item_identifier, :librarian_id, :item_id
   default_scope { order('accepts.id DESC') }
   belongs_to :basket
   belongs_to :item, touch: true
@@ -11,8 +10,6 @@ class Accept < ActiveRecord::Base
   validates_presence_of :item_id, message:  I18n.t('accept.item_not_found')
   validates_presence_of :basket_id
 
-  before_save :accept!, on: :create
-
   attr_accessor :item_identifier
 
   paginates_per 10

data/app/models/basket.rb

@@ -1,5 +1,4 @@
 class Basket < ActiveRecord::Base
-  attr_accessible :note, :user_number
   default_scope { order('baskets.id DESC') }
   scope :will_expire, lambda {|date| where('created_at < ?', date)}
   belongs_to :user, validate: true

data/app/models/bookstore.rb

@@ -1,6 +1,4 @@
 class Bookstore < ActiveRecord::Base
-  attr_accessible :name, :zip_code, :address, :note, :telephone_number,
-    :fax_number, :url
   default_scope { order('bookstores.position') }
   has_many :items
 

data/app/models/budget_type.rb

@@ -1,5 +1,4 @@
 class BudgetType < ActiveRecord::Base
-  attr_accessible :name, :display_name, :note, :position
   include MasterModel
   validates :name, presence: true, format: { with: /\A[0-9A-Za-z][0-9A-Za-z_\-\s,]*[0-9a-z]\Z/ }
   default_scope { order('budget_types.position') }

data/app/models/color.rb

@@ -1,5 +1,5 @@
 class Color < ActiveRecord::Base
-  attr_accessible :code, :property
+  #attr_accessible :code, :property
 
   belongs_to :library_group
   validates :code, presence: true, format: /\A[A-Fa-f0-9]{6}\Z/

data/app/models/library.rb

@@ -1,10 +1,5 @@
 # -*- encoding: utf-8 -*-
 class Library < ActiveRecord::Base
-  attr_accessible :name, :display_name, :short_display_name, :zip_code, :street,
-    :locality, :region, :telephone_number_1, :telephone_number_2, :fax_number,
-    :note, :call_number_rows, :call_number_delimiter, :library_group_id,
-    :country_id, :opening_hour, :isil, :position
-
   include MasterModel
   default_scope { order('libraries.position') }
   scope :real, -> { where('id != 1') }

data/app/models/library_group.rb

@@ -1,12 +1,5 @@
 # -*- encoding: utf-8 -*-
 class LibraryGroup < ActiveRecord::Base
-  attr_accessible :name, :display_name, :short_name, :my_networks,
-    :login_banner, :note, :country_id, :admin_networks, :url,
-    :colors_attributes
-  if defined?(EnjuBookmark)
-    attr_accessible :allow_bookmark_external_url
-  end
-
   #include Singleton
   include MasterModel
 

data/app/models/request_status_type.rb

@@ -1,5 +1,4 @@
 class RequestStatusType < ActiveRecord::Base
-  attr_accessible :name, :display_name, :note
   include MasterModel
   validates :name, presence: true, format: { with: /\A[0-9A-Za-z][0-9A-Za-z_\-\s,]*[0-9a-z]\Z/ }
   default_scope { order('request_status_types.position') }

data/app/models/request_type.rb

@@ -1,5 +1,4 @@
 class RequestType < ActiveRecord::Base
-  attr_accessible :name, :display_name, :note
   include MasterModel
   validates :name, presence: true, format: { with: /\A[0-9A-Za-z][0-9A-Za-z_\-\s,]*[0-9a-z]\Z/ }
   default_scope { order('request_types.position') }

data/app/models/search_engine.rb

@@ -1,6 +1,4 @@
 class SearchEngine < ActiveRecord::Base
-  attr_accessible :name, :display_name, :url, :base_url, :http_method,
-    :query_param, :additional_param, :note
   default_scope { order('search_engines.position') }
   acts_as_list
 

data/app/models/shelf.rb

@@ -1,5 +1,4 @@
 class Shelf < ActiveRecord::Base
-  attr_accessible :name, :display_name, :note, :library_id, :closed
   include MasterModel
   scope :real, -> { where('library_id != 1') }
   belongs_to :library, validate: true
@@ -10,6 +9,7 @@ class Shelf < ActiveRecord::Base
   validates :library, presence: true
   validates_uniqueness_of :display_name, scope: :library_id
   validates :name, format: { with: /\A[a-z][0-9a-z\-_]{1,253}[0-9a-z]\Z/ }
+  before_update :reset_position
 
   acts_as_list scope: :library
 
@@ -35,15 +35,16 @@ class Shelf < ActiveRecord::Base
     Shelf.find(1)
   end
 
-  def first?
-    # 必ずposition順に並んでいる
-    return true if library.shelves.first.position == position
-    false
-  end
-
   def localized_display_name
     display_name.localize
   end
+
+  # http://stackoverflow.com/a/12437606
+  def reset_position
+    if library_id_changed?
+      self.position = library.shelves.count > 0 ? library.shelves.last.position + 1 : 1
+    end
+  end
 end
 
 # == Schema Information

data/app/models/subscribe.rb

@@ -1,5 +1,4 @@
 class Subscribe < ActiveRecord::Base
-  attr_accessible :subscription_id, :work_id, :start_at, :end_at
   belongs_to :subscription, :counter_cache => true, validate: true
   belongs_to :work, class_name: 'Manifestation', validate: true
 

data/app/models/subscription.rb

@@ -1,5 +1,4 @@
 class Subscription < ActiveRecord::Base
-  attr_accessible :title, :note, :order_list_id, :user_id
   has_many :subscribes, dependent: :destroy
   has_many :works, through: :subscribes
   belongs_to :user, validate: true

data/lib/enju_library/engine.rb

@@ -1,7 +1,5 @@
-require 'enju_seed'
 require 'geocoder'
 require 'ipaddr'
-require "protected_attributes" if Rails::VERSION::MAJOR == 4
 
 module EnjuLibrary
   class Engine < ::Rails::Engine

data/lib/enju_library/version.rb

@@ -1,3 +1,3 @@
 module EnjuLibrary
-  VERSION = "0.1.0.pre39"
+  VERSION = "0.1.0.pre40"
 end

data/spec/controllers/baskets_controller_spec.rb

@@ -193,7 +193,7 @@ describe BasketsController do
 
       describe "with blank params" do
         it "assigns a newly created basket as @basket" do
-          post :create, :basket => { }
+          post :create, :basket => { note: 'test' }
           assigns(:basket).should_not be_valid
         end
       end
@@ -218,7 +218,7 @@ describe BasketsController do
 
       describe "with blank params" do
         it "assigns a newly created basket as @basket" do
-          post :create, :basket => { }
+          post :create, :basket => { note: 'test' }
           assigns(:basket).should_not be_valid
         end
       end
@@ -245,7 +245,7 @@ describe BasketsController do
       end
 
       it "should not create basket without user_number" do
-        post :create, :basket => { }
+        post :create, :basket => { note: 'test' }
         assigns(:basket).should_not be_valid
         response.should be_success
       end
@@ -257,7 +257,7 @@ describe BasketsController do
       end
 
       it "should not create basket without user_number" do
-        post :create, :basket => { }
+        post :create, :basket => { note: 'test' }
         assigns(:basket).should_not be_valid
         response.should be_success
       end
@@ -287,12 +287,12 @@ describe BasketsController do
     describe "When not logged in" do
       describe "with blank params" do
         it "assigns a newly created basket as @basket" do
-          post :create, :basket => { }
+          post :create, :basket => { note: 'test' }
           assigns(:basket).should_not be_valid
         end
 
         it "should be redirected to new_user_session_url" do
-          post :create, :basket => { }
+          post :create, :basket => { note: 'test' }
           assigns(:basket).should_not be_valid
           assert_response :redirect
           response.should redirect_to new_user_session_url

data/spec/controllers/budget_types_controller_spec.rb

@@ -84,14 +84,14 @@ describe BudgetTypesController do
       it "assigns a newly created but unsaved budget_type as @budget_type" do
         # Trigger the behavior that occurs when invalid params are submitted
         BudgetType.any_instance.stub(:save).and_return(false)
-        post :create, :budget_type => {}
+        post :create, :budget_type => { note: 'test' }
         assigns(:budget_type).should be_a_new(BudgetType)
       end
 
       it "re-renders the 'new' template" do
         # Trigger the behavior that occurs when invalid params are submitted
         BudgetType.any_instance.stub(:save).and_return(false)
-        post :create, :budget_type => {}
+        post :create, :budget_type => { note: 'test' }
         #response.should render_template("new")
       end
     end
@@ -105,8 +105,8 @@ describe BudgetTypesController do
         # specifies that the BudgetType created on the previous line
         # receives the :update_attributes message with whatever params are
         # submitted in the request.
-        BudgetType.any_instance.should_receive(:update_attributes).with({'these' => 'params'})
-        put :update, :id => budget_type.id, :budget_type => {'these' => 'params'}
+        BudgetType.any_instance.should_receive(:update_attributes).with({'note' => 'test'})
+        put :update, :id => budget_type.id, :budget_type => { note: 'test'}
       end
 
       it "assigns the requested budget_type as @budget_type" do
@@ -135,7 +135,7 @@ describe BudgetTypesController do
         budget_type = BudgetType.create! valid_attributes
         # Trigger the behavior that occurs when invalid params are submitted
         BudgetType.any_instance.stub(:save).and_return(false)
-        put :update, :id => budget_type.id, :budget_type => {}
+        put :update, :id => budget_type.id, :budget_type => { note: 'test' }
         assigns(:budget_type).should eq(budget_type)
       end
 
@@ -143,7 +143,7 @@ describe BudgetTypesController do
         budget_type = BudgetType.create! valid_attributes
         # Trigger the behavior that occurs when invalid params are submitted
         BudgetType.any_instance.stub(:save).and_return(false)
-        put :update, :id => budget_type.id, :budget_type => {}
+        put :update, :id => budget_type.id, :budget_type => { note: 'test' }
         #response.should render_template("edit")
       end
     end

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

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 class User < ActiveRecord::Base
   devise :database_authenticatable, #:registerable,
     :recoverable, :rememberable, :trackable, #, :validatable

data/spec/dummy/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

data/spec/dummy/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

data/spec/dummy/bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/spec/dummy/bin/setup

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts "== Installing dependencies =="
+  system "gem install bundler --conservative"
+  system "bundle check || bundle install"
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?("config/database.yml")
+  #   system "cp config/database.yml.sample config/database.yml"
+  # end
+
+  puts "\n== Preparing database =="
+  system "bin/rake db:setup"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system "rm -f log/*"
+  system "rm -rf tmp/cache"
+
+  puts "\n== Restarting application server =="
+  system "touch tmp/restart.txt"
+end

data/spec/dummy/config/application.rb

@@ -44,7 +44,7 @@ module Dummy
     # This will create an empty whitelist of attributes available for mass-assignment for all models
     # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
     # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = true
+    #config.active_record.whitelist_attributes = true
 
     # Enable the asset pipeline
     config.assets.enabled = true
@@ -55,7 +55,6 @@ module Dummy
 end
 
 require 'enju_leaf'
-require 'enju_biblio'
 require 'enju_circulation'
 require "enju_event"
 require "enju_inter_library_loan"

data/spec/dummy/config/environments/test.rb

@@ -30,7 +30,7 @@ Dummy::Application.configure do
   config.action_mailer.delivery_method = :test
 
   # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  #config.active_record.mass_assignment_sanitizer = :strict
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr

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: 20141020120523) do
 
   create_table "accepts", force: true do |t|
     t.integer  "basket_id"
@@ -290,6 +290,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "shelf_id"
+    t.integer  "library_id"
   end
 
   add_index "checkouts", ["basket_id"], name: "index_checkouts_on_basket_id"
@@ -297,6 +298,7 @@ ActiveRecord::Schema.define(version: 20141014065831) do
   add_index "checkouts", ["item_id", "basket_id"], name: "index_checkouts_on_item_id_and_basket_id", unique: true
   add_index "checkouts", ["item_id"], name: "index_checkouts_on_item_id"
   add_index "checkouts", ["librarian_id"], name: "index_checkouts_on_librarian_id"
+  add_index "checkouts", ["library_id"], name: "index_checkouts_on_library_id"
   add_index "checkouts", ["shelf_id"], name: "index_checkouts_on_shelf_id"
   add_index "checkouts", ["user_id"], name: "index_checkouts_on_user_id"
 

data/spec/fixtures/events.yml

@@ -3,48 +3,32 @@ event_00001:
   updated_at: 2008-01-13 02:54:43.764011 +09:00
   event_category_id: 1
   end_at: 2008-01-14 02:54:00 +09:00
-  name: !binary |
-    5LuV5LqL5aeL44KB
-
-  display_name: !binary |
-    5LuV5LqL5aeL44KB
-
+  name: 仕事始め
+  display_name: 仕事始め
   deleted_at: 
   start_at: 2008-01-13 02:54:00 +09:00
   id: 1
-  note: !binary |
-    44Gq44KT44Go44GL44GL44KT44Go44GL
-
+  note: なんとかかんとか
   library_id: 2
   created_at: 2008-01-01 16:20:54.372729 +09:00
 event_00002: 
   updated_at: 2008-01-13 02:54:21.134175 +09:00
   event_category_id: 2
   end_at: 2008-01-14 02:54:00 +09:00
-  name: !binary |
-    44OG44K544OI
-
-  display_name: !binary |
-    44OG44K544OI
-
+  name: テスト
+  display_name: テスト
   deleted_at: 
   start_at: 2008-01-13 02:54:00 +09:00
   id: 2
-  note: !binary |
-    44OG44K544OI55So44Gu44Kk44OZ44Oz44OI44Gn44GZ44CC
-
+  note: テスト用のイベントです。
   library_id: 2
   created_at: 2008-01-01 20:54:25.803201 +09:00
 event_00003: 
   updated_at: 2008-02-05 20:00:35.319131 +09:00
   event_category_id: 1
   end_at: 2008-02-05 00:00:00 +09:00
-  name: !binary |
-    44Of44O844OG44Kj44Oz44Kw
-
-  display_name: !binary |
-    44Of44O844OG44Kj44Oz44Kw
-
+  name: ミーティング
+  display_name: ミーティング
   deleted_at: 
   start_at: 2008-01-13 00:00:00 +09:00
   id: 3
@@ -55,18 +39,12 @@ event_00004:
   updated_at: 2008-02-05 15:43:42.617670 +09:00
   event_category_id: 4
   end_at: 2008-02-06 00:00:00 +09:00
-  name: !binary |
-    44OG44K544OI
-
-  display_name: !binary |
-    44OG44K544OI
-
+  name: テスト
+  display_name: テスト
   deleted_at: 
   start_at: 2008-02-05 00:00:00 +09:00
   id: 4
-  note: !binary |
-    44Gq44KT44Go44GL44GL44KT44Go44GL
-
+  note: なんとかかんとか
   library_id: 3
   created_at: 2008-02-05 15:43:42.617670 +09:00
 event_00005: 
@@ -85,12 +63,8 @@ event_00006:
   updated_at: 2008-02-05 23:52:06.315285 +09:00
   event_category_id: 2
   end_at: 2008-02-08 00:00:00 +09:00
-  name: !binary |
-    44Gq44KT44Go44GL44GL44KT44Go44GL
-
-  display_name: !binary |
-    44Gq44KT44Go44GL44GL44KT44Go44GL
-
+  name: なんとかかんとか
+  display_name: なんとかかんとか
   deleted_at: 
   start_at: 2008-02-05 00:00:00 +09:00
   id: 6

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: enju_library
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre39
+  version: 0.1.0.pre40
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-25 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: enju_seed
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1.pre11
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1.pre11
 - !ruby/object:Gem::Dependency
   name: geocoder
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -156,98 +142,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc15
+        version: 1.1.0.rc17
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc15
+        version: 1.1.0.rc17
 - !ruby/object:Gem::Dependency
   name: enju_ndl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre34
+        version: 0.1.0.pre35
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre34
+        version: 0.1.0.pre35
 - !ruby/object:Gem::Dependency
   name: enju_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre16
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0.pre16
-- !ruby/object:Gem::Dependency
-  name: enju_biblio
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0.pre63
+        version: 0.1.0.pre17
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre63
+        version: 0.1.0.pre17
 - !ruby/object:Gem::Dependency
   name: enju_event
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.17.pre23
+        version: 0.1.17.pre24
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.17.pre23
+        version: 0.1.17.pre24
 - !ruby/object:Gem::Dependency
   name: enju_circulation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre40
+        version: 0.1.0.pre42
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre40
+        version: 0.1.0.pre42
 - !ruby/object:Gem::Dependency
   name: enju_inter_library_loan
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre10
+        version: 0.1.0.pre11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre10
+        version: 0.1.0.pre11
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
@@ -497,6 +469,10 @@ files:
 - spec/dummy/app/models/setting.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/bin/bundle
+- spec/dummy/bin/rails
+- spec/dummy/bin/rake
+- spec/dummy/bin/setup
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/application.yml
@@ -695,7 +671,6 @@ files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
-- spec/dummy/script/rails
 - spec/dummy/tmp/cache/4AD/470/country_all
 - spec/factories/accepts.rb
 - spec/factories/basket.rb
@@ -810,7 +785,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: enju_library plugin
@@ -835,6 +810,10 @@ test_files:
 - spec/dummy/app/models/setting.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/bin/bundle
+- spec/dummy/bin/rails
+- spec/dummy/bin/rake
+- spec/dummy/bin/setup
 - spec/dummy/config/application.rb
 - spec/dummy/config/application.yml
 - spec/dummy/config/boot.rb
@@ -1035,7 +1014,6 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/Rakefile
 - spec/dummy/README.rdoc
-- spec/dummy/script/rails
 - spec/dummy/tmp/cache/4AD/470/country_all
 - spec/factories/accepts.rb
 - spec/factories/basket.rb

data/spec/dummy/script/rails

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
-require 'rails/commands'