enju_bookmark 0.2.2 → 0.3.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c8a6178c8d4e0b7e1437ed9201cd6b937e8064c
-  data.tar.gz: 1b3754c7ebb25dea1bb8f8d6fbfda53ea9b7979e
+  metadata.gz: 50879e85984f8a5f732955ec8ce3769df6475dcf
+  data.tar.gz: 183dce4e7686fa18605a69a08a1c75f464c826fb
 SHA512:
-  metadata.gz: b32e5e216313d4bc7408e67b42c1c341ed51733d3d9ff2221a19f401b37c00e1308776537d303b70b37ef331b7a2c7d61538e6de951f73b7a6f308b9636222ab
-  data.tar.gz: d5df204992e4fc76c7ac3e33c4ccbda2b189fbc0d099c6f6fa54064572a4b34a2c06d809aeed9f05a2cca918a2dc669b50ed1705d6447bf3adb6dd897052cf52
+  metadata.gz: a9969f3a358a4ba3b17d2fe82558097bdb8b7b7720cdc99587cd10bc46adb372f2e7a126ed42cbafef80ef32d99f4f5f0c8caf607c113687948a21a2660203c3
+  data.tar.gz: 8f1619d909b7e7a8e079daac8a451707dbf205ac5f86fec8f9d9b5ae984ced763b46cbaa9c0f12d7cf0ca3b8d013db8013cd70d9e00f4a36d53f3ca1f2bc74f0

data/README.rdoc

@@ -1,10 +1,10 @@
 = EnjuBookmark
-{<img src="https://travis-ci.org/next-l/enju_bookmark.svg?branch=1.2" alt="Build Status" />}[https://travis-ci.org/next-l/enju_bookmark]
-{<img src="https://coveralls.io/repos/next-l/enju_bookmark/badge.svg?branch=1.2&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_bookmark?branch=1.2]
-{<img src="https://hakiri.io/github/next-l/enju_bookmark/1.2.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_bookmark/1.2]
+{<img src="https://travis-ci.org/next-l/enju_bookmark.svg?branch=1.3" alt="Build Status" />}[https://travis-ci.org/next-l/enju_bookmark]
+{<img src="https://coveralls.io/repos/next-l/enju_bookmark/badge.svg?branch=1.3&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_bookmark?branch=1.3]
+{<img src="https://hakiri.io/github/next-l/enju_bookmark/1.3.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_bookmark/1.3]
 
 This project rocks and uses MIT-LICENSE.
 
 == 製作者・貢献者 (Authors and contributors)
 * {TANABE, Kosuke}[https://github.com/nabeta] ({@nabeta}[https://twitter.com/nabeta])
-* {Project Next-L}[http://www.next-l.jp] ({@ProjectNextL}[https://twitter.com/ProjectNextL])
+* {Project Next-L}[https://www.next-l.jp] ({@ProjectNextL}[https://twitter.com/ProjectNextL])

data/Rakefile

@@ -32,4 +32,4 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
     spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task :default => :spec
+task default: :spec

data/app/controllers/bookmarks_controller.rb

@@ -6,7 +6,7 @@ class BookmarksController < ApplicationController
   # GET /bookmarks
   # GET /bookmarks.json
   def index
-    search = Bookmark.search(:include => [:manifestation])
+    search = Bookmark.search(include: [:manifestation])
     query = params[:query].to_s.strip
     unless query.blank?
       @query = query.dup
@@ -103,7 +103,7 @@ class BookmarksController < ApplicationController
       access_denied; return
     end
     @bookmark.title = @bookmark.manifestation.try(:original_title)
-    @bookmark.taggings.where(:tagger_id => @bookmark.user.id).map{|t| t.destroy}
+    @bookmark.taggings.where(tagger_id: @bookmark.user.id).map{|t| t.destroy}
 
     respond_to do |format|
       if @bookmark.update_attributes(bookmark_params)

data/app/controllers/tags_controller.rb

@@ -6,7 +6,7 @@ class TagsController < ApplicationController
     session[:params] ={} unless session[:params]
     session[:params][:tag] = params
 
-    sort = {:sort_by => 'created_at', :order => 'desc'}
+    sort = {sort_by: 'created_at', order: 'desc'}
     case params[:sort_by]
     when 'name'
       sort[:sort_by] = 'name'
@@ -20,7 +20,7 @@ class TagsController < ApplicationController
 
     @tags = Tag.search do
       fulltext query if query.present?
-      paginate :page => page.to_i, :per_page => Tag.default_per_page
+      paginate page: page.to_i, per_page: Tag.default_per_page
       order_by sort[:sort_by], sort[:order]
     end.results
 
@@ -40,11 +40,11 @@ class TagsController < ApplicationController
   end
 
   def edit
-    #@tag = Tag.find(params[:id])
+    # @tag = Tag.find(params[:id])
   end
 
   def update
-    #@tag = Tag.find(params[:id])
+    # @tag = Tag.find(params[:id])
 
     respond_to do |format|
       if @tag.update_attributes(tag_params)
@@ -60,7 +60,7 @@ class TagsController < ApplicationController
   # DELETE /tags/1
   # DELETE /tags/1.json
   def destroy
-    #@tag = Tag.find(params[:id])
+    # @tag = Tag.find(params[:id])
     @tag.destroy
 
     respond_to do |format|
@@ -80,6 +80,6 @@ class TagsController < ApplicationController
   end
 
   def tag_params
-    params.require(:tag).permit(:name, :name_transcription)
+    params.require(:tag).permit(:name)
   end
 end

data/app/models/bookmark.rb

@@ -2,8 +2,8 @@ class Bookmark < ActiveRecord::Base
   scope :bookmarked, lambda {|start_date, end_date| where('created_at >= ? AND created_at < ?', start_date, end_date)}
   scope :user_bookmarks, lambda {|user| where(user_id: user.id)}
   scope :shared, -> {where(shared: true)}
-  belongs_to :manifestation, touch: true
-  belongs_to :user #, counter_cache: true, validate: true
+  belongs_to :manifestation, touch: true, optional: true
+  belongs_to :user
 
   validates_presence_of :user, :title
   validates_presence_of :url, on: :create
@@ -76,15 +76,15 @@ class Bookmark < ActiveRecord::Base
       normalized_url = Addressable::URI.parse(url).normalize.to_s
       doc = Nokogiri::HTML(Faraday.get(normalized_url).body)
       # TODO: 日本語以外
-      #charsets = ['iso-2022-jp', 'euc-jp', 'shift_jis', 'iso-8859-1']
-      #if charsets.include?(page.charset.downcase)
+      # charsets = ['iso-2022-jp', 'euc-jp', 'shift_jis', 'iso-8859-1']
+      # if charsets.include?(page.charset.downcase)
         title = NKF.nkf('-w', CGI.unescapeHTML((doc.at("title").inner_text))).to_s.gsub(/\r\n|\r|\n/, '').gsub(/\s+/, ' ').strip
         if title.blank?
           title = url
         end
-      #else
+      # else
       #  title = (doc/"title").inner_text
-      #end
+      # end
       title
     end
   rescue OpenURI::HTTPError

data/app/models/bookmark_stat.rb

@@ -21,7 +21,7 @@ class BookmarkStat < ActiveRecord::Base
     self.started_at = Time.zone.now
     Manifestation.find_each do |manifestation|
       daily_count = Bookmark.manifestations_count(start_date, end_date, manifestation)
-      #manifestation.update_attributes({:daily_bookmarks_count => daily_count, :total_count => manifestation.total_count + daily_count})
+      # manifestation.update_attributes({:daily_bookmarks_count => daily_count, :total_count => manifestation.total_count + daily_count})
       if daily_count > 0
         self.manifestations << manifestation
         sql = ['UPDATE bookmark_stat_has_manifestations SET bookmarks_count = ? WHERE bookmark_stat_id = ? AND manifestation_id = ?', daily_count, self.id, manifestation.id]

data/app/models/bookmark_stat_transition.rb

@@ -1,9 +1,8 @@
 class BookmarkStatTransition < ActiveRecord::Base
   include Statesman::Adapters::ActiveRecordTransition
 
-  
+
   belongs_to :bookmark_stat, inverse_of: :bookmark_stat_transitions
-  #attr_accessible :to_state, :sort_key, :metadata
 end
 
 # == Schema Information

data/app/models/concerns/enju_bookmark/enju_user.rb

@@ -3,7 +3,7 @@ module EnjuBookmark
     extend ActiveSupport::Concern
 
     included do
-      has_many :bookmarks, :dependent => :destroy
+      has_many :bookmarks, dependent: :destroy
       acts_as_tagger
     end
 

data/app/models/tag.rb

@@ -29,7 +29,7 @@ class Tag < ActiveRecord::Base
       tags = Tag.search do
         with(:bookmark_ids).any_of bookmark_ids
         order_by :taggings_count, :desc
-        paginate(:page => 1, :per_page => count)
+        paginate(page: 1, per_page: count)
       end.results
     end
   end
@@ -39,7 +39,7 @@ class Tag < ActiveRecord::Base
   end
 
   def tagged(taggable_type)
-    self.taggings.where(:taggable_type => taggable_type.to_s).includes(:taggable).collect(&:taggable)
+    self.taggings.where(taggable_type: taggable_type.to_s).includes(:taggable).collect(&:taggable)
   end
 end
 

data/app/views/tags/index.rss.builder

@@ -1,4 +1,4 @@
-xml.instruct! :xml, :version=>"1.0"
+xml.instruct! :xml, version: "1.0"
 xml.rss('version' => "2.0",
         'xmlns:opensearch' => "http://a9.com/-/spec/opensearch/1.1/",
         'xmlns:atom' => "http://www.w3.org/2005/Atom"){
@@ -15,14 +15,14 @@ xml.rss('version' => "2.0",
       xml.tag! "opensearch:totalResults", @count[:query_result]
       xml.tag! "opensearch:startIndex", @tags.offset + 1
       xml.tag! "opensearch:itemsPerPage", @tags.per_page
-      xml.tag! "opensearch:Query", :role => 'request', :searchTerms => h(params[:query]), :startPage => (h(params[:page]) || 1)
+      xml.tag! "opensearch:Query", role: 'request', searchTerms: h(params[:query]), startPage: (h(params[:page]) || 1)
     end
     @tags.each do |tag|
       xml.item do
         xml.title tag.name
         xml.pubDate tag.created_at.utc.rfc822
         xml.link tag_url(tag.name)
-        xml.guid tag_url(tag.name), :isPermaLink => "true"
+        xml.guid tag_url(tag.name), isPermaLink: "true"
       end
     end
   }

data/db/migrate/055_create_bookmarks.rb

@@ -1,7 +1,7 @@
-class CreateBookmarks < ActiveRecord::Migration
+class CreateBookmarks < ActiveRecord::Migration[4.2]
   def self.up
-    create_table :bookmarks, :force => true do |t|
-      t.integer :user_id, :null => false
+    create_table :bookmarks, force: true do |t|
+      t.integer :user_id, null: false
       t.integer :manifestation_id
       t.text :title
       t.string :url

data/db/migrate/20081212151614_create_bookmark_stats.rb

@@ -1,4 +1,4 @@
-class CreateBookmarkStats < ActiveRecord::Migration
+class CreateBookmarkStats < ActiveRecord::Migration[4.2]
   def change
     create_table :bookmark_stats do |t|
       t.datetime :start_date

data/db/migrate/20081212151820_create_bookmark_stat_has_manifestations.rb

@@ -1,8 +1,8 @@
-class CreateBookmarkStatHasManifestations < ActiveRecord::Migration
+class CreateBookmarkStatHasManifestations < ActiveRecord::Migration[4.2]
   def change
     create_table :bookmark_stat_has_manifestations do |t|
-      t.integer :bookmark_stat_id, :null => false
-      t.integer :manifestation_id, :null => false
+      t.integer :bookmark_stat_id, null: false
+      t.integer :manifestation_id, null: false
       t.integer :bookmarks_count
 
       t.timestamps

data/db/migrate/20100222124420_add_allow_bookmark_external_url_to_library_group.rb

@@ -1,6 +1,6 @@
-class AddAllowBookmarkExternalUrlToLibraryGroup < ActiveRecord::Migration
+class AddAllowBookmarkExternalUrlToLibraryGroup < ActiveRecord::Migration[4.2]
   def self.up
-    add_column :library_groups, :allow_bookmark_external_url, :boolean, :null => false, :default => false
+    add_column :library_groups, :allow_bookmark_external_url, :boolean, null: false, default: false
   end
 
   def self.down

data/db/migrate/20140524135607_create_bookmark_stat_transitions.rb

@@ -1,4 +1,4 @@
-class CreateBookmarkStatTransitions < ActiveRecord::Migration
+class CreateBookmarkStatTransitions < ActiveRecord::Migration[4.2]
   def change
     create_table :bookmark_stat_transitions do |t|
       t.string :to_state

data/db/migrate/20140812093836_add_share_bookmarks_to_profile.rb

@@ -1,4 +1,4 @@
-class AddShareBookmarksToProfile < ActiveRecord::Migration
+class AddShareBookmarksToProfile < ActiveRecord::Migration[4.2]
   def change
     add_column :profiles, :share_bookmarks, :boolean
   end

data/db/migrate/20160815045420_add_most_recent_to_bookmark_stat_transitions.rb

@@ -1,4 +1,4 @@
-class AddMostRecentToBookmarkStatTransitions < ActiveRecord::Migration
+class AddMostRecentToBookmarkStatTransitions < ActiveRecord::Migration[4.2]
   def up
     add_column :bookmark_stat_transitions, :most_recent, :boolean, null: true
   end

data/db/migrate/20180107172413_add_constraints_to_most_recent_for_bookmark_stat_transitions.rb

@@ -1,4 +1,4 @@
-class AddConstraintsToMostRecentForBookmarkStatTransitions < ActiveRecord::Migration
+class AddConstraintsToMostRecentForBookmarkStatTransitions < ActiveRecord::Migration[4.2]
   disable_ddl_transaction!
 
   def up

data/db/migrate/20180709023035_acts_as_taggable_on_migration.acts_as_taggable_on_engine.rb

@@ -0,0 +1,36 @@
+# This migration comes from acts_as_taggable_on_engine (originally 1)
+if ActiveRecord.gem_version >= Gem::Version.new('5.0')
+  class ActsAsTaggableOnMigration < ActiveRecord::Migration[4.2]; end
+else
+  class ActsAsTaggableOnMigration < ActiveRecord::Migration; end
+end
+ActsAsTaggableOnMigration.class_eval do
+  def self.up
+    create_table :tags do |t|
+      t.string :name
+    end
+
+    create_table :taggings do |t|
+      t.references :tag
+
+      # You should make sure that the column created is
+      # long enough to store the required class names.
+      t.references :taggable, polymorphic: true
+      t.references :tagger, polymorphic: true
+
+      # Limit is created to prevent MySQL error on index
+      # length for MyISAM table type: http://bit.ly/vgW2Ql
+      t.string :context, limit: 128
+
+      t.datetime :created_at
+    end
+
+    add_index :taggings, :tag_id
+    add_index :taggings, [:taggable_id, :taggable_type, :context]
+  end
+
+  def self.down
+    drop_table :taggings
+    drop_table :tags
+  end
+end

data/db/migrate/{20141013152011_add_missing_unique_indices.acts_as_taggable_on_engine.rb → 20180709023036_add_missing_unique_indices.acts_as_taggable_on_engine.rb}

@@ -1,9 +1,14 @@
 # This migration comes from acts_as_taggable_on_engine (originally 2)
-class AddMissingUniqueIndices < ActiveRecord::Migration
+if ActiveRecord.gem_version >= Gem::Version.new('5.0')
+  class AddMissingUniqueIndices < ActiveRecord::Migration[4.2]; end
+else
+  class AddMissingUniqueIndices < ActiveRecord::Migration; end
+end
+AddMissingUniqueIndices.class_eval do
   def self.up
     add_index :tags, :name, unique: true
 
-    remove_index :taggings, :tag_id
+    remove_index :taggings, :tag_id if index_exists?(:taggings, :tag_id)
     remove_index :taggings, [:taggable_id, :taggable_type, :context]
     add_index :taggings,
               [:tag_id, :taggable_id, :taggable_type, :context, :tagger_id, :tagger_type],
@@ -14,7 +19,8 @@ class AddMissingUniqueIndices < ActiveRecord::Migration
     remove_index :tags, :name
 
     remove_index :taggings, name: 'taggings_idx'
-    add_index :taggings, :tag_id
+
+    add_index :taggings, :tag_id unless index_exists?(:taggings, :tag_id)
     add_index :taggings, [:taggable_id, :taggable_type, :context]
   end
 end

data/db/migrate/{20141013152012_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb → 20180709023037_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb}

@@ -1,5 +1,10 @@
 # This migration comes from acts_as_taggable_on_engine (originally 3)
-class AddTaggingsCounterCacheToTags < ActiveRecord::Migration
+if ActiveRecord.gem_version >= Gem::Version.new('5.0')
+  class AddTaggingsCounterCacheToTags < ActiveRecord::Migration[4.2]; end
+else
+  class AddTaggingsCounterCacheToTags < ActiveRecord::Migration; end
+end
+AddTaggingsCounterCacheToTags.class_eval do
   def self.up
     add_column :tags, :taggings_count, :integer, default: 0
 

data/db/migrate/{20141013152013_add_missing_taggable_index.acts_as_taggable_on_engine.rb → 20180709023038_add_missing_taggable_index.acts_as_taggable_on_engine.rb}

@@ -1,5 +1,10 @@
 # This migration comes from acts_as_taggable_on_engine (originally 4)
-class AddMissingTaggableIndex < ActiveRecord::Migration
+if ActiveRecord.gem_version >= Gem::Version.new('5.0')
+  class AddMissingTaggableIndex < ActiveRecord::Migration[4.2]; end
+else
+  class AddMissingTaggableIndex < ActiveRecord::Migration; end
+end
+AddMissingTaggableIndex.class_eval do
   def self.up
     add_index :taggings, [:taggable_id, :taggable_type, :context]
   end

data/db/migrate/20180709023039_change_collation_for_tag_names.acts_as_taggable_on_engine.rb

@@ -0,0 +1,15 @@
+# This migration comes from acts_as_taggable_on_engine (originally 5)
+# This migration is added to circumvent issue #623 and have special characters
+# work properly
+if ActiveRecord.gem_version >= Gem::Version.new('5.0')
+  class ChangeCollationForTagNames < ActiveRecord::Migration[4.2]; end
+else
+  class ChangeCollationForTagNames < ActiveRecord::Migration; end
+end
+ChangeCollationForTagNames.class_eval do
+  def up
+    if ActsAsTaggableOn::Utils.using_mysql?
+      execute("ALTER TABLE tags MODIFY name varchar(255) CHARACTER SET utf8 COLLATE utf8_bin;")
+    end
+  end
+end

data/db/migrate/20180709023040_add_missing_indexes_on_taggings.acts_as_taggable_on_engine.rb

@@ -0,0 +1,23 @@
+# This migration comes from acts_as_taggable_on_engine (originally 6)
+if ActiveRecord.gem_version >= Gem::Version.new('5.0')
+  class AddMissingIndexesOnTaggings < ActiveRecord::Migration[4.2]; end
+else
+  class AddMissingIndexesOnTaggings < ActiveRecord::Migration; end
+end
+AddMissingIndexesOnTaggings.class_eval do
+  def change
+    add_index :taggings, :tag_id unless index_exists? :taggings, :tag_id
+    add_index :taggings, :taggable_id unless index_exists? :taggings, :taggable_id
+    add_index :taggings, :taggable_type unless index_exists? :taggings, :taggable_type
+    add_index :taggings, :tagger_id unless index_exists? :taggings, :tagger_id
+    add_index :taggings, :context unless index_exists? :taggings, :context
+
+    unless index_exists? :taggings, [:tagger_id, :tagger_type]
+      add_index :taggings, [:tagger_id, :tagger_type]
+    end
+
+    unless index_exists? :taggings, [:taggable_id, :taggable_type, :tagger_id, :context], name: 'taggings_idy'
+      add_index :taggings, [:taggable_id, :taggable_type, :tagger_id, :context], name: 'taggings_idy'
+    end
+  end
+end

data/db/migrate/20180709161346_add_created_at_to_tag.rb

@@ -0,0 +1,6 @@
+class AddCreatedAtToTag < ActiveRecord::Migration[5.1]
+  def change
+    add_column :tags, :created_at, :datetime
+    add_column :tags, :updated_at, :datetime
+  end
+end

data/lib/enju_bookmark.rb

@@ -4,7 +4,7 @@ require "enju_bookmark/manifestation"
 require "enju_bookmark/bookmark_url"
 require "enju_bookmark/expire_tag_cloud"
 require "enju_bookmark/bookmark_helper"
-#require "enju_bookmark/suggest_tag"
+# require "enju_bookmark/suggest_tag"
 
 module EnjuBookmark
 end

data/lib/enju_bookmark/bookmark_helper.rb

@@ -1,31 +1,31 @@
 module EnjuBookmark
   module BookmarkHelper
     def link_to_tag(tag)
-      link_to tag, manifestations_path(:tag => tag.name)
+      link_to tag, manifestations_path(tag: tag.name)
     end
 
     def render_tag_cloud(tags, options = {})
       # TODO: add options to specify different limits and sorts
-      #tags = Tag.all(:limit => 100, :order => 'taggings_count DESC').sort_by(&:name)
+      # tags = Tag.all(:limit => 100, :order => 'taggings_count DESC').sort_by(&:name)
 
       # TODO: add option to specify which classes you want and overide this if you want?
       classes = %w(popular v-popular vv-popular vvv-popular vvvv-popular)
 
       max, min = 0, 0
       tags.each do |tag|
-        #if options[:max] or options[:min]
+        # if options[:max] or options[:min]
         #  max = options[:max].to_i
         #  min = options[:min].to_i
-        #end
+        # end
         max = tag.taggings.size if tag.taggings.size > max
         min = tag.taggings.size if tag.taggings.size < min
       end
       divisor = ((max - min).div(classes.size)) + 1
 
-      content_tag :div, :class => "hTagcloud" do
-        content_tag :ul, :class => "popularity" do
+      content_tag :div, class: "hTagcloud" do
+        content_tag :ul, class: "popularity" do
           tags.collect do |tag|
-            concat(content_tag :li, link_to(tag.name, manifestations_path(:tag => tag.name), :class => classes[(tag.taggings.size - min).div(divisor)]) + "\n")
+            concat(content_tag :li, link_to(tag.name, manifestations_path(tag: tag.name), class: classes[(tag.taggings.size - min).div(divisor)]) + "\n")
           end
         end
       end