enju_bookmark 0.1.2.pre14 → 0.1.2.pre15

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

@@ -4,11 +4,11 @@
       <% if bookmark.shared? %>
         <li><%= link_to bookmark.user.username, bookmark -%>
           <%- bookmark.tags.each do |tag| -%>
-            [<%= link_to tag.name, manifestations_path(:tag => tag.name) -%>]
+            [<%= 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) -%>
+            <%= link_to image_tag('icons/page_edit.png', alt: t('page.edit')), edit_bookmark_path(bookmark) -%>
           <%- end -%>
         </li>
       <%- end -%>
@@ -18,7 +18,7 @@
   <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)}) -%>
+      <%= 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

@@ -1,5 +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) -%>
+    <%= link_to tag.name, manifestations_path(tag: tag.name) -%>
   <%- end -%>
 </div>

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

@@ -1,11 +1,11 @@
 <%- if user_signed_in? -%>
   <%- unless @bookmark.blank? -%>
     <!-- bookmarked_by_me -->
-    <%= form_for(:bookmark, :url => bookmark_path(@bookmark, :mode => 'tag_edit'), :html => { :method => :put }) do |f| -%>
+    <%= form_for(:bookmark, url: bookmark_path(@bookmark, mode: 'tag_edit'), html: { method: :put }) do |f| -%>
       <div>
-        <%= f.text_field :tag_list, :value => @bookmark.tag_list.join(' '), :class => 'editable_text_field' -%>
+        <%= f.text_field :tag_list, value: @bookmark.tag_list.join(' '), class: 'editable_text_field' -%>
         <%= submit_tag t('page.update') -%>
-        (<a onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#tag_list').html(request);}, type:'get', url:'<%= manifestation_path(manifestation, :mode => 'tag_list') %>'}); return false;" href="#"><%= t('page.cancel') %></a>)
+        (<a onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#tag_list').html(request);}, type:'get', url:'<%= manifestation_path(manifestation, mode: 'tag_list') %>'}); return false;" href="#"><%= t('page.cancel') %></a>)
         <br />
         <%= t('tag.use_space_as_delimiter') -%>
       </div>
@@ -13,13 +13,13 @@
     <%= javascript_tag("$(function(){$('#bookmark_tag_list').focus()})") %>
   <%- else -%>
     <!-- bookmarked_by_other_patron_or_not_bookmarked -->
-    <%= form_for(:bookmark, :url => bookmarks_path(: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 -%>
-        <%= f.hidden_field :url, :value => manifestation_url(manifestation) -%>
+        <%= f.text_field :tag_list, class: 'editable_text_field' -%>
+        <%= f.hidden_field :title, value: manifestation.original_title -%>
+        <%= f.hidden_field :url, value: manifestation_url(manifestation) -%>
         <%= submit_tag t('page.create') -%>
-        (<a onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#tag_list').html(request);}, type:'get', url:'<%= manifestation_path(manifestation, :mode => 'tag_list') %>'}); return false;" href="#"><%= t('page.cancel') %></a>)
+        (<a onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#tag_list').html(request);}, type:'get', url:'<%= manifestation_path(manifestation, mode: 'tag_list') %>'}); return false;" href="#"><%= t('page.cancel') %></a>)
         <br />
         <%= t('tag.use_space_as_delimiter') -%>
       </div>

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

@@ -3,11 +3,11 @@
     <%- manifestation.tags.each do |tag| -%>
       <%= link_to_tag(tag) -%>
       <%- if can? :delete, tag -%>
-        <%= link_to image_tag('icons/tag_blue_edit.png', :alt => t('page.edit')), tag_path(tag.name) -%>
+        <%= link_to image_tag('icons/tag_blue_edit.png', alt: t('page.edit')), tag_path(tag.name) -%>
       <%- end -%>
     <%- end -%>
   <%- end -%>
   <%- if user_signed_in? -%>
-    (<a href="#" onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#tag_list').html(request);}, type:'get', url:'<%= edit_manifestation_path(manifestation, :mode => 'tag_edit') %>'}); return false;"><%= t('page.edit') %></a>)
+    (<a href="#" onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#tag_list').html(request);}, type:'get', url:'<%= edit_manifestation_path(manifestation, mode: 'tag_edit') %>'}); return false;"><%= t('page.edit') %></a>)
   <%- end -%>
 </div>

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

@@ -1,12 +1,12 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.tag')) -%></h1>
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.tag')) -%></h1>
 <div id="content_list">
 
-<%= form_for(@tag, :url => tag_path(@tag.name)) do |f| -%>
+<%= form_for(@tag, url: tag_path(@tag.name)) do |f| -%>
   <%= f.error_messages -%>
   <div class="field">
     <%= f.label :name -%><br />
-    <%= f.text_field :name, :value => @tag.name -%>
+    <%= f.text_field :name, value: @tag.name -%>
   </div>
 
   <div class="actions">
@@ -16,7 +16,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.show'), tag_path(@tag.name) -%></li>
     <li><%= link_to t('page.back'), tags_path -%></li>

data/app/views/tags/index.atom.builder

@@ -1,5 +1,5 @@
-atom_feed(:url => tags_url(:format => :atom)) do |feed|
-  feed.title t('page.listing', :model => t('activerecord.models.tag')) + " (#{@library_group.display_name.localize})"
+atom_feed(url: tags_url(format: :atom)) do |feed|
+  feed.title t('page.listing', model: t('activerecord.models.tag')) + " (#{@library_group.display_name.localize})"
   feed.updated(@tags.first ? @tags.first.created_at : Time.zone.now)
 
   @tags.each do |tag|

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

@@ -1,19 +1,19 @@
-<div id="content_detail" class="ui-corner-all">
-  <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.tag')) -%></h1>
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+  <h1 class="title"><%= t('page.listing', model: t('activerecord.models.tag')) -%></h1>
 <div id="content_list">
 
-<%= form_for :tags, :url => tags_path, :html => {:method => 'get'} do -%>
+<%= form_for :tags, url: tags_path, html: {method: 'get'} do -%>
   <p>
-    <%= label_tag :search_form_top, t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
+    <%= label_tag :search_form_top, t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {id: 'search_form_top', class: 'search_form', placeholder: t('page.search_term')} -%>
     <%= submit_tag t('page.search') -%>
   </p>
 <%- end -%>
 
 <p>
   <%= t('page.sort_by') -%>:
-  <%= link_to t('activerecord.attributes.tag.name'), tags_path(:order => 'name') -%>
-  <%= link_to t('activerecord.attributes.tag.taggings_count'), tags_path(:sort_by => 'taggings_count') -%>
-  <%= link_to t('page.created_at'), tags_path(:sort_by => 'created_at') -%>
+  <%= link_to t('activerecord.attributes.tag.name'), tags_path(order: 'name') -%>
+  <%= link_to t('activerecord.attributes.tag.taggings_count'), tags_path(sort_by: 'taggings_count') -%>
+  <%= link_to t('page.created_at'), tags_path(sort_by: 'created_at') -%>
 </p>
 
 <table class="table table-striped index">
@@ -42,7 +42,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
   </ul>
 </div>

data/app/views/tags/index.rss.builder

@@ -3,14 +3,14 @@ xml.rss('version' => "2.0",
         'xmlns:opensearch' => "http://a9.com/-/spec/opensearch/1.1/",
         'xmlns:atom' => "http://www.w3.org/2005/Atom"){
   xml.channel{
-    xml.title t('page.listing', :model => t('activerecord.models.tag')) + " (#{@library_group.display_name.localize})"
-    xml.link "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(:format => nil, :only_path => true))}"
+    xml.title t('page.listing', model: t('activerecord.models.tag')) + " (#{@library_group.display_name.localize})"
+    xml.link "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(format: nil, only_path: true))}"
     xml.description "Next-L Enju, an open source integrated library system developed by Project Next-L"
     xml.language @locale.to_s
     xml.ttl "60"
-    xml.tag! "atom:link", :rel => 'self', :href => "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(:format => :rss, :only_path => true))}"
-    xml.tag! "atom:link", :rel => 'alternate', :href => tags_url
-    xml.tag! "atom:link", :rel => 'search', :type => 'application/opensearchdescription+xml', :href => page_opensearch_url
+    xml.tag! "atom:link", rel: 'self', href: "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(format: :rss, only_path: true))}"
+    xml.tag! "atom:link", rel: 'alternate', href: tags_url
+    xml.tag! "atom:link", rel: 'search', type: 'application/opensearchdescription+xml', href: page_opensearch_url
     unless params[:query].blank?
       xml.tag! "opensearch:totalResults", @count[:query_result]
       xml.tag! "opensearch:startIndex", @tags.offset + 1

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

@@ -1,5 +1,5 @@
-<div id="content_detail" class="ui-corner-all">
-  <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.tag')) -%></h1>
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+  <h1 class="title"><%= t('page.showing', model: t('activerecord.models.tag')) -%></h1>
   <div id="content_list">
 <p id="notice"><%= notice %></p>
 
@@ -15,7 +15,7 @@
     <p>
       <strong><%= t('activerecord.attributes.tag.taggings_count') -%>:</strong>
       <%= @tag.taggings.size -%>
-      (<%= link_to t('page.search'), manifestations_path(:tag => @tag.name) -%>)
+      (<%= link_to t('page.search'), manifestations_path(tag: @tag.name) -%>)
     </p>
 
     <p>
@@ -26,13 +26,13 @@
   </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.back'), :back -%></li>
     <li><%= link_to t('page.edit'), edit_tag_path(@tag.name) -%></li>
-    <li><%= link_to t('page.search_resource', :model => t('activerecord.models.resource')), manifestations_path(:tag => @tag.name) -%></li>
+    <li><%= link_to t('page.search_resource', model: t('activerecord.models.resource')), manifestations_path(tag: @tag.name) -%></li>
     <%- if user_signed_in? -%>
-      <li><%= link_to t('page.search_resource', :model => t('activerecord.models.bookmark')), user_bookmarks_path(current_user, :tag => @tag.name) -%></li>
+      <li><%= link_to t('page.search_resource', model: t('activerecord.models.bookmark')), bookmarks_path(user_id: current_user.username, tag: @tag.name) -%></li>
     <%- end -%>
   </ul>
 </div>

data/config/routes.rb

@@ -1,7 +1,4 @@
 Rails.application.routes.draw do
-  resources :users do
-    resources :bookmarks, :only => :index
-  end
   resources :bookmarks
   resources :tags
   resources :bookmark_stats

data/db/migrate/20081212151614_create_bookmark_stats.rb

@@ -6,11 +6,8 @@ class CreateBookmarkStats < ActiveRecord::Migration
       t.datetime :started_at
       t.datetime :completed_at
       t.text :note
-      t.string :state
 
       t.timestamps
     end
-
-    add_index :bookmark_stats, :state
   end
 end

data/db/migrate/20140812093836_add_share_bookmarks_to_profile.rb

@@ -0,0 +1,5 @@
+class AddShareBookmarksToProfile < ActiveRecord::Migration
+  def change
+    add_column :profiles, :share_bookmarks, :boolean
+  end
+end

data/lib/enju_bookmark.rb

@@ -1,5 +1,6 @@
 require "enju_bookmark/engine"
 require "enju_bookmark/user"
+require "enju_bookmark/profile"
 require "enju_bookmark/manifestation"
 require "enju_bookmark/bookmark_url"
 require "enju_bookmark/calculate_stat"
@@ -11,4 +12,5 @@ module EnjuBookmark
 end
 
 ActiveRecord::Base.send :include, EnjuBookmark::BookmarkUser
+ActiveRecord::Base.send :include, EnjuBookmark::BookmarkProfile
 ActiveRecord::Base.send :include, EnjuBookmark::BookmarkManifestation

data/lib/enju_bookmark/engine.rb

@@ -1,6 +1,6 @@
 require 'enju_seed'
 require 'acts-as-taggable-on'
-require 'state_machine'
+require 'statesman'
 require 'addressable/uri'
 require 'nkf'
 

data/lib/enju_bookmark/profile.rb

@@ -0,0 +1,13 @@
+module EnjuBookmark
+  module BookmarkProfile
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+      def enju_bookmark_profile_model
+        attr_accessible :share_bookmarks, as: :admin
+      end
+    end
+  end
+end

data/lib/enju_bookmark/user.rb

@@ -9,6 +9,8 @@ module EnjuBookmark
         include InstanceMethods
         has_many :bookmarks, :dependent => :destroy
         acts_as_tagger
+
+        attr_accessible :share_bookmarks, as: :admin
       end
     end
 

data/lib/enju_bookmark/version.rb

@@ -1,3 +1,3 @@
 module EnjuBookmark
-  VERSION = "0.1.2.pre14"
+  VERSION = "0.1.2.pre15"
 end

data/spec/controllers/bookmark_stat_has_manifestations_controller_spec.rb

@@ -11,7 +11,7 @@ describe BookmarkStatHasManifestationsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns all bookmark_stat_has_manifestations as @bookmark_stat_has_manifestations" do
         get :index
@@ -20,7 +20,7 @@ describe BookmarkStatHasManifestationsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns all bookmark_stat_has_manifestations as @bookmark_stat_has_manifestations" do
         get :index
@@ -29,7 +29,7 @@ describe BookmarkStatHasManifestationsController do
     end
 
     describe "When logged in as Manifestation" do
-      login_user
+      login_fixture_user
 
       it "assigns all bookmark_stat_has_manifestations as @bookmark_stat_has_manifestations" do
         get :index
@@ -49,7 +49,7 @@ describe BookmarkStatHasManifestationsController do
 
   describe "GET show" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested bookmark_stat_has_manifestation as @bookmark_stat_has_manifestation" do
         bookmark_stat_has_manifestation = FactoryGirl.create(:bookmark_stat_has_manifestation)
@@ -59,7 +59,7 @@ describe BookmarkStatHasManifestationsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested bookmark_stat_has_manifestation as @bookmark_stat_has_manifestation" do
         bookmark_stat_has_manifestation = FactoryGirl.create(:bookmark_stat_has_manifestation)
@@ -69,7 +69,7 @@ describe BookmarkStatHasManifestationsController do
     end
 
     describe "When logged in as Manifestation" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested bookmark_stat_has_manifestation as @bookmark_stat_has_manifestation" do
         bookmark_stat_has_manifestation = FactoryGirl.create(:bookmark_stat_has_manifestation)
@@ -89,7 +89,7 @@ describe BookmarkStatHasManifestationsController do
 
   describe "GET new" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested bookmark_stat_has_manifestation as @bookmark_stat_has_manifestation" do
         get :new
@@ -99,7 +99,7 @@ describe BookmarkStatHasManifestationsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "should not assign the requested bookmark_stat_has_manifestation as @bookmark_stat_has_manifestation" do
         get :new
@@ -109,7 +109,7 @@ describe BookmarkStatHasManifestationsController do
     end
 
     describe "When logged in as Manifestation" do
-      login_user
+      login_fixture_user
 
       it "should not assign the requested bookmark_stat_has_manifestation as @bookmark_stat_has_manifestation" do
         get :new
@@ -129,7 +129,7 @@ describe BookmarkStatHasManifestationsController do
 
   describe "GET edit" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested bookmark_stat_has_manifestation as @bookmark_stat_has_manifestation" do
         bookmark_stat_has_manifestation = FactoryGirl.create(:bookmark_stat_has_manifestation)
@@ -139,7 +139,7 @@ describe BookmarkStatHasManifestationsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested bookmark_stat_has_manifestation as @bookmark_stat_has_manifestation" do
         bookmark_stat_has_manifestation = FactoryGirl.create(:bookmark_stat_has_manifestation)
@@ -149,7 +149,7 @@ describe BookmarkStatHasManifestationsController do
     end
 
     describe "When logged in as Manifestation" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested bookmark_stat_has_manifestation as @bookmark_stat_has_manifestation" do
         bookmark_stat_has_manifestation = FactoryGirl.create(:bookmark_stat_has_manifestation)
@@ -174,7 +174,7 @@ describe BookmarkStatHasManifestationsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "assigns a newly created bookmark_stat_has_manifestation as @bookmark_stat_has_manifestation" do
@@ -202,7 +202,7 @@ describe BookmarkStatHasManifestationsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "assigns a newly created bookmark_stat_has_manifestation as @bookmark_stat_has_manifestation" do
@@ -230,7 +230,7 @@ describe BookmarkStatHasManifestationsController do
     end
 
     describe "When logged in as Manifestation" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "assigns a newly created bookmark_stat_has_manifestation as @bookmark_stat_has_manifestation" do
@@ -292,7 +292,7 @@ describe BookmarkStatHasManifestationsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "updates the requested bookmark_stat_has_manifestation" do
@@ -315,7 +315,7 @@ describe BookmarkStatHasManifestationsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "assigns the requested bookmark_stat_has_manifestation as @bookmark_stat_has_manifestation" do
@@ -342,7 +342,7 @@ describe BookmarkStatHasManifestationsController do
     end
 
     describe "When logged in as Manifestation" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "updates the requested bookmark_stat_has_manifestation" do
@@ -391,7 +391,7 @@ describe BookmarkStatHasManifestationsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "destroys the requested bookmark_stat_has_manifestation" do
         delete :destroy, :id => @bookmark_stat_has_manifestation.id
@@ -404,7 +404,7 @@ describe BookmarkStatHasManifestationsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "destroys the requested bookmark_stat_has_manifestation" do
         delete :destroy, :id => @bookmark_stat_has_manifestation.id
@@ -417,7 +417,7 @@ describe BookmarkStatHasManifestationsController do
     end
 
     describe "When logged in as Manifestation" do
-      login_user
+      login_fixture_user
 
       it "destroys the requested bookmark_stat_has_manifestation" do
         delete :destroy, :id => @bookmark_stat_has_manifestation.id