More work on tests.

modified:   app/controllers/application_controller.rb
modified:   app/models/analysis_item.rb
modified:   app/models/analysis_job.rb
modified:   app/models/analysis_script.rb
modified:   app/models/audio_event.rb
modified:   app/models/audio_recording.rb
modified:   app/models/bookmark.rb
modified:   app/models/photo.rb
modified:   app/models/progress.rb
modified:   app/models/project.rb
modified:   app/models/site.rb
modified:   app/models/tag.rb
modified:   app/models/user.rb
modified:   spec/factories/analysis_job_factory.rb
modified:   spec/factories/analysis_script_factory.rb
modified:   spec/factories/audio_event_factory.rb
modified:   spec/factories/bookmark_factory.rb
modified:   spec/factories/permission_factory.rb
modified:   spec/factories/saved_search_factory.rb
modified:   spec/factories/tag_factory.rb
modified:   spec/spec_helper.rb
modified:   spec/support/api_examples_delete.rb

app/controllers/application_controller.rb

@@ -43,9 +43,9 @@ def render_csv(filename = nil)
   end
 
   def add_archived_at_header(model)
-    #if model.respond_to?(:deleted_at) && !model.deleted_at.blank?
-      response.headers["X-Archived-At"] = 'hi'#model.deleted_at
-    #end
+    if model.respond_to?(:deleted_at) && !model.deleted_at.blank?
+      response.headers["X-Archived-At"] = model.deleted_at
+    end
   end
 
   def no_content_as_json

app/models/analysis_item.rb

@@ -16,6 +16,9 @@ class AnalysisItem < ActiveRecord::Base
   enumerize :status, in: AVAILABLE_STATUSES, :default => :ready, predicates: true
   validates :status, inclusion: {in: AVAILABLE_STATUSES}, presence: true
 
+
+  # userstamp not used
+
   # validations
   validates :offset_start_seconds, presence: true, numericality: {greater_than_or_equal_to: 0}
   validates :offset_end_seconds, presence: true, numericality: {greater_than_or_equal_to: 0}

app/models/analysis_job.rb

@@ -20,8 +20,10 @@ class AnalysisJob < ActiveRecord::Base
   accepts_nested_attributes_for :saved_search
 
   # userstamp
+  acts_as_paranoid
   stampable
   belongs_to :user, class_name: 'User', foreign_key: :creator_id
+  validates_as_paranoid
 
   # validations
   validates :name, presence: true, length: { minimum: 2, maximum: 255 }, uniqueness: { case_sensitive: false }

app/models/analysis_script.rb

@@ -33,9 +33,9 @@ def initialize(attributes = nil, options = {})
                                   #   TODO: THIS FIELD SHOULD BE RESTRICTED
 
   # userstamp
+  acts_as_paranoid
   stampable
   belongs_to :user, :class_name => 'User', :foreign_key => :creator_id
-  acts_as_paranoid
   validates_as_paranoid
 
   # validations

app/models/audio_event.rb

@@ -13,9 +13,9 @@ class AudioEvent < ActiveRecord::Base
                   :tags_attributes
 
   # userstamp
+  acts_as_paranoid
   stampable
   belongs_to :user, class_name: 'User', foreign_key: :creator_id
-  acts_as_paranoid
   validates_as_paranoid
 
   # validation

app/models/audio_recording.rb

@@ -10,7 +10,7 @@ class AudioRecording < ActiveRecord::Base
   # relations
   belongs_to :site
   has_many :audio_events
-  belongs_to :user, :class_name => 'User', :foreign_key => "uploader_id"
+  belongs_to :user, :class_name => 'User', :foreign_key => :uploader_id
   has_many :analysis_items
   has_many :bookmarks
 
@@ -23,9 +23,9 @@ class AudioRecording < ActiveRecord::Base
   accepts_nested_attributes_for :site
 
   # userstamp
-  stampable
-  belongs_to :user, :class_name => 'User', :foreign_key => :creator_id
   acts_as_paranoid
+  stampable
+  belongs_to :user, class_name: 'User', foreign_key: :creator_id
   validates_as_paranoid
 
   #enums

app/models/bookmark.rb

@@ -12,7 +12,7 @@ class Bookmark < ActiveRecord::Base
 
   # userstamp
   stampable
-  belongs_to :user, :class_name => 'User', :foreign_key => :creator_id
+  belongs_to :user, class_name: 'User', foreign_key: :creator_id
 
   # validation
   validates :offset_seconds,  :presence => true, :numericality => { :greater_than_or_equal_to  => 0 }

app/models/photo.rb

@@ -5,6 +5,10 @@ class Photo < ActiveRecord::Base
   # attr
   attr_accessible :copyright, :uri, :description, :imageable_type, :imageable_id
 
+  # userstamp
+  stampable
+  belongs_to :user, class_name: 'User', foreign_key: :creator_id
+
   # validation
   # http://stackoverflow.com/questions/6778269/rails-3-polymorphic-liking-of-entities-by-user-how
   # http://stackoverflow.com/questions/746387/labels-for-radio-buttons-in-rails-form

app/models/progress.rb

@@ -16,7 +16,7 @@ class Progress < ActiveRecord::Base
 
   # userstamp
   stampable
-  belongs_to :user, :class_name => 'User', :foreign_key => :creator_id
+  belongs_to :user, class_name: 'User', foreign_key: :creator_id
 
   # validation
   validates_uniqueness_of :activity,

app/models/project.rb

@@ -17,9 +17,9 @@ class Project < ActiveRecord::Base
 
 
   # userstamp
-  stampable
-  belongs_to :user, :class_name => 'User', :foreign_key => :creator_id
   acts_as_paranoid
+  stampable
+  belongs_to :user, class_name: 'User', foreign_key: :creator_id
   validates_as_paranoid
 
   # validation

app/models/site.rb

@@ -16,9 +16,9 @@ class Site < ActiveRecord::Base
   accepts_nested_attributes_for :audio_recordings
 
   # userstamp
-  stampable
-  belongs_to :user, :class_name => 'User', :foreign_key => :creator_id
   acts_as_paranoid
+  stampable
+  belongs_to :user, class_name: 'User', foreign_key: :creator_id
   validates_as_paranoid
 
   # validations

app/models/tag.rb

@@ -12,8 +12,6 @@ class Tag < ActiveRecord::Base
   # userstamp
   stampable
   belongs_to :user, class_name: 'User', foreign_key: :creator_id
-  #acts_as_paranoid # deletable, not archiveable
-  #validates_as_paranoid
 
   # enums
   AVAILABLE_TYPE_OF_TAGS = [:common_name, :species_name, :looks_like, :sounds_like].map{ |item| item.to_s }

app/models/user.rb

@@ -16,9 +16,12 @@ class User < ActiveRecord::Base
 
 
 
-  # user stamp
-  model_stamper
+  # userstamp
+  model_stamper # this identifies this class as being the class that 'stamps'
+  acts_as_paranoid
   stampable
+  belongs_to :user, class_name: 'User', foreign_key: :creator_id
+  validates_as_paranoid
 
   # other associations
   has_many :authorizations, :dependent => :destroy