enju_library 0.1.0.pre12 → 0.1.0.pre13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a3ef9da22975202b557d2becaaf3147de2d76d9
-  data.tar.gz: ee7bb96dc1bf7c80cafdc9d4ef7b8041c3b551f9
+  metadata.gz: de8afd76d4f213b4c2e6a12d36daff4d365ae849
+  data.tar.gz: 5f27c3dd400adbf75c65c91dddb43d40bc86b5ec
 SHA512:
-  metadata.gz: 7e9357bf1c2be74b050661ec02725aff65f8573d85eedc69bb24c1b66a536930ab22d36ce5f9aecf67010a355d12a80c232611f3cfa9bd525c02742e7d18f0e5
-  data.tar.gz: 69f69e69b573b95f119011a35f57ddf720ee758826d695616f72e8e45ead8bd4948fcb50dd68f260f04e8fb1bc988f43e8a49999cc9a6a2ed6402542259d7773
+  metadata.gz: 3c0b3712c30b1451d90c564bdd88c5bf2804513c378122b4e5d4f3d473e8818924789ae3369c27928e28fddba7584cd3bb19fce54e43764f048e4679afbae63b
+  data.tar.gz: 811a0084e629138938c68a8c8c5e985c5e99d119a55a7ee2f58e3bb26ec4a76c0ca2aabc0dde838676add02c0c38a3afd00b5e31d237f0d62f64856502e86184

data/app/models/enju_library/ability.rb

@@ -6,15 +6,15 @@ module EnjuLibrary
       case user.try(:role).try(:name)
       when 'Administrator'
         can [:read, :create, :update], Bookstore
-        can :destroy, Bookstore do |bookstore|
+        can [:delete, :destroy], Bookstore do |bookstore|
           bookstore.items.empty?
         end
         can [:read, :create, :update], Library
-        can :destroy, Library do |library|
+        can [:delete, :destroy], Library do |library|
           library.shelves.empty? and !library.web?
         end
         can [:read, :create, :update], Shelf
-        can :destroy, Shelf do |shelf|
+        can [:delete, :destroy], Shelf do |shelf|
           shelf.items.empty?
         end
         can :manage, [

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

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

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

@@ -28,7 +28,7 @@
       <%- if can? :update, bookstore -%>
         <%= link_to image_tag('icons/page_white_edit.png', :size => '16x16', :alt => t('page.edit')), edit_bookstore_path(bookstore) -%>
       <% end %>
-      <%- if can? :destroy, bookstore -%>
+      <%- if can? :delete, bookstore -%>
         <%= link_to image_tag('icons/delete.png', :size => '16x16', :alt => t('page.destroy')), bookstore, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>

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

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

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

@@ -54,7 +54,7 @@
       <%- if can? :update, library -%>
         <%= link_to image_tag('icons/page_white_edit.png', :size => '16x16', :alt => t('page.edit')), edit_library_path(library) -%>
       <% end %>
-      <%- if can? :destroy, library -%>
+      <%- if can? :delete, library -%>
         <%= link_to image_tag('icons/delete.png', :size => '16x16', :alt => t('page.destroy')), library, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>

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

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

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

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

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

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

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

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

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

@@ -14,7 +14,7 @@
     <td><%= link_to subscription.title, subscription -%></td>
     <td><%= subscription.works.size -%></td>
     <td>
-      <% if can? :destroy, subscription %>
+      <% if can? :delete, subscription %>
         <%= link_to t('page.edit'), edit_subscription_path(subscription) -%>
         <%= link_to t('page.destroy'), subscription, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <% end %>

data/lib/enju_library/version.rb

@@ -1,3 +1,3 @@
 module EnjuLibrary
-  VERSION = "0.1.0.pre12"
+  VERSION = "0.1.0.pre13"
 end

data/spec/dummy/app/controllers/application_controller.rb

@@ -39,9 +39,9 @@ class ApplicationController < ActionController::Base
     raise CanCan::AccessDenied
   end
 
-  def current_ability
-    @current_ability ||= Ability.new(current_user, request.remote_ip)
-  end
+  #def current_ability
+  #  @current_ability ||= Ability.new(current_user, request.remote_ip.split('%')[0])
+  #end
 
   def solr_commit
     Sunspot.commit

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

@@ -1,53 +1,68 @@
-class Ability
-  include CanCan::Ability
-
-  def initialize(user, ip_address = nil)
-    case user.try(:role).try(:name)
-    when 'Administrator'
-      can :manage, Accept
-      can [:read, :create, :update], Bookstore
-      can :manage, BudgetType
-      can :destroy, Bookstore do |bookstore|
-        if defined?(EnjuPurchaseRequest)
-          bookstore.order_lists.empty? and bookstore.items.empty?
-        else
+#module EnjuLibrary
+  class Ability
+    include CanCan::Ability
+  
+    def initialize(user)
+      case user.try(:role).try(:name)
+      when 'Administrator'
+        can [:read, :create, :update], Bookstore
+        can [:delete, :destroy], Bookstore do |bookstore|
           bookstore.items.empty?
         end
+        can [:read, :create, :update], Library
+        can [:delete, :destroy], Library do |library|
+          library.shelves.empty? and !library.web?
+        end
+        can [:read, :create, :update], Shelf
+        can [:delete, :destroy], Shelf do |shelf|
+          shelf.items.empty?
+        end
+        can :manage, [
+          Accept,
+          BudgetType,
+          SearchEngine,
+          Subscribe,
+          Subscription
+        ]
+        can :update, [
+          LibraryGroup,
+          RequestStatusType,
+          RequestType
+        ]
+        can :read, [
+          LibraryGroup,
+          RequestStatusType,
+          RequestType
+        ]
+      when 'Librarian'
+        can :manage, [
+          Accept,
+          Subscribe,
+          Subscription
+        ]
+        can :read, [
+          Bookstore,
+          BudgetType,
+          Library,
+          LibraryGroup,
+          RequestStatusType,
+          RequestType,
+          SearchEngine,
+          Shelf
+        ]
+      when 'User'
+        can :read, [
+          Library,
+          LibraryGroup,
+          Shelf
+        ]
+      else
+        can :read, [
+          Library,
+          LibraryGroup,
+          Shelf
+        ]
       end
-      can [:read, :create, :update], Library
-      can :destroy, Library do |library|
-        library.shelves.empty? and !library.web?
-      end
-      can [:read, :update], LibraryGroup
-      can [:read, :update], RequestStatusType
-      can [:read, :update], RequestType
-      can [:read, :create, :update], Shelf
-      can :destroy, Shelf do |shelf|
-        shelf.items.empty?
-      end
-      can :manage, SearchEngine
-      can :manage, Subscribe
-      can :manage, Subscription
-    when 'Librarian'
-      can :manage, Accept
-      can :read, Bookstore
-      can :read, BudgetType
-      can :read, Library
-      can :read, LibraryGroup
-      can :read, RequestStatusType
-      can :read, RequestType
-      can :read, Shelf
-      can :read, SearchEngine
-      can :manage, Subscribe
-      can :manage, Subscription
-    when 'User'
-      can :read, Shelf
-      can :read, Library
-      can :read, LibraryGroup
-    else
-      can :read, Library
-      can :read, LibraryGroup
-      can :read, Shelf
     end
   end
-end
+#end

data/spec/fixtures/library_groups.yml

@@ -10,6 +10,7 @@ one:
   url: "http://localhost:3000/"
   position: 1
   login_banner: "*Next-L Enju*"
+  admin_networks: 0.0.0.0/0
 
 # == Schema Information
 #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_library
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre12
+  version: 0.1.0.pre13
 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: enju_core
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre9
+        version: 0.1.0.pre10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre9
+        version: 0.1.0.pre10
 - !ruby/object:Gem::Dependency
   name: enju_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
@@ -184,56 +184,56 @@ 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_event
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.17.pre6
+        version: 0.1.17.pre7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.17.pre6
+        version: 0.1.17.pre7
 - !ruby/object:Gem::Dependency
   name: enju_circulation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre13
+        version: 0.1.0.pre15
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre13
+        version: 0.1.0.pre15
 - !ruby/object:Gem::Dependency
   name: enju_inter_library_loan
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre5
+        version: 0.1.0.pre6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre5
+        version: 0.1.0.pre6
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
@@ -540,16 +540,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/_3b.fdt
-- spec/dummy/solr/data/test/index/_3b.fdx
-- spec/dummy/solr/data/test/index/_3b.fnm
-- spec/dummy/solr/data/test/index/_3b.frq
-- spec/dummy/solr/data/test/index/_3b.nrm
-- spec/dummy/solr/data/test/index/_3b.prx
-- spec/dummy/solr/data/test/index/_3b.tii
-- spec/dummy/solr/data/test/index/_3b.tis
+- spec/dummy/solr/data/test/index/_7d.fdt
+- spec/dummy/solr/data/test/index/_7d.fdx
+- spec/dummy/solr/data/test/index/_7d.fnm
+- spec/dummy/solr/data/test/index/_7d.frq
+- spec/dummy/solr/data/test/index/_7d.nrm
+- spec/dummy/solr/data/test/index/_7d.prx
+- spec/dummy/solr/data/test/index/_7d.tii
+- spec/dummy/solr/data/test/index/_7d.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_7t
+- spec/dummy/solr/data/test/index/segments_hb
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/tmp/cache/4AD/470/country_all
@@ -769,16 +769,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/_3b.fdt
-- spec/dummy/solr/data/test/index/_3b.fdx
-- spec/dummy/solr/data/test/index/_3b.fnm
-- spec/dummy/solr/data/test/index/_3b.frq
-- spec/dummy/solr/data/test/index/_3b.nrm
-- spec/dummy/solr/data/test/index/_3b.prx
-- spec/dummy/solr/data/test/index/_3b.tii
-- spec/dummy/solr/data/test/index/_3b.tis
+- spec/dummy/solr/data/test/index/_7d.fdt
+- spec/dummy/solr/data/test/index/_7d.fdx
+- spec/dummy/solr/data/test/index/_7d.fnm
+- spec/dummy/solr/data/test/index/_7d.frq
+- spec/dummy/solr/data/test/index/_7d.nrm
+- spec/dummy/solr/data/test/index/_7d.prx
+- spec/dummy/solr/data/test/index/_7d.tii
+- spec/dummy/solr/data/test/index/_7d.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_7t
+- spec/dummy/solr/data/test/index/segments_hb
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/tmp/cache/4AD/470/country_all