enju_bookmark 0.1.2.pre8 → 0.1.2.pre9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c592ad67e5ecb09960cb7e9b0b5205a9fe4180f
-  data.tar.gz: 5b60f8eeb7160dd50eab72abdb6548f05f97d9b0
+  metadata.gz: e7b5b27f32240372a6cd8a1d3da3bdf3dd5a293f
+  data.tar.gz: 926d0b6885702eec6a86ecceb6e51369ee6a63f6
 SHA512:
-  metadata.gz: 223cb353a2a4e9ba0a077a0c30c8a04d4ad073386d5743b3bb5dd852ef00f7bab4fcfdcfc21aa90742edd9355aef4405e91733b5c6e67569e6f71489ff87fddc
-  data.tar.gz: 67200049f968de0e221ad6af92f29c5d48fddc230eae21887a35c8ff06b14e844939685891f9849d416fab80682d59bb842f3bd415fc1125229e94ee1dfeb12e
+  metadata.gz: fa373de672bb8ab7887febd285f7a6b6f03385ba37e5febb7eaa7003726943698cdebfaaa66033d066fee2d8baaaf312dbc2a342476ace7d8da451a90151189d
+  data.tar.gz: 93eedd05e92f7c527a4256a0aebcc55f9b73f7894fe8dfd1bc6496edb503a0db11262f6da27e0d1e2edbaafadc818c55e2c86789fbb660977de846cc2b218be4

data/app/models/enju_bookmark/ability.rb

@@ -29,7 +29,7 @@ module EnjuBookmark
             false
           end
         end
-        can [:update, :destroy], Bookmark do |bookmark|
+        can [:update, :destroy, :delete], Bookmark do |bookmark|
           bookmark.user == user
         end
         can :read, BookmarkStat

data/app/views/bookmarks/_index.html.erb

@@ -27,7 +27,7 @@
     </td>
     <td><%= l(bookmark.created_at) -%></td>
     <td>
-      <%- if can? :destroy, bookmark -%>
+      <%- if can? :delete, bookmark -%>
         <%= link_to t('page.show'), bookmark_path(bookmark) -%>
         <%= link_to t('page.destroy'), bookmark_path(bookmark), :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>

data/app/views/bookmarks/_index_user.html.erb

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

data/app/views/manifestations/_tag_list.html.erb

@@ -2,7 +2,7 @@
   <%- if manifestation.tags -%>
     <%- manifestation.tags.each do |tag| -%>
       <%= link_to_tag(tag) -%>
-      <%- if can? :destroy, tag -%>
+      <%- if can? :delete, tag -%>
         <%= link_to image_tag('icons/tag_blue_edit.png', :alt => t('page.edit')), tag_path(tag.name) -%>
       <%- end -%>
     <%- end -%>

data/lib/enju_bookmark/manifestation.rb

@@ -9,11 +9,7 @@ module EnjuBookmark
         include InstanceMethods
         has_many :bookmarks, :include => :tags, :dependent => :destroy, :foreign_key => :manifestation_id
         has_many :users, :through => :bookmarks
-      end
-    end
 
-    module InstanceMethods
-      def owned_tags_by_solr
         searchable do
           string :tag, :multiple => true do
             tags.collect(&:name)
@@ -23,7 +19,9 @@ module EnjuBookmark
           end
         end
       end
+    end
 
+    module InstanceMethods
       def bookmarked?(user)
         return true if user.bookmarks.where(:url => url).first
         false

data/lib/enju_bookmark/version.rb

@@ -1,3 +1,3 @@
 module EnjuBookmark
-  VERSION = "0.1.2.pre8"
+  VERSION = "0.1.2.pre9"
 end

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

@@ -29,7 +29,7 @@
             false
           end
         end
-        can [:update, :destroy], Bookmark do |bookmark|
+        can [:update, :destroy, :delete], Bookmark do |bookmark|
           bookmark.user == user
         end
         can :read, BookmarkStat

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_bookmark
 version: !ruby/object:Gem::Version
-  version: 0.1.2.pre8
+  version: 0.1.2.pre9
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-13 00:00:00.000000000 Z
+date: 2013-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -100,28 +100,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre22
+        version: 0.1.0.pre26
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre22
+        version: 0.1.0.pre26
 - !ruby/object:Gem::Dependency
   name: enju_library
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre11
+        version: 0.1.0.pre14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre11
+        version: 0.1.0.pre14
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
@@ -405,7 +405,7 @@ files:
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_bo
+- spec/dummy/solr/data/test/index/segments_ca
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/bookmark.rb
@@ -650,7 +650,7 @@ test_files:
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_bo
+- spec/dummy/solr/data/test/index/segments_ca
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/bookmark.rb