enju_bookmark 0.1.2.pre4 → 0.1.2.pre5

data/app/models/bookmark.rb

@@ -82,7 +82,7 @@ class Bookmark < ActiveRecord::Base
     end
     unless manifestation
       normalized_url = Addressable::URI.parse(url).normalize.to_s
-      doc = Nokogiri::HTML(open(normalized_url))
+      doc = Nokogiri::HTML(open(normalized_url).read)
       # TODO: 日本語以外
       #charsets = ['iso-2022-jp', 'euc-jp', 'shift_jis', 'iso-8859-1']
       #if charsets.include?(page.charset.downcase)
@@ -196,14 +196,14 @@ end
 #
 # Table name: bookmarks
 #
-#  id               :integer         not null, primary key
-#  user_id          :integer         not null
+#  id               :integer          not null, primary key
+#  user_id          :integer          not null
 #  manifestation_id :integer
 #  title            :text
 #  url              :string(255)
 #  note             :text
-#  created_at       :datetime
-#  updated_at       :datetime
 #  shared           :boolean
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
 #
 

data/app/models/bookmark_stat.rb

@@ -36,14 +36,14 @@ end
 #
 # Table name: bookmark_stats
 #
-#  id           :integer         not null, primary key
+#  id           :integer          not null, primary key
 #  start_date   :datetime
 #  end_date     :datetime
-#  note         :text
-#  state        :string(255)
-#  created_at   :datetime
-#  updated_at   :datetime
 #  started_at   :datetime
 #  completed_at :datetime
+#  note         :text
+#  state        :string(255)
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #
 

data/app/models/bookmark_stat_has_manifestation.rb

@@ -14,11 +14,11 @@ end
 #
 # Table name: bookmark_stat_has_manifestations
 #
-#  id               :integer         not null, primary key
-#  bookmark_stat_id :integer         not null
-#  manifestation_id :integer         not null
+#  id               :integer          not null, primary key
+#  bookmark_stat_id :integer          not null
+#  manifestation_id :integer          not null
 #  bookmarks_count  :integer
-#  created_at       :datetime
-#  updated_at       :datetime
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
 #
 

data/app/models/tag.rb

@@ -48,10 +48,10 @@ end
 #
 # Table name: tags
 #
-#  id                 :integer         not null, primary key
+#  id                 :integer          not null, primary key
 #  name               :string(255)
 #  name_transcription :string(255)
-#  created_at         :datetime
-#  updated_at         :datetime
+#  created_at         :datetime         not null
+#  updated_at         :datetime         not null
 #
 

data/app/views/bookmark_stat_has_manifestations/index.html.erb

@@ -21,7 +21,7 @@
 <%- end -%>
 </table>
 
-<%= will_paginate(@bookmark_stat_has_manifestations) -%>
+<%= paginate(@bookmark_stat_has_manifestations) -%>
 </div>
 </div>
 

data/app/views/bookmark_stats/index.html.erb

@@ -24,7 +24,7 @@
 <%- end -%>
 </table>
 
-<%= will_paginate(@bookmark_stats) -%>
+<%= paginate(@bookmark_stats) -%>
 </div>
 </div>
 

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

@@ -38,7 +38,7 @@
   <%- end -%>
 </table>
 
-<%= will_paginate(@stats) -%>
+<%= paginate(@stats) -%>
 
 </div>
 </div>

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

@@ -36,7 +36,7 @@
 <%- end -%>
 </table>
 
-<%= will_paginate(@bookmarks) -%>
+<%= paginate(@bookmarks) -%>
 
 </div>
 </div>

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

@@ -38,7 +38,7 @@
 <%- end -%>
 </table>
 
-<%= will_paginate(@bookmarks) -%>
+<%= paginate(@bookmarks) -%>
 
 </div>
 </div>

data/app/views/tags/index.html.erb

@@ -38,7 +38,7 @@
 <%- end -%>
 </table>
 
-<%= will_paginate(@tags) -%>
+<%= paginate(@tags) -%>
 </div>
 </div>
 

data/lib/enju_bookmark/version.rb

@@ -1,3 +1,3 @@
 module EnjuBookmark
-  VERSION = "0.1.2.pre4"
+  VERSION = "0.1.2.pre5"
 end

data/spec/dummy/db/migrate/20120516020924_add_online_isbn_to_manifestation.rb

@@ -0,0 +1,5 @@
+class AddOnlineIsbnToManifestation < ActiveRecord::Migration
+  def change
+    add_column :manifestations, :online_isbn, :string
+  end
+end

data/spec/dummy/db/migrate/20121119153944_add_manifestation_id_to_item.rb

@@ -0,0 +1,5 @@
+class AddManifestationIdToItem < ActiveRecord::Migration
+  def change
+    add_column :items, :manifestation_id, :integer
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120728204337) do
+ActiveRecord::Schema.define(:version => 20121119153944) do
 
   create_table "accepts", :force => true do |t|
     t.integer  "basket_id"
@@ -339,6 +339,7 @@ ActiveRecord::Schema.define(:version => 20120728204337) do
     t.datetime "acquired_at"
     t.integer  "bookstore_id"
     t.integer  "budget_type_id"
+    t.integer  "manifestation_id"
   end
 
   add_index "items", ["bookstore_id"], :name => "index_items_on_bookstore_id"
@@ -544,6 +545,7 @@ ActiveRecord::Schema.define(:version => 20120728204337) do
     t.integer  "year_of_publication"
     t.text     "attachment_meta"
     t.integer  "month_of_publication"
+    t.string   "online_isbn"
   end
 
   add_index "manifestations", ["access_address"], :name => "index_manifestations_on_access_address"

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

@@ -84,14 +84,11 @@
     <fieldType name="tfloat" class="solr.TrieFloatField" omitNorms="true"/>
     <!-- *** This fieldType is used by Sunspot! *** -->
     <fieldType name="tdate" class="solr.TrieDateField" omitNorms="true"/>
-
-    <!-- A specialized field for geospatial search. If indexed, this fieldType must not be multivalued. -->
-    <fieldType name="location" class="solr.LatLonType" subFieldSuffix="_coordinate"/>
   </types>
   <fields>
     <!-- Valid attributes for fields:
      name: mandatory - the name for the field
-     type: mandatory - the name of a previously defined type from the
+     type: mandatory - the name of a previously defined type from the 
        <types> section
      indexed: true if this field should be indexed (searchable or sortable)
      stored: true if this field should be retrievable
@@ -226,17 +223,8 @@
     <dynamicField name="*_ets" stored="true" termVectors="true" type="tdouble" multiValued="false" indexed="true"/>
     <!-- *** This dynamicField is used by Sunspot! *** -->
     <dynamicField name="*_etms" stored="true" termVectors="true" type="tdouble" multiValued="true" indexed="true"/>
-
-    <!-- Type used to index the lat and lon components for the "location" FieldType -->
-    <dynamicField name="*_coordinate"  type="tdouble" indexed="true"  stored="false" multiValued="false"/>
-    <dynamicField name="*_p" type="location" indexed="true" stored="true" multiValued="false"/>
-
-    <dynamicField name="*_ll" stored="false" type="location" multiValued="false" indexed="true"/>
-    <dynamicField name="*_llm" stored="false" type="location" multiValued="true" indexed="true"/>
-    <dynamicField name="*_lls" stored="true" type="location" multiValued="false" indexed="true"/>
-    <dynamicField name="*_llms" stored="true" type="location" multiValued="true" indexed="true"/>
   </fields>
-  <!-- Field to use to determine and enforce document uniqueness.
+  <!-- Field to use to determine and enforce document uniqueness. 
       Unless this field is marked with required="false", it will be a required field
    -->
   <uniqueKey>id</uniqueKey>

data/spec/fixtures/bookmark_stat_has_manifestations.yml

@@ -14,11 +14,11 @@ two:
 #
 # Table name: bookmark_stat_has_manifestations
 #
-#  id               :integer         not null, primary key
-#  bookmark_stat_id :integer         not null
-#  manifestation_id :integer         not null
+#  id               :integer          not null, primary key
+#  bookmark_stat_id :integer          not null
+#  manifestation_id :integer          not null
 #  bookmarks_count  :integer
-#  created_at       :datetime
-#  updated_at       :datetime
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
 #
 

data/spec/fixtures/bookmark_stats.yml

@@ -14,19 +14,18 @@ bookmark_stat_00002:
   note: MyText
   state: pending
 
-
 # == Schema Information
 #
 # Table name: bookmark_stats
 #
-#  id           :integer         not null, primary key
+#  id           :integer          not null, primary key
 #  start_date   :datetime
 #  end_date     :datetime
-#  note         :text
-#  state        :string(255)
-#  created_at   :datetime
-#  updated_at   :datetime
 #  started_at   :datetime
 #  completed_at :datetime
+#  note         :text
+#  state        :string(255)
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #
 

data/spec/fixtures/bookmarks.yml

@@ -46,14 +46,14 @@ bookmark_00005:
 #
 # Table name: bookmarks
 #
-#  id               :integer         not null, primary key
-#  user_id          :integer         not null
+#  id               :integer          not null, primary key
+#  user_id          :integer          not null
 #  manifestation_id :integer
 #  title            :text
 #  url              :string(255)
 #  note             :text
-#  created_at       :datetime
-#  updated_at       :datetime
 #  shared           :boolean
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
 #
 

data/spec/models/bookmark_spec.rb

@@ -44,14 +44,14 @@ end
 #
 # Table name: bookmarks
 #
-#  id               :integer         not null, primary key
-#  user_id          :integer         not null
+#  id               :integer          not null, primary key
+#  user_id          :integer          not null
 #  manifestation_id :integer
 #  title            :text
 #  url              :string(255)
 #  note             :text
-#  created_at       :datetime
-#  updated_at       :datetime
 #  shared           :boolean
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
 #
 

data/spec/models/bookmark_stat_has_manifestation_spec.rb

@@ -10,11 +10,11 @@ end
 #
 # Table name: bookmark_stat_has_manifestations
 #
-#  id               :integer         not null, primary key
-#  bookmark_stat_id :integer         not null
-#  manifestation_id :integer         not null
+#  id               :integer          not null, primary key
+#  bookmark_stat_id :integer          not null
+#  manifestation_id :integer          not null
 #  bookmarks_count  :integer
-#  created_at       :datetime
-#  updated_at       :datetime
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
 #
 

data/spec/models/bookmark_stat_spec.rb

@@ -13,14 +13,14 @@ end
 #
 # Table name: bookmark_stats
 #
-#  id           :integer         not null, primary key
+#  id           :integer          not null, primary key
 #  start_date   :datetime
 #  end_date     :datetime
-#  note         :text
-#  state        :string(255)
-#  created_at   :datetime
-#  updated_at   :datetime
 #  started_at   :datetime
 #  completed_at :datetime
+#  note         :text
+#  state        :string(255)
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_bookmark
 version: !ruby/object:Gem::Version
-  version: 0.1.2.pre4
+  version: 0.1.2.pre5
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-23 00:00:00.000000000 Z
+date: 2012-12-10 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.pre8
+        version: 0.1.0.pre10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre8
+        version: 0.1.0.pre10
 - !ruby/object:Gem::Dependency
   name: enju_library
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre6
+        version: 0.1.0.pre8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre6
+        version: 0.1.0.pre8
 - !ruby/object:Gem::Dependency
   name: enju_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
@@ -309,6 +309,7 @@ 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
@@ -433,8 +434,10 @@ files:
 - spec/dummy/db/migrate/20120424103932_add_librarian_id_to_checked_item.rb
 - spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb
 - spec/dummy/db/migrate/20120511072422_add_patron_identifier_to_patron.rb
+- spec/dummy/db/migrate/20120516020924_add_online_isbn_to_manifestation.rb
 - spec/dummy/db/migrate/20120602141129_add_edit_mode_to_patron_import_file.rb
 - spec/dummy/db/migrate/20120728204337_create_series_statement_relationships.rb
+- spec/dummy/db/migrate/20121119153944_add_manifestation_id_to_item.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/public/404.html
@@ -454,7 +457,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_1v
+- spec/dummy/solr/data/test/index/segments_66
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/bookmark.rb
@@ -557,6 +560,7 @@ 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
@@ -681,8 +685,10 @@ test_files:
 - spec/dummy/db/migrate/20120424103932_add_librarian_id_to_checked_item.rb
 - spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb
 - spec/dummy/db/migrate/20120511072422_add_patron_identifier_to_patron.rb
+- spec/dummy/db/migrate/20120516020924_add_online_isbn_to_manifestation.rb
 - spec/dummy/db/migrate/20120602141129_add_edit_mode_to_patron_import_file.rb
 - spec/dummy/db/migrate/20120728204337_create_series_statement_relationships.rb
+- spec/dummy/db/migrate/20121119153944_add_manifestation_id_to_item.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/public/404.html
@@ -702,7 +708,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_1v
+- spec/dummy/solr/data/test/index/segments_66
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/bookmark.rb