enju_circulation 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36c7b0cdffa83e769e73f3b1beb9e6705af07044
-  data.tar.gz: 1e0eddb8648a35597e0def7945cdd37e30a565fb
+  metadata.gz: 8fe700770c6a3e4efe23389b798124a3dceb6360
+  data.tar.gz: 4fe217962653f3d68d007b28d03a156fe7293ce1
 SHA512:
-  metadata.gz: 7a321cce817645bf567a8e903a3ea217e1a89d0eecaac34c046d85c10698377b9699fb0762b7988e95a3188f473dca5abdab38375571be287063a8ac73c2e5df
-  data.tar.gz: ba2501c18c23e0fd614afc0a8336d742cf054ce59a05d34f369664da871d575afd8959ad021e5df0dc45d595e0b9415ae6e26abebf1148a890570d48e9fd94cc
+  metadata.gz: 8ba1551d6af8e6c29644ba63c110d5965ef408eabd0353044cf87553382122651fb2a766e8d4eed1d333fe9718f50cdef7dfb9785775321fb0deb141649281d1
+  data.tar.gz: 182984aa80180b7e56802ed79f43cd29d9c7b19f1de5780826157d1b46f966d8a94da26e4644cf8152ef63cc67cdfa269ed846ea34e3629e17baac5996ec6cf9

data/README.rdoc

@@ -1,5 +1,5 @@
 = EnjuCirculation
-{<img src="https://secure.travis-ci.org/next-l/enju_circulation.png?branch=1.1" alt="Build Status" />}[http://travis-ci.org/next-l/enju_circulation]
+{<img src="https://travis-ci.org/next-l/enju_circulation.png?branch=1.1" alt="Build Status" />}[https://travis-ci.org/next-l/enju_circulation]
 {<img src="https://coveralls.io/repos/next-l/enju_circulation/badge.png?branch=1.1" alt="Coverage Status" />}[https://coveralls.io/r/next-l/enju_circulation?branch=1.1]
 {<img src="https://hakiri.io/github/next-l/enju_circulation/1.1.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_circulation/1.1]
 

data/app/controllers/checkouts_controller.rb

@@ -35,7 +35,6 @@ class CheckoutsController < ApplicationController
         if current_user.try(:has_role?, 'Librarian')
           search.build do
             with(:username).equal_to user.username
-            with(:checked_in_at).equal_to nil unless user.profile.save_checkout_history
           end
         else
           if current_user == user
@@ -50,12 +49,9 @@ class CheckoutsController < ApplicationController
         unless current_user.try(:has_role?, 'Librarian')
           search.build do
             with(:username).equal_to current_user.username
-          end
-        end
-
-        unless current_user.profile.save_checkout_history?
-          search.build do
-            with(:checked_in_at).equal_to nil
+            unless current_user.profile.save_checkout_history?
+              with(:checked_in_at).equal_to nil
+            end
           end
         end
       end

data/app/views/reserves/index.html.erb

@@ -60,8 +60,8 @@
         (<%= link_to reserve.item.item_identifier, reserve.item %>)
       <% end %>
     </td>
-    <%- if can? :delete, reserve -%>
-      <td>
+    <td>
+      <%- if can? :delete, reserve -%>
         <%= link_to t('page.edit'), edit_reserve_path(reserve) -%>
         <%- if reserve.user.reserves.waiting.include?(reserve) -%>
           <br />
@@ -70,8 +70,8 @@
           <br />
           <%= link_to t('page.destroy'), reserve, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
         <%- end -%>
-      </td>
-    <%- end -%>
+      <%- end -%>
+    </td>
   </tr>
 <%- end -%>
 </table>

data/app/workers/manifestation_checkout_stat_queue.rb

@@ -1,5 +1,5 @@
 class ManifestationCheckoutStatQueue
-  @queue = :manifestation_checkout_stat
+  @queue = :enju_leaf
 
   def self.perform(manifestation_checkout_stat_id)
     ManifestationCheckoutStat.find(manifestation_checkout_stat_id).transition_to!(:started)

data/app/workers/manifestation_reserve_stat_queue.rb

@@ -1,5 +1,5 @@
 class ManifestationReserveStatQueue
-  @queue = :manifestation_reserve_stat
+  @queue = :enju_leaf
 
   def self.perform(manifestation_reserve_stat_id)
     ManifestationReserveStat.find(manifestation_reserve_stat_id).transition_to!(:started)

data/app/workers/user_checkout_stat_queue.rb

@@ -1,5 +1,5 @@
 class UserCheckoutStatQueue
-  @queue = :user_checkout_stat
+  @queue = :enju_leaf
 
   def self.perform(user_checkout_stat_id)
     UserCheckoutStat.find(user_checkout_stat_id).transition_to!(:started)

data/app/workers/user_reserve_stat_queue.rb

@@ -1,5 +1,5 @@
 class UserReserveStatQueue
-  @queue = :user_reserve_stat
+  @queue = :enju_leaf
 
   def self.perform(user_reserve_stat_id)
     UserReserveStat.find(user_reserve_stat_id).transition_to!(:started)

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/controllers/checkouts_controller_spec.rb

@@ -18,6 +18,7 @@ describe CheckoutsController do
       it "assigns all checkouts as @checkouts" do
         get :index
         assigns(:checkouts).should eq Checkout.order('checkouts.created_at DESC').page(1)
+        assigns(:checkouts).total_entries.should eq Checkout.count
       end
 
       it "should get other user's index" do
@@ -82,6 +83,7 @@ describe CheckoutsController do
       it "assigns all checkouts as @checkouts" do
         get :index
         assigns(:checkouts).should eq(users(:user1).checkouts.order('checkouts.created_at DESC').page(1))
+        assigns(:checkouts).total_entries.should eq users(:user1).checkouts.count
         response.should be_success
       end
 

data/spec/dummy/config/initializers/assets.rb

@@ -0,0 +1,12 @@
+# Be sure to restart your server when you modify this file.
+
+# Version of your assets, change this if you want to expire all your assets.
+Rails.application.config.assets.version = '1.0'
+
+# Add additional assets to the asset load path
+# Rails.application.config.assets.paths << Emoji.images_path
+
+# Precompile additional assets.
+# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+# Rails.application.config.assets.precompile += %w( search.js )
+Rails.application.config.assets.precompile += %w( *.png icons/*.png )

data/spec/fixtures/manifestations.yml

@@ -384,7 +384,7 @@ manifestation_00114:
   price:
   manifestation_identifier:
   depth:
-  date_of_publication: 2001-03-20
+  pub_date: 2001-03-20
   access_address:
   id: 114
   height:
@@ -412,7 +412,7 @@ manifestation_00116:
   price:
   manifestation_identifier:
   depth:
-  date_of_publication: 1991-12-24
+  pub_date: 1991-12-24
   access_address:
   id: 116
   height:
@@ -468,7 +468,7 @@ manifestation_00120:
   price:
   manifestation_identifier:
   depth:
-  date_of_publication: 2000-10-01
+  pub_date: 2000-10-01
   access_address:
   id: 120
   height:
@@ -1476,7 +1476,7 @@ manifestation_00192:
   price:
   manifestation_identifier:
   depth:
-  date_of_publication: 2007-04-27
+  pub_date: 2007-04-27
   access_address:
   id: 192
   height:
@@ -1490,7 +1490,7 @@ manifestation_00193:
   price:
   manifestation_identifier:
   depth:
-  date_of_publication: 2007-02-01
+  pub_date: 2007-02-01
   access_address:
   id: 193
   height:
@@ -1532,7 +1532,7 @@ manifestation_00196:
   price:
   manifestation_identifier:
   depth:
-  date_of_publication: 2006-08-05
+  pub_date: 2006-08-05
   access_address:
   id: 196
   height:
@@ -1570,7 +1570,7 @@ manifestation_00201:
   carrier_type_id: 1
   language_id: 1
   updated_at: 2010-03-01 16:14:18 +09:00
-  original_title: "テスト雑誌１月号"
+  original_title: "テスト雑誌2005年１月号"
   price:
   manifestation_identifier:
   depth:
@@ -1581,6 +1581,7 @@ manifestation_00201:
   width:
   created_at: 2007-11-19 17:55:41 +9:00
   frequency_id: 3
+  serial: true
 manifestation_00202:
   carrier_type_id: 1
   language_id: 1
@@ -1599,11 +1600,12 @@ manifestation_00202:
   serial_number: 2
   volume_number: 1
   issue_number: 2
+  serial: true
 manifestation_00203:
   carrier_type_id: 1
   language_id: 1
   updated_at: 2010-03-01 16:14:18 +09:00
-  original_title: "テスト単行本記事"
+  original_title: "テスト単行本記事2005"
   price:
   manifestation_identifier:
   depth:
@@ -1614,11 +1616,12 @@ manifestation_00203:
   width:
   created_at: 2010-03-03 17:00:00 +9:00
   frequency_id: 1
+  serial: false
 manifestation_00204:
   carrier_type_id: 1
   language_id: 1
   updated_at: 2010-03-03 20:00:00 +09:00
-  original_title: "テスト雑誌１月号の記事１"
+  original_title: "テスト雑誌１月号の記事１ 2005"
   price:
   manifestation_identifier:
   depth:
@@ -1628,6 +1631,7 @@ manifestation_00204:
   height:
   width:
   created_at: 2010-03-03 20:00:00 +9:00
+  serial: true
 manifestation_00205:
   carrier_type_id: 1
   language_id: 1
@@ -1636,7 +1640,7 @@ manifestation_00205:
   price:
   manifestation_identifier:
   depth:
-  date_of_publication:
+  date_of_publication: 2000-01-01 00:00:00 +09:00
   access_address:
   id: 205
   height:
@@ -1650,7 +1654,7 @@ manifestation_00206:
   price:
   manifestation_identifier:
   depth:
-  date_of_publication:
+  date_of_publication: 2010-01-01 00:00:00 +09:00
   access_address:
   id: 206
   height:
@@ -1811,35 +1815,39 @@ manifestation_00216:
   created_at: 2010-03-19 13:00:00 +9:00
   required_role_id: 1
   repository_content: false
-
+manifestation_00217:
+  carrier_type_id: 1
+  language_id: 77
+  updated_at: 2014-12-20 16:44:00 +09:00
+  original_title: "VRML2.0 : 3Dサイバースペース構築言語"
+  content_type_id: 1
+  year_of_publication: 1996
+  statement_of_responsibility: "三浦憲二郎著"
+  id: 217
 
 # == Schema Information
 #
 # Table name: manifestations
 #
-#  id                              :integer         not null, primary key
-#  original_title                  :text            not null
+#  id                              :integer          not null, primary key
+#  original_title                  :text             not null
 #  title_alternative               :text
 #  title_transcription             :text
 #  classification_number           :string(255)
 #  manifestation_identifier        :string(255)
 #  date_of_publication             :datetime
 #  date_copyrighted                :datetime
-#  created_at                      :datetime        not null
-#  updated_at                      :datetime        not null
+#  created_at                      :datetime
+#  updated_at                      :datetime
 #  deleted_at                      :datetime
 #  access_address                  :string(255)
-#  language_id                     :integer         default(1), not null
-#  carrier_type_id                 :integer         default(1), not null
-#  extent_id                       :integer         default(1), not null
+#  language_id                     :integer          default(1), not null
+#  carrier_type_id                 :integer          default(1), not null
 #  start_page                      :integer
 #  end_page                        :integer
 #  height                          :integer
 #  width                           :integer
 #  depth                           :integer
-#  nbn                             :string(255)
-#  lccn                            :string(255)
-#  oclc_number                     :string(255)
 #  price                           :integer
 #  fulltext                        :text
 #  volume_number_string            :string(255)
@@ -1847,15 +1855,12 @@ manifestation_00216:
 #  serial_number_string            :string(255)
 #  edition                         :integer
 #  note                            :text
-#  repository_content              :boolean         default(FALSE), not null
-#  lock_version                    :integer         default(0), not null
-#  required_role_id                :integer         default(1), not null
-#  state                           :string(255)
-#  required_score                  :integer         default(0), not null
-#  frequency_id                    :integer         default(1), not null
-#  subscription_master             :boolean         default(FALSE), not null
-#  ipaper_id                       :integer
-#  ipaper_access_key               :string(255)
+#  repository_content              :boolean          default(FALSE), not null
+#  lock_version                    :integer          default(0), not null
+#  required_role_id                :integer          default(1), not null
+#  required_score                  :integer          default(0), not null
+#  frequency_id                    :integer          default(1), not null
+#  subscription_master             :boolean          default(FALSE), not null
 #  attachment_file_name            :string(255)
 #  attachment_content_type         :string(255)
 #  attachment_file_size            :integer
@@ -1868,17 +1873,19 @@ manifestation_00216:
 #  date_submitted                  :datetime
 #  date_accepted                   :datetime
 #  date_caputured                  :datetime
-#  ndl_bib_id                      :string(255)
 #  pub_date                        :string(255)
 #  edition_string                  :string(255)
 #  volume_number                   :integer
 #  issue_number                    :integer
 #  serial_number                   :integer
-#  ndc                             :string(255)
-#  content_type_id                 :integer         default(1)
+#  content_type_id                 :integer          default(1)
 #  year_of_publication             :integer
-#  attachment_fingerprint          :string(255)
 #  attachment_meta                 :text
 #  month_of_publication            :integer
+#  fulltext_content                :boolean
+#  serial                          :boolean
+#  statement_of_responsibility     :text
+#  publication_place               :text
+#  extent                          :text
+#  dimensions                      :text
 #
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2015-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_leaf
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: enju_event
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.17
+        version: 0.1.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.17
+        version: 0.1.18
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +112,16 @@ dependencies:
   name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -481,6 +481,7 @@ files:
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/devise.rb
 - spec/dummy/config/initializers/friendly_id.rb
@@ -776,7 +777,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: enju_circulation plugin
@@ -816,6 +817,7 @@ test_files:
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/devise.rb
 - spec/dummy/config/initializers/friendly_id.rb