enju_bookmark 0.1.2.pre18 → 0.1.2.pre19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db479211c5aa5bcee491d61771df0b9b65534259
-  data.tar.gz: 3e33b0aae96bed63858a2cec5c308dc5a854fa00
+  metadata.gz: a8e6f55b25a2340ef697b6ad420eb74870d73f58
+  data.tar.gz: 84c33aa8efee5bcfa4517c22eab1e3b6c3a5f760
 SHA512:
-  metadata.gz: fa7fa8ff67ff51148cf927b5da4cbbff9f9dc5d9f99407b2fe25c5c0b4ce385f53f283c59b2cdc023cbedbcb3f36235e21be47655701cea953dfa867f346a8af
-  data.tar.gz: 6814f8e114f61b0867df640ab89b5eae1683f8594b91dd182cda2a9d4c79e9c4af94db6b4c862bf349311d5eceea2a710b3acf24ed4ec022fd773f139857b6ad
+  metadata.gz: 18f8a8af6a24e234df18d304d07d4e32d42a3c0cbc45a8a9d11a8807d70f916308121126a8049f1abccc6b81cde88153f16d98d5f50306149258c07f4f4b49dd
+  data.tar.gz: 7b01640da1e6b96100367355463688ae1f17d1612aabac13d0adebe23d84cdc2687275c879ec1eefcc40df89edaf1023983c81b8692e657bbc758e705e5fe523

data/lib/enju_bookmark/version.rb

@@ -1,3 +1,3 @@
 module EnjuBookmark
-  VERSION = "0.1.2.pre18"
+  VERSION = "0.1.2.pre19"
 end

data/spec/dummy/config/application.rb

@@ -44,4 +44,4 @@ module Dummy
 end
 
 require 'enju_leaf'
-require 'enju_bookmark'
+require 'enju_circulation'

data/spec/dummy/db/migrate/20141013152011_add_missing_unique_indices.acts_as_taggable_on_engine.rb

@@ -0,0 +1,20 @@
+# This migration comes from acts_as_taggable_on_engine (originally 2)
+class AddMissingUniqueIndices < ActiveRecord::Migration
+  def self.up
+    add_index :tags, :name, unique: true
+
+    remove_index :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],
+              unique: true, name: 'taggings_idx'
+  end
+
+  def self.down
+    remove_index :tags, :name
+
+    remove_index :taggings, name: 'taggings_idx'
+    add_index :taggings, :tag_id
+    add_index :taggings, [:taggable_id, :taggable_type, :context]
+  end
+end

data/spec/dummy/db/migrate/20141013152012_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb

@@ -0,0 +1,15 @@
+# This migration comes from acts_as_taggable_on_engine (originally 3)
+class AddTaggingsCounterCacheToTags < ActiveRecord::Migration
+  def self.up
+    add_column :tags, :taggings_count, :integer, default: 0
+
+    ActsAsTaggableOn::Tag.reset_column_information
+    ActsAsTaggableOn::Tag.find_each do |tag|
+      ActsAsTaggableOn::Tag.reset_counters(tag.id, :taggings)
+    end
+  end
+
+  def self.down
+    remove_column :tags, :taggings_count
+  end
+end

data/spec/dummy/db/migrate/20141013152013_add_missing_taggable_index.acts_as_taggable_on_engine.rb

@@ -0,0 +1,10 @@
+# This migration comes from acts_as_taggable_on_engine (originally 4)
+class AddMissingTaggableIndex < ActiveRecord::Migration
+  def self.up
+    add_index :taggings, [:taggable_id, :taggable_type, :context]
+  end
+
+  def self.down
+    remove_index :taggings, [:taggable_id, :taggable_type, :context]
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140823095740) do
+ActiveRecord::Schema.define(version: 20141013152013) do
 
   create_table "accepts", force: true do |t|
     t.integer  "basket_id"
@@ -1330,7 +1330,7 @@ ActiveRecord::Schema.define(version: 20140823095740) do
     t.datetime "created_at"
   end
 
-  add_index "taggings", ["tag_id"], name: "index_taggings_on_tag_id"
+  add_index "taggings", ["tag_id", "taggable_id", "taggable_type", "context", "tagger_id", "tagger_type"], name: "taggings_idx", unique: true
   add_index "taggings", ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context"
 
   create_table "tags", force: true do |t|
@@ -1341,6 +1341,8 @@ ActiveRecord::Schema.define(version: 20140823095740) do
     t.integer  "taggings_count",     default: 0
   end
 
+  add_index "tags", ["name"], name: "index_tags_on_name", unique: true
+
   create_table "use_restrictions", force: true do |t|
     t.string   "name",         null: false
     t.text     "display_name"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_bookmark
 version: !ruby/object:Gem::Version
-  version: 0.1.2.pre18
+  version: 0.1.2.pre19
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2014-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_seed
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0.rc15
+- !ruby/object:Gem::Dependency
+  name: enju_circulation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0.pre39
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0.pre39
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
@@ -247,7 +261,6 @@ files:
 - db/migrate/20100525171356_acts_as_taggable_on_migration.rb
 - db/migrate/20111231145823_add_share_bookmarks_to_user.rb
 - db/migrate/20140524135607_create_bookmark_stat_transitions.rb
-- db/migrate/20140524142813_add_taggings_count_to_tag.rb
 - db/migrate/20140812093836_add_share_bookmarks_to_profile.rb
 - lib/enju_bookmark.rb
 - lib/enju_bookmark/bookmark_helper.rb
@@ -295,7 +308,6 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/001_create_agents.rb
 - spec/dummy/db/migrate/005_create_manifestations.rb
 - spec/dummy/db/migrate/006_create_items.rb
@@ -488,40 +500,15 @@ files:
 - spec/dummy/db/migrate/20140823083524_add_extent_to_manifestation.rb
 - spec/dummy/db/migrate/20140823094847_add_dimensions_to_manifestation.rb
 - spec/dummy/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb
+- spec/dummy/db/migrate/20141013152011_add_missing_unique_indices.acts_as_taggable_on_engine.rb
+- spec/dummy/db/migrate/20141013152012_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb
+- spec/dummy/db/migrate/20141013152013_add_missing_taggable_index.acts_as_taggable_on_engine.rb
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
-- spec/dummy/solr/conf/admin-extra.html
-- spec/dummy/solr/conf/elevate.xml
-- spec/dummy/solr/conf/mapping-ISOLatin1Accent.txt
-- spec/dummy/solr/conf/protwords.txt
-- spec/dummy/solr/conf/schema.xml
-- spec/dummy/solr/conf/scripts.conf
-- spec/dummy/solr/conf/solrconfig.xml
-- spec/dummy/solr/conf/spellings.txt
-- spec/dummy/solr/conf/stopwords.txt
-- spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/default/data/index/segments.gen
-- spec/dummy/solr/default/data/index/segments_1vs
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002429
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002430
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002431
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002432
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002433
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002434
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002435
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002436
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002437
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002438
-- spec/dummy/solr/development/data/index/segments.gen
-- spec/dummy/solr/development/data/index/segments_1
-- spec/dummy/solr/solr.xml
-- spec/dummy/solr/test/data/index/segments.gen
-- spec/dummy/solr/test/data/index/segments_1
 - spec/factories/bookmark.rb
 - spec/factories/bookmark_stat.rb
 - spec/factories/bookmark_stat_has_manifestation.rb
@@ -614,7 +601,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_agents.rb
 - spec/dummy/db/migrate/005_create_manifestations.rb
 - spec/dummy/db/migrate/006_create_items.rb
@@ -807,41 +793,16 @@ test_files:
 - spec/dummy/db/migrate/20140823083524_add_extent_to_manifestation.rb
 - spec/dummy/db/migrate/20140823094847_add_dimensions_to_manifestation.rb
 - spec/dummy/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb
+- spec/dummy/db/migrate/20141013152011_add_missing_unique_indices.acts_as_taggable_on_engine.rb
+- spec/dummy/db/migrate/20141013152012_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb
+- spec/dummy/db/migrate/20141013152013_add_missing_taggable_index.acts_as_taggable_on_engine.rb
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/Rakefile
 - spec/dummy/script/rails
-- spec/dummy/solr/conf/admin-extra.html
-- spec/dummy/solr/conf/elevate.xml
-- spec/dummy/solr/conf/mapping-ISOLatin1Accent.txt
-- spec/dummy/solr/conf/protwords.txt
-- spec/dummy/solr/conf/schema.xml
-- spec/dummy/solr/conf/scripts.conf
-- spec/dummy/solr/conf/solrconfig.xml
-- spec/dummy/solr/conf/spellings.txt
-- spec/dummy/solr/conf/stopwords.txt
-- spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/default/data/index/segments.gen
-- spec/dummy/solr/default/data/index/segments_1vs
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002429
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002430
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002431
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002432
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002433
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002434
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002435
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002436
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002437
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002438
-- spec/dummy/solr/development/data/index/segments.gen
-- spec/dummy/solr/development/data/index/segments_1
-- spec/dummy/solr/solr.xml
-- spec/dummy/solr/test/data/index/segments.gen
-- spec/dummy/solr/test/data/index/segments_1
 - spec/factories/bookmark.rb
 - spec/factories/bookmark_stat.rb
 - spec/factories/bookmark_stat_has_manifestation.rb

data/db/migrate/20140524142813_add_taggings_count_to_tag.rb

@@ -1,5 +0,0 @@
-class AddTaggingsCountToTag < ActiveRecord::Migration
-  def change
-    add_column :tags, :taggings_count, :integer, default: 0
-  end
-end

data/spec/dummy/solr/conf/admin-extra.html

@@ -1,31 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- The content of this page will be statically included into the top
-of the admin page.  Uncomment this as an example to see there the content
-will show up.
-
-<hr>
-<i>This line will appear before the first table</i>
-<tr>
-<td colspan="2">
-This row will be appended to the end of the first table
-</td>
-</tr>
-<hr>
-
--->

data/spec/dummy/solr/conf/elevate.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- If this file is found in the config directory, it will only be
-     loaded once at startup.  If it is found in Solr's data
-     directory, it will be re-loaded every commit.
--->
-
-<elevate>
- <query text="foo bar">
-  <doc id="1" />
-  <doc id="2" />
-  <doc id="3" />
- </query>
- 
- <query text="ipod">
-   <doc id="MA147LL/A" />  <!-- put the actual ipod at the top -->
-   <doc id="IW-02" exclude="true" /> <!-- exclude this cable -->
- </query>
- 
-</elevate>

data/spec/dummy/solr/conf/mapping-ISOLatin1Accent.txt

@@ -1,246 +0,0 @@
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Syntax:
-#   "source" => "target"
-#     "source".length() > 0 (source cannot be empty.)
-#     "target".length() >= 0 (target can be empty.)
-
-# example:
-#   "À" => "A"
-#   "\u00C0" => "A"
-#   "\u00C0" => "\u0041"
-#   "ß" => "ss"
-#   "\t" => " "
-#   "\n" => ""
-
-# À => A
-"\u00C0" => "A"
-
-# Á => A
-"\u00C1" => "A"
-
-# Â => A
-"\u00C2" => "A"
-
-# Ã => A
-"\u00C3" => "A"
-
-# Ä => A
-"\u00C4" => "A"
-
-# Å => A
-"\u00C5" => "A"
-
-# Æ => AE
-"\u00C6" => "AE"
-
-# Ç => C
-"\u00C7" => "C"
-
-# È => E
-"\u00C8" => "E"
-
-# É => E
-"\u00C9" => "E"
-
-# Ê => E
-"\u00CA" => "E"
-
-# Ë => E
-"\u00CB" => "E"
-
-# Ì => I
-"\u00CC" => "I"
-
-# Í => I
-"\u00CD" => "I"
-
-# Î => I
-"\u00CE" => "I"
-
-# Ï => I
-"\u00CF" => "I"
-
-# IJ => IJ
-"\u0132" => "IJ"
-
-# Ð => D
-"\u00D0" => "D"
-
-# Ñ => N
-"\u00D1" => "N"
-
-# Ò => O
-"\u00D2" => "O"
-
-# Ó => O
-"\u00D3" => "O"
-
-# Ô => O
-"\u00D4" => "O"
-
-# Õ => O
-"\u00D5" => "O"
-
-# Ö => O
-"\u00D6" => "O"
-
-# Ø => O
-"\u00D8" => "O"
-
-# Π=> OE
-"\u0152" => "OE"
-
-# Þ
-"\u00DE" => "TH"
-
-# Ù => U
-"\u00D9" => "U"
-
-# Ú => U
-"\u00DA" => "U"
-
-# Û => U
-"\u00DB" => "U"
-
-# Ü => U
-"\u00DC" => "U"
-
-# Ý => Y
-"\u00DD" => "Y"
-
-# Ÿ => Y
-"\u0178" => "Y"
-
-# à => a
-"\u00E0" => "a"
-
-# á => a
-"\u00E1" => "a"
-
-# â => a
-"\u00E2" => "a"
-
-# ã => a
-"\u00E3" => "a"
-
-# ä => a
-"\u00E4" => "a"
-
-# å => a
-"\u00E5" => "a"
-
-# æ => ae
-"\u00E6" => "ae"
-
-# ç => c
-"\u00E7" => "c"
-
-# è => e
-"\u00E8" => "e"
-
-# é => e
-"\u00E9" => "e"
-
-# ê => e
-"\u00EA" => "e"
-
-# ë => e
-"\u00EB" => "e"
-
-# ì => i
-"\u00EC" => "i"
-
-# í => i
-"\u00ED" => "i"
-
-# î => i
-"\u00EE" => "i"
-
-# ï => i
-"\u00EF" => "i"
-
-# ij => ij
-"\u0133" => "ij"
-
-# ð => d
-"\u00F0" => "d"
-
-# ñ => n
-"\u00F1" => "n"
-
-# ò => o
-"\u00F2" => "o"
-
-# ó => o
-"\u00F3" => "o"
-
-# ô => o
-"\u00F4" => "o"
-
-# õ => o
-"\u00F5" => "o"
-
-# ö => o
-"\u00F6" => "o"
-
-# ø => o
-"\u00F8" => "o"
-
-# œ => oe
-"\u0153" => "oe"
-
-# ß => ss
-"\u00DF" => "ss"
-
-# þ => th
-"\u00FE" => "th"
-
-# ù => u
-"\u00F9" => "u"
-
-# ú => u
-"\u00FA" => "u"
-
-# û => u
-"\u00FB" => "u"
-
-# ü => u
-"\u00FC" => "u"
-
-# ý => y
-"\u00FD" => "y"
-
-# ÿ => y
-"\u00FF" => "y"
-
-# ff => ff
-"\uFB00" => "ff"
-
-# fi => fi
-"\uFB01" => "fi"
-
-# fl => fl
-"\uFB02" => "fl"
-
-# ffi => ffi
-"\uFB03" => "ffi"
-
-# ffl => ffl
-"\uFB04" => "ffl"
-
-# ſt => ft
-"\uFB05" => "ft"
-
-# st => st
-"\uFB06" => "st"