enju_library 0.1.2 → 0.2.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4742f9db0ad3917fe0e1ae6848ca2bcd5f5ba7a
-  data.tar.gz: 1f666d31c8df75f3c94c6c78ec83eede5778147c
+  metadata.gz: d3e6909228abfb05e27d765b4ae1ca826886d9e6
+  data.tar.gz: 4dd3c86961e520555ce9a7f52c005a9f53cd4c29
 SHA512:
-  metadata.gz: 7dbc1ee13c7926817103c19cc93c83b32fe45f9aaeb910079f8104a8b38ca61d99bde96c7393c2f5717d17976ae695968997f12e820a068e8e24338d33b84bac
-  data.tar.gz: b601e27991964ff3bb4ca04e142b1df358fe2b9a0dcb0034ef93fd48d2f45d2edef91746a0445d26061ae2587762cf0991cf1721b196b6dc15ef81d0e151fe85
+  metadata.gz: cad580ab88688b578872724c8374d6e80e9d3baa3d027171d8fffd2b3a4bb1ae56e75aec783c0175444137e1ac3b6d1916c6593e803749adce4bb02fd8bf88f9
+  data.tar.gz: 623fff1279501648d69c5cc64aea61e1058a62bc3669b0e61641ffa7906da1a1cfd2e863279ea7c34438014477f4978eaef73d088062c7afbff99a94afaf1a84

data/README.rdoc

@@ -1,7 +1,7 @@
 = EnjuLibrary
-{<img src="https://travis-ci.org/next-l/enju_library.svg?branch=1.1" alt="Build Status" />}[https://travis-ci.org/next-l/enju_library]
-{<img src="https://coveralls.io/repos/next-l/enju_library/badge.svg?branch=1.1&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_library?branch=1.1]
-{<img src="https://hakiri.io/github/next-l/enju_library/1.1.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_library/1.1]
+{<img src="https://travis-ci.org/next-l/enju_library.svg?branch=1.2" alt="Build Status" />}[https://travis-ci.org/next-l/enju_library]
+{<img src="https://coveralls.io/repos/next-l/enju_library/badge.svg?branch=1.2&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_library?branch=1.2]
+{<img src="https://hakiri.io/github/next-l/enju_library/1.2.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_library/1.2]
 
 This project rocks and uses MIT-LICENSE.
 

data/Rakefile

@@ -1,10 +1,16 @@
+#!/usr/bin/env rake
 begin
   require 'bundler/setup'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
-
-require 'rdoc/task'
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rdoc/rdoc'
+  require 'rake/rdoctask'
+  RDoc::Task = Rake::RDocTask
+end
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -18,9 +24,6 @@ APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
 
-load 'rails/tasks/statistics.rake'
-
-
 
 Bundler::GemHelper.install_tasks
 
@@ -33,8 +36,12 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
+require 'rspec/core'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |spec|
+    spec.pattern = FileList['spec/**/*_spec.rb']
+end
 
-require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new("spec")
-task default: :spec
+task :default => :spec

data/app/controllers/accepts_controller.rb

@@ -1,7 +1,7 @@
 class AcceptsController < ApplicationController
-  load_and_authorize_resource except: :index
-  authorize_resource only: :index
-  before_filter :get_basket, only: [:index, :create]
+  before_action :set_accept, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :get_basket, only: [:index, :create]
 
   # GET /accepts
   # GET /accepts.json
@@ -68,6 +68,7 @@ class AcceptsController < ApplicationController
     unless @basket
       access_denied; return
     end
+    @accept = Accept.new(accept_params)
     @accept.basket = @basket
     @accept.librarian = current_user
 
@@ -120,6 +121,15 @@ class AcceptsController < ApplicationController
   end
 
   private
+  def set_accept
+    @accept = Accept.find(params[:id])
+    authorize @accept
+  end
+
+  def check_policy
+    authorize Accept
+  end
+
   def accept_params
     params.require(:accept).permit(:item_identifier, :librarian_id, :item_id)
   end

data/app/controllers/baskets_controller.rb

@@ -1,5 +1,6 @@
 class BasketsController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_basket, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
 
   # GET /baskets
   # GET /baskets.json
@@ -104,6 +105,15 @@ class BasketsController < ApplicationController
   end
 
   private
+  def set_basket
+    @basket = Basket.find(params[:id])
+    authorize @basket
+  end
+
+  def check_policy
+    authorize Basket
+  end
+
   def basket_params
     params.require(:basket).permit(:note, :user_number)
   end

data/app/controllers/bookstores_controller.rb

@@ -1,5 +1,7 @@
 class BookstoresController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_bookstore, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+
   # GET /bookstores
   # GET /bookstores.json
   def index
@@ -82,6 +84,15 @@ class BookstoresController < ApplicationController
   end
 
   private
+  def set_bookstore
+    @bookstore = Bookstore.find(params[:id])
+    authorize @bookstore
+  end
+
+  def check_policy
+    authorize Bookstore
+  end
+
   def bookstore_params
     params.require(:bookstore).permit(
       :name, :zip_code, :address, :note, :telephone_number,

data/app/controllers/budget_types_controller.rb

@@ -1,9 +1,11 @@
 class BudgetTypesController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_budget_type, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+
   # GET /budget_types
   # GET /budget_types.json
   def index
-    @budget_types = BudgetType.all
+    @budget_types = BudgetType.order(:position)
 
     respond_to do |format|
       format.html # index.html.erb
@@ -82,6 +84,15 @@ class BudgetTypesController < ApplicationController
   end
 
   private
+  def set_budget_type
+    @budget_type = BudgetType.find(params[:id])
+    authorize @budget_type
+  end
+
+  def check_policy
+    authorize BudgetType
+  end
+
   def budget_type_params
     params.require(:budget_type).permit(
       :name, :display_name, :note, :position

data/app/controllers/concerns/enju_library/controller.rb

@@ -0,0 +1,43 @@
+module EnjuLibrary
+  module Controller
+    extend ActiveSupport::Concern
+
+    private
+
+    def get_library_group
+      @library_group = LibraryGroup.site_config
+    end
+
+    def get_shelf
+      if params[:shelf_id]
+        @shelf = Shelf.includes(:library).find(params[:shelf_id])
+        authorize @shelf, :show?
+      end
+    end
+
+    def get_library
+      if params[:library_id]
+        @library = Library.find(params[:library_id])
+        authorize @library, :show?
+      end
+    end
+
+    def get_libraries
+      @libraries = Library.all_cache
+    end
+
+    def get_bookstore
+      if params[:bookstore_id]
+        @bookstore = Bookstore.find(params[:bookstore_id])
+        authorize @bookstore, :show?
+      end
+    end
+
+    def get_subscription
+      if params[:subscription_id]
+        @subscription = Subscription.find(params[:subscription_id])
+        authorize @subscription, :show?
+      end
+    end
+  end
+end

data/app/controllers/libraries_controller.rb

@@ -1,7 +1,6 @@
-# -*- encoding: utf-8 -*-
 class LibrariesController < ApplicationController
-  load_and_authorize_resource
-  after_filter :solr_commit, only: [:create, :update, :destroy]
+  before_action :set_library, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
 
   # GET /libraries
   # GET /libraries.json
@@ -45,6 +44,7 @@ class LibrariesController < ApplicationController
 
     respond_to do |format|
       format.html # show.html.erb
+      format.html.phone
       format.json { render json: @library }
       format.js
     end
@@ -117,6 +117,15 @@ class LibrariesController < ApplicationController
   end
 
   private
+  def set_library
+    @library = Library.find(params[:id])
+    authorize @library
+  end
+
+  def check_policy
+    authorize Library
+  end
+
   def library_params
     params.require(:library).permit(
       :name, :display_name, :short_display_name, :zip_code, :street,
@@ -128,6 +137,6 @@ class LibrariesController < ApplicationController
 
   def prepare_options
     @library_groups = LibraryGroup.all
-    @countries = Country.all_cache
+    @countries = Country.order(:position)
   end
 end

data/app/controllers/library_groups_controller.rb

@@ -1,6 +1,6 @@
-# -*- encoding: utf-8 -*-
 class LibraryGroupsController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_library_group, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
 
   # GET /library_groups
   # GET /library_groups.json
@@ -24,7 +24,7 @@ class LibraryGroupsController < ApplicationController
 
   # GET /library_groups/1/edit
   def edit
-    @countries = Country.all
+    @countries = Country.order(:position)
   end
 
   # PUT /library_groups/1
@@ -35,7 +35,7 @@ class LibraryGroupsController < ApplicationController
         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
+        @countries = Country.order(:position)
         format.html { render action: "edit" }
         format.json { render json: @library_group.errors, status: :unprocessable_entity }
       end
@@ -43,16 +43,26 @@ class LibraryGroupsController < ApplicationController
   end
 
   private
+  def set_library_group
+    @library_group = LibraryGroup.find(params[:id])
+    authorize @library_group
+  end
+
+  def check_policy
+    authorize LibraryGroup
+  end
+
   def library_group_params
     params.require(:library_group).permit(
       :name, :display_name, :short_name, :my_networks,
       :login_banner, :note, :country_id, :admin_networks, :url,
-      :max_number_of_results,
+      :max_number_of_results, :footer_banner,
       :book_jacket_source, :screenshot_generator, :erms_url,
       :allow_bookmark_external_url, # EnjuBookmark
       {
         :colors_attributes =>  [:id, :property, :code]
-      }
+      },
+      *LibraryGroup.globalize_attribute_names,
     )
   end
 end

data/app/controllers/request_status_types_controller.rb

@@ -1,9 +1,11 @@
 class RequestStatusTypesController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_request_status_type, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+
   # GET /request_status_types
   # GET /request_status_types.json
   def index
-    @request_status_types = RequestStatusType.all
+    @request_status_types = RequestStatusType.order(:position)
 
     respond_to do |format|
       format.html # index.html.erb
@@ -82,6 +84,15 @@ class RequestStatusTypesController < ApplicationController
   end
 
   private
+  def set_request_status_type
+    @request_status_type = RequestStatusType.find(params[:id])
+    authorize @request_status_type
+  end
+
+  def check_policy
+    authorize RequestStatusType
+  end
+
   def request_status_type_params
     params.require(:request_status_type).permit(:name, :display_name, :note)
   end

data/app/controllers/request_types_controller.rb

@@ -1,9 +1,11 @@
 class RequestTypesController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_request_type, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+
   # GET /request_types
   # GET /request_types.json
   def index
-    @request_types = RequestType.all
+    @request_types = RequestType.order(:position)
 
     respond_to do |format|
       format.html # index.html.erb
@@ -82,6 +84,15 @@ class RequestTypesController < ApplicationController
   end
 
   private
+  def set_request_type
+    @request_type = RequestType.find(params[:id])
+    authorize @request_type
+  end
+
+  def check_policy
+    authorize RequestType
+  end
+
   def request_type_params
     params.require(:request_type).permit(:name, :display_name, :note)
   end

data/app/controllers/search_engines_controller.rb

@@ -1,9 +1,11 @@
 class SearchEnginesController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_search_engine, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+
   # GET /search_engines
   # GET /search_engines.json
   def index
-    @search_engines = SearchEngine.all
+    @search_engines = SearchEngine.order(:position)
 
     respond_to do |format|
       format.html # index.html.erb
@@ -82,6 +84,15 @@ class SearchEnginesController < ApplicationController
   end
 
   private
+  def set_search_engine
+    @search_engine = SearchEngine.find(params[:id])
+    authorize @search_engine
+  end
+
+  def check_policy
+    authorize SearchEngine
+  end
+
   def search_engine_params
     params.require(:search_engine).permit(
       :name, :display_name, :url, :base_url, :http_method,

data/app/controllers/shelves_controller.rb

@@ -1,7 +1,8 @@
 class ShelvesController < ApplicationController
-  load_and_authorize_resource
-  before_filter :get_library
-  before_filter :get_libraries, only: [:new, :edit, :create, :update]
+  before_action :set_shelf, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :get_library
+  before_action :get_libraries, only: [:new, :edit, :create, :update]
 
   # GET /shelves
   # GET /shelves.json
@@ -55,7 +56,7 @@ class ShelvesController < ApplicationController
     respond_to do |format|
       format.html # show.html.erb
       format.json { render json: @shelf }
-      format.mobile
+      format.html.phone
     end
   end
 
@@ -135,6 +136,15 @@ class ShelvesController < ApplicationController
   end
 
   private
+  def set_shelf
+    @shelf = Shelf.find(params[:id])
+    authorize @shelf
+  end
+
+  def check_policy
+    authorize Shelf
+  end
+
   def shelf_params
     params.require(:shelf).permit(
       :name, :display_name, :note, :library_id, :closed

data/app/controllers/subscribes_controller.rb

@@ -1,6 +1,7 @@
 class SubscribesController < ApplicationController
-  load_and_authorize_resource
-  before_filter :get_subscription, :get_work
+  before_action :set_subscribe, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :get_subscription, :get_work
 
   # GET /subscribes
   # GET /subscribes.json
@@ -81,6 +82,15 @@ class SubscribesController < ApplicationController
   end
 
   private
+  def set_subscribe
+    @subscribe = Subscribe.find(params[:id])
+    authorize @subscribe
+  end
+
+  def check_policy
+    authorize Subscribe
+  end
+
   def subscribe_params
     params.require(:subscribe).permit(
       :subscription_id, :work_id, :start_at, :end_at

data/app/controllers/subscriptions_controller.rb

@@ -1,7 +1,7 @@
 class SubscriptionsController < ApplicationController
-  load_and_authorize_resource
-  before_filter :get_work
-  after_filter :solr_commit, only: [:create, :update, :destroy]
+  before_action :set_subscription, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :get_work
 
   # GET /subscriptions
   # GET /subscriptions.json
@@ -86,6 +86,15 @@ class SubscriptionsController < ApplicationController
   end
 
   private
+  def set_subscription
+    @subscription = Subscription.find(params[:id])
+    authorize @subscription
+  end
+
+  def check_policy
+    authorize Subscription
+  end
+
   def subscription_params
     params.require(:subscription).permit(
       :title, :note, :order_list_id, :user_id

data/app/controllers/withdraws_controller.rb

@@ -1,7 +1,7 @@
 class WithdrawsController < ApplicationController
-  load_and_authorize_resource except: :index
-  authorize_resource only: :index
-  before_filter :get_basket, only: [:index, :create]
+  before_action :set_withdraw, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :get_basket, only: [:index, :create]
 
   # GET /withdraws
   # GET /withdraws.json
@@ -49,6 +49,7 @@ class WithdrawsController < ApplicationController
     @basket.user = current_user
     @basket.save!
     @withdraw = Withdraw.new
+    authorize @withdraw, :new?
     @withdraws = []
 
     respond_to do |format|
@@ -68,6 +69,7 @@ class WithdrawsController < ApplicationController
     unless @basket
       access_denied; return
     end
+    @withdraw = Withdraw.new(withdraw_params)
     @withdraw.basket = @basket
     @withdraw.librarian = current_user
 
@@ -120,6 +122,15 @@ class WithdrawsController < ApplicationController
   end
 
   private
+  def set_withdraw
+    @withdraw = Withdraw.find(params[:id])
+    authorize @withdraw
+  end
+
+  def check_policy
+    authorize Withdraw
+  end
+
   def withdraw_params
     params.require(:withdraw).permit(:item_identifier, :librarian_id, :item_id)
   end

data/app/helpers/shelves_helper.rb

@@ -6,10 +6,10 @@ module ShelvesHelper
     content_tag :li do
       if current
         content_tag :strong do
-          link_to("#{library.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(page: nil, library_id: library.name, only_path: true)))
+          link_to("#{library.display_name.localize} (" + facet.count.to_s + ")", url_for(params.permit.merge(page: nil, library_id: library.name, only_path: true)))
         end
       else
-        link_to("#{library.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(page: nil, library_id: library.name, only_path: true)))
+        link_to("#{library.display_name.localize} (" + facet.count.to_s + ")", url_for(params.permit.merge(page: nil, library_id: library.name, only_path: true)))
       end
     end
   end

data/app/models/accept.rb

@@ -4,10 +4,8 @@ class Accept < ActiveRecord::Base
   belongs_to :item, touch: true
   belongs_to :librarian, class_name: 'User'
 
-  enju_circulation_accept_model if defined?(EnjuCirculation)
-
-  validates_uniqueness_of :item_id, message:  I18n.t('accept.already_accepted')
-  validates_presence_of :item_id, message:  I18n.t('accept.item_not_found')
+  validates_uniqueness_of :item_id #, message:  I18n.t('accept.already_accepted')
+  validates_presence_of :item_id #, message:  I18n.t('accept.item_not_found')
   validates_presence_of :basket_id
 
   attr_accessor :item_identifier

data/app/models/basket.rb

@@ -5,8 +5,6 @@ class Basket < ActiveRecord::Base
   has_many :accepts
   has_many :withdraws
 
-  enju_circulation_basket_model if defined?(EnjuCirculation)
-
   validates_associated :user, on: :create
   # 貸出完了後にかごのユーザidは破棄する
   validates_presence_of :user, on: :create

data/app/models/budget_type.rb

@@ -1,7 +1,6 @@
 class BudgetType < ActiveRecord::Base
   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') }
   has_many :items
 
   private

data/app/models/concerns/enju_library/enju_item.rb

@@ -0,0 +1,32 @@
+module EnjuLibrary
+  module EnjuItem
+    extend ActiveSupport::Concern
+
+    included do
+      has_one :accept
+      scope :accepted_between, lambda{|from, to| includes(:accept).where('items.created_at BETWEEN ? AND ?', Time.zone.parse(from).beginning_of_day, Time.zone.parse(to).end_of_day)}
+
+      belongs_to :shelf, counter_cache: true, validate: true
+      validates_associated :shelf
+
+      searchable do
+        string :library do
+          shelf.library.name if shelf
+        end
+      end
+    end
+
+    def shelf_name
+      shelf.name
+    end
+
+    def hold?(library)
+      return true if shelf.library == library
+      false
+    end
+
+    def library_url
+      "#{LibraryGroup.site_config.url}libraries/#{shelf.library.name}"
+    end
+  end
+end

data/app/models/library_group.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 class LibraryGroup < ActiveRecord::Base
   #include Singleton
   include MasterModel
@@ -12,21 +11,15 @@ class LibraryGroup < ActiveRecord::Base
       greater_than_or_equal_to: 0
     }
   accepts_nested_attributes_for :colors, update_only: true
-  if Rails::VERSION::MAJOR >= 4
-    store :settings, accessors: [
-      :max_number_of_results, :family_name_first,
-      :pub_year_facet_range_interval,
-      :book_jacket_source, :book_jacket_unknown_resource,
-      :screenshot_generator, :erms_url
-    ], coder: JSON
-  else
-    store :settings, accessors: [
-      :max_number_of_results, :family_name_first,
-      :pub_year_facet_range_interval,
-      :book_jacket_source, :book_jacket_unknown_resource,
-      :screenshot_generator, :erms_url
-    ]
-  end
+  store :settings, accessors: [
+    :max_number_of_results, :family_name_first,
+    :pub_year_facet_range_interval,
+    :book_jacket_source, :book_jacket_unknown_resource,
+    :screenshot_generator, :erms_url
+  ], coder: JSON
+
+  translates :login_banner, :footer_banner
+  globalize_accessors
 
   def self.site_config
     LibraryGroup.find(1)

data/app/models/request_status_type.rb

@@ -1,7 +1,6 @@
 class RequestStatusType < ActiveRecord::Base
   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') }
   has_many :reserves
 
   private