muck-services 0.1.14 → 0.1.16

data/VERSION

@@ -1 +1 @@
-0.1.14
+0.1.16

data/app/controllers/muck/feeds_controller.rb

@@ -161,7 +161,7 @@ class Muck::FeedsController < ApplicationController
     end
     
     def get_layout_by_params
-      if params[:layout].empty?
+      if params[:layout].blank?
         true
       else
         params[:layout] 

data/app/helpers/muck_services_service_helper.rb

@@ -8,8 +8,7 @@ module MuckServicesServiceHelper
 
   # Render personal recommendations
   def personal_recommendations(user, limit = 5)
-    recommendations = user.recommended_resources
-    render :partial => 'services/personal_recommendations', :locals => { :recommendations => recommendations }
+    render :partial => 'services/personal_recommendations', :locals => { :recommendations => user.personal_recommendations.limit(5) }
   end
   
   # Render a view with all services in categories.

data/app/models/aggregation.rb

@@ -3,7 +3,7 @@
 # Table name: aggregations
 #
 #  id           :integer(4)      not null, primary key
-#  terms         :string(255)
+#  terms        :string(255)
 #  title        :string(255)
 #  description  :text
 #  top_tags     :text
@@ -11,6 +11,7 @@
 #  updated_at   :datetime
 #  ownable_id   :integer(4)
 #  ownable_type :string(255)
+#  feed_count   :integer(4)      default(0)
 #
 
 class Aggregation < ActiveRecord::Base
@@ -19,9 +20,11 @@ class Aggregation < ActiveRecord::Base
   has_friendly_id :terms, :use_slug => true
   
   belongs_to :ownable, :polymorphic => true
+  
   has_many :aggregation_feeds, :conditions => ['feed_type = ?', 'Feed']
-  has_many :aggregation_oai_endpoints, :conditions => ['feed_type = ?', 'OaiEndpoint']
+  has_many :aggregation_oai_endpoints, :conditions => ['feed_type = ?', 'OaiEndpoint'], :source => 'aggregation_feeds'
   has_many :feeds, :through => :aggregation_feeds
+  has_many :oai_endpoints, :through => :aggregation_feeds
   
   named_scope :by_title, :order => "title ASC"
   named_scope :recent, lambda { { :conditions => ['created_at > ?', 1.week.ago] } }
@@ -41,11 +44,12 @@ class Aggregation < ActiveRecord::Base
     safe_add_feeds(Feed.create_tag_feeds(user, uris))
   end
   
-  # Only add feeds that aren't already part of the aggregation
-  def safe_add_feeds(new_feeds)
+  # Only add feeds that aren't already part of the aggregation.  This will setup the feed
+  # as type 'Feed'.  It is important to add feeds using this method or the type won't be set.
+  def safe_add_feeds(new_feeds, type = 'Feed')
     new_feeds.each do |feed|
       begin
-        self.feeds << feed
+        self.aggregation_feeds.create(:feed => feed, :feed_type => type)
       rescue ActiveRecord::RecordInvalid => ex
         # Throw away exception.  Feed already exists so we don't need to do anything.
       end

data/app/models/aggregation_feed.rb

@@ -5,6 +5,7 @@
 #  id             :integer(4)      not null, primary key
 #  aggregation_id :integer(4)
 #  feed_id        :integer(4)
+#  feed_type      :string(255)     default("Feed")
 #
 
 class AggregationFeed < ActiveRecord::Base

data/app/models/attention.rb

@@ -4,10 +4,11 @@
 #
 #  id                 :integer(4)      not null, primary key
 #  attentionable_id   :integer(4)
-#  attentionable_type :string(255)
+#  attentionable_type :string(255)     default("User")
 #  entry_id           :integer(4)
-#  action_type        :string(255)
-#  weight             :float
+#  attention_type_id  :integer(4)
+#  weight             :integer(4)      default(5)
+#  created_at         :datetime
 #
 
 class Attention < ActiveRecord::Base

data/app/models/attention_type.rb

@@ -1,3 +1,12 @@
+# == Schema Information
+#
+# Table name: attention_types
+#
+#  id             :integer(4)      not null, primary key
+#  name           :string(255)
+#  default_weight :integer(4)
+#
+
 
 class AttentionType < ActiveRecord::Base
   WRITE     = 1

data/app/models/entry.rb

@@ -22,18 +22,7 @@
 #  relevant                :text
 #  other                   :text
 #  grain_size              :string(255)     default("unknown")
-#
-# Indexes
-#
-#  index_entries_on_direct_link              (direct_link)
-#  index_entries_on_feed_id                  (feed_id)
-#  index_entries_on_indexed_at               (indexed_at)
-#  index_entries_on_language_id              (language_id)
-#  index_entries_on_oai_identifier           (oai_identifier)
-#  index_entries_on_permalink                (permalink)
-#  index_entries_on_published_at             (published_at)
-#  index_entries_on_relevance_calculated_at  (relevance_calculated_at)
-#  index_entries_on_grain_size               (grain_size)
+#  comment_count           :integer(4)      default(0)
 #
 
 class Entry < ActiveRecord::Base
@@ -44,8 +33,10 @@ class Entry < ActiveRecord::Base
   belongs_to :language
   has_many :activities, :as => :attachable, :dependent => :destroy
   has_many :attentions, :dependent => :destroy
+  has_many :personal_recommendations, :as => :destination
   acts_as_commentable
   acts_as_taggable
+  acts_as_muck_recommendation
   
   @@default_time_on_page = 60.0
   

data/app/models/oai_endpoint.rb

@@ -1,3 +1,20 @@
+# == Schema Information
+#
+# Table name: oai_endpoints
+#
+#  id                  :integer(4)      not null, primary key
+#  uri                 :string(2083)
+#  display_uri         :string(2083)
+#  metadata_prefix     :string(255)
+#  title               :string(1000)
+#  short_title         :string(100)
+#  contributor_id      :integer(4)
+#  status              :integer(4)
+#  default_language_id :integer(4)
+#  created_at          :datetime
+#  updated_at          :datetime
+#
+
 # == Schema Information
 #
 # Table name: oai_endpoints

data/app/models/personal_recommendation.rb

@@ -1,3 +1,25 @@
+# == Schema Information
+#
+# Table name: personal_recommendations
+#
+#  id                          :integer(4)      not null, primary key
+#  personal_recommendable_id   :integer(4)
+#  personal_recommendable_type :string(255)
+#  destination_id              :integer(4)
+#  destination_type            :string(255)
+#  relevance                   :float
+#  created_at                  :datetime
+#  visited_at                  :datetime
+#
+
 class PersonalRecommendation < ActiveRecord::Base
-  belongs_to :entry, :foreign_key => 'destination_id', :conditions => [:destination_type => 'Entry']
+  
+  belongs_to :personal_recommendable, :polymorphic => true
+  belongs_to :destination, :polymorphic => true
+  
+  named_scope :limit, lambda { |num| { :limit => num } }
+  named_scope :recent, lambda { { :conditions => ['created_at > ?', 1.week.ago] } }
+  named_scope :newest, :order => "created_at DESC"
+  named_scope :entries_only, :conditions => ["personal_recommendations.destination_type = 'Entry'"]
+  named_scope :users, :conditions => ["personal_recommendations.destination_type = 'User'"]
 end

data/app/models/service.rb

@@ -15,6 +15,8 @@
 #  active              :boolean(1)      default(TRUE)
 #  prompt              :string(255)
 #  template            :string(255)
+#  uri_data_template   :string(2083)    default("")
+#  uri_key             :string(255)
 #
 
 class Service < ActiveRecord::Base
@@ -148,8 +150,6 @@ class Service < ActiveRecord::Base
     uris.collect{ |u| Feed.find_or_create(u.url, u.title, username, password, service.id, contributor) } if uris
   end
 
-
-
   def self.build_photo_feeds(terms, user, service_ids = nil, refresh_services = false)
     if service_ids.nil?
       service_ids = get_photo_tag_services(refresh_services).map(&:id)

data/app/views/feeds/_feed_row.html.erb

@@ -16,7 +16,7 @@
     </td>
   <% end -%>
   <td><%= feed_row.error_message ? t('muck.services.failed_last_request', :error => feed_row.error_message) : feed_row.banned? ? t('muck.services.banned') : feed_row.pending? ? ('muck.services.pending') : t('muck.services.ok') %></td>
-  <td><%= feed_row.default_language.english_name %></td>
+  <td><%= feed_row.default_language.english_name unless feed_row.default_language.nil? %></td>
   <td><%= feed_row.entries_count.nil? ? "0" : feed_row.entries_count.to_s %></td>
   <td><%= feed_row.harvested_from_short_title %></td>
   <td>

data/app/views/services/_personal_recommendations.html.erb

@@ -1,5 +1,5 @@
 <ul>
-<% recommendations.each do |r| %>
-    <li><%= r.title %></li>
-<% end %>
+<% recommendations.each do |r| -%>
+  <li><%= link_to r.destination.title, r.destination %></li>
+<% end -%>
 </ul>    

data/db/migrate/20091118203605_add_default_feed_type_to_aggregation_feed.rb

@@ -0,0 +1,10 @@
+class AddDefaultFeedTypeToAggregationFeed < ActiveRecord::Migration
+  def self.up
+    change_column :aggregation_feeds, :feed_type, :string, :default => 'Feed'
+  end
+
+  def self.down
+    change_column :aggregation_feeds, :feed_type, :string, :default => nil
+  end
+  
+end

data/lib/active_record/acts/muck_recommendations.rb

@@ -0,0 +1,24 @@
+module ActiveRecord
+  module Acts #:nodoc:
+    module MuckRecommendations # :nodoc:
+
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+  
+      module ClassMethods
+
+        # +has_muck_recommendations+ gives the class it is called on personalized recommendations
+        def has_muck_recommendations
+          has_many :personal_recommendations, :as => :personal_recommendable
+        end
+
+        def acts_as_muck_recommendation
+          has_many :recommended_to, :as => :destination, :class_name => 'PersonalRecommendation'
+        end
+        
+      end
+
+    end
+  end
+end

data/lib/muck_services.rb

@@ -17,6 +17,6 @@ ActiveRecord::Base.class_eval { include ActiveRecord::Acts::MuckServicesComment
 ActiveRecord::Base.class_eval { include ActiveRecord::Acts::MuckServicesShare }
 ActiveRecord::Base.class_eval { include ActiveRecord::Acts::MuckFeedOwner }
 ActiveRecord::Base.class_eval { include ActiveRecord::Acts::MuckAggregationOwner }
-
+ActiveRecord::Base.class_eval { include ActiveRecord::Acts::MuckRecommendations }
 
 I18n.load_path += Dir[ File.join(File.dirname(__FILE__), '..', 'locales', '*.{rb,yml}') ]

data/muck-services.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-services}
-  s.version = "0.1.14"
+  s.version = "0.1.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joel Duffin", "Justin Ball"]
-  s.date = %q{2009-11-17}
+  s.date = %q{2009-11-30}
   s.description = %q{This gem contains the rails specific code for dealing with feeds, aggregations and recommendations.  It is meant to work with the muck-raker gem.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -347,7 +347,6 @@ Gem::Specification.new do |s|
      "db/migrate/20090623181458_add_grain_size_to_entries.rb",
      "db/migrate/20090623193525_add_grain_size_to_tag_clouds.rb",
      "db/migrate/20090703175825_denormalize_entries_subjects.rb",
-     "db/migrate/20090704220055_create_slugs.rb",
      "db/migrate/20090716035935_change_tag_cloud_grain_sizes.rb",
      "db/migrate/20090717173900_add_contributor_to_feeds.rb",
      "db/migrate/20090717175825_normalize_entries_subjects.rb",
@@ -371,9 +370,11 @@ Gem::Specification.new do |s|
      "db/migrate/20091022150615_add_uri_key_to_services.rb",
      "db/migrate/20091115011828_add_aggregations_for_personal_recs.rb",
      "db/migrate/20091116094447_rename_action_table.rb",
+     "db/migrate/20091118203605_add_default_feed_type_to_aggregation_feed.rb",
      "lib/active_record/acts/muck_aggregation_owner.rb",
      "lib/active_record/acts/muck_feed_owner.rb",
      "lib/active_record/acts/muck_feed_parent.rb",
+     "lib/active_record/acts/muck_recommendations.rb",
      "lib/active_record/acts/muck_services_comment.rb",
      "lib/active_record/acts/muck_services_share.rb",
      "lib/muck_services.rb",
@@ -764,6 +765,9 @@ Gem::Specification.new do |s|
      "test/rails_root/db/migrate/20090924200750_add_uri_data_template_to_services.rb",
      "test/rails_root/db/migrate/20091006183742_add_feed_count_to_aggregation.rb",
      "test/rails_root/db/migrate/20091022150615_add_uri_key_to_services.rb",
+     "test/rails_root/db/migrate/20091115011828_add_aggregations_for_personal_recs.rb",
+     "test/rails_root/db/migrate/20091116094447_rename_action_table.rb",
+     "test/rails_root/db/migrate/20091118203605_add_default_feed_type_to_aggregation_feed.rb",
      "test/rails_root/db/schema.rb",
      "test/rails_root/features/step_definitions/common_steps.rb",
      "test/rails_root/features/step_definitions/visit_steps.rb",
@@ -792,6 +796,7 @@ Gem::Specification.new do |s|
      "test/rails_root/test/unit/feed_test.rb",
      "test/rails_root/test/unit/identity_feed_test.rb",
      "test/rails_root/test/unit/oai_endpoint_test.rb",
+     "test/rails_root/test/unit/personal_recommendation_test.rb",
      "test/rails_root/test/unit/service_category_test.rb",
      "test/rails_root/test/unit/service_test.rb",
      "test/rails_root/test/unit/services_mailer_test.rb",

data/rails/init.rb

@@ -7,7 +7,7 @@ else
     require 'acts-as-taggable-on'
   rescue LoadError
     begin
-      gem 'mbleigh-acts-as-taggable-on'
+      gem 'acts-as-taggable-on'
     rescue Gem::LoadError
       puts "Please install the acts-as-taggable-on gem"
     end

data/test/rails_root/app/models/user.rb

@@ -37,6 +37,8 @@ class User < ActiveRecord::Base
   acts_as_muck_sharer
   acts_as_muck_feed_owner
   acts_as_muck_aggregation_owner
+  has_muck_recommendations
+  acts_as_muck_recommendation
   def feed_to
     self
   end

data/test/rails_root/config/environment.rb

@@ -21,8 +21,8 @@ Rails::Initializer.run do |config|
   config.gem "bcrypt-ruby", :lib => "bcrypt", :version => ">=2.0.5"
   config.gem "acts-as-taggable-on"
   config.gem "awesome_nested_set"
-  config.gem "muck-feedbag", :lib => "feedbag", :source => "http://gems.github.com"
-  config.gem "pauldix-feedzirra", :lib => 'feedzirra', :source => "http://gems.github.com"
+  config.gem "muck-feedbag", :lib => "feedbag"
+  config.gem "feedzirra"
   config.gem "httparty"
   config.gem "river"
   config.gem "overlord"
@@ -33,6 +33,6 @@ Rails::Initializer.run do |config|
   config.gem 'muck-activities', :lib => 'muck_activities'
   config.gem 'muck-shares', :lib => 'muck_shares'
   config.gem 'muck-solr', :lib => 'acts_as_solr'
-  config.gem 'muck-raker', :lib => 'muck-raker'
+  config.gem 'muck-raker', :lib => 'muck_raker'
   config.plugin_locators << TestGemLocator
 end

data/test/rails_root/db/migrate/20090602191243_create_muck_raker.rb

@@ -1,7 +1,10 @@
 class CreateMuckRaker < ActiveRecord::Migration
 
   def self.up
-
+    
+    # Gets the database adapter info defined in the database.yml file
+    adapter = User.connection.instance_variable_get("@config")[:adapter]
+             
     create_table "action_types", :force => true do |t|
       t.string  "action_type"
       t.integer "weight"
@@ -254,7 +257,13 @@ class CreateMuckRaker < ActiveRecord::Migration
       t.integer  "entry_id"
       t.boolean  "autogenerated", :default => false
     end
-    execute "ALTER TABLE entries_subjects DROP COLUMN id, DROP PRIMARY KEY, ADD PRIMARY KEY USING BTREE(subject_id, entry_id);"
+    
+    if adapter == 'mysql'
+      execute "ALTER TABLE entries_subjects DROP COLUMN id, DROP PRIMARY KEY, ADD PRIMARY KEY USING BTREE(subject_id, entry_id);"
+    elsif adapter == 'postgresql'
+      execute "CREATE UNIQUE INDEX entries_subjects_subject_id_entry_id ON entries_subjects USING btree(subject_id, entry_id); "
+      execute "ALTER TABLE entries_subjects CLUSTER ON entries_subjects_subject_id_entry_id; "
+    end
     add_index "entries_subjects", ["subject_id"]
     add_index "entries_subjects", ["entry_id"]
     add_index "entries_subjects", ["autogenerated"]
@@ -264,8 +273,14 @@ class CreateMuckRaker < ActiveRecord::Migration
       t.string   "filter"
       t.string   "tag_list", :limit => 2500
     end
-    execute "ALTER TABLE cloud_caches DROP COLUMN id, DROP PRIMARY KEY, ADD PRIMARY KEY USING BTREE(language_id, filter);"
-
+    
+    if adapter == 'mysql'
+      execute "ALTER TABLE cloud_caches DROP COLUMN id, DROP PRIMARY KEY, ADD PRIMARY KEY USING BTREE(language_id, filter);"
+    elsif adapter == 'postgresql'
+      execute "CREATE UNIQUE INDEX cloud_caches_language_id_filter ON cloud_caches USING btree(language_id, filter); "
+      execute "ALTER TABLE cloud_caches CLUSTER ON cloud_caches_language_id_filter; "
+    end
+    
     # add a flag to the languages table to flag languages we support
     add_column :languages, :muck_raker_supported, :boolean, :default => false
     add_column :languages, :indexed_records, :integer, :default => 0

data/test/rails_root/db/migrate/20090703175825_denormalize_entries_subjects.rb

@@ -1,15 +1,41 @@
 class DenormalizeEntriesSubjects < ActiveRecord::Migration
   def self.up
+    
+    # Gets the database adapter info defined in the database.yml file
+    adapter = User.connection.instance_variable_get("@config")[:adapter]
+    
     add_column :entries_subjects, :language_id, :integer
     add_column :entries_subjects, :grain_size, :string
     add_index "entries_subjects", ["language_id"]
     add_index "entries_subjects", ["grain_size"]
-    execute "ALTER TABLE entries_subjects DROP PRIMARY KEY, ADD PRIMARY KEY USING BTREE(subject_id, language_id, grain_size, entry_id);"
-    execute "UPDATE entries_subjects AS es INNER JOIN entries AS e ON e.id = es.entry_id SET es.language_id = e.language_id, es.grain_size = e.grain_size"
+    
+    if adapter == 'mysql'
+      execute "ALTER TABLE entries_subjects DROP PRIMARY KEY, ADD PRIMARY KEY USING BTREE(subject_id, language_id, grain_size, entry_id);"
+      execute "UPDATE entries_subjects AS es INNER JOIN entries AS e ON e.id = es.entry_id SET es.language_id = e.language_id, es.grain_size = e.grain_size"
+    elsif adapter == 'postgresql'
+      execute "DROP INDEX entries_subjects_subject_id_entry_id"
+      execute "CREATE UNIQUE INDEX entries_subjects_subject_id_entry_id ON entries_subjects USING btree(subject_id, language_id, grain_size, entry_id); "
+      execute "ALTER TABLE entries_subjects CLUSTER ON entries_subjects_subject_id_entry_id; "
+      execute "UPDATE entries_subjects es SET language_id = e.language_id, grain_size = e.grain_size FROM entries e WHERE es.entry_id = e.id"
+    else
+      raise 'Migration not implemented for this DB adapter'
+    end
+    
   end
 
   def self.down
-    execute "ALTER TABLE entries_subjects DROP PRIMARY KEY, ADD PRIMARY KEY USING BTREE(subject_id, entry_id);"
+    
+    # Gets the database adapter info defined in the database.yml file
+    adapter = User.connection.instance_variable_get("@config")[:adapter]
+    
+    if adapter == 'mysql'
+      execute "ALTER TABLE entries_subjects DROP PRIMARY KEY, ADD PRIMARY KEY USING BTREE(subject_id, entry_id);"
+    elsif adapter == 'postgresql'
+      execute "DROP INDEX entries_subjects_subject_id_entry_id" 
+      execute "CREATE UNIQUE INDEX entries_subjects_subject_id_entry_id ON entries_subjects USING btree(subject_id, entry_id); "
+      execute "ALTER TABLE entries_subjects CLUSTER ON entries_subjects_subject_id_entry_id; "
+    end
+    
     remove_column :entries_subjects, :language_id 
     remove_column :entries_subjects, :grain_size 
   end

data/test/rails_root/db/migrate/20090717175825_normalize_entries_subjects.rb

@@ -1,6 +1,19 @@
 class NormalizeEntriesSubjects < ActiveRecord::Migration
   def self.up
-    execute "ALTER TABLE entries_subjects DROP PRIMARY KEY, ADD PRIMARY KEY USING BTREE(subject_id, entry_id);"
+    
+    # Gets the database adapter info defined in the database.yml file
+    adapter = User.connection.instance_variable_get("@config")[:adapter]
+    
+    if adapter == 'mysql'
+      execute "ALTER TABLE entries_subjects DROP PRIMARY KEY, ADD PRIMARY KEY USING BTREE(subject_id, entry_id);"
+    elsif adapter == 'postgresql'
+      execute "DROP INDEX entries_subjects_subject_id_entry_id" 
+      execute "CREATE UNIQUE INDEX entries_subjects_subject_id_entry_id ON entries_subjects USING btree(subject_id, entry_id); "
+      execute "ALTER TABLE entries_subjects CLUSTER ON entries_subjects_subject_id_entry_id; "
+    else
+      raise 'Migration not implemented for this data adapter'
+    end
+    
     remove_column :entries_subjects, :language_id 
     remove_column :entries_subjects, :grain_size 
     execute "delete from entries_subjects where entry_id IN (select entries.id from entries inner join feeds ON feeds.id = entries.feed_id where feeds.uri = 'http://ndr.nsdl.org/oai?verb=ListRecords&metadataPrefix=nsdl_dc&set=439869');"
@@ -8,11 +21,27 @@ class NormalizeEntriesSubjects < ActiveRecord::Migration
   end
 
   def self.down
+    
+    # Gets the database adapter info defined in the database.yml file
+    adapter = User.connection.instance_variable_get("@config")[:adapter]
+    
     add_column :entries_subjects, :language_id, :integer
     add_column :entries_subjects, :grain_size, :string
     add_index "entries_subjects", ["language_id"]
     add_index "entries_subjects", ["grain_size"]
-    execute "ALTER TABLE entries_subjects DROP PRIMARY KEY, ADD PRIMARY KEY USING BTREE(subject_id, language_id, grain_size, entry_id);"
-    execute "UPDATE entries_subjects AS es INNER JOIN entries AS e ON e.id = es.entry_id SET es.language_id = e.language_id, es.grain_size = e.grain_size"
+    
+    if adapter == 'mysql'
+      execute "ALTER TABLE entries_subjects DROP PRIMARY KEY, ADD PRIMARY KEY USING BTREE(subject_id, language_id, grain_size, entry_id);"
+      execute "UPDATE entries_subjects AS es INNER JOIN entries AS e ON e.id = es.entry_id SET es.language_id = e.language_id, es.grain_size = e.grain_size"
+    elsif adapter == 'postgresql'
+      execute "DROP INDEX entries_subjects_subject_id_entry_id"
+      execute "CREATE UNIQUE INDEX entries_subjects_subject_id_entry_id ON entries_subjects USING btree(subject_id, language_id, grain_size, entry_id); "
+      execute "ALTER TABLE entries_subjects CLUSTER ON entries_subjects_subject_id_entry_id; "
+      execute "UPDATE entries_subjects es SET language_id = e.language_id, grain_size = e.grain_size FROM entries e WHERE es.entry_id = e.id"
+    else
+      raise 'Migration not implemented for this data adapter'
+    end
+    
+    
   end
 end

data/test/rails_root/db/migrate/20091115011828_add_aggregations_for_personal_recs.rb

@@ -0,0 +1,9 @@
+class AddAggregationsForPersonalRecs < ActiveRecord::Migration
+  def self.up
+    add_column :aggregation_feeds, :feed_type, :string
+  end
+
+  def self.down
+    remove_column :aggregation_feeds, :feed_type
+  end
+end

data/test/rails_root/db/migrate/20091116094447_rename_action_table.rb

@@ -0,0 +1,38 @@
+class RenameActionTable < ActiveRecord::Migration
+  def self.up
+    rename_table :action_types, :attention_types
+    rename_column :attention_types, :action_type, :name
+    rename_column :attention_types, :weight, :default_weight
+
+    change_column :attentions, :attentionable_type, :string, :default => 'User'
+    rename_column :attentions, :action_type, :attention_type_id
+    change_column :attentions, :attention_type_id, :integer
+    change_column :attentions, :weight, :integer, :default => 5
+    add_column :attentions, :created_at, :datetime
+    add_index :attentions, :attention_type_id
+    add_index :attentions, :entry_id
+
+    remove_column :personal_recommendations, :rank
+    add_column :personal_recommendations, :created_at, :datetime
+    add_column :personal_recommendations, :visited_at, :datetime
+    add_index :personal_recommendations, :personal_recommendable_id
+  end
+
+  def self.down
+    remove_index :personal_recommendations, :personal_recommendable_id
+    remove_column :personal_recommendations, :visited_at
+    remove_column :personal_recommendations, :created_at
+    add_column :personal_recommendations, :rank, :integer
+
+    remove_index :attentions, :entry_id
+    remove_index :attentions, :attention_type_id
+    remove_column :attentions, :created_at
+    change_column :attentions, :weight, :float
+    change_column :attentions, :attention_type_id, :string
+    rename_column :attentions, :attention_type_id, :action_type
+
+    rename_column :attention_types, :default_weight, :weight
+    rename_column :attention_types, :name, :action_type
+    rename_table :attention_types, :action_types
+  end
+end

data/test/rails_root/db/migrate/20091118203605_add_default_feed_type_to_aggregation_feed.rb

@@ -0,0 +1,10 @@
+class AddDefaultFeedTypeToAggregationFeed < ActiveRecord::Migration
+  def self.up
+    change_column :aggregation_feeds, :feed_type, :string, :default => 'Feed'
+  end
+
+  def self.down
+    change_column :aggregation_feeds, :feed_type, :string, :default => nil
+  end
+  
+end

data/test/rails_root/db/schema.rb

@@ -9,12 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20091022150615) do
-
-  create_table "action_types", :force => true do |t|
-    t.string  "action_type"
-    t.integer "weight"
-  end
+ActiveRecord::Schema.define(:version => 20091118203605) do
 
   create_table "activities", :force => true do |t|
     t.integer  "item_id"
@@ -49,6 +44,7 @@ ActiveRecord::Schema.define(:version => 20091022150615) do
   create_table "aggregation_feeds", :force => true do |t|
     t.integer "aggregation_id"
     t.integer "feed_id"
+    t.string  "feed_type",      :default => "Feed"
   end
 
   add_index "aggregation_feeds", ["aggregation_id"], :name => "index_aggregation_feeds_on_aggregation_id"
@@ -68,14 +64,23 @@ ActiveRecord::Schema.define(:version => 20091022150615) do
 
   add_index "aggregations", ["ownable_id", "ownable_type"], :name => "index_aggregations_on_ownable_id_and_ownable_type"
 
+  create_table "attention_types", :force => true do |t|
+    t.string  "name"
+    t.integer "default_weight"
+  end
+
   create_table "attentions", :force => true do |t|
-    t.integer "attentionable_id"
-    t.string  "attentionable_type"
-    t.integer "entry_id"
-    t.string  "action_type"
-    t.float   "weight"
+    t.integer  "attentionable_id"
+    t.string   "attentionable_type", :default => "User"
+    t.integer  "entry_id"
+    t.integer  "attention_type_id"
+    t.integer  "weight",             :default => 5
+    t.datetime "created_at"
   end
 
+  add_index "attentions", ["attention_type_id"], :name => "index_attentions_on_attention_type_id"
+  add_index "attentions", ["entry_id"], :name => "index_attentions_on_entry_id"
+
   create_table "clicks", :force => true do |t|
     t.integer  "recommendation_id"
     t.datetime "when",                              :null => false
@@ -327,14 +332,17 @@ ActiveRecord::Schema.define(:version => 20091022150615) do
   end
 
   create_table "personal_recommendations", :force => true do |t|
-    t.integer "personal_recommendable_id"
-    t.string  "personal_recommendable_type"
-    t.integer "destination_id"
-    t.string  "destination_type"
-    t.integer "rank"
-    t.float   "relevance"
+    t.integer  "personal_recommendable_id"
+    t.string   "personal_recommendable_type"
+    t.integer  "destination_id"
+    t.string   "destination_type"
+    t.float    "relevance"
+    t.datetime "created_at"
+    t.datetime "visited_at"
   end
 
+  add_index "personal_recommendations", ["personal_recommendable_id"], :name => "index_personal_recommendations_on_personal_recommendable_id"
+
   create_table "queries", :force => true do |t|
     t.text    "name"
     t.integer "frequency"

data/test/rails_root/test/unit/aggregation_feed_test.rb

@@ -5,6 +5,7 @@
 #  id             :integer(4)      not null, primary key
 #  aggregation_id :integer(4)
 #  feed_id        :integer(4)
+#  feed_type      :string(255)     default("Feed")
 #
 
 require File.dirname(__FILE__) + '/../test_helper'

data/test/rails_root/test/unit/aggregation_test.rb

@@ -3,7 +3,7 @@
 # Table name: aggregations
 #
 #  id           :integer(4)      not null, primary key
-#  name         :string(255)
+#  terms        :string(255)
 #  title        :string(255)
 #  description  :text
 #  top_tags     :text
@@ -11,6 +11,7 @@
 #  updated_at   :datetime
 #  ownable_id   :integer(4)
 #  ownable_type :string(255)
+#  feed_count   :integer(4)      default(0)
 #
 
 require File.dirname(__FILE__) + '/../test_helper'

data/test/rails_root/test/unit/entry_test.rb

@@ -22,18 +22,7 @@
 #  relevant                :text
 #  other                   :text
 #  grain_size              :string(255)     default("unknown")
-#
-# Indexes
-#
-#  index_entries_on_direct_link              (direct_link)
-#  index_entries_on_feed_id                  (feed_id)
-#  index_entries_on_indexed_at               (indexed_at)
-#  index_entries_on_language_id              (language_id)
-#  index_entries_on_oai_identifier           (oai_identifier)
-#  index_entries_on_permalink                (permalink)
-#  index_entries_on_published_at             (published_at)
-#  index_entries_on_relevance_calculated_at  (relevance_calculated_at)
-#  index_entries_on_grain_size               (grain_size)
+#  comment_count           :integer(4)      default(0)
 #
 
 require File.dirname(__FILE__) + '/../test_helper'

data/test/rails_root/test/unit/oai_endpoint_test.rb

@@ -1,3 +1,20 @@
+# == Schema Information
+#
+# Table name: oai_endpoints
+#
+#  id                  :integer(4)      not null, primary key
+#  uri                 :string(2083)
+#  display_uri         :string(2083)
+#  metadata_prefix     :string(255)
+#  title               :string(1000)
+#  short_title         :string(100)
+#  contributor_id      :integer(4)
+#  status              :integer(4)
+#  default_language_id :integer(4)
+#  created_at          :datetime
+#  updated_at          :datetime
+#
+
 require File.dirname(__FILE__) + '/../test_helper'
 
 # Used to test muck_content_permission

data/test/rails_root/test/unit/personal_recommendation_test.rb

@@ -0,0 +1,78 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class PersonalRecommendationTest < ActiveSupport::TestCase
+  context "personal recommendations" do
+    setup do
+      @user = Factory(:user)
+    end
+    
+    context "has_muck_recommendations" do
+      setup do
+        @entry = Factory(:entry)
+      end
+      should "create a personal recommendation" do
+        recommendation = @user.personal_recommendations.build(:destination => @entry)
+        assert recommendation.save
+      end
+    end
+    
+    context "acts_as_muck_recommendation" do
+      setup do
+        @recommended_user = Factory(:user)
+      end
+      should "make user recommended" do
+        recommendation = @user.personal_recommendations.create(:destination => @recommended_user)
+        assert @recommended_user.recommended_to.include?(recommendation)
+      end
+    end
+    
+    context "named scopes" do
+      setup do
+        @entry = Factory(:entry)
+        @entry_old = Factory(:entry)
+        @recommended_user = Factory(:user)
+        @entry_recommendation = @user.personal_recommendations.create(:destination => @entry)
+        @user_recommendation = @user.personal_recommendations.create(:destination => @recommended_user, :created_at => 1.day.ago)
+        @old_recommendation = @user.personal_recommendations.create(:destination => @entry_old, :created_at => 3.weeks.ago)
+      end
+
+      context "entries" do
+        should "return an entry" do
+          assert @user.personal_recommendations.entries_only.include?(@entry_recommendation)
+        end
+        should "not return a user" do
+          assert !@user.personal_recommendations.entries_only.include?(@user_recommendation)
+        end
+      end
+      context "users" do
+        should "return an user" do
+          assert @user.personal_recommendations.users.include?(@user_recommendation)
+        end
+        should "not return an entry" do
+          assert !@user.personal_recommendations.users.include?(@entry_recommendation)
+        end
+      end
+      context "limited" do
+        should "only return a limited number of recommendations" do
+          assert_equal 1, @user.personal_recommendations.limit(1).length
+        end
+      end
+      context "recent" do
+        should "return recent recommendations" do
+          assert @user.personal_recommendations.recent.include?(@entry_recommendation)
+        end
+        should "not return old recommendations" do
+          assert !@user.personal_recommendations.recent.include?(@old_recommendation)
+        end
+      end
+      context "newest" do
+        should "order recommendations by newest" do
+          recommendations = @user.personal_recommendations.newest
+          assert recommendations[0].created_at > recommendations[1].created_at
+        end
+      end
+      
+    end
+    
+  end
+end

data/test/rails_root/test/unit/service_test.rb

@@ -6,7 +6,7 @@
 #  uri                 :string(2083)    default("")
 #  name                :string(1000)    default("")
 #  api_uri             :string(2083)    default("")
-#  uri_data_template        :string(2083)    default("")
+#  uri_template        :string(2083)    default("")
 #  icon                :string(2083)    default("rss.gif")
 #  sort                :integer(4)
 #  requires_password   :boolean(1)
@@ -15,6 +15,8 @@
 #  active              :boolean(1)      default(TRUE)
 #  prompt              :string(255)
 #  template            :string(255)
+#  uri_data_template   :string(2083)    default("")
+#  uri_key             :string(255)
 #
 
 require File.dirname(__FILE__) + '/../test_helper'

data/test/rails_root/test/unit/user_test.rb

@@ -42,5 +42,6 @@ class UserTest < ActiveSupport::TestCase
     should_have_many :feeds
     should_have_many :own_feeds
     should_have_many :identity_feeds
+    
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-services
 version: !ruby/object:Gem::Version 
-  version: 0.1.14
+  version: 0.1.16
 platform: ruby
 authors: 
 - Joel Duffin
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-17 00:00:00 -07:00
+date: 2009-11-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -473,7 +473,6 @@ files:
 - db/migrate/20090623181458_add_grain_size_to_entries.rb
 - db/migrate/20090623193525_add_grain_size_to_tag_clouds.rb
 - db/migrate/20090703175825_denormalize_entries_subjects.rb
-- db/migrate/20090704220055_create_slugs.rb
 - db/migrate/20090716035935_change_tag_cloud_grain_sizes.rb
 - db/migrate/20090717173900_add_contributor_to_feeds.rb
 - db/migrate/20090717175825_normalize_entries_subjects.rb
@@ -497,9 +496,11 @@ files:
 - db/migrate/20091022150615_add_uri_key_to_services.rb
 - db/migrate/20091115011828_add_aggregations_for_personal_recs.rb
 - db/migrate/20091116094447_rename_action_table.rb
+- db/migrate/20091118203605_add_default_feed_type_to_aggregation_feed.rb
 - lib/active_record/acts/muck_aggregation_owner.rb
 - lib/active_record/acts/muck_feed_owner.rb
 - lib/active_record/acts/muck_feed_parent.rb
+- lib/active_record/acts/muck_recommendations.rb
 - lib/active_record/acts/muck_services_comment.rb
 - lib/active_record/acts/muck_services_share.rb
 - lib/muck_services.rb
@@ -911,6 +912,9 @@ test_files:
 - test/rails_root/db/migrate/20090924200750_add_uri_data_template_to_services.rb
 - test/rails_root/db/migrate/20091006183742_add_feed_count_to_aggregation.rb
 - test/rails_root/db/migrate/20091022150615_add_uri_key_to_services.rb
+- test/rails_root/db/migrate/20091115011828_add_aggregations_for_personal_recs.rb
+- test/rails_root/db/migrate/20091116094447_rename_action_table.rb
+- test/rails_root/db/migrate/20091118203605_add_default_feed_type_to_aggregation_feed.rb
 - test/rails_root/db/schema.rb
 - test/rails_root/features/step_definitions/common_steps.rb
 - test/rails_root/features/step_definitions/visit_steps.rb
@@ -939,6 +943,7 @@ test_files:
 - test/rails_root/test/unit/feed_test.rb
 - test/rails_root/test/unit/identity_feed_test.rb
 - test/rails_root/test/unit/oai_endpoint_test.rb
+- test/rails_root/test/unit/personal_recommendation_test.rb
 - test/rails_root/test/unit/service_category_test.rb
 - test/rails_root/test/unit/service_test.rb
 - test/rails_root/test/unit/services_mailer_test.rb

data/db/migrate/20090704220055_create_slugs.rb

@@ -1,18 +0,0 @@
-class CreateSlugs < ActiveRecord::Migration
-  def self.up
-    create_table :slugs do |t|
-      t.string :name
-      t.integer :sluggable_id
-      t.integer :sequence, :null => false, :default => 1
-      t.string :sluggable_type, :limit => 40
-      t.string :scope, :limit => 40
-      t.datetime :created_at
-    end
-    add_index :slugs, [:name, :sluggable_type, :scope, :sequence], :unique => true
-    add_index :slugs, :sluggable_id
-  end
-
-  def self.down
-    drop_table :slugs
-  end
-end