enju_bookmark 0.0.17 → 0.0.18

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

@@ -0,0 +1,24 @@
+<%- if manifestation.bookmarks.exists? -%>
+  <ul>
+    <%- manifestation.bookmarks.each do |bookmark| -%>
+      <% if bookmark.shared? %>
+        <li><%= link_to bookmark.user.username, bookmark -%>
+          <%- bookmark.tags.each do |tag| -%>
+            [<%= link_to tag.name, manifestations_path(:tag => tag.name) -%>]
+          <%- end -%>
+          <%= bookmark.note -%>
+          <%- if user_signed_in? and current_user == bookmark.user -%>
+            <%= link_to image_tag('icons/page_edit.png', :alt => t('page.edit')), edit_bookmark_path(bookmark) -%>
+          <%- end -%>
+        </li>
+      <%- end -%>
+    <%- end -%>
+  </ul>
+<%- else -%>
+  <p>
+    <%= t('bookmark.not_bookmarked') -%>
+    <%- if user_signed_in? -%>
+      <%= link_to t('bookmark.add_to_my_bookmark'), new_bookmark_path(:bookmark => {:url => manifestation_url(manifestation)}) -%>
+    <%- end -%>
+  </p>
+<%- end -%>

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

@@ -0,0 +1,5 @@
+<div class="tag" id="tag_<%= manifestation.id -%>" style="display: none">
+  <%- manifestation.tags.each do |tag| -%>
+    <%= link_to tag.name, manifestations_path(:tag => tag.name) -%>
+  <%- end -%>
+</div>

data/lib/enju_bookmark/version.rb

@@ -1,3 +1,3 @@
 module EnjuBookmark
-  VERSION = "0.0.17"
+  VERSION = "0.0.18"
 end

data/spec/requests/bookmarks_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "Bookmarks" do
-  describe "GET /bookmarks" do
+  describe "GET /boomarks" do
     it "works! (now write some real specs)" do
       get bookmarks_path
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_bookmark
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-27 00:00:00.000000000 Z
+date: 2012-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -301,6 +301,8 @@ files:
 - app/views/bookmarks/index.html.erb
 - app/views/bookmarks/new.html.erb
 - app/views/bookmarks/show.html.erb
+- app/views/manifestations/_bookmarks_for_this_manifestation.html.erb
+- app/views/manifestations/_show_tag.html.erb
 - app/views/manifestations/_tag_cloud.html.erb
 - app/views/manifestations/_tag_edit.html.erb
 - app/views/manifestations/_tag_list.html.erb
@@ -343,7 +345,6 @@ files:
 - spec/dummy/app/models/circulation_status.rb
 - spec/dummy/app/models/exemplify.rb
 - spec/dummy/app/models/item.rb
-- spec/dummy/app/models/item_has_use_restriction.rb
 - spec/dummy/app/models/language.rb
 - spec/dummy/app/models/library.rb
 - spec/dummy/app/models/library_group.rb
@@ -354,7 +355,6 @@ files:
 - spec/dummy/app/models/series_has_manifestation.rb
 - spec/dummy/app/models/series_statement.rb
 - spec/dummy/app/models/shelf.rb
-- spec/dummy/app/models/use_restriction.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/models/user_group.rb
 - spec/dummy/app/models/user_has_role.rb
@@ -382,7 +382,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
@@ -441,16 +440,8 @@ files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/data/test/index/_0.fdt
-- spec/dummy/solr/data/test/index/_0.fdx
-- spec/dummy/solr/data/test/index/_0.fnm
-- spec/dummy/solr/data/test/index/_0.frq
-- spec/dummy/solr/data/test/index/_0.nrm
-- spec/dummy/solr/data/test/index/_0.prx
-- spec/dummy/solr/data/test/index/_0.tii
-- spec/dummy/solr/data/test/index/_0.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_2
+- spec/dummy/solr/data/test/index/segments_1
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/bookmark.rb
@@ -529,7 +520,6 @@ test_files:
 - spec/dummy/app/models/circulation_status.rb
 - spec/dummy/app/models/exemplify.rb
 - spec/dummy/app/models/item.rb
-- spec/dummy/app/models/item_has_use_restriction.rb
 - spec/dummy/app/models/language.rb
 - spec/dummy/app/models/library.rb
 - spec/dummy/app/models/library_group.rb
@@ -540,7 +530,6 @@ test_files:
 - spec/dummy/app/models/series_has_manifestation.rb
 - spec/dummy/app/models/series_statement.rb
 - spec/dummy/app/models/shelf.rb
-- spec/dummy/app/models/use_restriction.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/models/user_group.rb
 - spec/dummy/app/models/user_has_role.rb
@@ -568,7 +557,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
@@ -627,16 +615,8 @@ test_files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/data/test/index/_0.fdt
-- spec/dummy/solr/data/test/index/_0.fdx
-- spec/dummy/solr/data/test/index/_0.fnm
-- spec/dummy/solr/data/test/index/_0.frq
-- spec/dummy/solr/data/test/index/_0.nrm
-- spec/dummy/solr/data/test/index/_0.prx
-- spec/dummy/solr/data/test/index/_0.tii
-- spec/dummy/solr/data/test/index/_0.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_2
+- spec/dummy/solr/data/test/index/segments_1
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/bookmark.rb

data/spec/dummy/app/models/item_has_use_restriction.rb

@@ -1,27 +0,0 @@
-class ItemHasUseRestriction < ActiveRecord::Base
-  attr_accessible
-  attr_accessible :item_id, :use_restriction_id, :as => :admin
-  belongs_to :item, :validate => true
-  belongs_to :use_restriction, :validate => true
-  accepts_nested_attributes_for :use_restriction
-
-  validates_associated :item, :use_restriction
-  validates_presence_of :use_restriction
-  validates_presence_of :item, :on => :update
-
-  def self.per_page
-    10
-  end
-end
-
-# == Schema Information
-#
-# Table name: item_has_use_restrictions
-#
-#  id                 :integer         not null, primary key
-#  item_id            :integer         not null
-#  use_restriction_id :integer         not null
-#  created_at         :datetime
-#  updated_at         :datetime
-#
-

data/spec/dummy/app/models/use_restriction.rb

@@ -1,22 +0,0 @@
-class UseRestriction < ActiveRecord::Base
-  attr_accessible :name, :display_name, :note
-  include MasterModel
-  default_scope :order => 'use_restrictions.position'
-  scope :available, where(:name => ['Not For Loan', 'Limited Circulation, Normal Loan Period'])
-  has_many :item_has_use_restrictions
-  has_many :items, :through => :item_has_use_restrictions
-end
-
-# == Schema Information
-#
-# Table name: use_restrictions
-#
-#  id           :integer         not null, primary key
-#  name         :string(255)     not null
-#  display_name :text
-#  note         :text
-#  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
-#
-

data/spec/dummy/solr/data/test/index/_0.fnm

@@ -1,3 +0,0 @@
-����	idtype
-class_nameurl_s	user_id_imanifestation_id_icreated_at_dupdated_at_d
-title_text

data/spec/dummy/solr/data/test/index/_0.nrm

@@ -1 +0,0 @@
-NRM�ttrtt