enju_library 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba733672dc7240ef5d131dfde66ce76a8f17f2ae
-  data.tar.gz: 99735387f747ab1c511873c7612afbb1e35bf5ed
+  metadata.gz: 711cb2a18f1e3b7d5b1a24895d3b813ba8a473fd
+  data.tar.gz: 53f08ee0f42d4ef78d765feebd194bff4f8021d7
 SHA512:
-  metadata.gz: 978f436871aa085c0173f8494d01d068e9a115c187ab1fbafada166adba847d8987a77f75032017e21f2c78ae321a5732fb430be4dad9a47ec7206e82e9edd54
-  data.tar.gz: 1537126f13484c10fe21aaeac07649c0fa66c99f66f7e744c44057bf07f96827fb779cf41e97c2ad41f7ebd9823a35124e176f27ed406fe23cbe20c3185a6db5
+  metadata.gz: f6c42ed7816ec5c125c5797b927d8f0569ad132cf84575a6dbccf3ba98c52fa6d6252fcdff13e253cd21330c2c27f412836aa0150bc3520186fe97d05077b970
+  data.tar.gz: 68a3820c1a175bd4c3a3ec1eea729443bba1853cfe0da0a3f878ef65ec05ff65fb59fc413d51a804526a87708b8139d43ff48566da815f3d3467dce13ee770ed

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

@@ -9,6 +9,7 @@ module EnjuLibrary
       #rescue_from ActiveRecord::RecordNotFound, with: :render_404
       rescue_from Errno::ECONNREFUSED, with: :render_500_nosolr
       #rescue_from ActionView::MissingTemplate, with: :render_404_invalid_format
+      helper_method :filtered_params
     end
 
     private
@@ -96,6 +97,7 @@ module EnjuLibrary
         I18n.locale = @locale = session[:locale] = I18n.default_locale
       end
     rescue InvalidLocaleError
+      reset_session
       @locale = I18n.default_locale
     end
 
@@ -137,7 +139,7 @@ module EnjuLibrary
     def convert_charset
       case params[:format]
       when 'csv'
-        return unless LibraryGroup.site_config.settings[:csv_charset_conversion]
+        return unless LibraryGroup.site_config.csv_charset_conversion
         # TODO: 他の言語
         if @locale.to_sym == :ja
           headers["Content-Type"] = "text/csv; charset=Shift_JIS"
@@ -183,7 +185,7 @@ module EnjuLibrary
     def get_top_page_content
       if defined?(EnjuNews)
         @news_feeds = Rails.cache.fetch('news_feed_all'){NewsFeed.order(:position)}
-        @news_posts = NewsPost.limit(LibraryGroup.site_config.settings[:news_post_number_top_page] || 10)
+        @news_posts = NewsPost.limit(LibraryGroup.site_config.news_post_number_top_page || 10)
       end
       @libraries = Library.real
     end
@@ -219,7 +221,7 @@ module EnjuLibrary
     end
 
     def store_current_location
-      store_location_for(:user, request.url) unless request.xhr?
+      store_location_for(:user, request.url) if request.format == 'text/html'
     end
 
     def get_library_group
@@ -257,5 +259,12 @@ module EnjuLibrary
         authorize @subscription, :show?
       end
     end
+
+    def filtered_params
+      params.permit([:q, :query, :view, :format, :order, :sort_by, :page, :per_page])
+    end
+
+    class InvalidLocaleError < StandardError
+    end
   end
 end

data/app/controllers/libraries_controller.rb

@@ -53,6 +53,7 @@ class LibrariesController < ApplicationController
   # GET /libraries/new
   def new
     @library = Library.new
+    @library.library_group = LibraryGroup.first
     @library.country = LibraryGroup.site_config.country
     prepare_options
 

data/app/controllers/shelves_controller.rb

@@ -33,8 +33,9 @@ class ShelvesController < ApplicationController
         if library
           with(:library).equal_to library.name
           order_by :position, :asc
+        else
+          order_by sort[:sort_by], sort[:order]
         end
-        order_by sort[:sort_by], sort[:order]
         facet :library
       end
       @shelves = search.results

data/app/models/library.rb

@@ -111,7 +111,7 @@ end
 #  note                  :text
 #  call_number_rows      :integer          default(1), not null
 #  call_number_delimiter :string           default("|"), not null
-#  library_group_id      :integer          default(1), not null
+#  library_group_id      :integer          not null
 #  users_count           :integer          default(0), not null
 #  position              :integer
 #  country_id            :integer

data/app/models/library_group.rb

@@ -68,21 +68,26 @@ end
 #
 # Table name: library_groups
 #
-#  id                          :integer          not null, primary key
-#  name                        :string           not null
-#  display_name                :text
-#  short_name                  :string           not null
-#  my_networks                 :text
-#  login_banner                :text
-#  note                        :text
-#  country_id                  :integer
-#  position                    :integer
-#  created_at                  :datetime
-#  updated_at                  :datetime
-#  admin_networks              :text
-#  allow_bookmark_external_url :boolean          default(FALSE), not null
-#  url                         :string           default("http://localhost:3000/")
-#  settings                    :text
-#  html_snippet                :text
-#  user_id                     :integer
+#  id                            :integer          not null, primary key
+#  name                          :string           not null
+#  display_name                  :text
+#  short_name                    :string           not null
+#  my_networks                   :text
+#  login_banner                  :text
+#  note                          :text
+#  country_id                    :integer
+#  position                      :integer
+#  created_at                    :datetime
+#  updated_at                    :datetime
+#  admin_networks                :text
+#  allow_bookmark_external_url   :boolean          default(FALSE), not null
+#  url                           :string           default("http://localhost:3000/")
+#  settings                      :text
+#  html_snippet                  :text
+#  book_jacket_source            :string
+#  max_number_of_results         :integer          default(500)
+#  family_name_first             :boolean          default(TRUE)
+#  screenshot_generator          :string
+#  pub_year_facet_range_interval :integer          default(10)
+#  user_id                       :integer
 #

data/app/models/shelf.rb

@@ -55,7 +55,7 @@ end
 #  name         :string           not null
 #  display_name :text
 #  note         :text
-#  library_id   :integer          default(1), not null
+#  library_id   :integer          not null
 #  items_count  :integer          default(0), not null
 #  position     :integer
 #  created_at   :datetime

data/app/views/libraries/_form.html.erb

@@ -85,6 +85,7 @@
   <% end %>
 
   <div class="actions">
+    <%= f.hidden_field :library_group_id %>
     <%= f.submit %>
   </div>
 <%- end -%>

data/app/views/library_groups/_color_fields.html.erb

@@ -1,5 +1,4 @@
 <div class="nested-fields">
   <%= f.text_field :property, disabled: true %>
   <%= f.text_field :code %>
-  <%= link_to_remove_association t('page.remove'), f, data: {confirm: t('page.are_you_sure')} %><br />
 </div>

data/app/views/library_groups/_form.html.erb

@@ -45,7 +45,7 @@
   <% if defined?(EnjuManifestationViewer) %>
     <div class="field">
       <%= f.label :book_jacket_source -%>
-      <%= f.select :book_jacket_source, [[t('book_jacket.google'), 'google'], [t('book_jacket.hanmotocom'), 'hanmotocom']] -%><br />
+      <%= f.select :book_jacket_source, [[t('book_jacket.google'), 'google'], [t('book_jacket.openbd'), 'openbd'], [t('book_jacket.hanmotocom'), 'hanmotocom']] -%><br />
     </div>
   <% end %>
 
@@ -54,9 +54,6 @@
     <%= f.fields_for :colors do |color_form| %>
       <%= render 'color_fields', f: color_form %>
     <% end %>
-    <div class="links">
-      <p><%= link_to_add_association t('page.add'), f, :colors %></p>
-    </div>
   </div>
 
   <div class="field">

data/config/locales/translation_en.yml

@@ -128,4 +128,5 @@ en:
     successfully_withdrawn: "This items was successfully withdrawn."
   book_jacket:
     google: Google Books
+    openbd: openBD
     hanmotocom: Hanmoto.com

data/config/locales/translation_ja.yml

@@ -128,4 +128,5 @@ ja:
     successfully_withdrawn: "この資料は正常に除籍されました。"
   book_jacket:
     google: Googleブックス
+    openbd: openBD
     hanmotocom: 版元ドットコム

data/config/routes.rb

@@ -1,4 +1,5 @@
 Rails.application.routes.draw do
+  resources :user_groups
   resources :withdraws, except: [:edit, :update]
   resources :libraries
   resources :shelves

data/lib/enju_library/version.rb

@@ -1,3 +1,3 @@
 module EnjuLibrary
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/tasks/enju_library_tasks.rake

@@ -26,11 +26,11 @@ EOS
 Next-L Enju, an open-source integrated library system. You can edit this message after logging in as Administrator.
 EOS
     footer_ja = <<"EOS"
-[Next-L Enju Leaf #{EnjuLeaf::VERSION}](https://github.com/next-l/enju_leaf), オープンソース統合図書館システム  
+[Next-L Enju Leaf __VERSION__](https://github.com/next-l/enju_leaf), オープンソース統合図書館システム  
 Developed by [Kosuke Tanabe](https://github.com/nabeta) and [Project Next-L](http://www.next-l.jp) \| [このシステムについて](/page/about) \| [不具合を報告する](https://github.com/next-l/enju_leaf/issues) \| [マニュアル](https://next-l.github.com/manual/1.2/)
 EOS
     footer_en = <<"EOS"
-[Next-L Enju Leaf #{EnjuLeaf::VERSION}](https://github.com/next-l/enju_leaf), an open source integrated library system  
+[Next-L Enju Leaf __VERSION__](https://github.com/next-l/enju_leaf), an open source integrated library system  
 Developed by [Kosuke Tanabe](https://github.com/nabeta) and [Project Next-L](http://www.next-l.jp) \| [About this system](/page/about) \| [Report bugs](https://github.com/next-l/enju_leaf/issues) \| [Manual](https://next-l.github.com/manual/1.2/)
 EOS
     library_group.login_banner_ja = login_ja if library_group.login_banner_ja.blank?

data/spec/controllers/accepts_controller_spec.rb

@@ -3,53 +3,53 @@ require 'rails_helper'
 describe AcceptsController do
   fixtures :all
 
-  def mock_user(stubs={})
+  def mock_user(stubs = {})
     (@mock_user ||= mock_model(Accept).as_null_object).tap do |user|
       user.stub(stubs) unless stubs.empty?
     end
   end
 
-  describe "GET index" do
-    describe "When logged in as Administrator" do
+  describe 'GET index' do
+    describe 'When logged in as Administrator' do
       login_fixture_admin
 
-      it "assigns all accepts as @accepts" do
+      it 'assigns all accepts as @accepts' do
         get :index
         assigns(:accepts).should_not be_nil
         response.should be_success
       end
 
-      describe "When basket_id is specified" do
-        it "assigns all accepts as @accepts" do
-          get :index, :basket_id => 10
+      describe 'When basket_id is specified' do
+        it 'assigns all accepts as @accepts' do
+          get :index, basket_id: 10
           assigns(:accepts).should eq baskets(:basket_00010).accepts.order('accepts.created_at DESC').page(1)
           response.should be_success
         end
       end
     end
 
-    describe "When logged in as Librarian" do
+    describe 'When logged in as Librarian' do
       login_fixture_librarian
 
-      it "assigns all accepts as @accepts" do
+      it 'assigns all accepts as @accepts' do
         get :index
         assigns(:accepts).should_not be_nil
         response.should be_success
       end
 
-      describe "When basket_id is specified" do
-        it "assigns all accepts as @accepts" do
-          get :index, :basket_id => 9
+      describe 'When basket_id is specified' do
+        it 'assigns all accepts as @accepts' do
+          get :index, basket_id: 9
           assigns(:accepts).should eq baskets(:basket_00009).accepts.order('accepts.created_at DESC').page(1)
           response.should be_success
         end
       end
     end
 
-    describe "When logged in as User" do
+    describe 'When logged in as User' do
       login_fixture_user
 
-      it "should not assign all accepts as @accepts" do
+      it 'should not assign all accepts as @accepts' do
         get :index
         assigns(:accepts).should be_nil
         response.should be_forbidden
@@ -57,79 +57,79 @@ describe AcceptsController do
     end
   end
 
-  describe "GET show" do
-    describe "When logged in as Administrator" do
+  describe 'GET show' do
+    describe 'When logged in as Administrator' do
       login_fixture_admin
 
-      it "assigns the requested accept as @accept" do
+      it 'assigns the requested accept as @accept' do
         accept = FactoryGirl.create(:accept)
-        get :show, :id => accept.id
+        get :show, id: accept.id
         assigns(:accept).should eq(accept)
       end
     end
 
-    describe "When logged in as Librarian" do
+    describe 'When logged in as Librarian' do
       login_fixture_librarian
 
-      it "assigns the requested accept as @accept" do
+      it 'assigns the requested accept as @accept' do
         accept = FactoryGirl.create(:accept)
-        get :show, :id => accept.id
+        get :show, id: accept.id
         assigns(:accept).should eq(accept)
       end
     end
 
-    describe "When logged in as User" do
+    describe 'When logged in as User' do
       login_fixture_user
 
-      it "assigns the requested accept as @accept" do
+      it 'assigns the requested accept as @accept' do
         accept = FactoryGirl.create(:accept)
-        get :show, :id => accept.id
+        get :show, id: accept.id
         assigns(:accept).should eq(accept)
         response.should be_forbidden
       end
     end
 
-    describe "When not logged in" do
-      it "assigns the requested accept as @accept" do
+    describe 'When not logged in' do
+      it 'assigns the requested accept as @accept' do
         accept = FactoryGirl.create(:accept)
-        get :show, :id => accept.id
+        get :show, id: accept.id
         assigns(:accept).should eq(accept)
         response.should redirect_to new_user_session_url
       end
     end
   end
 
-  describe "GET new" do
-    describe "When logged in as Administrator" do
+  describe 'GET new' do
+    describe 'When logged in as Administrator' do
       login_fixture_admin
 
-      it "assigns the requested accept as @accept" do
+      it 'assigns the requested accept as @accept' do
         get :new
         assigns(:accept).should_not be_valid
       end
     end
 
-    describe "When logged in as Librarian" do
+    describe 'When logged in as Librarian' do
       login_fixture_librarian
 
-      it "assigns the requested accept as @accept" do
+      it 'assigns the requested accept as @accept' do
         get :new
         assigns(:accept).should_not be_valid
       end
     end
 
-    describe "When logged in as User" do
+    describe 'When logged in as User' do
       login_fixture_user
 
-      it "should not assign the requested accept as @accept" do
+      it 'should not assign the requested accept as @accept' do
         get :new
         assigns(:accept).should be_nil
         response.should be_forbidden
       end
     end
 
-    describe "When not logged in" do
-      it "should not assign the requested accept as @accept" do
+    describe 'When not logged in' do
+      it 'should not assign the requested accept as @accept' do
         get :new
         assigns(:accept).should be_nil
         response.should redirect_to(new_user_session_url)
@@ -137,156 +137,156 @@ describe AcceptsController do
     end
   end
 
-  describe "POST create" do
+  describe 'POST create' do
     before(:each) do
-      @attrs = {:item_identifier => '00003'}
-      @invalid_attrs = {:item_identifier => 'invalid'}
+      @attrs = { item_identifier: '00003' }
+      @invalid_attrs = { item_identifier: 'invalid' }
     end
 
-    describe "When logged in as Administrator" do
+    describe 'When logged in as Administrator' do
       login_fixture_admin
 
-      describe "with valid params" do
-        it "assigns a newly created accept as @accept" do
-          post :create, :accept => @attrs
+      describe 'with valid params' do
+        it 'assigns a newly created accept as @accept' do
+          post :create, accept: @attrs
           assigns(:accept).should be_nil
         end
 
-        it "should not create a new accept without basket_id" do
-          post :create, :accept => @attrs
+        it 'should not create a new accept without basket_id' do
+          post :create, accept: @attrs
           response.should be_forbidden
         end
 
-        describe "When basket_id is specified" do
-          it "redirects to the created accept" do
-            post :create, :accept => @attrs, :basket_id => 9
+        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(accepts_url(basket_id: assigns(:accept).basket.id))
             assigns(:accept).item.circulation_status.name.should eq 'Available On Shelf'
           end
         end
       end
 
-      describe "with invalid params" do
-        it "assigns a newly created but unsaved accept as @accept" do
-          post :create, :accept => @invalid_attrs
+      describe 'with invalid params' do
+        it 'assigns a newly created but unsaved accept as @accept' do
+          post :create, accept: @invalid_attrs
           assigns(:accept).should be_nil
         end
 
-        it "should be forbidden" do
-          post :create, :accept => @invalid_attrs
+        it 'should be forbidden' do
+          post :create, accept: @invalid_attrs
           response.should be_forbidden
         end
       end
 
-      it "should not create accept without item_id" do
-        post :create, :accept => {:item_identifier => nil}, :basket_id => 9
+      it 'should not create accept without item_id' do
+        post :create, accept: { item_identifier: nil }, basket_id: 9
         assigns(:accept).should_not be_valid
         response.should be_success
       end
     end
 
-    describe "When logged in as Librarian" do
+    describe 'When logged in as Librarian' do
       login_fixture_librarian
 
-      describe "with valid params" do
-        it "assigns a newly created accept as @accept" do
-          post :create, :accept => @attrs
+      describe 'with valid params' do
+        it 'assigns a newly created accept as @accept' do
+          post :create, accept: @attrs
           assigns(:accept).should be_nil
         end
 
-        it "should not create a new accept without basket_id" do
-          post :create, :accept => @attrs
+        it 'should not create a new accept without basket_id' do
+          post :create, accept: @attrs
           response.should be_forbidden
         end
       end
     end
 
-    describe "When logged in as User" do
+    describe 'When logged in as User' do
       login_fixture_user
 
-      describe "with valid params" do
-        it "assigns a newly created accept as @accept" do
-          post :create, :accept => @attrs
+      describe 'with valid params' do
+        it 'assigns a newly created accept as @accept' do
+          post :create, accept: @attrs
           assigns(:accept).should be_nil
         end
 
-        it "should be forbidden" do
-          post :create, :accept => @attrs
+        it 'should be forbidden' do
+          post :create, accept: @attrs
           response.should be_forbidden
         end
       end
     end
 
-    describe "When not logged in" do
+    describe 'When not logged in' do
       before(:each) do
-        @attrs = {:item_identifier => '00003'}
-        @invalid_attrs = {:item_identifier => 'invalid'}
+        @attrs = { item_identifier: '00003' }
+        @invalid_attrs = { item_identifier: 'invalid' }
       end
 
-      describe "with valid params" do
-        it "assigns a newly created accept as @accept" do
-          post :create, :accept => @attrs
+      describe 'with valid params' do
+        it 'assigns a newly created accept as @accept' do
+          post :create, accept: @attrs
         end
 
-        it "should redirect to new session url" do
-          post :create, :accept => @attrs
+        it 'should redirect to new session url' do
+          post :create, accept: @attrs
           response.should redirect_to new_user_session_url
         end
       end
     end
   end
 
-  describe "DELETE destroy" do
+  describe 'DELETE destroy' do
     before(:each) do
       @accept = FactoryGirl.create(:accept)
     end
 
-    describe "When logged in as Administrator" do
+    describe 'When logged in as Administrator' do
       login_fixture_admin
 
-      it "destroys the requested accept" do
-        delete :destroy, :id => @accept.id
+      it 'destroys the requested accept' do
+        delete :destroy, id: @accept.id
       end
 
-      it "redirects to the accepts list" do
-        delete :destroy, :id => @accept.id
+      it 'redirects to the accepts list' do
+        delete :destroy, id: @accept.id
         response.should redirect_to(accepts_url)
       end
     end
 
-    describe "When logged in as Librarian" do
+    describe 'When logged in as Librarian' do
       login_fixture_librarian
 
-      it "destroys the requested accept" do
-        delete :destroy, :id => @accept.id
+      it 'destroys the requested accept' do
+        delete :destroy, id: @accept.id
       end
 
-      it "redirects to the accepts list" do
-        delete :destroy, :id => @accept.id
+      it 'redirects to the accepts list' do
+        delete :destroy, id: @accept.id
         response.should redirect_to(accepts_url)
       end
     end
 
-    describe "When logged in as User" do
+    describe 'When logged in as User' do
       login_fixture_user
 
-      it "destroys the requested accept" do
-        delete :destroy, :id => @accept.id
+      it 'destroys the requested accept' do
+        delete :destroy, id: @accept.id
       end
 
-      it "should be forbidden" do
-        delete :destroy, :id => @accept.id
+      it 'should be forbidden' do
+        delete :destroy, id: @accept.id
         response.should be_forbidden
       end
     end
 
-    describe "When not logged in" do
-      it "destroys the requested accept" do
-        delete :destroy, :id => @accept.id
+    describe 'When not logged in' do
+      it 'destroys the requested accept' do
+        delete :destroy, id: @accept.id
       end
 
-      it "should be forbidden" do
-        delete :destroy, :id => @accept.id
+      it 'should be forbidden' do
+        delete :destroy, id: @accept.id
         response.should redirect_to(new_user_session_url)
       end
     end