muck-services 0.1.42 → 0.1.43

data/VERSION

@@ -1 +1 @@
-0.1.42
+0.1.43

data/VERSION.orig

@@ -0,0 +1,5 @@
+<<<<<<< HEAD
+0.1.40
+=======
+0.1.42
+>>>>>>> 97d29b7a4de0792aa8744d745f5f6774266b01c8

data/app/controllers/muck/identity_feeds_controller.rb

@@ -98,7 +98,7 @@ class Muck::IdentityFeedsController < ApplicationController
   protected
     
     def get_owner
-      setup_parent('service')
+      setup_parent(:ignore => ['service'])
     end
     
     def get_identity_feed

data/app/models/personal_recommendation.rb

@@ -13,10 +13,14 @@
 #
 
 class PersonalRecommendation < ActiveRecord::Base
-  
+  unloadable
+
   belongs_to :personal_recommendable, :polymorphic => true
   belongs_to :destination, :polymorphic => true
-  
+
+  belongs_to :entry, :class_name => 'Entry', :foreign_key => 'destination_id', :include => :feed
+  belongs_to :user, :class_name => 'User', :foreign_key => 'destination_id'
+
   named_scope :limit, lambda { |num| { :limit => num } }
   named_scope :recent, lambda { { :conditions => ['created_at > ?', 1.week.ago] } }
   named_scope :newest, :order => "created_at DESC"

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

@@ -55,7 +55,7 @@ jQuery(document).ready(function() {
         if(json.success && json.feeds.length > 0){
           jQuery('#aggregation-feeds').prepend(json.html);
         } else {
-          <%= jquery_message('#ajax-messages') %>
+          <%= jquery_json_message('#ajax-messages') %>
         }
         jQuery('#add-feed-waiting').hide();
       });

data/app/views/entries/details.html.erb

@@ -12,7 +12,7 @@
     <td><%= render :partial => 'entries/related_entry', :locals => {:related_entry => r} %></td>
     <td class="centered"><%= round(r["relevance"]) %></td>
     <td class="centered"><%= r["clicks"] %></td>
-    <td class="centered"><%= r["avg_time_on_target"] %></td>
+    <td class="centered"><%= r["average_time_at_dest"] %></td>
   </tr>
   <% end%>
 </table>

data/lib/active_record/acts/muck_recommendations.rb

@@ -11,6 +11,8 @@ module ActiveRecord
         # +has_muck_recommendations+ gives the class it is called on personalized recommendations
         def has_muck_recommendations
           has_many :personal_recommendations, :as => :personal_recommendable
+          has_many :recommended_entries, :through => :personal_recommendations, :source => :entry,
+                              :conditions => "personal_recommendations.destination_type = 'Entry'"
         end
 
         def acts_as_muck_recommendation

data/muck-services.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{muck-services}
-  s.version = "0.1.42"
+  s.version = "0.1.43"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joel Duffin", "Justin Ball"]
-  s.date = %q{2010-03-12}
+  s.date = %q{2010-04-29}
   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 = [
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "VERSION.orig",
     "app/controllers/admin/muck/feeds_controller.rb",
     "app/controllers/admin/muck/oai_endpoints_controller.rb",
     "app/controllers/muck/aggregation_feeds_controller.rb",
@@ -135,7 +136,6 @@ Gem::Specification.new do |s|
     "app/views/service_templates/_zotero_group.html.erb",
     "app/views/services/_edit_service.html.erb",
     "app/views/services/_new_service.html.erb",
-    "app/views/services/_personal_recommendations.html.erb",
     "app/views/services/_summary.html.erb",
     "app/views/services/_view_service.html.erb",
     "app/views/services_mailer/notification_feed_added.text.ar.html.erb",
@@ -433,7 +433,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{muck-services}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Feeds, aggregations and services for muck}
   s.test_files = [
     "test/rails_root/app/controllers/application_controller.rb",
@@ -529,6 +529,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/one_test.rb",
     "test/rails_root/test/unit/personal_recommendation_test.rb",
     "test/rails_root/test/unit/recommendation_test.rb",
     "test/rails_root/test/unit/service_category_test.rb",

data/test/rails_root/test/unit/one_test.rb

@@ -0,0 +1,13 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class OneTest < ActiveSupport::TestCase
+  context "entry instance" do
+    setup do
+      @entry = Factory(:entry)
+    end
+
+    subject { @entry }
+
+
+  end
+end

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-services
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 42
-  version: 0.1.42
+  version: 0.1.43
 platform: ruby
 authors: 
 - Joel Duffin
@@ -15,153 +10,129 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-12 00:00:00 -07:00
+date: 2010-04-29 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: acts-as-taggable-on
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
   name: will_paginate
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id002
+    version: 
 - !ruby/object:Gem::Dependency 
   name: httparty
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id003
+    version: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id004
+    version: 
 - !ruby/object:Gem::Dependency 
   name: muck-feedbag
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id005
+    version: 
 - !ruby/object:Gem::Dependency 
   name: river
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id006
+    version: 
 - !ruby/object:Gem::Dependency 
   name: overlord
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id007
+    version: 
 - !ruby/object:Gem::Dependency 
   name: feedzirra
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id008
+    version: 
 - !ruby/object:Gem::Dependency 
   name: muck-engine
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id009
+    version: 
 - !ruby/object:Gem::Dependency 
   name: muck-users
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id010
+    version: 
 - !ruby/object:Gem::Dependency 
   name: muck-comments
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id011
+    version: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :development
-  version_requirements: *id012
+    version: 
 description: This gem contains the rails specific code for dealing with feeds, aggregations and recommendations.  It is meant to work with the muck-raker gem.
 email: justin@tatemae.com
 executables: []
@@ -178,6 +149,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- VERSION.orig
 - app/controllers/admin/muck/feeds_controller.rb
 - app/controllers/admin/muck/oai_endpoints_controller.rb
 - app/controllers/muck/aggregation_feeds_controller.rb
@@ -290,7 +262,6 @@ files:
 - app/views/service_templates/_zotero_group.html.erb
 - app/views/services/_edit_service.html.erb
 - app/views/services/_new_service.html.erb
-- app/views/services/_personal_recommendations.html.erb
 - app/views/services/_summary.html.erb
 - app/views/services/_view_service.html.erb
 - app/views/services_mailer/notification_feed_added.text.ar.html.erb
@@ -596,20 +567,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: muck-services
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Feeds, aggregations and services for muck
@@ -707,6 +676,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/one_test.rb
 - test/rails_root/test/unit/personal_recommendation_test.rb
 - test/rails_root/test/unit/recommendation_test.rb
 - test/rails_root/test/unit/service_category_test.rb

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

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