enju_bookmark 0.0.22 → 0.1.0.pre

data/app/controllers/bookmark_stats_controller.rb

@@ -19,9 +19,9 @@ class BookmarkStatsController < ApplicationController
     if params[:format] == 'csv'
       per_page = 65534
     else
-      per_page = BookmarkStatHasManifestation.per_page
+      per_page = BookmarkStatHasManifestation.default_per_page
     end
-    @stats = @bookmark_stat.bookmark_stat_has_manifestations.order('bookmarks_count DESC, manifestation_id').page(params[:page]).per_page(per_page)
+    @stats = @bookmark_stat.bookmark_stat_has_manifestations.order('bookmarks_count DESC, manifestation_id').page(params[:page]).per(per_page)
 
     respond_to do |format|
       format.html # show.html.erb

data/app/controllers/bookmarks_controller.rb

@@ -37,7 +37,7 @@ class BookmarksController < ApplicationController
     end
     page = params[:page] || "1"
     flash[:page] = page if page.to_i >= 1
-    search.query.paginate(page.to_i, Bookmark.per_page)
+    search.query.paginate(page.to_i, Bookmark.default_per_page)
     @bookmarks = search.execute!.results
 
     respond_to do |format|

data/app/controllers/tags_controller.rb

@@ -22,7 +22,7 @@ class TagsController < ApplicationController
 
     @tags = Tag.search do
       fulltext query if query.present?
-      paginate :page => page.to_i, :per_page => Tag.per_page
+      paginate :page => page.to_i, :per_page => Tag.default_per_page
       order_by sort[:sort_by], sort[:order]
     end.results
 

data/app/models/bookmark.rb

@@ -37,9 +37,7 @@ class Bookmark < ActiveRecord::Base
     boolean :shared
   end
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 
   def replace_space_in_tags
     # タグに含まれている全角スペースを除去する

data/app/models/bookmark_stat.rb

@@ -13,9 +13,7 @@ class BookmarkStat < ActiveRecord::Base
     end
   end
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 
   def calculate_count
     self.started_at = Time.zone.now

data/app/models/bookmark_stat_has_manifestation.rb

@@ -7,9 +7,7 @@ class BookmarkStatHasManifestation < ActiveRecord::Base
   validates_uniqueness_of :manifestation_id, :scope => :bookmark_stat_id
   validates_presence_of :bookmark_stat_id, :manifestation_id
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 end
 
 # == Schema Information

data/app/models/tag.rb

@@ -21,13 +21,11 @@ class Tag < ActiveRecord::Base
     end
   end
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 
   def self.bookmarked(bookmark_ids, options = {})
     count = Tag.count
-    count = Tag.per_page if count == 0
+    count = Tag.default_per_page if count == 0
     unless bookmark_ids.empty?
       tags = Tag.search do
         with(:bookmark_ids).any_of bookmark_ids

data/lib/enju_bookmark/engine.rb

@@ -1,14 +1,8 @@
-require 'devise'
-require 'cancan'
+require 'enju_core'
 require 'acts-as-taggable-on'
-require 'attribute_normalizer'
-require 'sunspot_rails'
 require 'state_machine'
-require 'friendly_id'
-require 'will_paginate'
 require 'addressable/uri'
 require 'nkf'
-require 'acts_as_list'
 
 module EnjuBookmark
   class Engine < ::Rails::Engine

data/lib/enju_bookmark/version.rb

@@ -1,3 +1,3 @@
 module EnjuBookmark
-  VERSION = "0.0.22"
+  VERSION = "0.1.0.pre"
 end

data/lib/generators/enju_bookmark/views_generator.rb

@@ -0,0 +1,21 @@
+module EnjuBookmark
+  module Generators
+    class ViewsGenerator < Rails::Generators::Base
+      source_root File.expand_path('../../../../app/views', __FILE__)
+
+      def copy_files
+        directories = %w(
+          bookmark_stat_has_manifestations
+          bookmark_stats
+          bookmarks
+          manifestations
+          tags
+        )
+
+        directories.each do |dir|
+          directory dir, "app/views/#{dir}"
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: enju_bookmark
 version: !ruby/object:Gem::Version
-  version: 0.0.22
-  prerelease: 
+  version: 0.1.0.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-21 00:00:00.000000000 Z
+date: 2012-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.1.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,39 +122,39 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.1.0.pre
 - !ruby/object:Gem::Dependency
-  name: enju_circulation
+  name: enju_library
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0.pre
 - !ruby/object:Gem::Dependency
-  name: enju_library
+  name: enju_circulation
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0.pre
 - !ruby/object:Gem::Dependency
   name: enju_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
@@ -249,6 +249,7 @@ files:
 - lib/enju_bookmark/user.rb
 - lib/enju_bookmark/version.rb
 - lib/enju_bookmark.rb
+- lib/generators/enju_bookmark/views_generator.rb
 - lib/tasks/enju_bookmark_tasks.rake
 - MIT-LICENSE
 - Rakefile
@@ -290,7 +291,6 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/001_create_patrons.rb
 - spec/dummy/db/migrate/005_create_manifestations.rb
 - spec/dummy/db/migrate/006_create_items.rb
@@ -439,7 +439,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_1a
+- spec/dummy/solr/data/test/index/segments_2d
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/bookmark.rb
@@ -493,9 +493,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -540,7 +540,6 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/001_create_patrons.rb
 - spec/dummy/db/migrate/005_create_manifestations.rb
 - spec/dummy/db/migrate/006_create_items.rb
@@ -689,7 +688,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_1a
+- spec/dummy/solr/data/test/index/segments_2d
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/bookmark.rb