enju_bookmark 0.1.2.pre14 → 0.1.2.pre15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbc1d55fc13c43c2ab1ed0e67ecf78ff62b2bf0f
-  data.tar.gz: 2b1c94a2709c235853e1badd437bd6fbcda61567
+  metadata.gz: 597585d3b39392f7465ae13a8dc80e8623d94c25
+  data.tar.gz: 07ab6bca2ef50010e713b9174cbd0fc350d94adf
 SHA512:
-  metadata.gz: a1eb6391d5c5b72482d90777b6ce2f15f81f79849a4047b39952a87332226679d2385d2c5ee71446c458ab7da060349fa55d57292c9819e8665d506669e0952e
-  data.tar.gz: 9c7f5d217200b326c6d0ba76027857dd4bbddd5ec74371cb12105965c9c94d788a15f97b96ae5c0b0ac7a16cd6cee538e2181be808b9aa124f7b5b587636175d
+  metadata.gz: 74bdf38277422a83a639401a630e86f8c60ff059b5c4105e928e167e9dfd1d95118a4e32063bb812b433b08524d8eacfd17b832bb9c544f78c44f181b52fc46f
+  data.tar.gz: b6da333ffed0d4ddaabac3e24767d2968aedd731d1a4d9ce7a5788fccf4e3f08abc68bb46fcc586e692f7712799eaf495296d78349d139f96939bb0bf8ccd896

data/app/controllers/bookmark_stat_has_manifestations_controller.rb

@@ -8,7 +8,7 @@ class BookmarkStatHasManifestationsController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @bookmark_stat_has_manifestations }
+      format.json { render json: @bookmark_stat_has_manifestations }
     end
   end
 
@@ -17,7 +17,7 @@ class BookmarkStatHasManifestationsController < ApplicationController
   def show
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @bookmark_stat_has_manifestation }
+      format.json { render json: @bookmark_stat_has_manifestation }
     end
   end
 
@@ -28,7 +28,7 @@ class BookmarkStatHasManifestationsController < ApplicationController
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @bookmark_stat_has_manifestation }
+      format.json { render json: @bookmark_stat_has_manifestation }
     end
   end
 
@@ -40,15 +40,15 @@ class BookmarkStatHasManifestationsController < ApplicationController
   # POST /bookmark_stat_has_manifestations.json
   def create
     @bookmark_stat_has_manifestation = BookmarkStatHasManifestation.new
-    @bookmark_stat_has_manifestation.assign_attributes(params[:bookmark_stat_has_manifestation], :as => :admin)
+    @bookmark_stat_has_manifestation.assign_attributes(params[:bookmark_stat_has_manifestation], as: :admin)
 
     respond_to do |format|
       if @bookmark_stat_has_manifestation.save
-        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 }
+        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" }
-        format.json { render :json => @bookmark_stat_has_manifestation.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @bookmark_stat_has_manifestation.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -56,14 +56,14 @@ class BookmarkStatHasManifestationsController < ApplicationController
   # PUT /bookmark_stat_has_manifestations/1
   # PUT /bookmark_stat_has_manifestations/1.json
   def update
-    @bookmark_stat_has_manifestation.assign_attributes(params[:bookmark_stat_has_manifestation], :as => :admin)
+    @bookmark_stat_has_manifestation.assign_attributes(params[:bookmark_stat_has_manifestation], as: :admin)
     respond_to do |format|
       if @bookmark_stat_has_manifestation.save
-        format.html { redirect_to @bookmark_stat_has_manifestation, :notice => t('controller.successfully_updated', :model => t('activerecord.models.bookmark_stat_has_manifestation')) }
+        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 }
+        format.html { render action: "edit" }
+        format.json { render json: @bookmark_stat_has_manifestation.errors, status: :unprocessable_entity }
       end
     end
   end

data/app/controllers/bookmark_stats_controller.rb

@@ -1,6 +1,6 @@
 class BookmarkStatsController < ApplicationController
   load_and_authorize_resource
-  after_filter :convert_charset, :only => :show
+  after_filter :convert_charset, only: :show
 
   # GET /bookmark_stats
   # GET /bookmark_stats.json
@@ -9,14 +9,14 @@ class BookmarkStatsController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @bookmark_stats }
+      format.json { render json: @bookmark_stats }
     end
   end
 
   # GET /bookmark_stats/1
   # GET /bookmark_stats/1.json
   def show
-    if params[:format] == 'csv'
+    if params[:format] == 'txt'
       per_page = 65534
     else
       per_page = BookmarkStatHasManifestation.default_per_page
@@ -25,8 +25,8 @@ class BookmarkStatsController < ApplicationController
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @bookmark_stat }
-      format.csv
+      format.json { render json: @bookmark_stat }
+      format.txt
     end
   end
 
@@ -37,7 +37,7 @@ class BookmarkStatsController < ApplicationController
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @bookmark_stat }
+      format.json { render json: @bookmark_stat }
     end
   end
 
@@ -52,11 +52,11 @@ class BookmarkStatsController < ApplicationController
 
     respond_to do |format|
       if @bookmark_stat.save
-        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 }
+        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" }
-        format.json { render :json => @bookmark_stat.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @bookmark_stat.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -66,11 +66,11 @@ class BookmarkStatsController < ApplicationController
   def update
     respond_to do |format|
       if @bookmark_stat.update_attributes(params[:bookmark_stat])
-        format.html { redirect_to @bookmark_stat, :notice => t('controller.successfully_updated', :model => t('activerecord.models.bookmark_stat')) }
+        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 }
+        format.html { render action: "edit" }
+        format.json { render json: @bookmark_stat.errors, status: :unprocessable_entity }
       end
     end
   end

data/app/controllers/bookmarks_controller.rb

@@ -1,11 +1,10 @@
 # -*- encoding: utf-8 -*-
 class BookmarksController < ApplicationController
   before_filter :store_location
-  load_and_authorize_resource :except => :index
-  authorize_resource :only => :index
-  before_filter :get_user, :only => :index
-  after_filter :solr_commit, :only => [:create, :update, :destroy]
-  cache_sweeper :bookmark_sweeper, :only => [:create, :update, :destroy]
+  load_and_authorize_resource except: :index
+  authorize_resource only: :index
+  before_filter :get_user, only: :index
+  after_filter :solr_commit, only: [:create, :update, :destroy]
 
   # GET /bookmarks
   # GET /bookmarks.json
@@ -17,7 +16,7 @@ class BookmarksController < ApplicationController
     end
     user = @user
     unless current_user.has_role?('Librarian')
-      if user and user != current_user and !user.try(:share_bookmarks)
+      if user and user != current_user and !user.profile.try(:share_bookmarks)
         access_denied; return
       end
       if current_user == @user
@@ -42,7 +41,7 @@ class BookmarksController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @bookmarks }
+      format.json { render json: @bookmarks }
     end
   end
 
@@ -51,7 +50,7 @@ class BookmarksController < ApplicationController
   def show
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @bookmark }
+      format.json { render json: @bookmark }
     end
   end
 
@@ -82,20 +81,20 @@ class BookmarksController < ApplicationController
 
     respond_to do |format|
       if @bookmark.save
-        flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.bookmark'))
+        flash[:notice] = t('controller.successfully_created', model: t('activerecord.models.bookmark'))
         @bookmark.create_tag_index
         @bookmark.manifestation.index!
         if params[:mode] == 'tag_edit'
           format.html { redirect_to(@bookmark.manifestation) }
-          format.json { render :json => @bookmark, :status => :created, :location => @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 }
+          format.json { render json: @bookmark, status: :created, location: @bookmark }
         end
       else
         @user = current_user
-        format.html { render :action => "new" }
-        format.json { render :json => @bookmark.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @bookmark.errors, status: :unprocessable_entity }
       end
     end
 
@@ -113,7 +112,7 @@ class BookmarksController < ApplicationController
 
     respond_to do |format|
       if @bookmark.update_attributes(params[:bookmark])
-        flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.bookmark'))
+        flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.bookmark'))
         @bookmark.manifestation.index!
         @bookmark.create_tag_index
         case params[:mode]
@@ -125,8 +124,8 @@ class BookmarksController < ApplicationController
           format.json { head :no_content }
         end
       else
-        format.html { render :action => "edit" }
-        format.json { render :json => @bookmark.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @bookmark.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -135,17 +134,17 @@ class BookmarksController < ApplicationController
   # DELETE /bookmarks/1.json
   def destroy
     @bookmark.destroy
-    flash[:notice] = t('controller.successfully_deleted', :model => t('activerecord.models.bookmark'))
+    flash[:notice] = t('controller.successfully_deleted', model: t('activerecord.models.bookmark'))
     @bookmark.create_tag_index
 
     if @user
       respond_to do |format|
-        format.html { redirect_to user_bookmarks_url(@user) }
+        format.html { redirect_to bookmarks_url(user_id: @user.username) }
         format.json { head :no_content }
       end
     else
       respond_to do |format|
-        format.html { redirect_to user_bookmarks_url(@bookmark.user) }
+        format.html { redirect_to bookmarks_url(user_id: @bookmark.user.username) }
         format.json { head :no_content }
       end
     end

data/app/controllers/tags_controller.rb

@@ -1,8 +1,7 @@
 class TagsController < ApplicationController
   load_and_authorize_resource
   before_filter :get_user
-  after_filter :solr_commit, :only => [:create, :update, :destroy]
-  cache_sweeper :bookmark_sweeper, :only => [:create, :update, :destroy]
+  after_filter :solr_commit, only: [:create, :update, :destroy]
 
   def index
     session[:params] ={} unless session[:params]
@@ -28,7 +27,7 @@ class TagsController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @tags }
+      format.json { render json: @tags }
       format.rss
       format.atom
     end
@@ -37,7 +36,7 @@ class TagsController < ApplicationController
   def show
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @tag }
+      format.json { render json: @tag }
     end
   end
 
@@ -50,11 +49,11 @@ class TagsController < ApplicationController
 
     respond_to do |format|
       if @tag.update_attributes(params[:tag])
-        format.html { redirect_to @tag, :notice => t('controller.successfully_updated', :model => t('activerecord.models.tag')) }
+        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 }
+        format.html { render action: "edit" }
+        format.json { render json: @tag.errors, status: :unprocessable_entity }
       end
     end
   end

data/app/models/bookmark.rb

@@ -4,15 +4,15 @@ class Bookmark < ActiveRecord::Base
   scope :bookmarked, lambda {|start_date, end_date| {:conditions => ['created_at >= ? AND created_at < ?', start_date, end_date]}}
   scope :user_bookmarks, lambda {|user| where(:user_id => user.id)}
   scope :shared, where(:shared => true)
-  belongs_to :manifestation
-  belongs_to :user #, :counter_cache => true, :validate => true
+  belongs_to :manifestation, touch: true
+  belongs_to :user #, :counter_cache => true, validate: true
 
   validates_presence_of :user, :title
-  validates_presence_of :url, :on => :create
-  validates_presence_of :manifestation_id, :on => :update
+  validates_presence_of :url, on: :create
+  validates_presence_of :manifestation_id, on: :update
   validates_associated :user, :manifestation
-  validates_uniqueness_of :manifestation_id, :scope => :user_id
-  validates :url, :url => true, :presence => true, :length => {:maximum => 255}
+  validates_uniqueness_of :manifestation_id, scope: :user_id
+  validates :url, url: true, presence: true, length: {:maximum => 255}
   before_save :create_manifestation, :if => :url_changed?
   validate :bookmarkable_url?
   validate :already_bookmarked?, :if => :url_changed?
@@ -27,7 +27,7 @@ class Bookmark < ActiveRecord::Base
       manifestation.title
     end
     string :url
-    string :tag, :multiple => true do
+    string :tag, multiple: true do
       tags.pluck(:name)
     end
     integer :user_id
@@ -49,10 +49,10 @@ class Bookmark < ActiveRecord::Base
   end
 
   def save_tagger
-    #user.tag(self, :with => tag_list, :on => :tags)
+    #user.tag(self, with: tag_list, on: :tags)
     taggings.each do |tagging|
       tagging.tagger = user
-      tagging.save(:validate => false)
+      tagging.save(validate: false)
     end
   end
 
@@ -151,7 +151,7 @@ class Bookmark < ActiveRecord::Base
       return
     end
     manifestation = Manifestation.new(:access_address => url)
-    manifestation.carrier_type = CarrierType.where(:name => 'file').first
+    manifestation.carrier_type = CarrierType.where(name: 'file').first
     if self.title.present?
       manifestation.original_title = self.title
     else
@@ -166,12 +166,12 @@ class Bookmark < ActiveRecord::Base
       item.shelf = Shelf.web
       item.manifestation = manifestation
       if defined?(EnjuCirculation)
-        item.circulation_status = CirculationStatus.where(:name => 'Not Available').first
+        item.circulation_status = CirculationStatus.where(name: 'Not Available').first
       end
 
       item.save!
       if defined?(EnjuCirculation)
-        item.use_restriction = UseRestriction.where(:name => 'Not For Loan').first
+        item.use_restriction = UseRestriction.where(name: 'Not For Loan').first
       end
     end
   end

data/app/models/bookmark_stat.rb

@@ -1,21 +1,24 @@
 class BookmarkStat < ActiveRecord::Base
-  attr_accessible :start_date, :end_date, :note
+  include Statesman::Adapters::ActiveRecordModel
   include CalculateStat
-  default_scope :order => 'id DESC'
-  scope :not_calculated, where(:state => 'pending')
+  attr_accessible :start_date, :end_date, :note
+  default_scope order: 'id DESC'
+  scope :not_calculated, -> {in_state(:pending)}
   has_many :bookmark_stat_has_manifestations
-  has_many :manifestations, :through => :bookmark_stat_has_manifestations
+  has_many :manifestations, through: :bookmark_stat_has_manifestations
 
-  state_machine :initial => :pending do
-    before_transition :pending => :completed, :do => :calculate_count
-    event :calculate do
-      transition :pending => :completed
-    end
+  paginates_per 10
+
+  has_many :bookmark_stat_transitions
+
+  def state_machine
+    BookmarkStatStateMachine.new(self, transition_class: BookmarkStatTransition)
   end
 
-  paginates_per 10
+  delegate :can_transition_to?, :transition_to!, :transition_to, :current_state,
+    to: :state_machine
 
-  def calculate_count
+  def calculate_count!
     self.started_at = Time.zone.now
     Manifestation.find_each do |manifestation|
       daily_count = Bookmark.manifestations_count(start_date, end_date, manifestation)
@@ -29,6 +32,12 @@ class BookmarkStat < ActiveRecord::Base
       end
     end
     self.completed_at = Time.zone.now
+    transition_to!(:completed)
+  end
+
+  private
+  def self.transition_class
+    BookmarkStatTransition
   end
 end
 
@@ -42,7 +51,6 @@ end
 #  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

@@ -1,10 +1,10 @@
 class BookmarkStatHasManifestation < ActiveRecord::Base
   attr_accessible
-  attr_accessible :bookmark_stat_id, :manifestation_id, :as => :admin
+  attr_accessible :bookmark_stat_id, :manifestation_id, as: :admin
   belongs_to :bookmark_stat
   belongs_to :manifestation
 
-  validates_uniqueness_of :manifestation_id, :scope => :bookmark_stat_id
+  validates_uniqueness_of :manifestation_id, scope: :bookmark_stat_id
   validates_presence_of :bookmark_stat_id, :manifestation_id
 
   paginates_per 10

data/app/models/bookmark_stat_state_machine.rb

@@ -0,0 +1,13 @@
+class BookmarkStatStateMachine
+  include Statesman::Machine
+  state :pending, initial: true
+  state :started
+  state :completed
+
+  transition from: :pending, to: :started
+  transition from: :started, to: :completed
+
+  after_transition(to: :started) do |bookmark_stat|
+    bookmark_stat.calculate_count!
+  end
+end