enju_bookmark 0.1.2.pre15 → 0.1.2.pre16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 597585d3b39392f7465ae13a8dc80e8623d94c25
-  data.tar.gz: 07ab6bca2ef50010e713b9174cbd0fc350d94adf
+  metadata.gz: c3b6a46ac63019863a0eb3a558985ed23f474868
+  data.tar.gz: ecc44cd3999d5f1ca634ff8e68086490bf5d88d3
 SHA512:
-  metadata.gz: 74bdf38277422a83a639401a630e86f8c60ff059b5c4105e928e167e9dfd1d95118a4e32063bb812b433b08524d8eacfd17b832bb9c544f78c44f181b52fc46f
-  data.tar.gz: b6da333ffed0d4ddaabac3e24767d2968aedd731d1a4d9ce7a5788fccf4e3f08abc68bb46fcc586e692f7712799eaf495296d78349d139f96939bb0bf8ccd896
+  metadata.gz: 9d2c7241afa3ca132d3206dc3e618ca723e208109805d9b8fefe9763703ccc1b48d7e3b9d281b1829452f8b5e78fb398cadbe3c5e0cc21923f1c015a033eca62
+  data.tar.gz: 297f8f3d0b0cf22c26c19be85581004858fea1077b4e6c98b99dd7406feab1d7958bb5f3d5b49ad642edfe86d08b2a3649015a49e503ccc3911eabd26d3ed854

data/app/assets/stylesheets/enju_bookmark/acts_as_taggable_stylesheet.css

@@ -0,0 +1,7 @@
+.hTagcloud .popularity 		{ margin:0; padding:0; }
+.hTagcloud .popularity li	{ display:inline; text-decoration:none; line-height: 2em; }
+.hTagcloud .popularity .popular				{ font-size:1.0em; }
+.hTagcloud .popularity .v-popular 		{ font-size:1.2em; }
+.hTagcloud .popularity .vv-popular 		{ font-size:1.4em; }
+.hTagcloud .popularity .vvv-popular		{ font-size:1.6em; }
+.hTagcloud .popularity .vvvv-popular	{ font-size:1.8em; }

data/app/controllers/bookmarks_controller.rb

@@ -81,14 +81,12 @@ class BookmarksController < ApplicationController
 
     respond_to do |format|
       if @bookmark.save
-        flash[:notice] = t('controller.successfully_created', model: t('activerecord.models.bookmark'))
-        @bookmark.create_tag_index
-        @bookmark.manifestation.index!
+        @bookmark.tag_index!
         if params[:mode] == 'tag_edit'
-          format.html { redirect_to(@bookmark.manifestation) }
+          format.html { redirect_to @bookmark.manifestation , notice: t('controller.successfully_created', model: t('activerecord.models.bookmark')) }
           format.json { render json: @bookmark, status: :created, location: @bookmark }
         else
-          format.html { redirect_to(@bookmark) }
+          format.html { redirect_to @bookmark , notice: t('controller.successfully_created', model: t('activerecord.models.bookmark')) }
           format.json { render json: @bookmark, status: :created, location: @bookmark }
         end
       else
@@ -112,15 +110,13 @@ class BookmarksController < ApplicationController
 
     respond_to do |format|
       if @bookmark.update_attributes(params[:bookmark])
-        flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.bookmark'))
-        @bookmark.manifestation.index!
-        @bookmark.create_tag_index
+        @bookmark.tag_index!
         case params[:mode]
         when 'tag_edit'
-          format.html { redirect_to @bookmark.manifestation }
+          format.html { redirect_to @bookmark.manifestation, notice: t('controller.successfully_updated', model: t('activerecord.models.bookmark')) }
           format.json { head :no_content }
         else
-          format.html { redirect_to @bookmark }
+          format.html { redirect_to @bookmark, notice: t('controller.successfully_updated', model: t('activerecord.models.bookmark')) }
           format.json { head :no_content }
         end
       else
@@ -134,17 +130,15 @@ class BookmarksController < ApplicationController
   # DELETE /bookmarks/1.json
   def destroy
     @bookmark.destroy
-    flash[:notice] = t('controller.successfully_deleted', model: t('activerecord.models.bookmark'))
-    @bookmark.create_tag_index
 
     if @user
       respond_to do |format|
-        format.html { redirect_to bookmarks_url(user_id: @user.username) }
+        format.html { redirect_to bookmarks_url(user_id: @user.username), notice: t('controller.successfully_deleted', model: t('activerecord.models.bookmark')) }
         format.json { head :no_content }
       end
     else
       respond_to do |format|
-        format.html { redirect_to bookmarks_url(user_id: @bookmark.user.username) }
+        format.html { redirect_to bookmarks_url(user_id: @bookmark.user.username), notice: t('controller.successfully_deleted', model: t('activerecord.models.bookmark')) }
         format.json { head :no_content }
       end
     end

data/app/models/bookmark.rb

@@ -13,11 +13,10 @@ class Bookmark < ActiveRecord::Base
   validates_associated :user, :manifestation
   validates_uniqueness_of :manifestation_id, scope: :user_id
   validates :url, url: true, presence: true, length: {:maximum => 255}
-  before_save :create_manifestation, :if => :url_changed?
   validate :bookmarkable_url?
   validate :already_bookmarked?, :if => :url_changed?
+  before_save :create_manifestation, :if => :url_changed?
   before_save :replace_space_in_tags
-  after_destroy :reindex_manifestation
 
   acts_as_taggable_on :tags
   normalize_attributes :url
@@ -28,7 +27,7 @@ class Bookmark < ActiveRecord::Base
     end
     string :url
     string :tag, multiple: true do
-      tags.pluck(:name)
+      tag_list
     end
     integer :user_id
     integer :manifestation_id
@@ -41,15 +40,10 @@ class Bookmark < ActiveRecord::Base
 
   def replace_space_in_tags
     # タグに含まれている全角スペースを除去する
-    self.tag_list = self.tag_list.map{|tag| tag.gsub('　', ' ').gsub(' ', ', ')}
-  end
-
-  def reindex_manifestation
-    self.manifestation.try(:index!)
+    self.tag_list = tag_list.map{|tag| tag.gsub('　', ' ').gsub(' ', ', ')}
   end
 
   def save_tagger
-    #user.tag(self, with: tag_list, on: :tags)
     taggings.each do |tagging|
       tagging.tagger = user
       tagging.save(validate: false)
@@ -57,7 +51,7 @@ class Bookmark < ActiveRecord::Base
   end
 
   def shelved?
-    true if self.manifestation.items.on_web.first
+    true if manifestation.items.on_web.first
   end
 
   def self.get_title(string)
@@ -132,7 +126,7 @@ class Bookmark < ActiveRecord::Base
     if url.try(:my_host?)
       manifestation = self.my_host_resource
     else
-      manifestation = Manifestation.where(:access_address => self.url).first if self.url.present?
+      manifestation = Manifestation.where(:access_address => url).first if url.present?
     end
   end
 
@@ -152,17 +146,15 @@ class Bookmark < ActiveRecord::Base
     end
     manifestation = Manifestation.new(:access_address => url)
     manifestation.carrier_type = CarrierType.where(name: 'file').first
-    if self.title.present?
-      manifestation.original_title = self.title
+    if title.present?
+      manifestation.original_title = title
     else
       manifestation.original_title = self.get_title
     end
     Manifestation.transaction do
       manifestation.save
       self.manifestation = manifestation
-      item = Item.new(
-        :manifestation_id => manifestation.id
-      )
+      item = Item.new
       item.shelf = Shelf.web
       item.manifestation = manifestation
       if defined?(EnjuCirculation)
@@ -184,12 +176,12 @@ class Bookmark < ActiveRecord::Base
     end
   end
 
-  def create_tag_index
-    taggings.each do |tagging|
-      Tag.find(tagging.tag_id).index!
-    end
+  def tag_index!
+    manifestation.reload
+    manifestation.index
+    taggings.map{|tagging| Tag.find(tagging.tag_id).index}
+    Sunspot.commit
   end
-
 end
 
 # == Schema Information

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

@@ -25,6 +25,11 @@
   <%- } -%>
 </p>
 
+<p>
+  <strong><%= t('activerecord.attributes.bookmark.shared') -%>:</strong>
+  <%= localized_boolean(@bookmark.shared) -%>
+</p>
+
 <p>
   <strong><%= t('activerecord.attributes.bookmark.note') -%>:</strong>
   <%= @bookmark.note -%>

data/lib/enju_bookmark/manifestation.rb

@@ -12,10 +12,10 @@ module EnjuBookmark
 
         searchable do
           string :tag, :multiple => true do
-            tags.collect(&:name)
+            bookmarks.map{|bookmark| bookmark.tag_list}.flatten
           end
           text :tag do
-            tags.collect(&:name)
+            bookmarks.map{|bookmark| bookmark.tag_list}.flatten
           end
         end
       end
@@ -28,11 +28,7 @@ module EnjuBookmark
       end
 
       def tags
-        if self.bookmarks.first
-          self.bookmarks.tag_counts
-        else
-          []
-        end
+        bookmarks.map{|bookmark| bookmark.tags}.flatten
       end
     end
   end

data/lib/enju_bookmark/version.rb

@@ -1,3 +1,3 @@
 module EnjuBookmark
-  VERSION = "0.1.2.pre15"
+  VERSION = "0.1.2.pre16"
 end

data/spec/controllers/bookmark_stats_controller_spec.rb

@@ -15,7 +15,7 @@ describe BookmarkStatsController do
 
       it "assigns all bookmark_stats as @bookmark_stats" do
         get :index
-        assigns(:bookmark_stats).should eq(BookmarkStat.all)
+        expect(assigns(:bookmark_stats)).to eq(BookmarkStat.all)
       end
     end
 
@@ -24,7 +24,7 @@ describe BookmarkStatsController do
 
       it "assigns all bookmark_stats as @bookmark_stats" do
         get :index
-        assigns(:bookmark_stats).should eq(BookmarkStat.all)
+        expect(assigns(:bookmark_stats)).to eq(BookmarkStat.all)
       end
     end
 
@@ -33,14 +33,14 @@ describe BookmarkStatsController do
 
       it "assigns all bookmark_stats as @bookmark_stats" do
         get :index
-        assigns(:bookmark_stats).should eq(BookmarkStat.all)
+        expect(assigns(:bookmark_stats)).to eq(BookmarkStat.all)
       end
     end
 
     describe "When not logged in" do
       it "should not assign bookmark_stats as @bookmark_stats" do
         get :index
-        assigns(:bookmark_stats).should eq(BookmarkStat.all)
+        expect(assigns(:bookmark_stats)).to eq(BookmarkStat.all)
       end
     end
   end
@@ -52,7 +52,7 @@ describe BookmarkStatsController do
       it "assigns the requested bookmark_stat as @bookmark_stat" do
         bookmark_stat = FactoryGirl.create(:bookmark_stat)
         get :show, :id => bookmark_stat.id
-        assigns(:bookmark_stat).should eq(bookmark_stat)
+        expect(assigns(:bookmark_stat)).to eq(bookmark_stat)
       end
     end
 
@@ -62,7 +62,7 @@ describe BookmarkStatsController do
       it "assigns the requested bookmark_stat as @bookmark_stat" do
         bookmark_stat = FactoryGirl.create(:bookmark_stat)
         get :show, :id => bookmark_stat.id
-        assigns(:bookmark_stat).should eq(bookmark_stat)
+        expect(assigns(:bookmark_stat)).to eq(bookmark_stat)
       end
     end
 
@@ -72,7 +72,7 @@ describe BookmarkStatsController do
       it "assigns the requested bookmark_stat as @bookmark_stat" do
         bookmark_stat = FactoryGirl.create(:bookmark_stat)
         get :show, :id => bookmark_stat.id
-        assigns(:bookmark_stat).should eq(bookmark_stat)
+        expect(assigns(:bookmark_stat)).to eq(bookmark_stat)
       end
     end
 
@@ -80,7 +80,7 @@ describe BookmarkStatsController do
       it "assigns the requested bookmark_stat as @bookmark_stat" do
         bookmark_stat = FactoryGirl.create(:bookmark_stat)
         get :show, :id => bookmark_stat.id
-        assigns(:bookmark_stat).should eq(bookmark_stat)
+        expect(assigns(:bookmark_stat)).to eq(bookmark_stat)
       end
     end
   end
@@ -91,7 +91,7 @@ describe BookmarkStatsController do
 
       it "assigns the requested bookmark_stat as @bookmark_stat" do
         get :new
-        assigns(:bookmark_stat).should_not be_valid
+        expect(assigns(:bookmark_stat)).not_to be_valid
       end
     end
 
@@ -100,7 +100,7 @@ describe BookmarkStatsController do
 
       it "assigns the requested bookmark_stat as @bookmark_stat" do
         get :new
-        assigns(:bookmark_stat).should_not be_valid
+        expect(assigns(:bookmark_stat)).not_to be_valid
       end
     end
 
@@ -109,16 +109,16 @@ describe BookmarkStatsController do
 
       it "should not assign the requested bookmark_stat as @bookmark_stat" do
         get :new
-        assigns(:bookmark_stat).should_not be_valid
-        response.should be_forbidden
+        expect(assigns(:bookmark_stat)).not_to be_valid
+        expect(response).to be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "should not assign the requested bookmark_stat as @bookmark_stat" do
         get :new
-        assigns(:bookmark_stat).should_not be_valid
-        response.should redirect_to(new_user_session_url)
+        expect(assigns(:bookmark_stat)).not_to be_valid
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
@@ -130,7 +130,7 @@ describe BookmarkStatsController do
       it "assigns the requested bookmark_stat as @bookmark_stat" do
         bookmark_stat = FactoryGirl.create(:bookmark_stat)
         get :edit, :id => bookmark_stat.id
-        assigns(:bookmark_stat).should eq(bookmark_stat)
+        expect(assigns(:bookmark_stat)).to eq(bookmark_stat)
       end
     end
 
@@ -140,7 +140,7 @@ describe BookmarkStatsController do
       it "assigns the requested bookmark_stat as @bookmark_stat" do
         bookmark_stat = FactoryGirl.create(:bookmark_stat)
         get :edit, :id => bookmark_stat.id
-        assigns(:bookmark_stat).should eq(bookmark_stat)
+        expect(assigns(:bookmark_stat)).to eq(bookmark_stat)
       end
     end
 
@@ -150,7 +150,7 @@ describe BookmarkStatsController do
       it "assigns the requested bookmark_stat as @bookmark_stat" do
         bookmark_stat = FactoryGirl.create(:bookmark_stat)
         get :edit, :id => bookmark_stat.id
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -158,7 +158,7 @@ describe BookmarkStatsController do
       it "should not assign the requested bookmark_stat as @bookmark_stat" do
         bookmark_stat = FactoryGirl.create(:bookmark_stat)
         get :edit, :id => bookmark_stat.id
-        response.should redirect_to(new_user_session_url)
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
@@ -175,24 +175,24 @@ describe BookmarkStatsController do
       describe "with valid params" do
         it "assigns a newly created bookmark_stat as @bookmark_stat" do
           post :create, :bookmark_stat => @attrs
-          assigns(:bookmark_stat).should be_valid
+          expect(assigns(:bookmark_stat)).to be_valid
         end
 
         it "redirects to the created bookmark_stat" do
           post :create, :bookmark_stat => @attrs
-          response.should redirect_to(bookmark_stat_url(assigns(:bookmark_stat)))
+          expect(response).to redirect_to(bookmark_stat_url(assigns(:bookmark_stat)))
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved bookmark_stat as @bookmark_stat" do
           post :create, :bookmark_stat => @invalid_attrs
-          assigns(:bookmark_stat).should_not be_valid
+          expect(assigns(:bookmark_stat)).not_to be_valid
         end
 
         it "re-renders the 'new' template" do
           post :create, :bookmark_stat => @invalid_attrs
-          response.should render_template("new")
+          expect(response).to render_template("new")
         end
       end
     end
@@ -203,24 +203,24 @@ describe BookmarkStatsController do
       describe "with valid params" do
         it "assigns a newly created bookmark_stat as @bookmark_stat" do
           post :create, :bookmark_stat => @attrs
-          assigns(:bookmark_stat).should be_valid
+          expect(assigns(:bookmark_stat)).to be_valid
         end
 
         it "redirects to the created bookmark_stat" do
           post :create, :bookmark_stat => @attrs
-          response.should redirect_to(bookmark_stat_url(assigns(:bookmark_stat)))
+          expect(response).to redirect_to(bookmark_stat_url(assigns(:bookmark_stat)))
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved bookmark_stat as @bookmark_stat" do
           post :create, :bookmark_stat => @invalid_attrs
-          assigns(:bookmark_stat).should_not be_valid
+          expect(assigns(:bookmark_stat)).not_to be_valid
         end
 
         it "re-renders the 'new' template" do
           post :create, :bookmark_stat => @invalid_attrs
-          response.should render_template("new")
+          expect(response).to render_template("new")
         end
       end
     end
@@ -231,24 +231,24 @@ describe BookmarkStatsController do
       describe "with valid params" do
         it "assigns a newly created bookmark_stat as @bookmark_stat" do
           post :create, :bookmark_stat => @attrs
-          assigns(:bookmark_stat).should be_valid
+          expect(assigns(:bookmark_stat)).to be_valid
         end
 
         it "should be forbidden" do
           post :create, :bookmark_stat => @attrs
-          response.should be_forbidden
+          expect(response).to be_forbidden
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved bookmark_stat as @bookmark_stat" do
           post :create, :bookmark_stat => @invalid_attrs
-          assigns(:bookmark_stat).should_not be_valid
+          expect(assigns(:bookmark_stat)).not_to be_valid
         end
 
         it "should be forbidden" do
           post :create, :bookmark_stat => @invalid_attrs
-          response.should be_forbidden
+          expect(response).to be_forbidden
         end
       end
     end
@@ -257,24 +257,24 @@ describe BookmarkStatsController do
       describe "with valid params" do
         it "assigns a newly created bookmark_stat as @bookmark_stat" do
           post :create, :bookmark_stat => @attrs
-          assigns(:bookmark_stat).should be_valid
+          expect(assigns(:bookmark_stat)).to be_valid
         end
 
         it "should be forbidden" do
           post :create, :bookmark_stat => @attrs
-          response.should redirect_to(new_user_session_url)
+          expect(response).to redirect_to(new_user_session_url)
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved bookmark_stat as @bookmark_stat" do
           post :create, :bookmark_stat => @invalid_attrs
-          assigns(:bookmark_stat).should_not be_valid
+          expect(assigns(:bookmark_stat)).not_to be_valid
         end
 
         it "should be forbidden" do
           post :create, :bookmark_stat => @invalid_attrs
-          response.should redirect_to(new_user_session_url)
+          expect(response).to redirect_to(new_user_session_url)
         end
       end
     end
@@ -297,14 +297,14 @@ describe BookmarkStatsController do
 
         it "assigns the requested bookmark_stat as @bookmark_stat" do
           put :update, :id => @bookmark_stat.id, :bookmark_stat => @attrs
-          assigns(:bookmark_stat).should eq(@bookmark_stat)
+          expect(assigns(:bookmark_stat)).to eq(@bookmark_stat)
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested bookmark_stat as @bookmark_stat" do
           put :update, :id => @bookmark_stat.id, :bookmark_stat => @invalid_attrs
-          response.should render_template("edit")
+          expect(response).to render_template("edit")
         end
       end
     end
@@ -319,20 +319,20 @@ describe BookmarkStatsController do
 
         it "assigns the requested bookmark_stat as @bookmark_stat" do
           put :update, :id => @bookmark_stat.id, :bookmark_stat => @attrs
-          assigns(:bookmark_stat).should eq(@bookmark_stat)
-          response.should redirect_to(@bookmark_stat)
+          expect(assigns(:bookmark_stat)).to eq(@bookmark_stat)
+          expect(response).to redirect_to(@bookmark_stat)
         end
       end
 
       describe "with invalid params" do
         it "assigns the bookmark_stat as @bookmark_stat" do
           put :update, :id => @bookmark_stat, :bookmark_stat => @invalid_attrs
-          assigns(:bookmark_stat).should_not be_valid
+          expect(assigns(:bookmark_stat)).not_to be_valid
         end
 
         it "re-renders the 'edit' template" do
           put :update, :id => @bookmark_stat, :bookmark_stat => @invalid_attrs
-          response.should render_template("edit")
+          expect(response).to render_template("edit")
         end
       end
     end
@@ -347,15 +347,15 @@ describe BookmarkStatsController do
 
         it "assigns the requested bookmark_stat as @bookmark_stat" do
           put :update, :id => @bookmark_stat.id, :bookmark_stat => @attrs
-          assigns(:bookmark_stat).should eq(@bookmark_stat)
-          response.should be_forbidden
+          expect(assigns(:bookmark_stat)).to eq(@bookmark_stat)
+          expect(response).to be_forbidden
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested bookmark_stat as @bookmark_stat" do
           put :update, :id => @bookmark_stat.id, :bookmark_stat => @invalid_attrs
-          response.should be_forbidden
+          expect(response).to be_forbidden
         end
       end
     end
@@ -368,14 +368,14 @@ describe BookmarkStatsController do
 
         it "should be forbidden" do
           put :update, :id => @bookmark_stat.id, :bookmark_stat => @attrs
-          response.should redirect_to(new_user_session_url)
+          expect(response).to redirect_to(new_user_session_url)
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested bookmark_stat as @bookmark_stat" do
           put :update, :id => @bookmark_stat.id, :bookmark_stat => @invalid_attrs
-          response.should redirect_to(new_user_session_url)
+          expect(response).to redirect_to(new_user_session_url)
         end
       end
     end
@@ -395,7 +395,7 @@ describe BookmarkStatsController do
 
       it "redirects to the bookmark_stats list" do
         delete :destroy, :id => @bookmark_stat.id
-        response.should redirect_to(bookmark_stats_url)
+        expect(response).to redirect_to(bookmark_stats_url)
       end
     end
 
@@ -408,7 +408,7 @@ describe BookmarkStatsController do
 
       it "should be forbidden" do
         delete :destroy, :id => @bookmark_stat.id
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -421,7 +421,7 @@ describe BookmarkStatsController do
 
       it "should be forbidden" do
         delete :destroy, :id => @bookmark_stat.id
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -432,7 +432,7 @@ describe BookmarkStatsController do
 
       it "should be forbidden" do
         delete :destroy, :id => @bookmark_stat.id
-        response.should redirect_to(new_user_session_url)
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end