enju_circulation 0.1.0.pre45 → 0.1.0.pre46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 221ca150ecf674e9c773798930e314dd4f36feac
-  data.tar.gz: c7a4e4a14dfa75488958e2885572e0e2d4bc1f66
+  metadata.gz: dbac65337fbd0c74d751430f251d7943ef5bb033
+  data.tar.gz: 2a6dc125d89d8211aeb4894b01ced7e2bda78dc2
 SHA512:
-  metadata.gz: 3ea15535e7b36df2154fc75ac3172521cec3fb0d10279803a248a162ccf9afec5efca684ae899bb277e6cb952427b21cd9fd9d7297e48e61d68c8942680f40bf
-  data.tar.gz: 53068cdc6785ee212ef0473bd7e4bded77f623b94050d0f5ac0f5ebf55a48b9b1e82e7f4d40f65c4f4bc0ccf72561011b8e4fcf8359d89150a1b643e89aa921b
+  metadata.gz: fc45fed8e102b392090e5127beba9375054da1dca6aaef35001a84be3bddb5f05d08ef76a7913695618b98d2f52fb53df167fd5f6ea204d9d6b1b137b3b82dd2
+  data.tar.gz: ce5d0588de1a7e09995298206cf78fecd29fd78deac88c0e3f0d3fca41de3e1026abe58ee9363e46491a944b2493bc0bdecd67e36eab152a850e4f65781a4a5f

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2012 Kosuke Tanabe
+Copyright 2015 Project Next-L
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

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

@@ -31,8 +31,12 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.edit'), edit_checkout_type_path(@checkout_type) -%></li>
+    <%- if can? :update, @checkout_type -%>
+      <li><%= link_to t('page.edit'), edit_checkout_type_path(@checkout_type) -%></li>
+    <%- end -%>
     <li><%= back_to_index(flash[:page_info]) -%></li>
-    <li><%= link_to t('page.new', model: t('activerecord.models.user_group_has_checkout_type')), new_checkout_type_user_group_has_checkout_type_path(@checkout_type) -%></li>
+    <%- if can? :create, UserGroupHasCheckoutType -%>
+      <li><%= link_to t('page.new', model: t('activerecord.models.user_group_has_checkout_type')), new_checkout_type_user_group_has_checkout_type_path(@checkout_type) -%></li>
+    <%- end -%>
   </ul>
 </div>

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

@@ -23,7 +23,9 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.edit'), edit_circulation_status_path(@circulation_status) -%></li>
+    <%- if can? :update, @circulation_status -%>
+      <li><%= link_to t('page.edit'), edit_circulation_status_path(@circulation_status) -%></li>
+    <%- end -%>
     <li><%= back_to_index(flash[:page_info]) -%></li>
   </ul>
 </div>

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

@@ -23,7 +23,9 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.edit'), edit_use_restriction_path(@use_restriction) -%></li>
+    <%- if can? :update, @use_restriction -%>
+      <li><%= link_to t('page.edit'), edit_use_restriction_path(@use_restriction) -%></li>
+    <%- end -%>
     <li><%= back_to_index(flash[:page_info]) -%></li>
   </ul>
 </div>

data/lib/enju_circulation/profile.rb

@@ -12,7 +12,7 @@ module EnjuCirculation
 
     module InstanceMethods
       def reset_checkout_icalendar_token
-        self.checkout_icalendar_token = Devise.friendly_token
+        self.checkout_icalendar_token = SecureRandom.hex(16)
       end
 
       def delete_checkout_icalendar_token

data/lib/enju_circulation/user.rb

@@ -32,14 +32,6 @@ module EnjuCirculation
         end
       end
 
-      def reset_checkout_icalendar_token
-        self.checkout_icalendar_token = Devise.friendly_token
-      end
-
-      def delete_checkout_icalendar_token
-        self.checkout_icalendar_token = nil
-      end
-
       def checked_item_count
         checkout_count = {}
         CheckoutType.all.each do |checkout_type|

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.1.0.pre45"
+  VERSION = "0.1.0.pre46"
 end

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

@@ -1,7 +1,7 @@
 class User < ActiveRecord::Base
   # Include default devise modules. Others available are:
   # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
-  devise :database_authenticatable, :registerable,
+  devise :database_authenticatable, #:registerable,
          :recoverable, :rememberable, :trackable, :validatable
 
   # Setup accessible (or protected) attributes for your model

data/spec/factories/user.rb

@@ -2,7 +2,6 @@ FactoryGirl.define do
   factory :admin, :class => User do |f|
     f.sequence(:username){|n| "admin_#{n}"}
     f.sequence(:email){|n| "admin_#{n}@example.jp"}
-    f.email_confirmation{|u| u.email}
     f.role {Role.find_by_name('Administrator')}
     f.password 'adminpassword'
     f.password_confirmation 'adminpassword'
@@ -11,7 +10,6 @@ FactoryGirl.define do
   factory :librarian, :class => User do |f|
     f.sequence(:username){|n| "librarian_#{n}"}
     f.sequence(:email){|n| "librarian_#{n}@example.jp"}
-    f.email_confirmation{|u| u.email}
     f.role {Role.find_by_name('Librarian')}
     f.password 'librarianpassword'
     f.password_confirmation 'librarianpassword'
@@ -20,7 +18,6 @@ FactoryGirl.define do
   factory :user, :class => User do |f|
     f.sequence(:username){|n| "user_#{n}"}
     f.sequence(:email){|n| "user_#{n}@example.jp"}
-    f.email_confirmation{|u| u.email}
     f.role {Role.find_by_name('User')}
     f.password 'userpassword'
     f.password_confirmation 'userpassword'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre45
+  version: 0.1.0.pre46
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-10 00:00:00.000000000 Z
+date: 2015-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_biblio
@@ -44,42 +44,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.14.pre22
+        version: 0.1.14.pre24
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.14.pre22
+        version: 0.1.14.pre24
 - !ruby/object:Gem::Dependency
   name: enju_event
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.17.pre25
+        version: 0.1.17.pre26
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.17.pre25
+        version: 0.1.17.pre26
 - !ruby/object:Gem::Dependency
   name: enju_leaf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc18
+        version: 1.1.0.rc19
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc18
+        version: 1.1.0.rc19
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement