enju_circulation 0.1.0.pre14 → 0.1.0.pre15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0557b6769b99cbba61295d93b895895b29816c85
-  data.tar.gz: 5f3c123b482ec3fc8916e350740687383068831a
+  metadata.gz: 9298b4e2ef205c74dd31f6f2f18521a658668dbb
+  data.tar.gz: 26f1b41b8e6426288583dcfa44ffa9ba237934f1
 SHA512:
-  metadata.gz: 797b70b0c4c3607f43d850121eaa7461da9a1a9b127142ee6807a152cf6bfdb1424b1a3fb3c68b1808532c3f7978c7561d01b7353ec0b4f26b14232efd5edce1
-  data.tar.gz: 77c12777e53cbb3505f4a16b58efdd2dc0bc9d30ea8bac8293dd622d3a9bd4b754f8712085380d72af7086d7603e06dbdfc469efa44a6a5d93bd79bfabba5bfd
+  metadata.gz: 47af4dbdf5fd8ede360fbd02cc9a5232091a6f2a2b5c26fdb0edbdd0ed4c2a914d403c522c40db780d636350a1cb51d9fb006e2bd3de94e3f651283dace94070
+  data.tar.gz: 8cca8e4cd1c6c9f4da75d27e412b5d80403d7b2f2deaae113acfc46427536917eebffaf84bddafa5514a25316bf82b75cf10249249342942a3e260eaa0a1e6b2

data/app/models/enju_circulation/ability.rb

@@ -5,10 +5,10 @@ module EnjuCirculation
     def initialize(user, ip_address = nil)
       case user.try(:role).try(:name)
       when 'Administrator'
-        can :destroy, Manifestation do |manifestation|
+        can [:destroy, :delete], Manifestation do |manifestation|
           manifestation.items.empty? and !manifestation.periodical_master? and !manifestation.is_reserved?
         end
-        can :destroy, User do |u|
+        can [:destroy, :delete], User do |u|
           u.deletable? and u != user
         end
         can :manage, [
@@ -30,7 +30,7 @@ module EnjuCirculation
           UserReserveStat
         ]
         can [:read, :create, :update, :remove_all], Checkout
-        can :destroy, Checkout do |checkout|
+        can [:destroy, :delete], Checkout do |checkout|
           checkout.checkin
         end
         can [:read, :update], [
@@ -38,15 +38,15 @@ module EnjuCirculation
           LendingPolicy,
           UseRestriction
         ]
-        can :destroy, LendingPolicy
+        can [:destroy, :delete], LendingPolicy
       when 'Librarian'
-        can :destroy, Item do |item|
+        can [:destroy, :delete], Item do |item|
           item.checkouts.not_returned.empty?
         end
-        can :destroy, Manifestation do |manifestation|
+        can [:destroy, :delete], Manifestation do |manifestation|
           manifestation.items.empty? and !manifestation.periodical_master? and !manifestation.is_reserved?
         end
-        can :destroy, User do |u|
+        can [:destroy, :delete], User do |u|
           u.deletable? and u.role.name == 'User' and u != user
         end
         can :manage, [
@@ -58,7 +58,7 @@ module EnjuCirculation
           Reserve
         ]
         can [:read, :create, :update, :remove_all], Checkout
-        can :destroy, Checkout do |checkout|
+        can [:destroy, :delete], Checkout do |checkout|
           checkout.checkin
         end
         can [:read, :create, :update], UserCheckoutStat
@@ -81,14 +81,14 @@ module EnjuCirculation
         can [:show, :update], Checkout do |checkout|
           checkout.user == user
         end
-        can :destroy, Checkout do |checkout|
+        can [:destroy, :delete], Checkout do |checkout|
           checkout.user == user && checkout.checkin
         end
         can :index, Reserve
         can :create, Reserve do |reserve|
           user.user_number.present?
         end
-        can [:show, :update, :destroy], Reserve do |reserve|
+        can [:show, :update, :destroy, :delete], Reserve do |reserve|
           reserve.user == user
         end
         can :read, [

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

@@ -27,7 +27,7 @@
       <%- if can? :update, checkout_type -%>
         <%= link_to t('page.edit'), edit_checkout_type_path(checkout_type) -%>
       <% end %>
-      <%- if can? :destroy, checkout_type -%>
+      <%- if can? :delete, checkout_type -%>
         <%= link_to t('page.destroy'), checkout_type, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <% end %>
     </td>

data/app/views/checkouts/_list.html.erb

@@ -33,7 +33,7 @@
           <%= link_to t('checkout.extend'), edit_checkout_path(checkout) -%>
         <% end %>
       <%- end -%>
-      <%- if can? :destroy, checkout -%>
+      <%- if can? :delete, checkout -%>
         <%= link_to t('page.destroy'), checkout, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>

data/app/views/checkouts/show.html.erb

@@ -12,7 +12,7 @@
     <strong><%= t('activerecord.attributes.checkout.due_date') -%></strong><br />
     <%= l(@checkout.due_date, :format => :only_date) if @checkout.due_date -%>
   </p>
-  <%- if can? :destroy, @checkout -%>
+  <%- if can? :delete, @checkout -%>
     <p>
       <strong><%= t('checkout.current_user') -%></strong><br />
       <%= link_to @checkout.user_username, @checkout.user if @checkout.user -%>

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

@@ -23,7 +23,7 @@
       <%- if can? :update, circulation_status -%>
         <%= link_to t('page.edit'), edit_circulation_status_path(circulation_status) -%>
       <% end %>
-      <%- if can? :destroy, circulation_status -%>
+      <%- if can? :delete, circulation_status -%>
         <%= link_to t('page.destroy'), circulation_status, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>

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

@@ -58,7 +58,7 @@
         (<%= link_to reserve.item.item_identifier, reserve.item %>)
       <% end %>
     </td>
-    <%- if can? :destroy, reserve -%>
+    <%- if can? :delete, reserve -%>
       <td>
         <%= link_to t('page.edit'), edit_reserve_path(reserve) -%>
         <%- if reserve.user.reserves.waiting.include?(reserve) -%>

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

@@ -23,7 +23,7 @@
       <%- if can? :update, use_restriction -%>
         <%= link_to t('page.edit'), edit_use_restriction_path(use_restriction) -%>
       <% end %>
-      <%- if can? :destroy, use_restriction -%>
+      <%- if can? :delete, use_restriction -%>
         <%= link_to t('page.destroy'), use_restriction, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>

data/lib/enju_circulation/user.rb

@@ -5,7 +5,7 @@ module EnjuCirculation
     end
 
     module ClassMethods
-      def enju_circulation_user
+      def enju_circulation_user_model
         include InstanceMethods
         attr_accessible :save_checkout_history, :checkout_icalendar_token
         attr_accessible :save_checkout_history, :checkout_icalendar_token,

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.1.0.pre14"
+  VERSION = "0.1.0.pre15"
 end

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

@@ -5,10 +5,10 @@
     def initialize(user, ip_address = nil)
       case user.try(:role).try(:name)
       when 'Administrator'
-        can :destroy, Manifestation do |manifestation|
+        can [:delete, :destroy], Manifestation do |manifestation|
           manifestation.items.empty? and !manifestation.periodical_master? and !manifestation.is_reserved?
         end
-        can :destroy, User do |u|
+        can [:delete, :destroy], User do |u|
           u.deletable? and u != user
         end
         can :manage, [
@@ -30,7 +30,7 @@
           UserReserveStat
         ]
         can [:read, :create, :update, :remove_all], Checkout
-        can :destroy, Checkout do |checkout|
+        can [:delete, :destroy], Checkout do |checkout|
           checkout.checkin
         end
         can [:read, :update], [
@@ -38,16 +38,16 @@
           LendingPolicy,
           UseRestriction
         ]
-        can :destroy, LendingPolicy
+        can [:delete, :destroy], LendingPolicy
         can :read, [Item, Manifestation]
       when 'Librarian'
-        can :destroy, Item do |item|
+        can [:delete, :destroy], Item do |item|
           item.checkouts.not_returned.empty?
         end
-        can :destroy, Manifestation do |manifestation|
+        can [:delete, :destroy], Manifestation do |manifestation|
           manifestation.items.empty? and !manifestation.periodical_master? and !manifestation.is_reserved?
         end
-        can :destroy, User do |u|
+        can [:delete, :destroy], User do |u|
           u.deletable? and u.role.name == 'User' and u != user
         end
         can :manage, [
@@ -59,7 +59,7 @@
           Reserve
         ]
         can [:read, :create, :update, :remove_all], Checkout
-        can :destroy, Checkout do |checkout|
+        can [:delete, :destroy], Checkout do |checkout|
           checkout.checkin
         end
         can [:read, :create, :update], UserCheckoutStat
@@ -83,14 +83,14 @@
         can [:show, :update], Checkout do |checkout|
           checkout.user == user
         end
-        can :destroy, Checkout do |checkout|
+        can [:delete, :destroy], Checkout do |checkout|
           checkout.user == user && checkout.checkin
         end
         can :index, Reserve
         can :create, Reserve do |reserve|
           user.user_number.present?
         end
-        can [:show, :update, :destroy], Reserve do |reserve|
+        can [:show, :update, :delete, :destroy], Reserve do |reserve|
           reserve.user == user
         end
         can :read, [

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

@@ -16,7 +16,7 @@ class User < ActiveRecord::Base
 
   extend FriendlyId
   friendly_id :username
-  enju_circulation_user
+  enju_circulation_user_model
 
   def has_role?(role_in_question)
     return false unless role

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre14
+  version: 0.1.0.pre15
 platform: ruby
 authors:
 - Kosuke Tanabe
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.13.rc1
+        version: 3.2.13.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.13.rc1
+        version: 3.2.13.rc2
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.14.pre
+        version: 0.1.14.pre4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.14.pre
+        version: 0.1.14.pre4
 - !ruby/object:Gem::Dependency
   name: enju_event
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.17.pre5
+        version: 0.1.17.pre6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.17.pre5
+        version: 0.1.17.pre6
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre22
+        version: 0.1.0.pre23
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre22
+        version: 0.1.0.pre23
 - !ruby/object:Gem::Dependency
   name: enju_library
   requirement: !ruby/object:Gem::Requirement
@@ -612,16 +612,16 @@ files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/data/test/index/_ub.fdt
-- spec/dummy/solr/data/test/index/_ub.fdx
-- spec/dummy/solr/data/test/index/_ub.fnm
-- spec/dummy/solr/data/test/index/_ub.frq
-- spec/dummy/solr/data/test/index/_ub.nrm
-- spec/dummy/solr/data/test/index/_ub.prx
-- spec/dummy/solr/data/test/index/_ub.tii
-- spec/dummy/solr/data/test/index/_ub.tis
+- spec/dummy/solr/data/test/index/_wh.fdt
+- spec/dummy/solr/data/test/index/_wh.fdx
+- spec/dummy/solr/data/test/index/_wh.fnm
+- spec/dummy/solr/data/test/index/_wh.frq
+- spec/dummy/solr/data/test/index/_wh.nrm
+- spec/dummy/solr/data/test/index/_wh.prx
+- spec/dummy/solr/data/test/index/_wh.tii
+- spec/dummy/solr/data/test/index/_wh.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_1op
+- spec/dummy/solr/data/test/index/segments_1t1
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/basket.rb
@@ -885,16 +885,16 @@ test_files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/data/test/index/_ub.fdt
-- spec/dummy/solr/data/test/index/_ub.fdx
-- spec/dummy/solr/data/test/index/_ub.fnm
-- spec/dummy/solr/data/test/index/_ub.frq
-- spec/dummy/solr/data/test/index/_ub.nrm
-- spec/dummy/solr/data/test/index/_ub.prx
-- spec/dummy/solr/data/test/index/_ub.tii
-- spec/dummy/solr/data/test/index/_ub.tis
+- spec/dummy/solr/data/test/index/_wh.fdt
+- spec/dummy/solr/data/test/index/_wh.fdx
+- spec/dummy/solr/data/test/index/_wh.fnm
+- spec/dummy/solr/data/test/index/_wh.frq
+- spec/dummy/solr/data/test/index/_wh.nrm
+- spec/dummy/solr/data/test/index/_wh.prx
+- spec/dummy/solr/data/test/index/_wh.tii
+- spec/dummy/solr/data/test/index/_wh.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_1op
+- spec/dummy/solr/data/test/index/segments_1t1
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/basket.rb