enju_bookmark 0.1.2.pre2 → 0.1.2.pre3

data/app/models/tag.rb

@@ -14,7 +14,7 @@ class Tag < ActiveRecord::Base
     time :created_at
     time :updated_at
     integer :bookmark_ids, :multiple => true do
-      tagged(Bookmark).collect(&:id)
+      tagged(Bookmark).compact.collect(&:id)
     end
     integer :taggings_count do
       taggings.size

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

@@ -13,7 +13,7 @@
     <%= javascript_tag("$('#bookmark_tag_list').focus()") -%>
   <%- else -%>
     <!-- bookmarked_by_other_patron_or_not_bookmarked -->
-    <%= form_for(:bookmark, :url => user_bookmarks_path(current_user, :mode => 'tag_edit'), :html => { :method => :post }) do |f| -%>
+    <%= form_for(:bookmark, :url => bookmarks_path(:mode => 'tag_edit'), :html => { :method => :post }) do |f| -%>
       <div>
         <%= f.text_field :tag_list, :class => 'editable_text_field' -%>
         <%= f.hidden_field :title, :value => manifestation.original_title -%>

data/lib/enju_bookmark/bookmark_helper.rb

@@ -25,7 +25,7 @@ module EnjuBookmark
       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)]))
+            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

data/lib/enju_bookmark/version.rb

@@ -1,3 +1,3 @@
 module EnjuBookmark
-  VERSION = "0.1.2.pre2"
+  VERSION = "0.1.2.pre3"
 end

data/spec/dummy/app/controllers/application_controller.rb

@@ -60,7 +60,7 @@ class ApplicationController < ActionController::Base
   def convert_charset
     case params[:format]
     when 'csv'
-      return unless configatron.csv_charset_conversion
+      return unless Setting.csv_charset_conversion
       # TODO: 他の言語
       if @locale.to_sym == :ja
         headers["Content-Type"] = "text/csv; charset=Shift_JIS"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_bookmark
 version: !ruby/object:Gem::Version
-  version: 0.1.2.pre2
+  version: 0.1.2.pre3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-23 00:00:00.000000000 Z
+date: 2012-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre5
+        version: 0.1.0.pre6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre5
+        version: 0.1.0.pre6
 - !ruby/object:Gem::Dependency
   name: enju_library
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre3
+        version: 0.1.0.pre4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre3
+        version: 0.1.0.pre4
 - !ruby/object:Gem::Dependency
   name: enju_circulation
   requirement: !ruby/object:Gem::Requirement
@@ -293,7 +293,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
@@ -444,7 +443,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_4y
+- spec/dummy/solr/data/test/index/segments_3c
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/bookmark.rb
@@ -547,7 +546,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
@@ -698,7 +696,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_4y
+- spec/dummy/solr/data/test/index/segments_3c
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/bookmark.rb