enju_bookmark 0.1.2.pre14 → 0.1.2.pre15

data/app/models/bookmark_stat_transition.rb

@@ -0,0 +1,20 @@
+class BookmarkStatTransition < ActiveRecord::Base
+  include Statesman::Adapters::ActiveRecordTransition
+
+  
+  belongs_to :bookmark_stat, inverse_of: :bookmark_stat_transitions
+  attr_accessible :to_state, :sort_key, :metadata
+end
+
+# == Schema Information
+#
+# Table name: bookmark_stat_transitions
+#
+#  id               :integer          not null, primary key
+#  to_state         :string(255)
+#  metadata         :text             default("{}")
+#  sort_key         :integer
+#  bookmark_stat_id :integer
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
+#

data/app/models/tag.rb

@@ -1,7 +1,7 @@
 class Tag < ActiveRecord::Base
   attr_accessible :name, :name_transcription
-  has_many :taggings, :dependent => :destroy, :class_name => 'ActsAsTaggableOn::Tagging'
-  validates :name, :presence => true
+  has_many :taggings, dependent: :destroy, class_name: 'ActsAsTaggableOn::Tagging'
+  validates :name, presence: true
   after_save :save_taggings
   after_destroy :save_taggings
 
@@ -13,7 +13,7 @@ class Tag < ActiveRecord::Base
     string :name
     time :created_at
     time :updated_at
-    integer :bookmark_ids, :multiple => true do
+    integer :bookmark_ids, multiple: true do
       tagged(Bookmark).compact.collect(&:id)
     end
     integer :taggings_count do
@@ -36,7 +36,7 @@ class Tag < ActiveRecord::Base
   end
 
   def save_taggings
-    self.taggings.collect(&:taggable).each do |t| t.save end
+    taggings.collect(&:taggable).each do |t| t.save end
   end
 
   def tagged(taggable_type)
@@ -53,5 +53,5 @@ end
 #  name_transcription :string(255)
 #  created_at         :datetime         not null
 #  updated_at         :datetime         not null
+#  taggings_count     :integer          default(0)
 #
-

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

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.bookmark_stat_has_manifestation')) -%></h1>
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.bookmark_stat_has_manifestation')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </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'), @bookmark_stat_has_manifestation -%></li>
     <li><%= link_to t('page.back'), bookmark_stat_has_manifestations_path -%></li>

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

@@ -1,5 +1,5 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.bookmark_stat_has_manifestation')) -%></h1>
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.bookmark_stat_has_manifestation')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
@@ -16,7 +16,7 @@
     <td><%= bookmark_stat_has_manifestation.bookmarks_count -%></td>
     <td><%= link_to t('page.show'), bookmark_stat_has_manifestation -%></td>
     <td><%= link_to t('page.edit'), edit_bookmark_stat_has_manifestation_path(bookmark_stat_has_manifestation) -%></td>
-    <td><%= link_to t('page.destroy'), bookmark_stat_has_manifestation, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%></td>
+    <td><%= link_to t('page.destroy'), bookmark_stat_has_manifestation, data: {confirm: t('page.are_you_sure')}, method: :delete -%></td>
   </tr>
 <%- end -%>
 </table>
@@ -25,8 +25,8 @@
 </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.new', :model => t('activerecord.models.bookmark_stat_has_manifestation')), new_bookmark_stat_has_manifestation_path -%></li>
+    <li><%= link_to t('page.new', model: t('activerecord.models.bookmark_stat_has_manifestation')), new_bookmark_stat_has_manifestation_path -%></li>
   </ul>
 </div>

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

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.bookmark_stat_has_manifestation')) -%></h1>
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.bookmark_stat_has_manifestation')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </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'), bookmark_stat_has_manifestations_path -%></li>
   </ul>

data/app/views/bookmark_stat_has_manifestations/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.bookmark_stat_has_manifestation')) -%></h1>
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.bookmark_stat_has_manifestation')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 
@@ -21,7 +21,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.edit'), edit_bookmark_stat_has_manifestation_path(@bookmark_stat_has_manifestation) -%></li>
     <li><%= back_to_index(flash[:page_info]) -%></li>

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

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.bookmark_stat')) -%></h1>
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.bookmark_stat')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </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'), @bookmark_stat -%></li>
     <li><%= link_to t('page.back'), bookmark_stats_path -%></li>

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

@@ -1,5 +1,5 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.bookmark_stat')) -%></h1>
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.bookmark_stat')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
@@ -14,11 +14,11 @@
   <tr class="line<%= cycle("0", "1") -%>">
     <td><%= l(bookmark_stat.start_date) -%></td>
     <td><%= l(bookmark_stat.end_date) -%></td>
-    <td><%= bookmark_stat.state -%></td>
+    <td><%= bookmark_stat.current_state -%></td>
     <td>
       <%= link_to t('page.show'), bookmark_stat -%>
       <%= link_to t('page.edit'), edit_bookmark_stat_path(bookmark_stat) -%>
-      <%= link_to t('page.destroy'), bookmark_stat, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+      <%= link_to t('page.destroy'), bookmark_stat, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
     </td>
   </tr>
 <%- end -%>
@@ -28,8 +28,8 @@
 </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.new', :model => t('activerecord.models.bookmark_stat')), new_bookmark_stat_path -%></li>
+    <li><%= link_to t('page.new', model: t('activerecord.models.bookmark_stat')), new_bookmark_stat_path -%></li>
   </ul>
 </div>

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

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.bookmark_stat')) -%></h1>
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.bookmark_stat')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </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'), bookmark_stats_path -%></li>
   </ul>

data/app/views/bookmark_stats/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.bookmark_stat')) -%></h1>
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.bookmark_stat')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 
@@ -15,7 +15,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.bookmark_stat.state') -%>:</strong>
-  <%= @bookmark_stat.state -%>
+  <%= @bookmark_stat.current_state -%>
 </p>
 
 <p>
@@ -31,7 +31,7 @@
   <%- @stats.each do |stat| -%>
     <tr class="line<%= cycle("0", "1") -%>">
       <td>
-        <%= render 'manifestations/show_index', :manifestation => stat.manifestation if stat.manifestation -%>
+        <%= render 'manifestations/show_index', manifestation: stat.manifestation if stat.manifestation -%>
       </td>
       <td><%= stat.bookmarks_count -%></td>
     </tr>
@@ -43,13 +43,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.edit'), edit_bookmark_stat_path(@bookmark_stat) -%></li>
     <li><%= back_to_index(flash[:page_info]) -%></li>
   </ul>
   <h4><%= t('page.export') -%></h4>
   <ul>
-    <li><%= link_to 'CSV', bookmark_stat_path(@bookmark_stat, :format => :csv, :locale => @locale.to_s) -%></li>
+    <li><%= link_to 'TSV', bookmark_stat_path(@bookmark_stat, format: :txt) -%></li>
   </ul>
 </div>

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

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.bookmark')) -%></h1>
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.bookmark')) -%></h1>
 <div id="content_list">
   
 <div class="search_form">
-  <%= form_for :bookmarks, :url => bookmarks_path, :html => {:method => 'get'} do -%>
+  <%= form_for :bookmarks, url: bookmarks_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 -%>
@@ -21,15 +21,15 @@
 
 <%- @bookmarks.each do |bookmark| -%>
   <tr class="line<%= cycle("0", "1") -%>">
-    <td><%= link_to bookmark.user.username, bookmark.user -%></td>
+    <td><%= link_to bookmark.user.username, bookmark.user.username -%></td>
     <td>
-      <%= render 'manifestations/show_index', :manifestation => bookmark.manifestation -%>
+      <%= render 'manifestations/show_index', manifestation: bookmark.manifestation -%>
     </td>
     <td><%= l(bookmark.created_at) -%></td>
     <td>
       <%- if can? :delete, bookmark -%>
         <%= link_to t('page.show'), bookmark_path(bookmark) -%>
-        <%= link_to t('page.destroy'), bookmark_path(bookmark), :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+        <%= link_to t('page.destroy'), bookmark_path(bookmark), data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
   </tr>
@@ -41,7 +41,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <%- if user_signed_in? -%>
     <h4><%= t('page.bookmarklet') -%></h4>
     <ul>

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

@@ -1,14 +1,14 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.bookmark')) -%></h1>
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.bookmark')) -%></h1>
 <div id="content_list">
   <h2 class="resource_title">
-    <%= t('bookmark.user_bookmark', :login_name => @user.username) -%>
+    <%= t('bookmark.user_bookmark', login_name: @user.username) -%>
   </h2>
 
 <div class="search_form">
-  <%= form_for :bookmarks, :url => user_bookmarks_path(@user), :html => {:method => 'get'} do -%>
+  <%= form_for :bookmarks, url: bookmarks_path(user_id: @user.username), 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 -%>
@@ -24,14 +24,14 @@
 
 <%- @bookmarks.each do |bookmark| -%>
   <tr class="line<%= cycle("0", "1") -%>">
-    <td><%= link_to bookmark.user.username, bookmark.user -%></td>
+    <td><%= link_to bookmark.user.username, bookmark.user.profile -%></td>
     <td>
-      <%= render 'manifestations/show_index', :manifestation => bookmark.manifestation -%>
+      <%= render 'manifestations/show_index', manifestation: bookmark.manifestation -%>
     </td>
     <td><%= l(bookmark.created_at) -%></td>
     <td>
       <%- if can? :delete, bookmark -%>
-        <%= link_to t('page.destroy'), bookmark, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+        <%= link_to t('page.destroy'), bookmark, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
   </tr>
@@ -43,7 +43,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <%- if user_signed_in? -%>
     <h4><%= t('page.bookmarklet') -%></h4>
     <ul>

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

@@ -3,7 +3,7 @@
     <ul class="popularity">
       <%- unless @tags.empty? -%>
         <%- tag_cloud @tags, ['popular', 'v-popular', 'vv-popular', 'vvv-popular', 'vvvv-popular'] do |tag, css_class| -%>
-          <li><%= link_to tag.name, manifestations_path(:tag => tag.name), :class => css_class %></li>
+          <li><%= link_to tag.name, manifestations_path(tag: tag.name), class: css_class %></li>
         <% end %>
       <% end %>
     </ul>

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

@@ -1,8 +1,8 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.bookmark')) -%></h1>
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.bookmark')) -%></h1>
 <div id="content_list">
 
-<%= form_for(@bookmark, :url => bookmark_path(@bookmark)) do |f| -%>
+<%= form_for(@bookmark, url: bookmark_path(@bookmark)) do |f| -%>
   <%= f.error_messages -%>
 
   <div class="field">
@@ -16,7 +16,7 @@
 
   <div class="field">
     <%= f.label t('activerecord.models.tag') -%><br />
-    <%= f.text_field :tag_list, :class => 'resource_title' -%>
+    <%= f.text_field :tag_list, class: 'resource_title' -%>
   </div>
 
   <div class="field">
@@ -26,7 +26,7 @@
 
   <div class="field">
     <%= f.label :note -%><br />
-    <%= f.text_area :note, :class => 'resource_textarea' -%>
+    <%= f.text_area :note, class: 'resource_textarea' -%>
   </div>
 
   <div class="actions">
@@ -36,10 +36,10 @@
 </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.showing', :model => t('activerecord.models.manifestation')), @bookmark.manifestation -%></li>
+    <li><%= link_to t('page.showing', model: t('activerecord.models.manifestation')), @bookmark.manifestation -%></li>
     <li><%= link_to t('page.show'), @bookmark -%></li>
-    <li><%= link_to t('page.back'), user_bookmarks_path(@bookmark.user) -%></li>
+    <li><%= link_to t('page.back'), bookmarks_path(user_id: @bookmark.user.username) -%></li>
   </ul>
 </div>

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

@@ -1,5 +1,5 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.bookmark')) -%></h1>
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.bookmark')) -%></h1>
 <div id="content_list">
 
 <%= form_for(@bookmark) do |f| -%>
@@ -7,16 +7,16 @@
 
   <div class="field">
     <%= f.label t('page.title') -%><br />
-    <%= f.text_field :title, :class => 'resource_title' -%>
+    <%= f.text_field :title, class: 'resource_title' -%>
   </div>
 
   <div class="field">
     <%= f.label :url -%><br />
     <%- if @bookmark.url -%>
       <%= link_to @bookmark.url, @bookmark.url -%>
-      <%= f.hidden_field :url, :class => 'resource_url' -%>
+      <%= f.hidden_field :url, class: 'resource_url' -%>
     <%- else -%>
-      <%= f.url_field :url, :class => 'resource_url' -%>
+      <%= f.url_field :url, class: 'resource_url' -%>
     <%- end -%>
   </div>
 
@@ -32,7 +32,7 @@
 
   <div class="field">
     <%= f.label :note -%><br />
-    <%= f.text_area :note, :class => 'resource_textarea' -%>
+    <%= f.text_area :note, class: 'resource_textarea' -%>
   </div>
 
   <div class="actions">
@@ -43,7 +43,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.back'), :back -%></li>
   </ul>

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

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.bookmark')) -%></h1>
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.bookmark')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 
 <p>
   <strong><%= t('activerecord.models.user') -%>:</strong>
-  <%= link_to @bookmark.user.username, @bookmark.user -%>
+  <%= link_to @bookmark.user.username, @bookmark.user.profile -%>
 </p>
 
 <p>
@@ -21,7 +21,7 @@
 <p>
   <strong><%= t('page.tag') -%>:</strong>
   <%- @bookmark.tag_counts.collect {|tag| -%>
-  <%= link_to tag.name, manifestations_path(:tag => tag.name) -%>
+  <%= link_to tag.name, manifestations_path(tag: tag.name) -%>
   <%- } -%>
 </p>
 
@@ -43,11 +43,11 @@
 </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.edit'),edit_bookmark_path(@bookmark) -%></li>
-    <li><%= link_to t('page.destroy'), @bookmark, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%></li>
-    <li><%= link_to t('page.back_to', :model => t('activerecord.models.manifestation')), @bookmark.manifestation -%></li>
+    <li><%= link_to t('page.destroy'), @bookmark, data: {confirm: t('page.are_you_sure')}, method: :delete -%></li>
+    <li><%= link_to t('page.back_to', model: t('activerecord.models.manifestation')), @bookmark.manifestation -%></li>
     <li><%= link_to t('page.back'), bookmarks_url -%></li>
   </ul>
 </div>