enju_circulation 0.1.0.pre15 → 0.1.0.pre16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9298b4e2ef205c74dd31f6f2f18521a658668dbb
-  data.tar.gz: 26f1b41b8e6426288583dcfa44ffa9ba237934f1
+  metadata.gz: 7f86efed31c18ea347f1658523aab6bd370f1841
+  data.tar.gz: 61f456e339046fd324677c83eb51d1c87184919a
 SHA512:
-  metadata.gz: 47af4dbdf5fd8ede360fbd02cc9a5232091a6f2a2b5c26fdb0edbdd0ed4c2a914d403c522c40db780d636350a1cb51d9fb006e2bd3de94e3f651283dace94070
-  data.tar.gz: 8cca8e4cd1c6c9f4da75d27e412b5d80403d7b2f2deaae113acfc46427536917eebffaf84bddafa5514a25316bf82b75cf10249249342942a3e260eaa0a1e6b2
+  metadata.gz: 49d8ab628ce347d257b9f20eac121778fbf0a71b27087aa3aa38093519881406206a8f8744d1e387c0ad122d1087dd4c2fd0eeb70d1943da1662df84b8435991
+  data.tar.gz: 65f319e166213426075e0c833144bae589d1301980143ca532407ded3e60fccaa6586196b8723d82e7f66bd29a32f8029aa58429d4f371b9a8c54f8e681f2f9f

data/app/models/enju_circulation/ability.rb

@@ -8,9 +8,6 @@ module EnjuCirculation
         can [:destroy, :delete], Manifestation do |manifestation|
           manifestation.items.empty? and !manifestation.periodical_master? and !manifestation.is_reserved?
         end
-        can [:destroy, :delete], User do |u|
-          u.deletable? and u != user
-        end
         can :manage, [
           Basket,
           CarrierTypeHasCheckoutType,
@@ -46,9 +43,6 @@ module EnjuCirculation
         can [:destroy, :delete], Manifestation do |manifestation|
           manifestation.items.empty? and !manifestation.periodical_master? and !manifestation.is_reserved?
         end
-        can [:destroy, :delete], User do |u|
-          u.deletable? and u.role.name == 'User' and u != user
-        end
         can :manage, [
           Basket,
           CheckedItem,

data/lib/enju_circulation/item.rb

@@ -1,5 +1,5 @@
 module EnjuCirculation
-  module Item
+  module EnjuItem
     def self.included(base)
       base.extend ClassMethods
     end

data/lib/enju_circulation/manifestation.rb

@@ -1,5 +1,5 @@
 module EnjuCirculation
-  module Manifestation
+  module EnjuManifestation
     def self.included(base)
       base.extend ClassMethods
     end

data/lib/enju_circulation/user.rb

@@ -1,5 +1,5 @@
 module EnjuCirculation
-  module User
+  module EnjuUser
     def self.included(base)
       base.extend ClassMethods
     end

data/lib/enju_circulation/user_group.rb

@@ -0,0 +1,20 @@
+module EnjuCirculation
+  module EnjuUserGroup
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+      def enju_circulation_user_group_model
+        has_many :user_group_has_checkout_types, :dependent => :destroy
+        has_many :checkout_types, :through => :user_group_has_checkout_types, :order => :position
+        has_many :lending_policies
+
+        validates_numericality_of :number_of_day_to_notify_due_date,
+          :number_of_day_to_notify_overdue,
+          :number_of_time_to_notify_overdue,
+          :greater_than_or_equal_to => 0
+      end
+    end
+  end
+end

data/lib/enju_circulation/version.rb

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

data/lib/enju_circulation.rb

@@ -2,6 +2,7 @@ require "enju_circulation/engine"
 require "enju_circulation/manifestation"
 require "enju_circulation/item"
 require "enju_circulation/user"
+require "enju_circulation/user_group"
 require "enju_circulation/controller"
 require "enju_circulation/helper"
 
@@ -9,7 +10,8 @@ module EnjuCirculation
 end
 
 ActionController::Base.send :include, EnjuCirculation::Controller
-ActiveRecord::Base.send :include, EnjuCirculation::Manifestation
-ActiveRecord::Base.send :include, EnjuCirculation::Item
-ActiveRecord::Base.send :include, EnjuCirculation::User
+ActiveRecord::Base.send :include, EnjuCirculation::EnjuManifestation
+ActiveRecord::Base.send :include, EnjuCirculation::EnjuItem
+ActiveRecord::Base.send :include, EnjuCirculation::EnjuUser
+ActiveRecord::Base.send :include, EnjuCirculation::EnjuUserGroup
 ActionView::Base.send :include, EnjuCirculation::ManifestationsHelper

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

@@ -5,12 +5,9 @@
     def initialize(user, ip_address = nil)
       case user.try(:role).try(:name)
       when 'Administrator'
-        can [:delete, :destroy], Manifestation do |manifestation|
+        can [:destroy, :delete], Manifestation do |manifestation|
           manifestation.items.empty? and !manifestation.periodical_master? and !manifestation.is_reserved?
         end
-        can [:delete, :destroy], User do |u|
-          u.deletable? and u != user
-        end
         can :manage, [
           Basket,
           CarrierTypeHasCheckoutType,
@@ -30,7 +27,7 @@
           UserReserveStat
         ]
         can [:read, :create, :update, :remove_all], Checkout
-        can [:delete, :destroy], Checkout do |checkout|
+        can [:destroy, :delete], Checkout do |checkout|
           checkout.checkin
         end
         can [:read, :update], [
@@ -38,18 +35,15 @@
           LendingPolicy,
           UseRestriction
         ]
-        can [:delete, :destroy], LendingPolicy
+        can [:destroy, :delete], LendingPolicy
         can :read, [Item, Manifestation]
       when 'Librarian'
-        can [:delete, :destroy], Item do |item|
+        can [:destroy, :delete], Item do |item|
           item.checkouts.not_returned.empty?
         end
-        can [:delete, :destroy], Manifestation do |manifestation|
+        can [:destroy, :delete], Manifestation do |manifestation|
           manifestation.items.empty? and !manifestation.periodical_master? and !manifestation.is_reserved?
         end
-        can [:delete, :destroy], User do |u|
-          u.deletable? and u.role.name == 'User' and u != user
-        end
         can :manage, [
           Basket,
           CheckedItem,
@@ -59,7 +53,7 @@
           Reserve
         ]
         can [:read, :create, :update, :remove_all], Checkout
-        can [:delete, :destroy], Checkout do |checkout|
+        can [:destroy, :delete], Checkout do |checkout|
           checkout.checkin
         end
         can [:read, :create, :update], UserCheckoutStat
@@ -83,14 +77,14 @@
         can [:show, :update], Checkout do |checkout|
           checkout.user == user
         end
-        can [:delete, :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, :delete, :destroy], Reserve do |reserve|
+        can [:show, :update, :destroy, :delete], Reserve do |reserve|
           reserve.user == user
         end
         can :read, [
@@ -110,6 +104,7 @@
           UserCheckoutStat,
           UserReserveStat
         ]
+        can :read, [Item, Manifestation]
       end
     end
   end

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

@@ -14,20 +14,9 @@ class UserGroup < ActiveRecord::Base
     :greater_than_or_equal_to => 0,
     :allow_blank => true
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 
-  if defined?(EnjuCirculation)
-    has_many :user_group_has_checkout_types, :dependent => :destroy
-    has_many :checkout_types, :through => :user_group_has_checkout_types, :order => :position
-    has_many :lending_policies
-
-    validates_numericality_of :number_of_day_to_notify_due_date,
-      :number_of_day_to_notify_overdue,
-      :number_of_time_to_notify_overdue,
-      :greater_than_or_equal_to => 0
-  end
+  enju_circulation_user_group_model if defined?(EnjuCirculation)
 end
 
 # == Schema Information

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre15
+  version: 0.1.0.pre16
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-13 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -456,6 +456,7 @@ files:
 - lib/enju_circulation/item.rb
 - lib/enju_circulation/manifestation.rb
 - lib/enju_circulation/user.rb
+- lib/enju_circulation/user_group.rb
 - lib/enju_circulation/version.rb
 - lib/enju_circulation.rb
 - lib/generators/enju_circulation/views_generator.rb
@@ -612,16 +613,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/_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/_12z.fdt
+- spec/dummy/solr/data/test/index/_12z.fdx
+- spec/dummy/solr/data/test/index/_12z.fnm
+- spec/dummy/solr/data/test/index/_12z.frq
+- spec/dummy/solr/data/test/index/_12z.nrm
+- spec/dummy/solr/data/test/index/_12z.prx
+- spec/dummy/solr/data/test/index/_12z.tii
+- spec/dummy/solr/data/test/index/_12z.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_1t1
+- spec/dummy/solr/data/test/index/segments_261
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/basket.rb
@@ -885,16 +886,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/_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/_12z.fdt
+- spec/dummy/solr/data/test/index/_12z.fdx
+- spec/dummy/solr/data/test/index/_12z.fnm
+- spec/dummy/solr/data/test/index/_12z.frq
+- spec/dummy/solr/data/test/index/_12z.nrm
+- spec/dummy/solr/data/test/index/_12z.prx
+- spec/dummy/solr/data/test/index/_12z.tii
+- spec/dummy/solr/data/test/index/_12z.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_1t1
+- spec/dummy/solr/data/test/index/segments_261
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/basket.rb