enju_bookmark 0.0.5 → 0.0.6

data/app/controllers/bookmark_stat_has_manifestations_controller.rb

@@ -43,8 +43,7 @@ class BookmarkStatHasManifestationsController < ApplicationController
 
     respond_to do |format|
       if @bookmark_stat_has_manifestation.save
-        flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.bookmark_stat_has_manifestation'))
-        format.html { redirect_to(@bookmark_stat_has_manifestation) }
+        format.html { redirect_to @bookmark_stat_has_manifestation, :notice => t('controller.successfully_created', :model => t('activerecord.models.bookmark_stat_has_manifestation')) }
         format.json { render :json => @bookmark_stat_has_manifestation, :status => :created, :location => @bookmark_stat_has_manifestation }
       else
         format.html { render :action => "new" }
@@ -58,9 +57,8 @@ class BookmarkStatHasManifestationsController < ApplicationController
   def update
     respond_to do |format|
       if @bookmark_stat_has_manifestation.update_attributes(params[:bookmark_stat_has_manifestation])
-        flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.bookmark_stat_has_manifestation'))
-        format.html { redirect_to(@bookmark_stat_has_manifestation) }
-        format.json { head :ok }
+        format.html { redirect_to @bookmark_stat_has_manifestation, :notice => t('controller.successfully_updated', :model => t('activerecord.models.bookmark_stat_has_manifestation')) }
+      format.json { head :no_content }
       else
         format.html { render :action => "edit" }
         format.json { render :json => @bookmark_stat_has_manifestation.errors, :status => :unprocessable_entity }
@@ -74,8 +72,8 @@ class BookmarkStatHasManifestationsController < ApplicationController
     @bookmark_stat_has_manifestation.destroy
 
     respond_to do |format|
-      format.html { redirect_to(bookmark_stat_has_manifestations_url) }
-      format.json { head :ok }
+      format.html { redirect_to bookmark_stat_has_manifestations_url }
+      format.json { head :no_content }
     end
   end
 end

data/app/controllers/bookmark_stats_controller.rb

@@ -48,8 +48,7 @@ class BookmarkStatsController < ApplicationController
 
     respond_to do |format|
       if @bookmark_stat.save
-        flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.bookmark_stat'))
-        format.html { redirect_to(@bookmark_stat) }
+        format.html { redirect_to @bookmark_stat, :notice => t('controller.successfully_created', :model => t('activerecord.models.bookmark_stat')) }
         format.json { render :json => @bookmark_stat, :status => :created, :location => @bookmark_stat }
       else
         format.html { render :action => "new" }
@@ -63,9 +62,8 @@ class BookmarkStatsController < ApplicationController
   def update
     respond_to do |format|
       if @bookmark_stat.update_attributes(params[:bookmark_stat])
-        flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.bookmark_stat'))
-        format.html { redirect_to(@bookmark_stat) }
-        format.json { head :ok }
+        format.html { redirect_to @bookmark_stat, :notice => t('controller.successfully_updated', :model => t('activerecord.models.bookmark_stat')) }
+        format.json { head :no_content }
       else
         format.html { render :action => "edit" }
         format.json { render :json => @bookmark_stat.errors, :status => :unprocessable_entity }
@@ -79,8 +77,8 @@ class BookmarkStatsController < ApplicationController
     @bookmark_stat.destroy
 
     respond_to do |format|
-      format.html { redirect_to(bookmark_stats_url) }
-      format.json { head :ok }
+      format.html { redirect_to bookmark_stats_url }
+      format.json { head :no_content }
     end
   end
 end

data/app/controllers/bookmarks_controller.rb

@@ -3,7 +3,7 @@ class BookmarksController < ApplicationController
   before_filter :store_location
   load_and_authorize_resource :except => :index
   authorize_resource :only => :index
-  before_filter :get_user_if_nil, :only => :index
+  before_filter :get_user, :only => :index
   after_filter :solr_commit, :only => [:create, :update, :destroy]
   cache_sweeper :bookmark_sweeper, :only => [:create, :update, :destroy]
 
@@ -71,7 +71,7 @@ class BookmarksController < ApplicationController
     end
   end
 
-  # GET /bookmarks/1;edit
+  # GET /bookmarks/1/edit
   def edit
   end
 
@@ -87,10 +87,10 @@ class BookmarksController < ApplicationController
         @bookmark.manifestation.index!
         if params[:mode] == 'tag_edit'
           format.html { redirect_to(@bookmark.manifestation) }
-          format.json { render :json => @bookmark, :status => :created, :location => bookmark_url(@bookmark) }
+          format.json { render :json => @bookmark, :status => :created, :location => @bookmark }
         else
           format.html { redirect_to(@bookmark) }
-          format.json { render :json => @bookmark, :status => :created, :location => bookmark_url(@bookmark) }
+          format.json { render :json => @bookmark, :status => :created, :location => @bookmark }
         end
       else
         @user = current_user
@@ -118,11 +118,11 @@ class BookmarksController < ApplicationController
         @bookmark.create_tag_index
         case params[:mode]
         when 'tag_edit'
-          format.html { redirect_to(@bookmark.manifestation) }
-          format.json { head :ok }
+          format.html { redirect_to @bookmark.manifestation }
+          format.json { head :no_content }
         else
-          format.html { redirect_to bookmark_url(@bookmark) }
-          format.json { head :ok }
+          format.html { redirect_to @bookmark }
+          format.json { head :no_content }
         end
       else
         format.html { render :action => "edit" }
@@ -141,12 +141,12 @@ class BookmarksController < ApplicationController
     if @user
       respond_to do |format|
         format.html { redirect_to user_bookmarks_url(@user) }
-        format.json { head :ok }
+        format.json { head :no_content }
       end
     else
       respond_to do |format|
         format.html { redirect_to user_bookmarks_url(@bookmark.user) }
-        format.json { head :ok }
+        format.json { head :no_content }
       end
     end
   end

data/app/controllers/tags_controller.rb

@@ -1,6 +1,6 @@
 class TagsController < ApplicationController
   load_and_authorize_resource
-  before_filter :get_user_if_nil
+  before_filter :get_user
   after_filter :solr_commit, :only => [:create, :update, :destroy]
   cache_sweeper :bookmark_sweeper, :only => [:create, :update, :destroy]
 
@@ -35,9 +35,6 @@ class TagsController < ApplicationController
   end
 
   def show
-    #@tag = Tag.find(params[:id])
-    raise ActiveRecord::RecordNotFound if @tag.blank?
-
     respond_to do |format|
       format.html # show.html.erb
       format.json { render :json => @tag }
@@ -53,9 +50,8 @@ class TagsController < ApplicationController
 
     respond_to do |format|
       if @tag.update_attributes(params[:tag])
-        flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.tag'))
-        format.html { redirect_to tag_url(@tag.name) }
-        format.json { head :ok }
+        format.html { redirect_to @tag, :notice => t('controller.successfully_updated', :model => t('activerecord.models.tag')) }
+        format.json { head :no_content }
       else
         format.html { render :action => "edit" }
         format.json { render :json => @tag.errors, :status => :unprocessable_entity }
@@ -70,8 +66,8 @@ class TagsController < ApplicationController
     @tag.destroy
 
     respond_to do |format|
-      format.html { redirect_to(tags_url) }
-      format.json { head :ok }
+      format.html { redirect_to tags_url }
+      format.json { head :no_content }
     end
   end
 end

data/app/models/bookmark_stat.rb

@@ -19,7 +19,7 @@ class BookmarkStat < ActiveRecord::Base
   def calculate_count
     self.started_at = Time.zone.now
     Manifestation.find_each do |manifestation|
-      daily_count = Bookmark.manifestations_count(self.start_date, self.end_date, manifestation)
+      daily_count = Bookmark.manifestations_count(start_date, end_date, manifestation)
       #manifestation.update_attributes({:daily_bookmarks_count => daily_count, :total_count => manifestation.total_count + daily_count})
       if daily_count > 0
         self.manifestations << manifestation

data/db/migrate/20081212151614_create_bookmark_stats.rb

@@ -1,19 +1,14 @@
 class CreateBookmarkStats < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :bookmark_stats do |t|
       t.datetime :start_date
       t.datetime :end_date
-      t.text :note
-      t.string :state
       t.datetime :started_at
       t.datetime :completed_at
+      t.text :note
+      t.string :state
 
       t.timestamps
     end
-    add_index :bookmark_stats, :state
-  end
-
-  def self.down
-    drop_table :bookmark_stats
   end
 end

data/db/migrate/20081212151820_create_bookmark_stat_has_manifestations.rb

@@ -1,5 +1,5 @@
 class CreateBookmarkStatHasManifestations < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :bookmark_stat_has_manifestations do |t|
       t.integer :bookmark_stat_id, :null => false
       t.integer :manifestation_id, :null => false
@@ -10,8 +10,4 @@ class CreateBookmarkStatHasManifestations < ActiveRecord::Migration
     add_index :bookmark_stat_has_manifestations, :bookmark_stat_id
     add_index :bookmark_stat_has_manifestations, :manifestation_id
   end
-
-  def self.down
-    drop_table :bookmark_stat_has_manifestations
-  end
 end

data/lib/enju_bookmark/engine.rb

@@ -8,6 +8,7 @@ require 'friendly_id'
 require 'will_paginate'
 require 'addressable/uri'
 require 'nkf'
+require 'acts_as_list'
 
 module EnjuBookmark
   class Engine < Rails::Engine

data/lib/enju_bookmark/version.rb

@@ -1,3 +1,3 @@
 module EnjuBookmark
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/dummy/app/controllers/application_controller.rb

@@ -48,7 +48,7 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  def get_user_if_nil
+  def get_user
     @user = User.where(:username => params[:user_id]).first if params[:user_id]
     #authorize! :show, @user if @user
   end

data/spec/dummy/db/schema.rb

@@ -17,8 +17,8 @@ ActiveRecord::Schema.define(:version => 20111231145823) do
     t.integer  "bookmark_stat_id", :null => false
     t.integer  "manifestation_id", :null => false
     t.integer  "bookmarks_count"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
   end
 
   add_index "bookmark_stat_has_manifestations", ["bookmark_stat_id"], :name => "index_bookmark_stat_has_manifestations_on_bookmark_stat_id"
@@ -27,16 +27,14 @@ ActiveRecord::Schema.define(:version => 20111231145823) do
   create_table "bookmark_stats", :force => true do |t|
     t.datetime "start_date"
     t.datetime "end_date"
-    t.text     "note"
-    t.string   "state"
     t.datetime "started_at"
     t.datetime "completed_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.text     "note"
+    t.string   "state"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
   end
 
-  add_index "bookmark_stats", ["state"], :name => "index_bookmark_stats_on_state"
-
   create_table "bookmarks", :force => true do |t|
     t.integer  "user_id",          :null => false
     t.integer  "manifestation_id"
@@ -44,8 +42,8 @@ ActiveRecord::Schema.define(:version => 20111231145823) do
     t.string   "url"
     t.text     "note"
     t.boolean  "shared"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
   end
 
   add_index "bookmarks", ["manifestation_id"], :name => "index_bookmarks_on_manifestation_id"
@@ -57,8 +55,8 @@ ActiveRecord::Schema.define(:version => 20111231145823) do
     t.text     "display_name"
     t.text     "note"
     t.integer  "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
   end
 
   create_table "checkout_types", :force => true do |t|
@@ -66,8 +64,8 @@ ActiveRecord::Schema.define(:version => 20111231145823) do
     t.text     "display_name"
     t.text     "note"
     t.integer  "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
   end
 
   add_index "checkout_types", ["name"], :name => "index_checkout_types_on_name"
@@ -77,8 +75,8 @@ ActiveRecord::Schema.define(:version => 20111231145823) do
     t.text     "display_name"
     t.text     "note"
     t.integer  "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
   end
 
   create_table "content_types", :force => true do |t|
@@ -86,8 +84,8 @@ ActiveRecord::Schema.define(:version => 20111231145823) do
     t.text     "display_name"
     t.text     "note"
     t.integer  "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
   end
 
   create_table "exemplifies", :force => true do |t|
@@ -95,8 +93,8 @@ ActiveRecord::Schema.define(:version => 20111231145823) do
     t.integer  "item_id",          :null => false
     t.string   "type"
     t.integer  "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
   end
 
   add_index "exemplifies", ["item_id"], :name => "index_exemplifies_on_item_id", :unique => true
@@ -106,8 +104,8 @@ ActiveRecord::Schema.define(:version => 20111231145823) do
   create_table "item_has_use_restrictions", :force => true do |t|
     t.integer  "item_id",            :null => false
     t.integer  "use_restriction_id", :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
   end
 
   add_index "item_has_use_restrictions", ["item_id"], :name => "index_item_has_use_restrictions_on_item_id"
@@ -118,8 +116,8 @@ ActiveRecord::Schema.define(:version => 20111231145823) do
     t.string   "item_identifier"
     t.integer  "circulation_status_id",       :default => 5,     :null => false
     t.integer  "checkout_type_id",            :default => 1,     :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                                     :null => false
+    t.datetime "updated_at",                                     :null => false
     t.datetime "deleted_at"
     t.integer  "shelf_id",                    :default => 1,     :null => false
     t.integer  "basket_id"
@@ -178,8 +176,8 @@ ActiveRecord::Schema.define(:version => 20111231145823) do
     t.integer  "users_count",           :default => 0,   :null => false
     t.integer  "position"
     t.integer  "country_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                             :null => false
+    t.datetime "updated_at",                             :null => false
     t.datetime "deleted_at"
   end
 
@@ -198,8 +196,8 @@ ActiveRecord::Schema.define(:version => 20111231145823) do
     t.integer  "valid_period_for_new_user",   :default => 365,                      :null => false
     t.boolean  "post_to_union_catalog",       :default => false,                    :null => false
     t.integer  "country_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                                                        :null => false
+    t.datetime "updated_at",                                                        :null => false
     t.text     "admin_networks"
     t.boolean  "allow_bookmark_external_url", :default => false,                    :null => false
     t.integer  "position"
@@ -216,8 +214,8 @@ ActiveRecord::Schema.define(:version => 20111231145823) do
     t.string   "manifestation_identifier"
     t.datetime "date_of_publication"
     t.datetime "copyright_date"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                                  :null => false
+    t.datetime "updated_at",                                  :null => false
     t.datetime "deleted_at"
     t.string   "access_address"
     t.integer  "language_id",              :default => 1,     :null => false
@@ -254,10 +252,10 @@ ActiveRecord::Schema.define(:version => 20111231145823) do
     t.integer  "frequency_id",             :default => 1,     :null => false
     t.boolean  "subscription_master",      :default => false, :null => false
     t.string   "pub_date"
+    t.string   "edition_string"
     t.integer  "volume_number"
     t.integer  "issue_number"
     t.integer  "serial_number"
-    t.string   "edition_string"
   end
 
   add_index "manifestations", ["access_address"], :name => "index_manifestations_on_access_address"
@@ -277,8 +275,8 @@ ActiveRecord::Schema.define(:version => 20111231145823) do
     t.text     "display_name"
     t.text     "note"
     t.integer  "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
   end
 
   create_table "patrons", :force => true do |t|
@@ -294,8 +292,8 @@ ActiveRecord::Schema.define(:version => 20111231145823) do
     t.string   "full_name"
     t.text     "full_name_transcription"
     t.text     "full_name_alternative"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                                  :null => false
+    t.datetime "updated_at",                                  :null => false
     t.datetime "deleted_at"
     t.string   "zip_code_1"
     t.string   "zip_code_2"
@@ -342,16 +340,16 @@ ActiveRecord::Schema.define(:version => 20111231145823) do
     t.text     "display_name"
     t.text     "note"
     t.integer  "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
   end
 
   create_table "series_has_manifestations", :force => true do |t|
     t.integer  "series_statement_id"
     t.integer  "manifestation_id"
     t.integer  "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",          :null => false
+    t.datetime "updated_at",          :null => false
   end
 
   add_index "series_has_manifestations", ["manifestation_id"], :name => "index_series_has_manifestations_on_manifestation_id"
@@ -365,8 +363,8 @@ ActiveRecord::Schema.define(:version => 20111231145823) do
     t.integer  "position"
     t.text     "title_transcription"
     t.text     "title_alternative"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
     t.string   "series_statement_identifier"
     t.string   "issn"
     t.boolean  "periodical"
@@ -384,8 +382,8 @@ ActiveRecord::Schema.define(:version => 20111231145823) do
     t.integer  "library_id",   :default => 1, :null => false
     t.integer  "items_count",  :default => 0, :null => false
     t.integer  "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
     t.datetime "deleted_at"
   end
 
@@ -407,8 +405,8 @@ ActiveRecord::Schema.define(:version => 20111231145823) do
   create_table "tags", :force => true do |t|
     t.string   "name"
     t.string   "name_transcription"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
   end
 
   create_table "use_restrictions", :force => true do |t|
@@ -416,8 +414,8 @@ ActiveRecord::Schema.define(:version => 20111231145823) do
     t.text     "display_name"
     t.text     "note"
     t.integer  "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
   end
 
   create_table "user_groups", :force => true do |t|
@@ -425,15 +423,15 @@ ActiveRecord::Schema.define(:version => 20111231145823) do
     t.text     "display_name"
     t.text     "note"
     t.integer  "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
   end
 
   create_table "user_has_roles", :force => true do |t|
     t.integer  "user_id"
     t.integer  "role_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   create_table "users", :force => true do |t|
@@ -442,8 +440,8 @@ ActiveRecord::Schema.define(:version => 20111231145823) do
     t.string   "username"
     t.text     "note"
     t.string   "locale"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                                            :null => false
+    t.datetime "updated_at",                                            :null => false
     t.string   "email",                                 :default => "", :null => false
     t.string   "encrypted_password",     :limit => 128, :default => "", :null => false
     t.string   "reset_password_token"