enju_message 0.1.14.pre4 → 0.1.14.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bbe2db6f2ea6139210bf831bf091d5455861548
-  data.tar.gz: 477c65cc92f1fb4be90479e86b2a702d1a1e66a4
+  metadata.gz: c04c804795763d2becd15270ff5e5f9380a728ee
+  data.tar.gz: 9a2a3e651b3038e5e94323ea697ad980b0ed94c7
 SHA512:
-  metadata.gz: 2e1abcdaad6886aa9f039efca2f428a93d358980c95c39be2bcec37352a2fe2dca439c2d427072f5fd1d598354af50675eb39be29f688ce1849201abd00a1ae9
-  data.tar.gz: 0fb76d5552b9dc610d498d730162e18a2405006ca74578dee2db53b918dbbbd841ab74c671d0c3a145408a44a8ca8d5fb36e8760194dd043dba538bbf2bd5f9a
+  metadata.gz: 6647e1a50929259696f2743ee95aff21ddd882aca0b4a057e0c4a8764403db24ed13fbe6f060ec539b49becbeedf97bd78438741da76e864d15c9eada9adc0ec
+  data.tar.gz: f9d1e3bb737ad18779b253ef1f7c56cc92e03418356b8d475008673b5fd0b9b3586966e496fafcdae3cfc831ebd7669181623c8d8c6d1fc1708107d6ba147cfd

data/app/models/enju_message/ability.rb

@@ -6,20 +6,20 @@ module EnjuMessage
       case user.try(:role).try(:name)
       when 'Administrator'
         can :manage, Message
-        can [:read, :update, :destroy], MessageRequest
+        can [:read, :update, :destroy, :delete], MessageRequest
         can [:read, :update], MessageTemplate
       when 'Librarian'
         can [:index, :create], Message
         can [:update], Message do |message|
           message.sender == user
         end
-        can [:show, :destroy], Message do |message|
+        can [:show, :destroy, :delete], Message do |message|
           message.receiver == user
         end
-        can [:read, :update, :destroy], MessageRequest
+        can [:read, :update, :destroy, :delete], MessageRequest
         can :read, MessageTemplate
       when 'User'
-        can [:read, :destroy], Message do |message|
+        can [:read, :destroy, :delete], Message do |message|
           message.receiver == user
         end
         can :index, Message

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

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

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

@@ -41,7 +41,7 @@
       <li><%= link_to t('page.listing', :model => t('activerecord.models.message')), messages_path -%></li>
     <% end %>
     <li><%= link_to t('message.reply'), new_message_path(:parent_id => @message.id) -%></li>
-    <% if can? :destroy, :message %>
+    <% if can? :delete, :message %>
       <li><%= link_to t('page.destroy'), @message, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%></li>
     <% end %>
   </ul>

data/lib/enju_message/version.rb

@@ -1,3 +1,3 @@
 module EnjuMessage
-  VERSION = "0.1.14.pre4"
+  VERSION = "0.1.14.pre5"
 end

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

@@ -6,20 +6,20 @@
       case user.try(:role).try(:name)
       when 'Administrator'
         can :manage, Message
-        can [:read, :update, :destroy], MessageRequest
+        can [:read, :update, :destroy, :delete], MessageRequest
         can [:read, :update], MessageTemplate
       when 'Librarian'
         can [:index, :create], Message
         can [:update], Message do |message|
           message.sender == user
         end
-        can [:show, :destroy], Message do |message|
+        can [:show, :destroy, :delete], Message do |message|
           message.receiver == user
         end
-        can [:read, :update, :destroy], MessageRequest
+        can [:read, :update, [:destroy, :delete]], MessageRequest
         can :read, MessageTemplate
       when 'User'
-        can [:read, :destroy], Message do |message|
+        can [:read, :destroy, :delete], Message do |message|
           message.receiver == user
         end
         can :index, Message

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_message
 version: !ruby/object:Gem::Version
-  version: 0.1.14.pre4
+  version: 0.1.14.pre5
 platform: ruby
 authors:
 - Kosuke Tanabe
@@ -296,16 +296,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/_1z.fdt
-- spec/dummy/solr/data/test/index/_1z.fdx
-- spec/dummy/solr/data/test/index/_1z.fnm
-- spec/dummy/solr/data/test/index/_1z.frq
-- spec/dummy/solr/data/test/index/_1z.nrm
-- spec/dummy/solr/data/test/index/_1z.prx
-- spec/dummy/solr/data/test/index/_1z.tii
-- spec/dummy/solr/data/test/index/_1z.tis
+- spec/dummy/solr/data/test/index/_2f.fdt
+- spec/dummy/solr/data/test/index/_2f.fdx
+- spec/dummy/solr/data/test/index/_2f.fnm
+- spec/dummy/solr/data/test/index/_2f.frq
+- spec/dummy/solr/data/test/index/_2f.nrm
+- spec/dummy/solr/data/test/index/_2f.prx
+- spec/dummy/solr/data/test/index/_2f.tii
+- spec/dummy/solr/data/test/index/_2f.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_41
+- spec/dummy/solr/data/test/index/segments_4x
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/message.rb
@@ -431,16 +431,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/_1z.fdt
-- spec/dummy/solr/data/test/index/_1z.fdx
-- spec/dummy/solr/data/test/index/_1z.fnm
-- spec/dummy/solr/data/test/index/_1z.frq
-- spec/dummy/solr/data/test/index/_1z.nrm
-- spec/dummy/solr/data/test/index/_1z.prx
-- spec/dummy/solr/data/test/index/_1z.tii
-- spec/dummy/solr/data/test/index/_1z.tis
+- spec/dummy/solr/data/test/index/_2f.fdt
+- spec/dummy/solr/data/test/index/_2f.fdx
+- spec/dummy/solr/data/test/index/_2f.fnm
+- spec/dummy/solr/data/test/index/_2f.frq
+- spec/dummy/solr/data/test/index/_2f.nrm
+- spec/dummy/solr/data/test/index/_2f.prx
+- spec/dummy/solr/data/test/index/_2f.tii
+- spec/dummy/solr/data/test/index/_2f.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_41
+- spec/dummy/solr/data/test/index/segments_4x
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/message.rb