enju_biblio 0.1.0.pre67 → 0.1.0.pre68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7e9faf90d23891338d7804ceaa2b86045886e6c
-  data.tar.gz: 8a9bb0d6a8085690f585ccbc6e45cbf677bacd1a
+  metadata.gz: d5e83fab1fdd340daddda0555c8efc9e70f7b2c9
+  data.tar.gz: f5c958e7086cc3df0076b2f815740333063b18ad
 SHA512:
-  metadata.gz: 55176d5e1130eee8b75c8efd03f42a98178ea342562972387edf4a46571581518fa93aa136809f29d6458709f16b4b14e62f398552dbf6c62d0eaa60e72b3875
-  data.tar.gz: 2f560a2ada3c29ccabb09cce58a823d33ea36ff2cb5c3c383a64b510fe46ffe03c5c4e0b037613191029ef283787b01dd915308a8871ffab557d937e7b24f257
+  metadata.gz: 93439c42241d75567e91f6405733e5f32211f83abaf172472e731d3485826f25c9afa7df55bf3f2f47c92aaf546e8994d86608a02103f46b965ebc4adb093fb3
+  data.tar.gz: 2df19cbe086954c6ea6abe8c0218f9d81e90cf5bfc11c8233d687822ef05d3316836db66cc3c62cc50d03a46d7c9a5980b0389736595f6a8b6724e654e5871df

data/app/controllers/items_controller.rb

@@ -272,7 +272,7 @@ class ItemsController < ApplicationController
     else
       @library = @item.shelf.library
     end
-    @shelves = @library.shelves
+    @shelves = @library.try(:shelves)
     @bookstores = Bookstore.all
     @budget_types = BudgetType.all
     @roles = Role.all

data/app/controllers/resource_import_files_controller.rb

@@ -40,7 +40,6 @@ class ResourceImportFilesController < ApplicationController
   def new
     @resource_import_file = ResourceImportFile.new
     @resource_import_file.library_id = current_user.profile.library_id
-    @shelves = Library.find(@resource_import_file.library_id).shelves
 
     respond_to do |format|
       format.html # new.html.erb
@@ -116,7 +115,7 @@ class ResourceImportFilesController < ApplicationController
     if library
       @shelves = library.shelves
     else
-      @shelves = current_user.profile.library.shelves
+      @shelves = current_user.profile.library.try(:shelves)
     end
   end
 end

data/app/helpers/manifestations_helper.rb

@@ -110,15 +110,15 @@ module ManifestationsHelper
     end
   end
 
-  def pub_year_facet(pub_date_from, pub_date_to, facet)
+  def pub_year_facet(pub_date_from, pub_date_until, facet)
     string = ''
-    current = true if facet.value.first.to_i == pub_date_from.to_i && facet.value.last.to_i - 1 == pub_date_to.to_i
+    current = true if facet.value.first.to_i == pub_date_from.to_i and facet.value.last.to_i - 1 == pub_date_until.to_i
     if current
       content_tag :strong do
-        link_to("#{facet.value.first.to_i} - #{facet.value.last.to_i - 1} (" + facet.count.to_s + ")", url_for(params.merge(pub_date_from: facet.value.first.to_i, pub_date_to: facet.value.last.to_i - 1, page: nil, view: nil, only_path: true)))
+        link_to("#{facet.value.first.to_i} - #{facet.value.last.to_i - 1} (" + facet.count.to_s + ")", url_for(params.merge(pub_date_from: facet.value.first.to_i, pub_date_until: facet.value.last.to_i - 1, page: nil, view: nil, only_path: true)))
       end
     else
-      link_to("#{facet.value.first.to_i} - #{facet.value.last.to_i - 1} (" + facet.count.to_s + ")", url_for(params.merge(pub_date_from: facet.value.first.to_i, pub_date_to: facet.value.last.to_i - 1, page: nil, view: nil, only_path: true)))
+      link_to("#{facet.value.first.to_i} - #{facet.value.last.to_i - 1} (" + facet.count.to_s + ")", url_for(params.merge(pub_date_from: facet.value.first.to_i, pub_date_until: facet.value.last.to_i - 1, page: nil, view: nil, only_path: true)))
     end
   end
 

data/app/models/enju_biblio/ability.rb

@@ -59,14 +59,18 @@ module EnjuBiblio
           SeriesStatementMergeList
         ]
         can :manage, [
-          ContentType,
+          AgentType,
           Country,
-          Frequency,
           Language,
           License,
-          MediumOfPerformance,
-          AgentType
-        ] if LibraryGroup.site_config.network_access_allowed?(ip_address)
+          MediumOfPerformance
+        ]
+        can :manage, [
+          ContentType,
+          Frequency
+        ] do |record|
+          record.manifestations.empty?
+        end if LibraryGroup.site_config.network_access_allowed?(ip_address)
         can :read, [
           CarrierType,
           ContentType,

data/app/models/resource_import_file.rb

@@ -27,6 +27,8 @@ class ResourceImportFile < ActiveRecord::Base
     'application/vnd.ms-excel'
   ]
   validates_attachment_presence :resource_import
+  validates :resource_import, presence: true, on: :create
+  validates :default_shelf_id, presence: true, if: Proc.new{|model| model.edit_mode == 'create'}
   belongs_to :user, validate: true
   belongs_to :default_shelf, class_name: 'Shelf'
   has_many :resource_import_results

data/config/locales/translation_ja.yml

@@ -185,7 +185,7 @@ ja:
         edit_mode: 編集モード
         error_message: エラーメッセージ
         user_encoding: 文字コード
-        default_shelf_id: 既定の書棚
+        default_shelf_id: 既定の本棚
       series_statement:
         original_title: シリーズ名
         numbering: シリーズ番号
@@ -334,7 +334,7 @@ ja:
 
   resource_import_file:
     update_relationship: 関連を更新
-    default_shelf: TSVファイルで"shelf"列が指定されていない場合、この書棚が登録されます。
+    default_shelf: TSVファイルで"shelf"列が指定されていない場合、この本棚が登録されます。
 
   agent:
     creator: 著者
@@ -400,7 +400,7 @@ ja:
     add: "所蔵情報を追加する"
     specify_manifestation: "資料を指定してください。"
     this_item_is_reserved: "この資料は予約されています！"
-    create_shelf_first: "最初に書棚を作成してください。"
+    create_shelf_first: "最初に本棚を作成してください。"
     this_item_include_supplement: "この資料は付録を含んでいます。"
     all_item: "全ての所蔵情報"
     add_new_copy: "複本を追加"

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.1.0.pre67"
+  VERSION = "0.1.0.pre68"
 end

data/spec/controllers/items_controller_spec.rb

@@ -152,6 +152,17 @@ describe ItemsController do
         get :new
         expect(response).to redirect_to(manifestations_url)
       end
+
+      it "should work without exception, even if library and shelf is unavailable" do
+	Library.real.each do |library|
+	  library.try(:shelves).to_a.each do |shelf|
+	    shelf.destroy
+	  end
+	  library.destroy
+	end
+        get :new, :manifestation_id => @manifestation.id
+	expect(response).to redirect_to(libraries_url)
+      end
     end
 
     describe "When logged in as Librarian" do

data/spec/controllers/resource_import_files_controller_spec.rb

@@ -124,21 +124,28 @@ describe ResourceImportFilesController do
   describe "POST create" do
     describe "When logged in as Librarian" do
       before(:each) do
-        @user = FactoryGirl.create(:librarian)
+        @user = users(:librarian1)
         sign_in @user
       end
 
-      it "should create agent_import_file" do
-        post :create, :resource_import_file => {:resource_import => fixture_file_upload("/../../examples/resource_import_file_sample1.tsv", 'text/csv') }
+      it "should create resource_import_file" do
+        post :create, :resource_import_file => {:resource_import => fixture_file_upload("/../../examples/resource_import_file_sample1.tsv", 'text/csv'), edit_mode: 'create', default_shelf_id: 1 }
         expect(assigns(:resource_import_file)).to be_valid
         assigns(:resource_import_file).user.username.should eq @user.username
         expect(response).to redirect_to resource_import_file_url(assigns(:resource_import_file))
       end
+
+      it "should not create resource_import_file without default_shelf_id" do
+        post :create, :resource_import_file => {:resource_import => fixture_file_upload("/../../examples/resource_import_file_sample1.tsv", 'text/csv'), edit_mode: 'create'}
+        expect(assigns(:resource_import_file)).not_to be_valid
+        assigns(:resource_import_file).user.username.should eq @user.username
+        expect(response).to be_success
+      end
     end
 
     describe "When logged in as User" do
       before(:each) do
-        @user = FactoryGirl.create(:user)
+        @user = users(:user1)
         sign_in @user
       end
 

data/spec/fixtures/resource_import_files.yml

@@ -18,6 +18,7 @@ resource_import_file_00003:
   resource_import_file_size: 1
   user_id: 1
   resource_import_content_type: text/csv
+  default_shelf_id: 1
 
 # == Schema Information
 #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_biblio
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre67
+  version: 0.1.0.pre68
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-28 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: jc-validates_timeliness
   requirement: !ruby/object:Gem::Requirement
@@ -310,14 +310,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre31
+        version: 0.1.0.pre33
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre31
+        version: 0.1.0.pre33
 - !ruby/object:Gem::Dependency
   name: enju_inventory
   requirement: !ruby/object:Gem::Requirement
@@ -380,14 +380,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre46
+        version: 0.1.0.pre47
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre46
+        version: 0.1.0.pre47
 - !ruby/object:Gem::Dependency
   name: enju_ndl
   requirement: !ruby/object:Gem::Requirement
@@ -1475,7 +1475,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: enju_biblio plugin